package org.oransc.ric.portal.dashboard;
import java.lang.invoke.MethodHandles;
+import java.util.List;
-import org.oransc.ric.portal.dashboard.config.RICInstanceConfiguration;
-import org.oransc.ric.portal.dashboard.model.InstanceTransport;
+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.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
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Autowired
- private RICInstanceConfiguration instanceConfig;
+ private RicRegionList instanceConfig;
public static void main(String[] args) {
SpringApplication.run(DashboardApplication.class, args);
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()));
- for (InstanceTransport it : instanceConfig.getInstances())
- logger.warn("run: RIC instance {}", it);
+ // 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());
+ }
+ }
}
/**