From e020df304f6faa1d90f64ddea14407aec1c15dcb Mon Sep 17 00:00:00 2001
From: "Lott, Christopher (cl778h)" <cl778h@att.com>
Date: Thu, 9 Jan 2020 11:10:03 -0500
Subject: [PATCH] Adjust application.yaml keys and values

Move path components from prefixes to suffixes to support Helm deployment

Change-Id: If3e3ccd9704e2606f27408f502799134ea87fc5f
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---
 .../portal/dashboard/config/RICInstanceConfiguration.java    |  4 ++--
 .../org/oransc/ric/portal/dashboard/model/RicInstance.java   |  6 +++---
 webapp-backend/src/main/resources/application.yaml           | 12 ++++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

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 290331fc..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
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Profile;
  * in application properties like this:
  * 
  * <pre>
- * ric-instance-list:
+ * ricinstances:
     instances:
         -
           key: key1
@@ -48,7 +48,7 @@ import org.springframework.context.annotation.Profile;
  * </pre>
  */
 @Configuration
-@ConfigurationProperties(prefix = "ric-instance-list")
+@ConfigurationProperties(prefix = "ricinstances")
 @Profile("!test")
 public class RICInstanceConfiguration {
 
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RicInstance.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RicInstance.java
index ad3b3f2e..ccb224d6 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RicInstance.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RicInstance.java
@@ -25,11 +25,11 @@ package org.oransc.ric.portal.dashboard.model;
  */
 public class RicInstance extends RicInstanceKeyName {
 
-	/* Application entry point */
+	/* Entry point for all applications */
 	private String appUrlPrefix;
-	/* Platform entry point */
+	/* Entry point for all platform components */
 	private String pltUrlPrefix;
-	/* CAAS-Ingress */
+	/* Entry point for CAAS-Ingress */
 	private String caasUrlPrefix;
 
 	/**
diff --git a/webapp-backend/src/main/resources/application.yaml b/webapp-backend/src/main/resources/application.yaml
index 9b8f5d05..83b3b7c4 100644
--- a/webapp-backend/src/main/resources/application.yaml
+++ b/webapp-backend/src/main/resources/application.yaml
@@ -50,17 +50,20 @@ portalapi:
 # A1 Mediator
 a1med:
     url:
-        suffix:
+        # uses pltUrlPrefix
+        suffix: /a1mediator
 
 # App Manager
 appmgr:
     url:
-        suffix: /ric/v1
+        # uses pltUrlPrefix
+        suffix: /appmgr/ric/v1
 
 # E2 Manager
 e2mgr:
     url:
-        suffix: /v1
+        # uses pltUrlPrefix
+        suffix: /e2mgr/v1
 
 # Kubernetes API via https://github.com/nokia/caas-ingress
 caasingress:
@@ -68,6 +71,7 @@ caasingress:
     insecure: true
     plt:
         url:
+            # uses caasUrlPrefix
             suffix: /api
 
 # Mimic slow endpoints by defining sleep period, in milliseconds
@@ -82,7 +86,7 @@ metrics:
         mc: http://jar-app-props-kibana-url-mc
 
 # Instances
-ric-instance-list:
+ricinstances:
     instances:
         -
           key: i1
-- 
2.16.6