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%2FAppManagerMockConfiguration.java;h=d97884d7386bac5794682925555c3970a4f3fe90;hb=93a44cb851a49c923126f32016646860d104075c;hp=10517e88ca47bce277df5fb28f9cf63b3d8281ea;hpb=80f26bbeef6caea8f9946e8a0e1a5e0319dacc38;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
index 10517e88..d97884d7 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
@@ -75,7 +75,7 @@ public class AppManagerMockConfiguration {
 			allXappConfigs.add(config);
 			availXapps.add(n);
 			Xapp xapp = new Xapp().name(n).version("version").status(StatusEnum.UNKNOWN);
-			xapp.addInstancesItem(new XappInstance().name("abcd-1234").ip("1.2.3.4").port(200)
+			xapp.addInstancesItem(new XappInstance().name("abcd-1234").ip("127.0.0.1").port(200)
 					.status(XappInstance.StatusEnum.RUNNING));
 			deployedXapps.add(xapp);
 		}
@@ -88,12 +88,8 @@ public class AppManagerMockConfiguration {
 		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();
+		doAnswer(i -> null).when(mockApi).getHealthAlive();
+		doAnswer(i -> null).when(mockApi).getHealthReady();
 		return mockApi;
 	}
 
@@ -102,41 +98,21 @@ public class AppManagerMockConfiguration {
 	public XappApi xappMgrXappApi() {
 		ApiClient mockClient = mock(ApiClient.class);
 		when(mockClient.getStatusCode()).thenReturn(HttpStatus.OK);
-
 		XappApi mockApi = mock(XappApi.class);
 		when(mockApi.getApiClient()).thenReturn(mockClient);
-
 		when(mockApi.getAllXappConfig()).thenReturn(allXappConfigs);
-
-		when(mockApi.createXappConfig(any(XAppConfig.class))).thenReturn(new XAppConfig());
-
-		when(mockApi.modifyXappConfig(any(XAppConfig.class))).thenReturn(new XAppConfig());
-
-		doAnswer(i -> {
-			return null;
-		}).when(mockApi).deleteXappConfig(any(ConfigMetadata.class));
-
-		when(mockApi.deployXapp(any(XAppInfo.class))).thenReturn(new Xapp());
-
+		when(mockApi.createXappConfig(any(XAppConfig.class))).thenReturn(allXappConfigs.get(0));
+		when(mockApi.modifyXappConfig(any(XAppConfig.class))).thenReturn(allXappConfigs.get(0));
+		doAnswer(i -> null).when(mockApi).deleteXappConfig(any(ConfigMetadata.class));
+		when(mockApi.deployXapp(any(XAppInfo.class))).thenReturn(deployedXapps.get(0));
 		when(mockApi.listAllXapps()).thenReturn(availXapps);
-
 		when(mockApi.getAllXapps()).thenReturn(deployedXapps);
-
-		Xapp xappByName = new Xapp().name("name").status(StatusEnum.UNKNOWN).version("v1");
-		when(mockApi.getXappByName(any(String.class))).thenReturn(xappByName);
-
-		doAnswer(i -> {
-			return null;
-		}).when(mockApi).undeployXapp(any(String.class));
-
+		when(mockApi.getXappByName(any(String.class))).thenReturn(deployedXapps.get(0));
+		doAnswer(i -> null).when(mockApi).undeployXapp(any(String.class));
 		SubscriptionResponse subRes = new SubscriptionResponse().eventType(SubscriptionResponse.EventTypeEnum.ALL)
 				.id("subid").version(1);
 		when(mockApi.addSubscription(any(SubscriptionRequest.class))).thenReturn(subRes);
-
-		doAnswer(i -> {
-			return null;
-		}).when(mockApi).deleteSubscription(any(String.class));
-
+		doAnswer(i -> null).when(mockApi).deleteSubscription(any(String.class));
 		return mockApi;
 	}