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=refs%2Fchanges%2F84%2F184%2F2;hp=27d713bc8ec124adbde529ee72ff0ad62d388793;hpb=5577df1ec38f5810920100116ea0b4023f2649ef;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 27d713bc..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
@@ -58,18 +58,18 @@ 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));
+		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));
+		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));
-		Xapp pc = new Xapp().name("Pendulum Control").version("v1").status(StatusEnum.DEPLOYED);
-		pc.addInstancesItem(new XappInstance().name("abcd-1234").ip("1.2.3.4").port(100).status(XappInstance.StatusEnum.RUNNING));
+		dc.addInstancesItem(
+				new XappInstance().name("def0-6789").ip("6.7.8.9").port(300).status(XappInstance.StatusEnum.COMPLETED));
 		allXapps = new AllXapps();
 		allXapps.add(ac);
 		allXapps.add(an);
 		allXapps.add(dc);
-		allXapps.add(pc);
 	}
 
 	@Bean
@@ -80,7 +80,10 @@ public class XappManagerMockConfiguration {
 		when(mockApi.getApiClient()).thenReturn(mockClient);
 		doAnswer(i -> {
 			return null;
-		}).when(mockApi).getHealth();
+		}).when(mockApi).getHealthAlive();
+		doAnswer(i -> {
+			return null;
+		}).when(mockApi).getHealthReady();
 		return mockApi;
 	}
 
@@ -98,13 +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);
 
-
 		Xapp xappByName = new Xapp().name("name").status(StatusEnum.UNKNOWN).version("v1");
 		when(mockApi.getXappByName(any(String.class))).thenReturn(xappByName);