From: Lusheng Ji <lji@research.att.com>
Date: Fri, 29 May 2020 17:42:13 +0000 (+0000)
Subject: Merge "Enable https in nonrtric A1 simulator"
X-Git-Tag: f-release~101
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=8c3573e016c2f12579383b54eef7f62c652e5ff4;hp=2047196f688aa19a83dc1e68c5f12d2933d92bc9;p=it%2Fdep.git

Merge "Enable https in nonrtric A1 simulator"
---

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 6231bd92..8482f6cf 100644
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -58,7 +58,18 @@ a1simulator:
       name: a1-simulator
       tag: 1.0.1
     service:
-      internalPort: 8085
+      httpName: http
+      internalPort1: 8085
+      targetPort1: 8085
+      httpsName: https
+      internalPort2: 8185
+      targetPort2: 8185
+    liveness:
+      initialDelaySeconds: 20
+      periodSeconds: 10
+    readiness:
+      initialDelaySeconds: 20
+      periodSeconds: 10
     oscVersion:
       name: a1-sim-osc
       replicaCount: 2
diff --git a/nonrtric/helm/a1simulator/templates/service.yaml b/nonrtric/helm/a1simulator/templates/service.yaml
index 616595f9..d22654c9 100644
--- a/nonrtric/helm/a1simulator/templates/service.yaml
+++ b/nonrtric/helm/a1simulator/templates/service.yaml
@@ -26,10 +26,14 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   ports:
-  - name: http
-    protocol: TCP
-    port: {{ .Values.a1simulator.service.internalPort }}
-    targetPort: {{ .Values.a1simulator.service.internalPort }}
+    - name: {{ index .Values.a1simulator.service.httpName }}
+      port: {{ .Values.a1simulator.service.internalPort1 }}
+      targetPort: {{ .Values.a1simulator.service.targetPort1 }}
+      protocol: TCP
+    - name: {{ index .Values.a1simulator.service.httpsName }}
+      port: {{ .Values.a1simulator.service.internalPort2 }}
+      targetPort: {{ .Values.a1simulator.service.targetPort2 }}
+      protocol: TCP
   selector:
     app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }}
     release: {{ .Release.Name }}
diff --git a/nonrtric/helm/a1simulator/templates/statefulset.yaml b/nonrtric/helm/a1simulator/templates/statefulset.yaml
index 865e2ca0..d6dc0b30 100644
--- a/nonrtric/helm/a1simulator/templates/statefulset.yaml
+++ b/nonrtric/helm/a1simulator/templates/statefulset.yaml
@@ -46,13 +46,20 @@ spec:
         image: {{ .Values.a1simulator.image.registry }}/{{ .Values.a1simulator.image.name }}:{{ .Values.a1simulator.image.tag }}
         imagePullPolicy: {{ .Values.a1simulator.imagePullPolicy }}
         ports:
-        - containerPort: {{ .Values.a1simulator.service.internalPort }}
+        - containerPort: {{ .Values.a1simulator.service.targetPort1 }}
+          protocol: TCP
+        - containerPort: {{ .Values.a1simulator.service.targetPort2 }}
           protocol: TCP
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.a1simulator.service.internalPort }}
-          initialDelaySeconds: 5
-          periodSeconds: 15
+            port: {{ .Values.a1simulator.service.targetPort1 }}
+          initialDelaySeconds: {{ .Values.a1simulator.readiness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.a1simulator.readiness.periodSeconds }}
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.a1simulator.service.targetPort1 }}
+          initialDelaySeconds: {{ .Values.a1simulator.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.a1simulator.liveness.periodSeconds }}
         env:
         - name: A1_VERSION
           value: OSC_2.1.0
@@ -90,13 +97,20 @@ spec:
         image: {{ .Values.a1simulator.image.registry }}/{{ .Values.a1simulator.image.name }}:{{ .Values.a1simulator.image.tag }}
         imagePullPolicy: {{ .Values.a1simulator.imagePullPolicy }}
         ports:
-        - containerPort: {{ .Values.a1simulator.service.internalPort }}
+        - containerPort: {{ .Values.a1simulator.service.targetPort1 }}
+          protocol: TCP
+        - containerPort: {{ .Values.a1simulator.service.targetPort2 }}
           protocol: TCP
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.a1simulator.service.internalPort }}
-          initialDelaySeconds: 5
-          periodSeconds: 15
+            port: {{ .Values.a1simulator.service.targetPort1 }}
+          initialDelaySeconds: {{ .Values.a1simulator.readiness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.a1simulator.readiness.periodSeconds }}
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.a1simulator.service.targetPort1 }}
+          initialDelaySeconds: {{ .Values.a1simulator.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.a1simulator.liveness.periodSeconds }}
         env:
         - name: A1_VERSION
           value: STD_1.1.3
\ No newline at end of file
diff --git a/nonrtric/helm/a1simulator/values.yaml b/nonrtric/helm/a1simulator/values.yaml
index 97316395..53715699 100644
--- a/nonrtric/helm/a1simulator/values.yaml
+++ b/nonrtric/helm/a1simulator/values.yaml
@@ -26,7 +26,18 @@ a1simulator:
     name: a1-simulator
     tag: 1.0.1
   service:
-    internalPort: 8085
+    httpName: http
+    internalPort1: 8085
+    targetPort1: 8085
+    httpsName: https
+    internalPort2: 8185
+    targetPort2: 8185
+  liveness:
+    initialDelaySeconds: 20
+    periodSeconds: 10
+  readiness:
+    initialDelaySeconds: 20
+    periodSeconds: 10
   oscVersion:
     name: a1-sim-osc
     replicaCount: 2
diff --git a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
index a0860c6e..706d0d59 100644
--- a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
+++ b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
@@ -11,7 +11,7 @@
        "ric":[
           {
              "name":"ric1",
-             "baseUrl":"http://a1-sim-osc-0.a1-sim:8085",
+             "baseUrl":"https://a1-sim-osc-0.a1-sim:8185",
              "controller": "controller1",
              "managedElementIds":[
                 "kista_1",
@@ -29,7 +29,7 @@
          },
           {
             "name":"ric3",
-            "baseUrl":"http://a1-sim-std-0.a1-sim:8085",
+            "baseUrl":"https://a1-sim-std-0.a1-sim:8185",
             "controller": "controller1",
             "managedElementIds":[
                "kista_1",