Add multi-layer RIC instance selector

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

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java
index 4819e34..136606b 100644 (file)
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,41 +17,56 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
+
 package org.oransc.ric.portal.dashboard;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.lang.invoke.MethodHandles;
+import java.util.List;
 
+import org.oransc.ric.portal.dashboard.model.RicInstance;
+import org.oransc.ric.portal.dashboard.model.RicRegion;
+import org.oransc.ric.portal.dashboard.model.RicRegionList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.util.Assert;
 
 @SpringBootApplication
 // Limit scan to dashboard classes; exclude generated API classes
 @ComponentScan("org.oransc.ric.portal.dashboard")
-public class DashboardApplication {
+public class DashboardApplication implements CommandLineRunner {
 
        private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-       // Unfortunately these names are not available as constants
-       private static final String[] propertyFiles = { "ESAPI.properties", "key.properties", "portal.properties",
-                       "validation.properties" };
+       @Autowired
+       private RicRegionList instanceConfig;
 
-       public static void main(String[] args) throws IOException {
+       public static void main(String[] args) {
                SpringApplication.run(DashboardApplication.class, args);
-               for (String pf : propertyFiles) {
-                       InputStream in = MethodHandles.lookup().lookupClass().getClassLoader().getResourceAsStream(pf);
-                       if (in == null)
-                               logger.warn("Failed to find property file on classpath: {}", pf);
-                       else
-                               in.close();
+       }
+
+       @Override
+       public void run(String... args) throws Exception {
+               // Ensure output appears on the console by using level WARN
+               logger.warn("run: version '{}'", getImplementationVersion(MethodHandles.lookup().lookupClass()));
+               // Validate configuration
+               List<RicRegion> regions = instanceConfig.getRegions();
+               Assert.notEmpty(regions, "Region list empty");
+               for (RicRegion r : regions) {
+                       Assert.notEmpty(r.getInstances(), "Instance list empty for region " + r.getName());
+                       for (RicInstance it : r.getInstances()) {
+                               logger.warn("run: RIC region {} instance {}", r, it);
+                               Assert.hasText(it.getKey(), "Instance key missing");
+                               Assert.hasText(it.getName(), "Name missing for instance " + it.getKey());
+                               Assert.hasText(it.getAppUrlPrefix(), "App URL prefix missing for instance " + it.getKey());
+                               Assert.hasText(it.getCaasUrlPrefix(), "Caas URL prefix missing for instance " + it.getKey());
+                               Assert.hasText(it.getPltUrlPrefix(), "Plt URL prefix missing for instance " + it.getKey());
+                       }
                }
-               // Force this onto the console by using level WARN
-               logger.warn("main: version '{}' successful start",
-                               getImplementationVersion(MethodHandles.lookup().lookupClass()));
        }
 
        /**