Merge "Bug Fix: Increased the initialdelay for liveness probe test"

diff --git a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
index 706d0d5..ab42552 100644 (file)
--- a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
+++ b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
@@ -20,13 +20,13 @@
           },
           {
             "name":"ric2",
-            "baseUrl":"http://a1-sim-osc-1.a1-sim:8085",
+            "baseUrl":"https://a1-sim-osc-1.a1-sim:8185",
             "controller": "controller1",
             "managedElementIds":[
                "kista_1",
                "kista_2"
             ]
-         },
+          },
           {
             "name":"ric3",
             "baseUrl":"https://a1-sim-std-0.a1-sim:8185",
@@ -35,7 +35,16 @@
                "kista_1",
                "kista_2"
             ]
-         }
+          },
+          {
+            "name":"ric4",
+            "baseUrl":"https://a1-sim-std-1.a1-sim:8185",
+            "controller": "controller1",
+            "managedElementIds":[
+               "kista_1",
+               "kista_2"
+            ]
+          }
        ],
        "streams_publishes":{
           "dmaap_publisher":{

diff --git a/ric-common/Common-Template/helm/ric-common/Chart.yaml b/ric-common/Common-Template/helm/ric-common/Chart.yaml
index 23da501..2f71492 100644 (file)
--- a/ric-common/Common-Template/helm/ric-common/Chart.yaml
+++ b/ric-common/Common-Template/helm/ric-common/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: Common templates for inclusion in other charts
 name: ric-common
-version: 3.3.0
+version: 3.3.1

diff --git a/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl b/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl
index 6ff7b58..2755492 100755 (executable)
--- a/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl
@@ -61,4 +61,4 @@
 
 {{- define "common.serviceport.alarmadapter.rmr.data" -}}4560{{- end -}}
 {{- define "common.serviceport.alarmadapter.rmr.route" -}}4561{{- end -}}
-{{- define "common.serviceport.alarmadapter.http" -}}3800{{- end -}}
+{{- define "common.serviceport.alarmadapter.http" -}}8080{{- end -}}