X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FAppManagerMockConfiguration.java;fp=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FAppManagerMockConfiguration.java;h=32de4df11fb7e859afc007c04e77950661e687a0;hb=c3b80bfed44dd12cf869d85bcda9c63583b147fb;hp=f4cd495558d991b1483e160008ecefc8786379a5;hpb=a38e36caa736b48ca6aefafc3f03eeb966f6efb5;p=portal%2Fric-dashboard.git diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java index f4cd4955..32de4df1 100644 --- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java +++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java @@ -62,7 +62,7 @@ public class AppManagerMockConfiguration { @Value("${mock.config.delay:0}") private int delayMs; - private final AllDeployableXapps availXapps; + private final AllDeployableXapps deployableApps; private final AllDeployedXapps deployedXapps; private final AllXappConfig allXappConfigs; private final SubscriptionResponse subRes; @@ -73,13 +73,13 @@ public class AppManagerMockConfiguration { final String configJson = " { \"config\" : \"example\" }"; final String descriptorJson = " { \"descriptor\" : \"example\" }"; allXappConfigs = new AllXappConfig(); - availXapps = new AllDeployableXapps(); + deployableApps = new AllDeployableXapps(); deployedXapps = new AllDeployedXapps(); for (String n : appNames) { ConfigMetadata metadata = new ConfigMetadata().configName("config-" + n).name(n).namespace("namespace"); XAppConfig config = new XAppConfig().config(configJson).descriptor(descriptorJson).metadata(metadata); allXappConfigs.add(config); - availXapps.add(n); + deployableApps.add(n); Xapp xapp = new Xapp().name(n).version("version").status(StatusEnum.UNKNOWN); xapp.addInstancesItem(new XappInstance().name("abcd-1234").ip("127.0.0.1").port(200) .status(XappInstance.StatusEnum.RUNNING)); @@ -144,11 +144,11 @@ public class AppManagerMockConfiguration { }).when(mockApi).deployXapp(any(XAppInfo.class)); doAnswer(inv -> { if (delayMs > 0) { - logger.debug("listAllXapps sleeping {}", delayMs); + logger.debug("listAllDeployableXapps sleeping {}", delayMs); Thread.sleep(delayMs); } - return availXapps; - }).when(mockApi).listAllXapps(); + return deployableApps; + }).when(mockApi).listAllDeployableXapps(); doAnswer(inv -> { if (delayMs > 0) { logger.debug("getAllXapps sleeping {}", delayMs);