Adjust application.yaml keys and values

[portal/ric-dashboard.git] / webapp-backend / src / main / resources / application.yaml

diff --git a/webapp-backend/src/main/resources/application.yaml b/webapp-backend/src/main/resources/application.yaml
index ab7ff6f..83b3b7c 100644 (file)
--- a/webapp-backend/src/main/resources/application.yaml
+++ b/webapp-backend/src/main/resources/application.yaml
@@ -45,25 +45,25 @@ portalapi:
     username:
     password:
 
-# endpoint URLs must be supplied at deployment time
+# Instance-specific URL prefixes must be supplied at deployment time
 
 # A1 Mediator
 a1med:
     url:
-        prefix: http://jar-app-props-default-A1-URL-prefix
-        suffix:
+        # uses pltUrlPrefix
+        suffix: /a1mediator
 
 # App Manager
 appmgr:
     url:
-        prefix: http://jar-app-props-default-Xapp-Mgr-URL
-        suffix: /ric/v1
+        # uses pltUrlPrefix
+        suffix: /appmgr/ric/v1
 
 # E2 Manager
 e2mgr:
     url:
-        prefix: http://jar-app-props-default-E2-URL
-        suffix: /v1
+        # uses pltUrlPrefix
+        suffix: /e2mgr/v1
 
 # Kubernetes API via https://github.com/nokia/caas-ingress
 caasingress:
@@ -71,7 +71,7 @@ caasingress:
     insecure: true
     plt:
         url:
-            prefix: https://jar-app-props-default-caas-ingress-plt-URL
+            # uses caasUrlPrefix
             suffix: /api
 
 # Mimic slow endpoints by defining sleep period, in milliseconds
@@ -86,11 +86,17 @@ metrics:
         mc: http://jar-app-props-kibana-url-mc
 
 # Instances
-ric-instance-list:
+ricinstances:
     instances:
         -
           key: i1
           name: Primary RIC Instance
+          appUrlPrefix: App prefix 1
+          caasUrlPrefix: Caas prefix 1
+          pltUrlPrefix: Plt prefix 1
         -
           key: i2
           name: RIC Instance Nr Two
+          appUrlPrefix: App prefix 2
+          caasUrlPrefix: Caas prefix 2
+          pltUrlPrefix: Plt prefix 2