Upgrade xapp manager to spec 0.1.3

[portal/ric-dashboard.git] / webapp-backend / src / main / java / org / oransc / ric / portal / dashboard / config / XappManagerMockConfiguration.java

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 bbc1160..ed4f49c 100644 (file)
--- 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
@@ -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;
@@ -57,26 +58,41 @@ 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
-       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)
@@ -85,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);