X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FXappManagerMockConfiguration.java;h=ed4f49ccfb283c5f4b677d1c1fceb4f2a7fa9339;hb=e496666f846aa72dbfb1ff8870a08be8ab34a2c2;hp=869889309d9651435b62212bc7d13ea9ccbbf3c0;hpb=f660cae7a447b60d84ef75f7c2bcbf62412d4579;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
index 86988930..ed4f49cc 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
@@ -26,7 +26,8 @@ import static org.mockito.Mockito.when;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.xappmgr.client.api.DefaultApi;
+import org.oransc.ric.xappmgr.client.api.HealthApi;
+import org.oransc.ric.xappmgr.client.api.XappApi;
 import org.oransc.ric.xappmgr.client.invoker.ApiClient;
 import org.oransc.ric.xappmgr.client.model.AllXapps;
 import org.oransc.ric.xappmgr.client.model.SubscriptionRequest;
@@ -34,6 +35,7 @@ import org.oransc.ric.xappmgr.client.model.SubscriptionResponse;
 import org.oransc.ric.xappmgr.client.model.XAppInfo;
 import org.oransc.ric.xappmgr.client.model.Xapp;
 import org.oransc.ric.xappmgr.client.model.Xapp.StatusEnum;
+import org.oransc.ric.xappmgr.client.model.XappInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
@@ -55,19 +57,42 @@ public class XappManagerMockConfiguration {
 
 	public XappManagerMockConfiguration() {
 		logger.info("Configuring mock xApp Manager");
+		Xapp ac = new Xapp().name("Admission Control").version("v3").status(StatusEnum.FAILED);
+		ac.addInstancesItem(
+				new XappInstance().name("cdef-3456").ip("3.4.5.6").port(200).status(XappInstance.StatusEnum.RUNNING));
+		Xapp an = new Xapp().name("ANR Control").version("v0").status(StatusEnum.SUPERSEDED);
+		an.addInstancesItem(
+				new XappInstance().name("fedc-8765").ip("8.7.6.5").port(400).status(XappInstance.StatusEnum.RUNNING));
+		Xapp dc = new Xapp().name("Dual Connectivity").version("v2").status(StatusEnum.DELETED);
+		dc.addInstancesItem(
+				new XappInstance().name("def0-6789").ip("6.7.8.9").port(300).status(XappInstance.StatusEnum.COMPLETED));
 		allXapps = new AllXapps();
-		allXapps.add(new Xapp().name("Pendulum Control").version("v1").status(StatusEnum.DEPLOYED));
-		allXapps.add(new Xapp().name("Dual Connectivity").version("v2").status(StatusEnum.DELETED));
-		allXapps.add(new Xapp().name("Admission Control").version("v3").status(StatusEnum.FAILED));
-		allXapps.add(new Xapp().name("ANR Control").version("v0").status(StatusEnum.SUPERSEDED));
+		allXapps.add(ac);
+		allXapps.add(an);
+		allXapps.add(dc);
 	}
 
 	@Bean
-	public DefaultApi xappManagerMockClient() {
+	public HealthApi xappHealthMockApi() {
 		ApiClient mockClient = mock(ApiClient.class);
 		when(mockClient.getStatusCode()).thenReturn(HttpStatus.OK);
+		HealthApi mockApi = mock(HealthApi.class);
+		when(mockApi.getApiClient()).thenReturn(mockClient);
+		doAnswer(i -> {
+			return null;
+		}).when(mockApi).getHealthAlive();
+		doAnswer(i -> {
+			return null;
+		}).when(mockApi).getHealthReady();
+		return mockApi;
+	}
 
-		DefaultApi mockApi = mock(DefaultApi.class);
+	@Bean
+	public XappApi xappMgrMockApi() {
+		ApiClient mockClient = mock(ApiClient.class);
+		when(mockClient.getStatusCode()).thenReturn(HttpStatus.OK);
+
+		XappApi mockApi = mock(XappApi.class);
 		when(mockApi.getApiClient()).thenReturn(mockClient);
 
 		SubscriptionResponse subRes = new SubscriptionResponse().eventType(SubscriptionResponse.EventTypeEnum.ALL)
@@ -76,16 +101,12 @@ public class XappManagerMockConfiguration {
 
 		doAnswer(i -> {
 			return null;
-		}).when(mockApi).deleteSubscription(any(Integer.class));
+		}).when(mockApi).deleteSubscription(any(String.class));
 
 		when(mockApi.deployXapp(any(XAppInfo.class))).thenReturn(new Xapp());
 
 		when(mockApi.getAllXapps()).thenReturn(allXapps);
 
-		doAnswer(i -> {
-			return null;
-		}).when(mockApi).getHealth();
-
 		Xapp xappByName = new Xapp().name("name").status(StatusEnum.UNKNOWN).version("v1");
 		when(mockApi.getXappByName(any(String.class))).thenReturn(xappByName);