Drop A1 mediator and AC xApp

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

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AdminController.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AdminController.java
index 58e9481..1285a0b 100644 (file)
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AdminController.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AdminController.java
@@ -62,12 +62,12 @@ public class AdminController {
        public static final String VERSION_METHOD = DashboardConstants.VERSION_METHOD;
        public static final String XAPPMETRICS_METHOD = "metrics";
 
-       @Value("${metrics.url.ac}")
-       private String acAppMetricsUrl;
-
        @Value("${metrics.url.mc}")
        private String mcAppMetricsUrl;
 
+       @Value("${metrics.url.ml}")
+       private String mlAppMetricsUrl;
+
        @Autowired
        private DashboardUserManager dashboardUserManager;
 
@@ -114,10 +114,10 @@ public class AdminController {
        @Secured({ DashboardConstants.ROLE_ADMIN, DashboardConstants.ROLE_STANDARD })
        public ResponseEntity<Object> getAppMetricsUrl(@RequestParam String app) {
                String metricsUrl = null;
-               if (DashboardConstants.APP_NAME_AC.equals(app))
-                       metricsUrl = acAppMetricsUrl;
-               else if (DashboardConstants.APP_NAME_MC.equals(app))
+               if (DashboardConstants.APP_NAME_MC.equals(app))
                        metricsUrl = mcAppMetricsUrl;
+               else if (DashboardConstants.APP_NAME_ML.equals(app))
+                       metricsUrl = mlAppMetricsUrl;
                logger.debug("getAppMetricsUrl: app {} metricsurl {}", app, metricsUrl);
                if (metricsUrl != null)
                        return new ResponseEntity<>(new SuccessTransport(HttpStatus.OK.ordinal(), metricsUrl), HttpStatus.OK);