Merge changes I858320af,I05b8456d

* changes:
  SMO-Install: Standalone NONRTRIC installation mode added
  SMO-Install: A1 PMS config correction and simulator URL update in charts

diff --git a/smo-install/README.md b/smo-install/README.md
index 9291a9f..a3a1922 100644 (file)
--- a/smo-install/README.md
+++ b/smo-install/README.md
@@ -195,10 +195,14 @@ In the ./helm-override/ folder the helm config that are used by the SMO installa
        - ONAP + ORAN "nonrtric" <strong>(RECOMMENDED ONE)</strong>:
 
                ```./dep/smo-install/scripts/layer-2/2-install-oran.sh```
-       - ORAN "nonrtric" par only:
+       - ORAN "nonrtric" part only(To work with ONAP):
 
                ```./dep/smo-install/scripts/layer-2/2-install-nonrtric-only.sh```
 
+       - ORAN "nonrtric" standalone:
+
+               ```./dep/smo-install/scripts/layer-2/2-install-nonrtric-only.sh standalone-nonrtric```
+
        - ONAP CNF + ORAN "nonrtric" (This must still be documented properly):
 
                ```./dep/smo-install/scripts/layer-2/2-install-oran-cnf.sh```

diff --git a/smo-install/helm-override/standalone-nonrtric/oran-override.yaml b/smo-install/helm-override/standalone-nonrtric/oran-override.yaml
new file mode 100644 (file)
index 0000000..8506a9f
--- /dev/null
+++ b/smo-install/helm-override/standalone-nonrtric/oran-override.yaml
@@ -0,0 +1,126 @@
+################################################################################
+#   Copyright (c) 2022 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+#################################################################
+# Global configuration overrides for standalone nonrtric deployment
+#
+# These overrides will affect all helm charts (ie. applications)
+# that are listed below and are 'enabled'.
+#################################################################
+
+##### ORAN #####
+
+######### NONRTRIC #########
+
+nonrtric:
+  installPms: true
+  installA1controller: true
+  installA1simulator: true
+  installControlpanel: true
+  installInformationservice: true
+  installRappcatalogueservice: true
+  installNonrtricgateway: true
+  installKong: false
+  installORUApp: false
+  installTopology: false
+  installDmaapadapterservice: true
+  installDmaapmediatorservice: true
+  installHelmmanager: true
+  # override default mount path root directory
+  # referenced by persistent volumes and log files
+  persistence:
+    mountPath: /dockerdata-nfs
+  volume1:
+    # Set the size to 0 if you do not need the volume (if you are using Dynamic Volume Provisioning)
+    size: 2Gi
+    storageClassName: pms-storage
+  volume2:
+     # Set the size to 0 if you do not need the volume (if you are using Dynamic Volume Provisioning)
+    size: 2Gi
+    storageClassName: ics-storage
+  volume3:
+    size: 1Gi
+    storageClassName: helmmanager-storage
+
+common:
+  releasePrefix: r3-dev-nonrtric
+  ingressClassName: kong
+
+informationservice:
+  informationservice:
+    persistence:
+      # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed size should be the same.
+      # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be for instance 'standard' or 'gluster-fs' (depeneds on which classes that are available)
+      size: 2Gi
+      storageClassName: ics-storage
+    ingress:
+      enabled: true
+
+
+# Need to check the external port Availability
+policymanagementservice:
+  policymanagementservice:
+    persistence:
+      # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed size should be the same.
+      # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be fon instance 'standard' or 'gluster-fs' (depeneds on which classes that are available)
+      size: 2Gi
+      storageClassName: pms-storage
+    ingress:
+      enabled: true
+
+kong:
+  ingressController:
+    installCRDs: false
+  admin:
+    enabled: true
+
+helmmanager:
+  helmmanager:
+    persistence:
+      # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed si>
+      # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be f>
+      storageClassName: helmmanager-storage
+
+controlpanel:
+  controlpanel:
+    ingress:
+      enabled: false
+
+nonrtricgateway:
+  a1PolicyLink: https://policymanagementservice:8433
+
+a1simulator:
+  a1Sims:
+    - name: a1-sim-osc-0
+      a1Version: OSC_2.1.0
+      allowHttp: true
+    - name: a1-sim-osc-1
+      a1Version: OSC_2.1.0
+      allowHttp: true
+    - name: a1-sim-std-0
+      a1Version: STD_1.1.3
+      allowHttp: true
+    - name: a1-sim-std-1
+      a1Version: STD_1.1.3
+      allowHttp: true
+    - name: a1-sim-std2-0
+      a1Version: STD_2.0.0
+      allowHttp: true
+    - name: a1-sim-std2-1
+      a1Version: STD_2.0.0
+      allowHttp: true
+
+

diff --git a/smo-install/oran_oom/policymanagementservice/resources/config/application.yaml b/smo-install/oran_oom/policymanagementservice/resources/config/application.yaml
index 0294e37..ffb6f8c 100644 (file)
--- a/smo-install/oran_oom/policymanagementservice/resources/config/application.yaml
+++ b/smo-install/oran_oom/policymanagementservice/resources/config/application.yaml
@@ -65,8 +65,12 @@ app:
     # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
     http.proxy-host:
     http.proxy-port: 0
+    http.proxy-type: HTTP
   # path where the service can store data
   vardata-directory: /var/policy-management-service
   # the config-file-schema-path referres to a location in the jar file. If this property is empty or missing,
   # no schema validation will be executed.
   config-file-schema-path: /application_configuration_schema.json
+  # A file containing an authorization token, which shall be inserted in each HTTP header (authorization).
+  # If the file name is empty, no authorization token is sent.
+  auth-token-file:

diff --git a/smo-install/oran_oom/policymanagementservice/resources/data/application_configuration.json b/smo-install/oran_oom/policymanagementservice/resources/data/application_configuration.json
index 8c446fa..56e96aa 100644 (file)
--- a/smo-install/oran_oom/policymanagementservice/resources/data/application_configuration.json
+++ b/smo-install/oran_oom/policymanagementservice/resources/data/application_configuration.json
@@ -11,7 +11,7 @@
       "ric": [
         {
              "name":"ric1",
-             "baseUrl":"https://a1-sim-osc-0.a1-sim:8185",
+             "baseUrl":"https://a1-sim-osc-0:8185",
              "controller": "controller1",
              "managedElementIds":[
                 "kista_1",
@@ -20,7 +20,7 @@
           },
           {
             "name":"ric2",
-            "baseUrl":"https://a1-sim-osc-1.a1-sim:8185",
+            "baseUrl":"https://a1-sim-osc-1:8185",
             "controller": "controller1",
             "managedElementIds":[
                "kista_1",
@@ -29,7 +29,7 @@
           },
           {
             "name":"ric3",
-            "baseUrl":"https://a1-sim-std-0.a1-sim:8185",
+            "baseUrl":"https://a1-sim-std-0:8185",
             "controller": "controller1",
             "managedElementIds":[
                "kista_1",
@@ -38,7 +38,7 @@
           },
           {
             "name":"ric4",
-            "baseUrl":"https://a1-sim-std-1.a1-sim:8185",
+            "baseUrl":"https://a1-sim-std-1:8185",
             "controller": "controller1",
             "managedElementIds":[
                "kista_1",
@@ -47,7 +47,7 @@
           },
           {
             "name":"ric5",
-            "baseUrl":"https://a1-sim-std2-0.a1-sim:8185",
+            "baseUrl":"https://a1-sim-std2-0:8185",
             "controller": "controller1",
             "managedElementIds":[
                "kista_1",
@@ -56,7 +56,7 @@
           },
           {
             "name":"ric6",
-            "baseUrl":"https://a1-sim-std2-1.a1-sim:8185",
+            "baseUrl":"https://a1-sim-std2-1:8185",
             "controller": "controller1",
             "managedElementIds":[
                "kista_1",