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=-c;p=it%2Fdep.git

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

8c3573e016c2f12579383b54eef7f62c652e5ff4
diff --combined nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 6231bd92,a13d2c92..8482f6cf
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@@ -32,22 -32,11 +32,22 @@@ a1controller
      image:
        registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
        name: nonrtric-a1-controller
 -      tag: 1.7.4
 +      tag: 1.7.5
      replicaCount: 1
      service:
 -      internalPort: 8181
 -      externalPort: 8282
 +      allowHttp: true
 +      httpName: http
 +      internalPort1: 8282
 +      targetPort1: 8181
 +      httpsName: https
 +      internalPort2: 8383
 +      targetPort2: 8443
 +    liveness:
 +      initialDelaySeconds: 60
 +      periodSeconds: 10
 +    readiness:
 +      initialDelaySeconds: 60
 +      periodSeconds: 10
  
  a1simulator:
    a1simulator:
@@@ -58,7 -47,18 +58,18 @@@
        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
@@@ -77,21 -77,8 +88,21 @@@ controlpanel
        tag: 1.0.0
      replicaCount: 1
      service:
 -      internalPort: 8080
 -      externalPort: 30090
 +      allowHttp: true
 +      httpName: http
 +      internalPort1: 8080
 +      targetPort1: 8080
 +      externalPort1: 30091
 +      httpsName: https
 +      internalPort2: 8081
 +      targetPort2: 8082
 +      externalPort2: 30092
 +    liveness:
 +      initialDelaySeconds: 20
 +      periodSeconds: 10
 +    readiness:
 +      initialDelaySeconds: 20
 +      periodSeconds: 10
  
  # Need to check the external port Availability
  policymanagementservice:
@@@ -102,18 -89,5 +113,18 @@@
        name: nonrtric-policy-agent
        tag: 1.0.0
      service:
 -      internalPort: 8081
 -      externalPort: 30091
 +      allowHttp: true
 +      httpName: http
 +      internalPort1: 9080
 +      targetPort1: 8081
 +      externalPort1: 30093
 +      httpsName: https
 +      internalPort2: 9081
 +      targetPort2: 8433
 +      externalPort2: 30094
 +    liveness:
 +      initialDelaySeconds: 20
 +      periodSeconds: 10
 +    readiness:
 +      initialDelaySeconds: 20
 +      periodSeconds: 10
diff --combined nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
index a0860c6e,86379d94..706d0d59
--- a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
+++ b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
@@@ -3,7 -3,7 +3,7 @@@
        "controller": [
           {
              "name": "controller1",
 -            "baseUrl": "http://a1controller:8282",
 +            "baseUrl": "https://a1controller:8383",
              "userName": "admin",
              "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
           }
@@@ -11,7 -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 +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",