From: Louis Li Date: Mon, 26 Feb 2024 18:37:21 +0000 (+0000) Subject: SMO-Install charts - A1 Controller updates X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=fdc0387c396db2b730829841172556078b4ce5c7;p=it%2Fdep.git SMO-Install charts - A1 Controller updates Disable OSC nonrtic-A1-Controller, and use ONAP SDNC instead Disable ONAP A1PMS use ORAN A1PMS instead Issue-ID: NONRTRIC-974 Change-Id: Ibaa7f902e3c47a399811d6ee3eca2b6c826e5054 Signed-off-by: Louis Li --- diff --git a/smo-install/helm-override/cnf/onap-override.yaml b/smo-install/helm-override/cnf/onap-override.yaml index 3b8085eb..beccc62c 100644 --- a/smo-install/helm-override/cnf/onap-override.yaml +++ b/smo-install/helm-override/cnf/onap-override.yaml @@ -58,7 +58,7 @@ global: # to customize the ONAP deployment. ################################################################# a1policymanagement: - enabled: true + enabled: false rics: - name: ric1 link: http://a1-sim-osc-0.a1-sim.nonrtric:8085 diff --git a/smo-install/helm-override/cnf/oran-override.yaml b/smo-install/helm-override/cnf/oran-override.yaml index 222a8bd7..8ae50c07 100644 --- a/smo-install/helm-override/cnf/oran-override.yaml +++ b/smo-install/helm-override/cnf/oran-override.yaml @@ -25,7 +25,7 @@ ######### NONRTRIC ######### nonrtric: - installPms: false + installPms: true installA1controller: false installA1simulator: true installControlpanel: true diff --git a/smo-install/helm-override/default/onap-override.yaml b/smo-install/helm-override/default/onap-override.yaml index b623848b..ad29d4c9 100644 --- a/smo-install/helm-override/default/onap-override.yaml +++ b/smo-install/helm-override/default/onap-override.yaml @@ -61,7 +61,7 @@ global: # to customize the ONAP deployment. ################################################################# a1policymanagement: - enabled: true + enabled: false rics: - name: ric1 link: http://a1-sim-osc-0.nonrtric:8085 @@ -180,6 +180,9 @@ policy: enabled: true policy-clamp-ac-a1pms-ppnt: enabled: true + a1pmsconfig: + a1pms: + baseUrl: http://policymanagementservice.nonrtric:8081 policy-clamp-ac-kserve-ppnt: enabled: true sdnc: diff --git a/smo-install/helm-override/default/oran-override.yaml b/smo-install/helm-override/default/oran-override.yaml index 222a8bd7..8ae50c07 100644 --- a/smo-install/helm-override/default/oran-override.yaml +++ b/smo-install/helm-override/default/oran-override.yaml @@ -25,7 +25,7 @@ ######### NONRTRIC ######### nonrtric: - installPms: false + installPms: true installA1controller: false installA1simulator: true installControlpanel: true diff --git a/smo-install/helm-override/pythonsdk-tests/onap-override.yaml b/smo-install/helm-override/pythonsdk-tests/onap-override.yaml index 0d3ae4a1..257f9d8f 100644 --- a/smo-install/helm-override/pythonsdk-tests/onap-override.yaml +++ b/smo-install/helm-override/pythonsdk-tests/onap-override.yaml @@ -58,7 +58,7 @@ global: # to customize the ONAP deployment. ################################################################# a1policymanagement: - enabled: true + enabled: false rics: - name: ric1 link: http://a1-sim-osc-0.nonrtric:8085 diff --git a/smo-install/helm-override/pythonsdk-tests/oran-override.yaml b/smo-install/helm-override/pythonsdk-tests/oran-override.yaml index 58eded0f..f8e608b0 100644 --- a/smo-install/helm-override/pythonsdk-tests/oran-override.yaml +++ b/smo-install/helm-override/pythonsdk-tests/oran-override.yaml @@ -25,7 +25,7 @@ ######### NONRTRIC ######### nonrtric: - installPms: false + installPms: true installA1controller: false installA1simulator: true installControlpanel: true diff --git a/smo-install/oran_oom/nonrtricgateway/values.yaml b/smo-install/oran_oom/nonrtricgateway/values.yaml index c37308eb..63c096f9 100644 --- a/smo-install/oran_oom/nonrtricgateway/values.yaml +++ b/smo-install/oran_oom/nonrtricgateway/values.yaml @@ -38,7 +38,7 @@ readiness: initialDelaySeconds: 20 periodSeconds: 10 -a1PolicyLink: &a1PolicyLink http://a1policymanagement.onap:8081 +a1PolicyLink: &a1PolicyLink http://policymanagementservice:8081 application: server: diff --git a/smo-install/oran_oom/policymanagementservice/values.yaml b/smo-install/oran_oom/policymanagementservice/values.yaml index 20de309e..e34f8869 100644 --- a/smo-install/oran_oom/policymanagementservice/values.yaml +++ b/smo-install/oran_oom/policymanagementservice/values.yaml @@ -51,42 +51,42 @@ config: config: controller: - name: controller1 - baseUrl: https://a1controller:8383 + baseUrl: http://sdnc.onap:8282 userName: admin password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U ric: - name: ric1 - baseUrl: https://a1-sim-osc-0:8185 + baseUrl: http://a1-sim-osc-0.nonrtric:8085 controller: controller1 managedElementIds: - kista_1 - kista_2 - name: ric2 - baseUrl: https://a1-sim-osc-1:8185 + baseUrl: http://a1-sim-osc-1.nonrtric:8085 controller: controller1 managedElementIds: - kista_1 - kista_2 - name: ric3 - baseUrl: https://a1-sim-std-0:8185 + baseUrl: http://a1-sim-std-0.nonrtric:8085 controller: controller1 managedElementIds: - kista_1 - kista_2 - name: ric4 - baseUrl: https://a1-sim-std-1:8185 + baseUrl: http://a1-sim-std-1.nonrtric:8085 controller: controller1 managedElementIds: - kista_1 - kista_2 - name: ric5 - baseUrl: https://a1-sim-std2-0:8185 + baseUrl: http://a1-sim-std2-0.nonrtric:8085 controller: controller1 managedElementIds: - kista_1 - kista_2 - name: ric6 - baseUrl: https://a1-sim-std2-1:8185 + baseUrl: http://a1-sim-std2-1.nonrtric:8085 controller: controller1 managedElementIds: - kista_1