X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FRICInstanceConfiguration.java;h=6159e4d60fcd26a741a6fd09b1bfdd50aa071b0d;hb=e020df304f6faa1d90f64ddea14407aec1c15dcb;hp=f39f2001f06dbd98dc2d651e3133ae5c71f42984;hpb=a16f2d04fa1af4fe1ea993133a1d106e7fa1da3d;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/RICInstanceConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/RICInstanceConfiguration.java
index f39f2001..6159e4d6 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/RICInstanceConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/RICInstanceConfiguration.java
@@ -23,36 +23,45 @@ package org.oransc.ric.portal.dashboard.config;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.oransc.ric.portal.dashboard.model.InstanceTransport;
+import org.oransc.ric.portal.dashboard.model.RicInstance;
+import org.oransc.ric.portal.dashboard.model.RicInstanceList;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
 /**
- * Holds the list of RIC instances read from configuration data. This asserts no
- * Spring profile such as ("!test"). No mock version of this class is required.
- * Populated from a YAML list in the application properties like this:
+ * Publishes a list of RIC instances from configuration, written as a YAML list
+ * in application properties like this:
  * 
  * <pre>
- * ric-instance-list:
+ * ricinstances:
     instances:
         -
           key: key1
           name: Friendly Name One
+          urlPrefix: http://foo.bar.one/
         -
           key: key2
           name: Friendly Name Two
+          urlPrefix: http://foo.bar.two/
  * </pre>
  */
 @Configuration
-@ConfigurationProperties(prefix = "ric-instance-list")
+@ConfigurationProperties(prefix = "ricinstances")
+@Profile("!test")
 public class RICInstanceConfiguration {
-	private List<InstanceTransport> instances = new ArrayList<>();
 
-	public List<InstanceTransport> getInstances() {
-		return instances;
-	}
+	private List<RicInstance> instances = new ArrayList<>();
 
-	public void setInstances(List<InstanceTransport> instances) {
+	// Called by spring with config data
+	public void setInstances(List<RicInstance> instances) {
 		this.instances = instances;
 	}
+
+	@Bean
+	public RicInstanceList ricInstanceList() {
+		return new RicInstanceList(instances);
+	}
+
 }