From facf93e436bfe13e866f86a510bad8c1c9c85430 Mon Sep 17 00:00:00 2001 From: sebdet Date: Wed, 11 May 2022 16:01:27 +0200 Subject: [PATCH 1/1] Add Onap Jakarta support Upgrade Onap to Jakarta + FIx jenkins startup + Add NFS scripts for K8S multinodes + CL tests (disabled for now) Issue-ID: NONRTRIC-669 Signed-off-by: sebdet Change-Id: I650814f19bc9b9932864c9d15fa8fc1cb5af2dbb --- smo-install/README.md | 96 +++++---- smo-install/helm-override/cnf/onap-override.yaml | 24 +-- .../helm-override/default/cicd-override.yaml | 18 +- .../helm-override/default/onap-override.yaml | 15 +- .../default/tests-override.yaml} | 25 +-- .../pythonsdk-tests/onap-override.yaml | 16 +- .../pythonsdk-tests/oran-override.yaml | 2 +- smo-install/jenkins/gerrit/manual-tests-pipeline | 2 + smo-install/jenkins/github/manual-tests-pipeline | 2 + smo-install/onap_oom | 2 +- smo-install/oran_oom/Makefile | 8 +- smo-install/oran_oom/a1controller/Chart.yaml | 7 +- .../oran_oom/a1controller/requirements.yaml | 20 -- smo-install/oran_oom/a1simulator/Chart.yaml | 7 +- smo-install/oran_oom/a1simulator/requirements.yaml | 20 -- smo-install/oran_oom/aux-common/Chart.yaml | 2 +- smo-install/oran_oom/controlpanel/Chart.yaml | 7 +- .../oran_oom/controlpanel/requirements.yaml | 20 -- .../oran_oom/dmaapadapterservice/Chart.yaml | 7 +- .../oran_oom/dmaapadapterservice/requirements.yaml | 20 -- .../oran_oom/dmaapmediatorservice/Chart.yaml | 7 +- .../dmaapmediatorservice/requirements.yaml | 20 -- smo-install/oran_oom/helmmanager/Chart.yaml | 7 +- smo-install/oran_oom/helmmanager/requirements.yaml | 19 -- smo-install/oran_oom/informationservice/Chart.yaml | 7 +- .../oran_oom/informationservice/requirements.yaml | 20 -- smo-install/oran_oom/nonrtric-common/Chart.yaml | 2 +- smo-install/oran_oom/nonrtric/Chart.yaml | 77 ++++++- smo-install/oran_oom/nonrtric/requirements.yaml | 90 --------- smo-install/oran_oom/nonrtricgateway/Chart.yaml | 7 +- .../oran_oom/nonrtricgateway/requirements.yaml | 20 -- smo-install/oran_oom/oru-app/Chart.yaml | 16 +- .../oran_oom/policymanagementservice/Chart.yaml | 7 +- .../policymanagementservice/requirements.yaml | 20 -- .../oran_oom/rappcatalogueservice/Chart.yaml | 7 +- .../rappcatalogueservice/requirements.yaml | 20 -- smo-install/oran_oom/ric-common/Chart.yaml | 2 +- smo-install/oran_oom/topology/Chart.yaml | 2 +- .../layer-0/0-setup-master-nfs-multinodes.sh | 32 +++ smo-install/scripts/layer-0/0-setup-microk8s.sh | 5 +- .../layer-0/0-setup-slave-nfs-multinodes.sh | 25 +++ smo-install/scripts/layer-0/0-setup-tests-env.sh | 1 + smo-install/scripts/layer-2/2-install-tests.sh | 43 ++++ .../src/oransdk/configuration/global_settings.py | 1 + .../test/pythonsdk/src/oransdk/policy/clamp.py | 55 +++-- .../policy/templates/commission_apex.json.j2 | 4 +- .../policy/templates/commission_k8s.json.j2 | 146 ++++++++++++++ .../src/orantests/configuration/settings.py | 8 +- .../test/pythonsdk/src/orantests/conftest.py | 15 ++ .../src/orantests/disable_test_cl_apex.py | 132 ++++++++++++ .../pythonsdk/src/orantests/disable_test_cl_k8s.py | 152 ++++++++++++++ .../src/orantests/disabled_test_cl_apex.py | 222 --------------------- .../test/pythonsdk/src/orantests/smo/cl_usecase.py | 77 +++++++ .../test/pythonsdk/src/orantests/smo/dmaap.py | 46 +++++ .../src/orantests/smo/network_simulators.py | 8 +- .../pythonsdk/src/orantests/test_apex_policy.py | 15 +- .../test/pythonsdk/src/orantests/test_o1.py | 25 ++- smo-install/test/pythonsdk/tox.ini | 2 +- .../test/pythonsdk/unit-tests/test_clamp.py | 85 ++++++++ smo-install/tests_oom/du-simulator/values.yaml | 4 +- .../tests_oom/oran-tests-suite/requirements.yaml | 2 +- smo-install/tests_oom/ru-simulator/values.yaml | 4 +- 62 files changed, 1101 insertions(+), 678 deletions(-) rename smo-install/{oran_oom/oru-app/requirements.yaml => helm-override/default/tests-override.yaml} (63%) delete mode 100644 smo-install/oran_oom/a1controller/requirements.yaml delete mode 100644 smo-install/oran_oom/a1simulator/requirements.yaml delete mode 100644 smo-install/oran_oom/controlpanel/requirements.yaml delete mode 100644 smo-install/oran_oom/dmaapadapterservice/requirements.yaml delete mode 100644 smo-install/oran_oom/dmaapmediatorservice/requirements.yaml delete mode 100644 smo-install/oran_oom/helmmanager/requirements.yaml delete mode 100644 smo-install/oran_oom/informationservice/requirements.yaml delete mode 100644 smo-install/oran_oom/nonrtric/requirements.yaml delete mode 100644 smo-install/oran_oom/nonrtricgateway/requirements.yaml delete mode 100644 smo-install/oran_oom/policymanagementservice/requirements.yaml delete mode 100644 smo-install/oran_oom/rappcatalogueservice/requirements.yaml create mode 100755 smo-install/scripts/layer-0/0-setup-master-nfs-multinodes.sh create mode 100755 smo-install/scripts/layer-0/0-setup-slave-nfs-multinodes.sh create mode 100755 smo-install/scripts/layer-2/2-install-tests.sh create mode 100644 smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_k8s.json.j2 create mode 100644 smo-install/test/pythonsdk/src/orantests/disable_test_cl_apex.py create mode 100644 smo-install/test/pythonsdk/src/orantests/disable_test_cl_k8s.py delete mode 100644 smo-install/test/pythonsdk/src/orantests/disabled_test_cl_apex.py create mode 100644 smo-install/test/pythonsdk/src/orantests/smo/cl_usecase.py create mode 100644 smo-install/test/pythonsdk/src/orantests/smo/dmaap.py create mode 100644 smo-install/test/pythonsdk/unit-tests/test_clamp.py diff --git a/smo-install/README.md b/smo-install/README.md index 7c76d096..3cce9150 100644 --- a/smo-install/README.md +++ b/smo-install/README.md @@ -8,22 +8,24 @@ This project uses different helm charts from different Linux Foundation projects The CNF part is still a "work in progress" so not well documented, it's a DU/RU/topology server deployment done by ONAP SO instantiation. It has been created out of the ONAP vfirewall usecase. -## Quick Installation -* Setup a VM with 20GB Memory, 8VCPU, 60GB of diskspace. +## Quick Installation on blank node +* Setup a VM with 40GB Memory, 6VCPU, 60GB of diskspace. * Install an ubuntu live server 20.04 LTS (https://releases.ubuntu.com/20.04/ubuntu-20.04.3-live-server-amd64.iso) +* Install snap and restart the shell session: sudo apt-get install snapd -y * Execute the following commands being logged as root: - ```git clone --recursive "https://gerrit.o-ran-sc.org/r/it/dep"``` - ```./dep/smo-install/scripts/layer-0/0-setup-microk8s.sh``` + ```git clone --recursive https://github.com/sebdet/oran-deployment.git``` - ```./dep/smo-install/scripts/layer-0/0-setup-charts-museum.sh``` + ```./oran-deployment/scripts/layer-0/0-setup-microk8s.sh``` - ```./dep/smo-install/scripts/layer-0/0-setup-helm3.sh``` - - ```./dep/smo-install/scripts/layer-1/1-build-all-charts.sh``` + ```./oran-deployment/scripts/layer-0/0-setup-charts-museum.sh``` + + ```./oran-deployment/scripts/layer-0/0-setup-helm3.sh``` + + ```./oran-deployment/scripts/layer-1/1-build-all-charts.sh``` - ```./dep/smo-install/scripts/layer-2/2-install-oran.sh``` + ```./oran-deployment/scripts/layer-2/2-install-oran.sh``` Verify pods: @@ -31,31 +33,29 @@ It has been created out of the ONAP vfirewall usecase. When all pods in "onap" and "nonrtric" namespaces are well up & running: - ```./dep/smo-install/scripts/layer-2/2-install-simulators.sh``` + ```./oran-deployment/scripts/layer-2/2-install-simulators.sh``` ## Quick Installation on existing kubernetes -* Ensure you have at least 20GB Memory, 6VCPU, 60GB of diskspace. +* Ensure you have at least 20GB Memory, 6VCPU, 60GB of diskspace. * Execute the following commands being logged as root: - ```git clone --recursive "https://gerrit.o-ran-sc.org/r/it/dep"``` - - ```./oran-deployment/scripts/layer-0/0-setup-charts-museum.sh``` - - ```./oran-deployment/scripts/layer-0/0-setup-helm3.sh``` - - ```./oran-deployment/scripts/layer-1/1-build-all-charts.sh``` + ```git clone --recursive git@github.com:gmngueko/oran-deployment.git``` - ```./oran-deployment/scripts/layer-2/2-install-oran.sh``` - - Verify pods: - - ```kubectl get pods -n onap && kubectl get pods -n nonrtric``` - - When all pods in "onap" and "nonrtric" namespaces are well up & running: + ```./oran-deployment/scripts/layer-0/0-setup-charts-museum.sh``` + + ```./oran-deployment/scripts/layer-0/0-setup-helm3.sh``` + + ```./oran-deployment/scripts/layer-1/1-build-all-charts.sh``` - ```./oran-deployment/scripts/layer-2/2-install-simulators.sh``` + ```./oran-deployment/scripts/layer-2/2-install-oran.sh``` + Verify pods: + ```kubectl get pods -n onap && kubectl get pods -n nonrtric``` + + When all pods in "onap" and "nonrtric" namespaces are well up & running: + + ```./oran-deployment/scripts/layer-2/2-install-simulators.sh``` ## Structure @@ -102,7 +102,6 @@ The user entry point is located in the scripts folder │   │   └── 0-setup-kud-node.sh <--- Setup K8S node with ONAP Multicloud KUD installation │   │   └── 0-setup-microk8s.sh <--- Setup K8S node with MicroK8S installation │   │   └── 0-setup-helm3.sh <--- Setup HELM3 -│   │   └── 0-setup-tests-env.sh <--- Setup Python SDK tools │   ├── layer-1 <--- Scripts to prepare for the SMO installation │   │   └── 1-build-all-charts.sh <--- Build all HELM charts and upload them to ChartMuseum │   ├── layer-2 <--- Scripts to install SMO package @@ -110,7 +109,7 @@ The user entry point is located in the scripts folder │   │   ├── 2-install-oran-cnf.sh <--- Install SMO full with ONAP CNF features │   │   ├── 2-install-oran.sh <--- Install SMO minimal │   │   └── 2-install-simulators.sh <--- Install Network simulator (RU/DU/Topology Server) -│   │   └── 2-upgrade-simulators.sh <--- Upgrade the simulators install at runtime when changes are done on override files +│   │   └── 2-upgrade-simulators.sh <--- Upgrade the simulators install at runtime when changes are done on override files │   ├── sub-scripts <--- Sub-Scripts used by the main layer-0, layer-1, layer-2 │   │   ├── clean-up.sh │   │   ├── install-nonrtric.sh @@ -129,9 +128,9 @@ The user entry point is located in the scripts folder │   ├── apex-policy-test.sh │   └── data ├── enable-sim-fault-report <--- Enable the fault reporting of the network simulators by SDNC - │ ├── data - │ └── enable-network-sim-fault-reporting.sh - └── pythonsdk <--- Test based on ONAP Python SDK to validate O1 and A1 + │   ├── data + │   └── enable-network-sim-fault-reporting.sh + └── pythonsdk <--- Test based on ONAP Python SDK to validate O1 and A1 ├── oran-tests.xml ├── Pipfile.lock ├── README.md @@ -140,12 +139,11 @@ The user entry point is located in the scripts folder ├── tox.ini └── unit-tests - ``` ## Download: -Use git clone to get it on your server: +Use git clone to get it on your server (github ssh key config is required): -```git clone --recursive "https://gerrit.o-ran-sc.org/r/it/dep"``` +```git clone --recursive git@github.com:gmngueko/oran-deployment.git``` Note: The current repository has multiple sub git submodules, therefore the --recursive flag is absolutely REQUIRED @@ -155,13 +153,13 @@ Use git clone to get it on your server: FOR K8S installation, multiple options are available: - MicroK8S standalone deployment: - ```./dep/smo-install/scripts/layer-0/0-setup-microk8s.sh``` + ```./oran-deployment/scripts/layer-0/0-setup-microk8s.sh``` OR this wiki can help to setup it (Section 1, 2 and 3): https://wiki.onap.org/display/DW/Deploy+OOM+and+SDC+%28or+ONAP%29+on+a+single+VM+with+microk8s+-+Honolulu+Setup - KubeSpray using ONAP multicloud KUD (https://git.onap.org/multicloud/k8s/tree/kud) installation by executing(this is required for ONAP CNF deployments): - ```./dep/smo-install/scripts/layer-0/0-setup-kud-node.sh``` + ```./oran-deployment/scripts/layer-0/0-setup-kud-node.sh``` - Use an existing K8S installation (Cloud, etc ...). @@ -170,32 +168,32 @@ Use git clone to get it on your server: * ChartMuseum to store the HELM charts on the server, multiple options are available: - Execute the install script: - ```./dep/smo-install/scripts/layer-0/0-setup-charts-museum.sh``` - + ```./oran-deployment/scripts/layer-0/0-setup-charts-museum.sh``` + ```./oran-deployment/scripts/layer-0/0-setup-helm3.sh``` - Install chartmuseum manually on port 18080 (https://chartmuseum.com/#Instructions, https://github.com/helm/chartmuseum) ## Configuration: -In the ./helm-override/ folder the helm config that are used by the SMO installation. +In the ./helm-override/ folder the helm config that are used by the SMO installation.

Different flavors are preconfigured, and should NOT be changed unless you intentionally want to updates some configurations. ## Installation: * Build ONAP/ORAN charts - ```./dep/smo-install/scripts/layer-1/1-build-all-charts.sh``` + ```./oran-deployment/scripts/layer-1/1-build-all-charts.sh``` * Choose the installation: - ONAP + ORAN "nonrtric" (RECOMMENDED ONE): - ```./dep/smo-install/scripts/layer-2/2-install-oran.sh``` + ```./oran-deployment/scripts/layer-2/2-install-oran.sh``` - ORAN "nonrtric" par only: - ```./dep/smo-install/scripts/layer-2/2-install-nonrtric-only.sh``` + ```./oran-deployment/scripts/layer-2/2-install-nonrtric-only.sh``` - ONAP CNF + ORAN "nonrtric" (This must still be documented properly): - - ```./dep/smo-install/scripts/layer-2/2-install-oran-cnf.sh``` + + ```./oran-deployment/scripts/layer-2/2-install-oran-cnf.sh``` @@ -206,22 +204,22 @@ In the ./helm-override/ folder the helm config that are used by the SMO installa - Execute the install script: - ```./dep/smo-install/scripts/layer-2/2-install-simulators.sh``` + ```./oran-deployment/scripts/layer-2/2-install-simulators.sh``` - Check the simulators status: ```kubectl get pods -n network``` Note: The simulators topology can be customized in the file ./oran-deployment/helm-override/network-simulators-topology-override.yaml - + ## Platform access points: * SDNR WEB: - https://K8SServerIP:30205/odlux/index.html + https://:30205/odlux/index.html * NONRTRIC Dashboard: - http://K8SServerIP:30091/ + http://:30091/ More to come ... ## Uninstallation: * Execute - ```./dep/smo-install/scripts/uninstall-all.sh``` + ```./oran-deployment/scripts/uninstall-all.sh``` diff --git a/smo-install/helm-override/cnf/onap-override.yaml b/smo-install/helm-override/cnf/onap-override.yaml index d989e06f..df0b145e 100644 --- a/smo-install/helm-override/cnf/onap-override.yaml +++ b/smo-install/helm-override/cnf/onap-override.yaml @@ -289,7 +289,7 @@ oof: enabled: false platform: enabled: true -policy: +policy: enabled: true policy-api: enabled: true @@ -304,21 +304,19 @@ policy: policy-distribution: enabled: false policy-clamp-be: - enabled: false - policy-clamp-fe: - enabled: false - policy-clamp-cl-runtime: - enabled: false - policy-clamp-cl-k8s-ppnt: - enabled: false + enabled: true + policy-clamp-runtime-acm: + enabled: true + policy-clamp-ac-k8s-ppnt: + enabled: true policy-gui: - enabled: false + enabled: true policy-nexus: enabled: false - policy-clamp-cl-pf-ppnt: - enabled: false - policy-clamp-cl-http-ppnt: - enabled: false + policy-clamp-ac-pf-ppnt: + enabled: true + policy-clamp-ac-http-ppnt: + enabled: true pomba: enabled: false portal: diff --git a/smo-install/helm-override/default/cicd-override.yaml b/smo-install/helm-override/default/cicd-override.yaml index c1f02957..026037ee 100644 --- a/smo-install/helm-override/default/cicd-override.yaml +++ b/smo-install/helm-override/default/cicd-override.yaml @@ -17,12 +17,6 @@ testsSuite: jenkins: true tests: false -oran-tests: - oranTests: - name: orantests1 - flag: true - commitId: 83be1833161166e663098ab09f56551fc83b84c0 - github: username: "username" password: "token_api" @@ -32,5 +26,17 @@ gerrit: password: "token_api" jenkins: + persistence: + enabled: false controller: jenkinsUrl: "http://smo-jenkins:32080" + JCasC: + securityRealm: |- + local: + allowsSignup: false + enableCaptcha: false + users: + - id: "test" + name: "Jenkins Admin" + password: "testos" + diff --git a/smo-install/helm-override/default/onap-override.yaml b/smo-install/helm-override/default/onap-override.yaml index e4506aca..3ba13b31 100644 --- a/smo-install/helm-override/default/onap-override.yaml +++ b/smo-install/helm-override/default/onap-override.yaml @@ -239,6 +239,9 @@ dcaegen2-services: enabled: true dcae-ves-mapper: enabled: false + dcae-ves-openapi-manager: + enabled: false + dcaemod: enabled: false holmes: @@ -303,20 +306,18 @@ policy: enabled: false policy-clamp-be: enabled: true - image: onap/policy-clamp-backend:6.2-SNAPSHOT-latest - policy-clamp-fe: - enabled: true - policy-clamp-cl-runtime: + policy-clamp-runtime-acm: enabled: true - policy-clamp-cl-k8s-ppnt: + policy-clamp-ac-k8s-ppnt: enabled: true policy-gui: enabled: true + image: onap/policy-gui:2.2.1 policy-nexus: enabled: false - policy-clamp-cl-pf-ppnt: + policy-clamp-ac-pf-ppnt: enabled: true - policy-clamp-cl-http-ppnt: + policy-clamp-ac-http-ppnt: enabled: true pomba: diff --git a/smo-install/oran_oom/oru-app/requirements.yaml b/smo-install/helm-override/default/tests-override.yaml similarity index 63% rename from smo-install/oran_oom/oru-app/requirements.yaml rename to smo-install/helm-override/default/tests-override.yaml index c51ac3df..9f73f071 100644 --- a/smo-install/oran_oom/oru-app/requirements.yaml +++ b/smo-install/helm-override/default/tests-override.yaml @@ -1,4 +1,4 @@ -# Copyright © 2021 AT&T +# Copyright © 2021-2022 AT&T Intellectual Property # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,16 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -dependencies: - - name: common - version: ~9.x-0 - repository: '@local' - - name: certInitializer - version: ~9.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~9.x-0 - repository: '@local' - - name: serviceAccount - version: ~9.x-0 - repository: '@local' +# Static Defaults +testsSuite: + jenkins: false + tests: true + +oran-tests: + oranTests: + name: orantests1 + commitId: origin/main + diff --git a/smo-install/helm-override/pythonsdk-tests/onap-override.yaml b/smo-install/helm-override/pythonsdk-tests/onap-override.yaml index e4506aca..6500fc03 100644 --- a/smo-install/helm-override/pythonsdk-tests/onap-override.yaml +++ b/smo-install/helm-override/pythonsdk-tests/onap-override.yaml @@ -239,6 +239,9 @@ dcaegen2-services: enabled: true dcae-ves-mapper: enabled: false + dcae-ves-openapi-manager: + enabled: false + dcaemod: enabled: false holmes: @@ -287,7 +290,7 @@ oof: enabled: false platform: enabled: true -policy: +policy: enabled: true policy-api: enabled: true @@ -303,20 +306,17 @@ policy: enabled: false policy-clamp-be: enabled: true - image: onap/policy-clamp-backend:6.2-SNAPSHOT-latest - policy-clamp-fe: - enabled: true - policy-clamp-cl-runtime: + policy-clamp-runtime-acm: enabled: true - policy-clamp-cl-k8s-ppnt: + policy-clamp-ac-k8s-ppnt: enabled: true policy-gui: enabled: true policy-nexus: enabled: false - policy-clamp-cl-pf-ppnt: + policy-clamp-ac-pf-ppnt: enabled: true - policy-clamp-cl-http-ppnt: + policy-clamp-ac-http-ppnt: enabled: true pomba: diff --git a/smo-install/helm-override/pythonsdk-tests/oran-override.yaml b/smo-install/helm-override/pythonsdk-tests/oran-override.yaml index c2ccb22c..27f98210 100644 --- a/smo-install/helm-override/pythonsdk-tests/oran-override.yaml +++ b/smo-install/helm-override/pythonsdk-tests/oran-override.yaml @@ -33,7 +33,7 @@ nonrtric: installRappcatalogueservice: true installNonrtricgateway: true installKong: true - installORUApp: true + installORUApp: false installTopology: true installDmaapadapterservice: true installDmaapmediatorservice: true diff --git a/smo-install/jenkins/gerrit/manual-tests-pipeline b/smo-install/jenkins/gerrit/manual-tests-pipeline index ce742460..d3166272 100644 --- a/smo-install/jenkins/gerrit/manual-tests-pipeline +++ b/smo-install/jenkins/gerrit/manual-tests-pipeline @@ -61,9 +61,11 @@ podTemplate(yaml: ''' } else { sh 'tox' } + currentBuild.result = 'SUCCESS' } catch(exec) { echo 'TOX tests crashed' + currentBuild.result = 'FAILURE' } } } diff --git a/smo-install/jenkins/github/manual-tests-pipeline b/smo-install/jenkins/github/manual-tests-pipeline index 77524183..e73841a4 100644 --- a/smo-install/jenkins/github/manual-tests-pipeline +++ b/smo-install/jenkins/github/manual-tests-pipeline @@ -61,9 +61,11 @@ podTemplate(yaml: ''' } else { sh 'tox' } + currentBuild.result = 'SUCCESS' } catch(exec) { echo 'TOX tests crashed' + currentBuild.result = 'FAILURE' } } } diff --git a/smo-install/onap_oom b/smo-install/onap_oom index e1661bdc..c45c81f1 160000 --- a/smo-install/onap_oom +++ b/smo-install/onap_oom @@ -1 +1 @@ -Subproject commit e1661bdc0f82fe98a11a723de54e9b6b13418b43 +Subproject commit c45c81f10b54f55f0eb3a7d43c2474e28cf05dd2 diff --git a/smo-install/oran_oom/Makefile b/smo-install/oran_oom/Makefile index 50c1e11d..617cbe86 100644 --- a/smo-install/oran_oom/Makefile +++ b/smo-install/oran_oom/Makefile @@ -62,9 +62,9 @@ $(SUBMODS): @make package-$@ submod-%: - @make $*/requirements.yaml + @make $*/Chart.yaml -%/requirements.yaml: +%/Chart.yaml: $(error Submodule $* needs to be retrieved from gerrit. See https://wiki.onap.org/display/DW/OOM+-+Development+workflow+after+code+transfer+to+tech+teams ); fi print_helm_bin: @@ -74,7 +74,7 @@ make-%: @if [ -f $*/Makefile ]; then make -C $*; fi dep-%: make-% - @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi lint-%: dep-% @if [ -f $*/Chart.yaml ]; then $(HELM_LINT_CMD) $*; fi @@ -89,7 +89,7 @@ else endif clean: - @rm -f */requirements.lock + @rm -f */Chart.lock @find . -type f -name '*.tgz' -delete @rm -rf $(PACKAGE_DIR)/* diff --git a/smo-install/oran_oom/a1controller/Chart.yaml b/smo-install/oran_oom/a1controller/Chart.yaml index 99ced473..a2e06881 100644 --- a/smo-install/oran_oom/a1controller/Chart.yaml +++ b/smo-install/oran_oom/a1controller/Chart.yaml @@ -14,8 +14,13 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 appVersion: "2.0.0" description: A Helm chart for nonrtric a1controller name: a1controller version: 2.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" \ No newline at end of file diff --git a/smo-install/oran_oom/a1controller/requirements.yaml b/smo-install/oran_oom/a1controller/requirements.yaml deleted file mode 100644 index f3b3ecd4..00000000 --- a/smo-install/oran_oom/a1controller/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2020 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. # -################################################################################ - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/a1simulator/Chart.yaml b/smo-install/oran_oom/a1simulator/Chart.yaml index 66d4028b..d4570a4f 100644 --- a/smo-install/oran_oom/a1simulator/Chart.yaml +++ b/smo-install/oran_oom/a1simulator/Chart.yaml @@ -1,5 +1,10 @@ -apiVersion: v1 +apiVersion: v2 appVersion: "2.0.0" description: A Helm chart for A1 simulator name: a1simulator version: 2.1.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" \ No newline at end of file diff --git a/smo-install/oran_oom/a1simulator/requirements.yaml b/smo-install/oran_oom/a1simulator/requirements.yaml deleted file mode 100644 index f3b3ecd4..00000000 --- a/smo-install/oran_oom/a1simulator/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2020 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. # -################################################################################ - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/aux-common/Chart.yaml b/smo-install/oran_oom/aux-common/Chart.yaml index 379771c8..34925473 100644 --- a/smo-install/oran_oom/aux-common/Chart.yaml +++ b/smo-install/oran_oom/aux-common/Chart.yaml @@ -14,7 +14,7 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 description: Common templates for inclusion in other charts name: aux-common version: 3.0.0 diff --git a/smo-install/oran_oom/controlpanel/Chart.yaml b/smo-install/oran_oom/controlpanel/Chart.yaml index 585ada4c..b99826a3 100644 --- a/smo-install/oran_oom/controlpanel/Chart.yaml +++ b/smo-install/oran_oom/controlpanel/Chart.yaml @@ -14,8 +14,13 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 appVersion: "2.0.0" description: A Helm chart for nonrtric controlpanel name: controlpanel version: 2.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" diff --git a/smo-install/oran_oom/controlpanel/requirements.yaml b/smo-install/oran_oom/controlpanel/requirements.yaml deleted file mode 100644 index f3b3ecd4..00000000 --- a/smo-install/oran_oom/controlpanel/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2020 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. # -################################################################################ - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/dmaapadapterservice/Chart.yaml b/smo-install/oran_oom/dmaapadapterservice/Chart.yaml index 623ae8b8..15d22c41 100644 --- a/smo-install/oran_oom/dmaapadapterservice/Chart.yaml +++ b/smo-install/oran_oom/dmaapadapterservice/Chart.yaml @@ -14,8 +14,13 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 appVersion: "1.0.0" description: A Helm chart for Dmaap Adapter Service name: dmaapadapterservice version: 1.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" \ No newline at end of file diff --git a/smo-install/oran_oom/dmaapadapterservice/requirements.yaml b/smo-install/oran_oom/dmaapadapterservice/requirements.yaml deleted file mode 100644 index 69b4db6d..00000000 --- a/smo-install/oran_oom/dmaapadapterservice/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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. # -################################################################################ - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/dmaapmediatorservice/Chart.yaml b/smo-install/oran_oom/dmaapmediatorservice/Chart.yaml index 37ec9cd7..3abc57f9 100644 --- a/smo-install/oran_oom/dmaapmediatorservice/Chart.yaml +++ b/smo-install/oran_oom/dmaapmediatorservice/Chart.yaml @@ -14,8 +14,13 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 appVersion: "1.0.0" description: A Helm chart for Dmaap Mediator Service name: dmaapmediatorservice version: 1.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" diff --git a/smo-install/oran_oom/dmaapmediatorservice/requirements.yaml b/smo-install/oran_oom/dmaapmediatorservice/requirements.yaml deleted file mode 100644 index f3b3ecd4..00000000 --- a/smo-install/oran_oom/dmaapmediatorservice/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2020 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. # -################################################################################ - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/helmmanager/Chart.yaml b/smo-install/oran_oom/helmmanager/Chart.yaml index 46af0d5c..511176b3 100644 --- a/smo-install/oran_oom/helmmanager/Chart.yaml +++ b/smo-install/oran_oom/helmmanager/Chart.yaml @@ -13,8 +13,13 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 appVersion: "1.0.0" description: A Helm chart for Helm Manager name: helmmanager version: 1.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" \ No newline at end of file diff --git a/smo-install/oran_oom/helmmanager/requirements.yaml b/smo-install/oran_oom/helmmanager/requirements.yaml deleted file mode 100644 index 7bd421f5..00000000 --- a/smo-install/oran_oom/helmmanager/requirements.yaml +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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. # -################################################################################ -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/informationservice/Chart.yaml b/smo-install/oran_oom/informationservice/Chart.yaml index 610411be..900578d1 100644 --- a/smo-install/oran_oom/informationservice/Chart.yaml +++ b/smo-install/oran_oom/informationservice/Chart.yaml @@ -14,8 +14,13 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 appVersion: "1.0.0" description: A Helm chart for Information Coordinator Service name: informationservice version: 1.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" \ No newline at end of file diff --git a/smo-install/oran_oom/informationservice/requirements.yaml b/smo-install/oran_oom/informationservice/requirements.yaml deleted file mode 100644 index f3b3ecd4..00000000 --- a/smo-install/oran_oom/informationservice/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2020 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. # -################################################################################ - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/nonrtric-common/Chart.yaml b/smo-install/oran_oom/nonrtric-common/Chart.yaml index 693b6dfa..3798faff 100644 --- a/smo-install/oran_oom/nonrtric-common/Chart.yaml +++ b/smo-install/oran_oom/nonrtric-common/Chart.yaml @@ -14,7 +14,7 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 description: NONRTRIC Common templates for inclusion in other charts name: nonrtric-common version: 2.0.0 \ No newline at end of file diff --git a/smo-install/oran_oom/nonrtric/Chart.yaml b/smo-install/oran_oom/nonrtric/Chart.yaml index ae89fa78..07703a70 100644 --- a/smo-install/oran_oom/nonrtric/Chart.yaml +++ b/smo-install/oran_oom/nonrtric/Chart.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v2 name: nonrtric version: 1.0.0 appVersion: test @@ -7,3 +7,78 @@ home: https://www.o-ran.org/ sources: - https://gerrit.o-ran-sc.org/r/#/admin/projects/ kubeVersion: ">=1.19.0-0" + +dependencies: + - name: a1controller + version: ~2.0.0 + repository: "@local" + condition: nonrtric.installA1controller + + - name: a1simulator + version: ~2.1.0 + repository: "@local" + condition: nonrtric.installA1simulator + + - name: controlpanel + version: ~2.0.0 + repository: "@local" + condition: nonrtric.installControlpanel + + - name: policymanagementservice + version: ~2.0.0 + repository: "@local" + condition: nonrtric.installPms + + - name: informationservice + version: ~1.0.0 + repository: "@local" + condition: nonrtric.installInformationservice + + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" + + - name: rappcatalogueservice + version: ~1.0.0 + repository: "@local" + condition: nonrtric.installRappcatalogueservice + + - name: nonrtricgateway + version: ~1.0.0 + repository: "@local" + condition: nonrtric.installNonrtricgateway + + - name: oru-app + version: ~1.0.0 + repository: "@local" + condition: nonrtric.installORUApp + + - name: topology + version: ~1.0.0 + repository: "@local" + condition: nonrtric.installTopology + + - name: dmaapmediatorservice + version: ~1.0.0 + repository: "@local" + condition: nonrtric.installDmaapmediatorservice + + - name: helmmanager + version: ~1.0.0 + repository: "@local" + condition: nonrtric.installHelmmanager + + - name: kong + version: ~2.4.0 + repository: https://nexus3.o-ran-sc.org/repository/helm-konghq/ + condition: nonrtric.installKong + + - name: dmaapadapterservice + version: ~1.0.0 + repository: "@local" + condition: nonrtric.installDmaapadapterservice + + - name: cert-wrapper + version: ~10.x-0 + repository: '@local' + condition: cert-wrapper.enabled diff --git a/smo-install/oran_oom/nonrtric/requirements.yaml b/smo-install/oran_oom/nonrtric/requirements.yaml deleted file mode 100644 index 29517b23..00000000 --- a/smo-install/oran_oom/nonrtric/requirements.yaml +++ /dev/null @@ -1,90 +0,0 @@ -################################################################################ -# Copyright (c) 2020 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. # -################################################################################ - -dependencies: - - name: a1controller - version: ~2.0.0 - repository: "@local" - condition: nonrtric.installA1controller - - - name: a1simulator - version: ~2.1.0 - repository: "@local" - condition: nonrtric.installA1simulator - - - name: controlpanel - version: ~2.0.0 - repository: "@local" - condition: nonrtric.installControlpanel - - - name: policymanagementservice - version: ~2.0.0 - repository: "@local" - condition: nonrtric.installPms - - - name: informationservice - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installInformationservice - - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" - - - name: rappcatalogueservice - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installRappcatalogueservice - - - name: nonrtricgateway - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installNonrtricgateway - - - name: oru-app - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installORUApp - - - name: topology - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installTopology - - - name: dmaapmediatorservice - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installDmaapmediatorservice - - - name: helmmanager - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installHelmmanager - - - name: kong - version: ~2.4.0 - repository: https://nexus3.o-ran-sc.org/repository/helm-konghq/ - condition: nonrtric.installKong - - - name: dmaapadapterservice - version: ~1.0.0 - repository: "@local" - condition: nonrtric.installDmaapadapterservice - - - name: cert-wrapper - version: ~9.x-0 - repository: '@local' - condition: cert-wrapper.enabled diff --git a/smo-install/oran_oom/nonrtricgateway/Chart.yaml b/smo-install/oran_oom/nonrtricgateway/Chart.yaml index c989221e..9ca9e2d2 100644 --- a/smo-install/oran_oom/nonrtricgateway/Chart.yaml +++ b/smo-install/oran_oom/nonrtricgateway/Chart.yaml @@ -14,8 +14,13 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 appVersion: "0.0.1" description: A Helm chart for Nonrtric Gateway name: nonrtricgateway version: 1.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" \ No newline at end of file diff --git a/smo-install/oran_oom/nonrtricgateway/requirements.yaml b/smo-install/oran_oom/nonrtricgateway/requirements.yaml deleted file mode 100644 index 69b4db6d..00000000 --- a/smo-install/oran_oom/nonrtricgateway/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2021 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. # -################################################################################ - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/oru-app/Chart.yaml b/smo-install/oran_oom/oru-app/Chart.yaml index 0728b48f..47130282 100644 --- a/smo-install/oran_oom/oru-app/Chart.yaml +++ b/smo-install/oran_oom/oru-app/Chart.yaml @@ -1,5 +1,19 @@ -apiVersion: v1 +apiVersion: v2 appVersion: "1.0.0" description: A Helm chart to deploy oru-app name: oru-app version: 1.0.0 + +dependencies: + - name: common + version: ~10.x-0 + repository: '@local' + - name: certInitializer + version: ~10.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~10.x-0 + repository: '@local' + - name: serviceAccount + version: ~10.x-0 + repository: '@local' \ No newline at end of file diff --git a/smo-install/oran_oom/policymanagementservice/Chart.yaml b/smo-install/oran_oom/policymanagementservice/Chart.yaml index 256af345..5b5c0c6e 100644 --- a/smo-install/oran_oom/policymanagementservice/Chart.yaml +++ b/smo-install/oran_oom/policymanagementservice/Chart.yaml @@ -14,8 +14,13 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 appVersion: "2.0.0" description: A Helm chart for Policy Management Service name: policymanagementservice version: 2.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" \ No newline at end of file diff --git a/smo-install/oran_oom/policymanagementservice/requirements.yaml b/smo-install/oran_oom/policymanagementservice/requirements.yaml deleted file mode 100644 index f3b3ecd4..00000000 --- a/smo-install/oran_oom/policymanagementservice/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2020 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. # -################################################################################ - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/rappcatalogueservice/Chart.yaml b/smo-install/oran_oom/rappcatalogueservice/Chart.yaml index 4482422d..4d28e415 100644 --- a/smo-install/oran_oom/rappcatalogueservice/Chart.yaml +++ b/smo-install/oran_oom/rappcatalogueservice/Chart.yaml @@ -14,8 +14,13 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 appVersion: "2.0.0" description: A Helm chart for rAPP Catalogue Service name: rappcatalogueservice version: 1.0.0 + +dependencies: + - name: nonrtric-common + version: ^2.0.0 + repository: "@local" \ No newline at end of file diff --git a/smo-install/oran_oom/rappcatalogueservice/requirements.yaml b/smo-install/oran_oom/rappcatalogueservice/requirements.yaml deleted file mode 100644 index f3b3ecd4..00000000 --- a/smo-install/oran_oom/rappcatalogueservice/requirements.yaml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# Copyright (c) 2020 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. # -################################################################################ - -dependencies: - - name: nonrtric-common - version: ^2.0.0 - repository: "@local" diff --git a/smo-install/oran_oom/ric-common/Chart.yaml b/smo-install/oran_oom/ric-common/Chart.yaml index 56ddffe9..2dcf56b0 100644 --- a/smo-install/oran_oom/ric-common/Chart.yaml +++ b/smo-install/oran_oom/ric-common/Chart.yaml @@ -15,7 +15,7 @@ # limitations under the License. # ################################################################################ -apiVersion: v1 +apiVersion: v2 description: Common templates for inclusion in other charts name: ric-common version: 3.3.2 diff --git a/smo-install/oran_oom/topology/Chart.yaml b/smo-install/oran_oom/topology/Chart.yaml index fab10eb0..47dd9535 100644 --- a/smo-install/oran_oom/topology/Chart.yaml +++ b/smo-install/oran_oom/topology/Chart.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 appVersion: "1.0.0" description: A Helm chart to deploy topology name: topology diff --git a/smo-install/scripts/layer-0/0-setup-master-nfs-multinodes.sh b/smo-install/scripts/layer-0/0-setup-master-nfs-multinodes.sh new file mode 100755 index 00000000..32574c9f --- /dev/null +++ b/smo-install/scripts/layer-0/0-setup-master-nfs-multinodes.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +usage () { + echo "Usage:" + echo " ./$(basename $0) node1_ip node2_ip ... nodeN_ip" + exit 1 +} + +if [ "$#" -lt 1 ]; then + echo "Missing NFS slave nodes" + usage +fi + +#Install NFS kernel +sudo apt-get update +sudo apt-get install -y nfs-kernel-server + +#Create /dockerdata-nfs and set permissions +sudo mkdir -p /dockerdata-nfs +sudo chmod 777 -R /dockerdata-nfs +sudo chown nobody:nogroup /dockerdata-nfs/ + +#Update the /etc/exports +NFS_EXP="" +for i in $@; do + NFS_EXP="${NFS_EXP}$i(rw,sync,no_root_squash,no_subtree_check) " +done +echo "/dockerdata-nfs "$NFS_EXP | sudo tee -a /etc/exports + +#Restart the NFS service +sudo exportfs -a +sudo systemctl restart nfs-kernel-server diff --git a/smo-install/scripts/layer-0/0-setup-microk8s.sh b/smo-install/scripts/layer-0/0-setup-microk8s.sh index 800a953b..d8fc65ff 100755 --- a/smo-install/scripts/layer-0/0-setup-microk8s.sh +++ b/smo-install/scripts/layer-0/0-setup-microk8s.sh @@ -24,6 +24,7 @@ ### ## Microk8S part +sudo apt-get update sudo swapoff -a sudo sed -i '/ swap / s/^\(.*\)$/#\1/g' /etc/fstab snap remove microk8s @@ -36,11 +37,11 @@ ufw allow in on cni0 && sudo ufw allow out on cni0 ufw default allow routed ## Enable required features for K8S -microk8s enable dns storage +microk8s enable dns storage prometheus ## Setup kubectl cd -mkdir .kube +mkdir -p .kube cd .kube sudo microk8s.config > config chmod 700 config diff --git a/smo-install/scripts/layer-0/0-setup-slave-nfs-multinodes.sh b/smo-install/scripts/layer-0/0-setup-slave-nfs-multinodes.sh new file mode 100755 index 00000000..1035ff5a --- /dev/null +++ b/smo-install/scripts/layer-0/0-setup-slave-nfs-multinodes.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +usage () { + echo "Usage:" + echo " ./$(basename $0) nfs_master_ip" + exit 1 +} + +if [ "$#" -ne 1 ]; then + echo "Missing NFS mater node" + usage +fi + +MASTER_IP=$1 + +#Install NFS common +sudo apt-get update +sudo apt-get install -y nfs-common + +#Create NFS directory +sudo mkdir -p /dockerdata-nfs + +#Mount the remote NFS directory to the local one +sudo mount $MASTER_IP:/dockerdata-nfs /dockerdata-nfs/ +echo "$MASTER_IP:/dockerdata-nfs /dockerdata-nfs nfs auto,nofail,noatime,nolock,intr,tcp,actimeo=1800 0 0" | sudo tee -a /etc/fstab diff --git a/smo-install/scripts/layer-0/0-setup-tests-env.sh b/smo-install/scripts/layer-0/0-setup-tests-env.sh index afd7f33d..f0ff8719 100755 --- a/smo-install/scripts/layer-0/0-setup-tests-env.sh +++ b/smo-install/scripts/layer-0/0-setup-tests-env.sh @@ -28,5 +28,6 @@ sudo apt-get update sudo apt-get install maven -y sudo apt-get install python3.8 -y sudo apt-get install python3-pip -y +sudo apt-get install curl -y pip3 install tox diff --git a/smo-install/scripts/layer-2/2-install-tests.sh b/smo-install/scripts/layer-2/2-install-tests.sh new file mode 100755 index 00000000..c97c4cee --- /dev/null +++ b/smo-install/scripts/layer-2/2-install-tests.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# ORAN SMO Package +# ================================================================================ +# Copyright (C) 2021 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END============================================ +# =================================================================== +# +### + +SCRIPT=$(readlink -f "$0") +SCRIPT_PATH=$(dirname "$SCRIPT") +cd $SCRIPT_PATH + +FLAVOUR=$1 +if [ -z "$1" ] + then + echo "No helm override flavour supplied, going to default" + FLAVOUR="default" +fi + + +echo "Starting CICD in 'tests' namespace..." + +../sub-scripts/install-cicd.sh ../../helm-override/$FLAVOUR/tests-override.yaml + +kubectl get pods -n tests +kubectl get namespaces diff --git a/smo-install/test/pythonsdk/src/oransdk/configuration/global_settings.py b/smo-install/test/pythonsdk/src/oransdk/configuration/global_settings.py index f00dce60..07561f20 100644 --- a/smo-install/test/pythonsdk/src/oransdk/configuration/global_settings.py +++ b/smo-install/test/pythonsdk/src/oransdk/configuration/global_settings.py @@ -32,3 +32,4 @@ POLICY_PAP_URL = "https://localhost:6969" POLICY_API_URL = "https://localhost:6969" SDNC_URL = "http://localhost:8282" EMS_URL = "http://localhost:8083" +CLAMP_URL = "http://localhost:8084" diff --git a/smo-install/test/pythonsdk/src/oransdk/policy/clamp.py b/smo-install/test/pythonsdk/src/oransdk/policy/clamp.py index e693a05a..921207f7 100644 --- a/smo-install/test/pythonsdk/src/oransdk/policy/clamp.py +++ b/smo-install/test/pythonsdk/src/oransdk/policy/clamp.py @@ -22,9 +22,10 @@ # ### """Onap Policy Clamp Tosca Template module.""" - +import time from typing import Dict from onapsdk.clamp.clamp_element import Clamp +from onapsdk.exceptions import RequestError class ClampToscaTemplate(Clamp): """Onap Policy Clamp Tosca Template class.""" @@ -49,7 +50,7 @@ class ClampToscaTemplate(Clamp): Returns: the tosca template instance """ - url = f"{self.base_url()}/toscaControlLoop/getToscaInstantiation" + url = f"{self.base_url()}/acm/getToscaInstantiation" template_instance = self.send_message_json('GET', 'Get tosca template instance', url, @@ -67,7 +68,7 @@ class ClampToscaTemplate(Clamp): the response of the uploading action """ - url = f"{self.base_url()}/toscaControlLoop/commissionToscaTemplate" + url = f"{self.base_url()}/acm/commissionToscaTemplate" response = self.send_message_json('POST', 'Upload Tosca to commissioning', url, @@ -85,7 +86,7 @@ class ClampToscaTemplate(Clamp): Returns: the response of the creation action """ - url = f"{self.base_url()}/toscaControlLoop/postToscaInstanceProperties" + url = f"{self.base_url()}/acm/postToscaInstanceProperties" response = self.send_message_json('POST', 'Create Tosca instance', url, @@ -104,7 +105,7 @@ class ClampToscaTemplate(Clamp): Returns: the template instance """ - url = f"{self.base_url()}/toscaControlLoop/getInstantiationOrderState?name={name}&version={version}" + url = f"{self.base_url()}/acm/getInstantiationOrderState?name={name}&version={version}" template_instance = self.send_message_json('GET', 'Get tosca template instance', url, @@ -112,7 +113,7 @@ class ClampToscaTemplate(Clamp): return template_instance - def change_instance_status(self, new_status, name, version) -> dict: + def change_instance_status(self, new_status, name, version) -> str: """ Update tosca instance status. @@ -124,14 +125,36 @@ class ClampToscaTemplate(Clamp): the updated template instance """ body = '{"orderedState":"' + new_status + '","controlLoopIdentifierList":[{"name":"' + name + '","version":"' + version + '"}]}' - url = f"{self.base_url()}/toscaControlLoop/putToscaInstantiationStateChange" - response = self.send_message_json('PUT', - 'Update tosca instance status', - url, - data=body, - headers=self.header, - basic_auth=self.basic_auth) - return response + url = f"{self.base_url()}/acm/putToscaInstantiationStateChange" + try: + response = self.send_message_json('PUT', + 'Update tosca instance status', + url, + data=body, + headers=self.header, + basic_auth=self.basic_auth) + except RequestError: + self._logger.error("Change Instance Status request returned failed. Will query the instance status to double check whether the request is successful or not.") + + # There's a bug in Clamp code, sometimes it returned 500, but actually the status has been changed successfully + # Thus we verify the status to determine whether it was successful or not + time.sleep(2) + response = self.get_template_instance() + return response["automationCompositionList"][0]["orderedState"] + + def verify_instance_status(self, new_status): + """ + Verify whether the instance changed to the new status. + + Args: + new_status : the new status of the instance + Returns: + the boolean value indicating whether status changed successfully + """ + response = self.get_template_instance() + if response["automationCompositionList"][0]["state"] == new_status: + return True + return False def delete_template_instance(self, name: str, version: str) -> dict: """ @@ -143,7 +166,7 @@ class ClampToscaTemplate(Clamp): Returns: the response of the deletion action """ - url = f"{self.base_url()}/toscaControlLoop/deleteToscaInstanceProperties?name={name}&version={version}" + url = f"{self.base_url()}/acm/deleteToscaInstanceProperties?name={name}&version={version}" response = self.send_message_json('DELETE', 'Delete the tosca instance', url, @@ -161,7 +184,7 @@ class ClampToscaTemplate(Clamp): Returns: the response of the decommission action """ - url = f"{self.base_url()}/toscaControlLoop/decommissionToscaTemplate?name={name}&version={version}" + url = f"{self.base_url()}/acm/decommissionToscaTemplate?name={name}&version={version}" response = self.send_message_json('DELETE', 'Decommission the tosca template', url, diff --git a/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_apex.json.j2 b/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_apex.json.j2 index cdacaa1e..57f4734c 100644 --- a/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_apex.json.j2 +++ b/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_apex.json.j2 @@ -158,7 +158,7 @@ entity that generated the ONSET event will be the target. "DMaaPConsumer": { "carrierTechnologyParameters": { "parameters": { - "url": "http://message-router:3904/events/unauthenticated.SEC_FAULT_OUTPUT/users/link-monitor-nonrtric?timeout=15000&limit=100" + "url": "http://message-router:3904/events/unauthenticated.SEC_FAULT_OUTPUT/{{dmaapGroup}}/{{dmaapUser}}?timeout=15000&limit=100" }, "carrierTechnology": "RESTCLIENT", "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters" @@ -2111,4 +2111,4 @@ Policy Types. This does NOT support the legacy Policy YAML policy type. "version": "1.0.1" } } -} \ No newline at end of file +} diff --git a/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_k8s.json.j2 b/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_k8s.json.j2 new file mode 100644 index 00000000..0b797c06 --- /dev/null +++ b/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_k8s.json.j2 @@ -0,0 +1,146 @@ +{ + "data_types": { + "onap.datatypes.ToscaConceptIdentifier": { + "derived_from": "tosca.datatypes.Root", + "properties": { + "version": { + "required": true, + "type": "string" + }, + "name": { + "required": true, + "type": "string" + } + } + } + }, + "topology_template": { + "node_templates": { + "org.onap.k8s.controlloop.K8SControlLoopParticipant": { + "properties": { + "provider": "ONAP" + }, + "description": "Participant for k8s", + "version": "2.3.4", + "type_version": "1.0.1", + "type": "org.onap.policy.clamp.controlloop.Participant" + }, + "org.onap.domain.linkmonitor.LinkMonitorControlLoopDefinition1": { + "properties": { + "elements": [ + { + "version": "1.2.3", + "name": "org.onap.domain.linkmonitor.OruAppK8SMicroserviceControlLoopElement" + }], + "provider": "Ericsson" + }, + "description": "Control loop for Link Monitor", + "version": "1.2.3", + "type_version": "1.0.1", + "type": "org.onap.policy.clamp.controlloop.ControlLoop" + }, + "org.onap.domain.linkmonitor.OruAppK8SMicroserviceControlLoopElement": { + "properties": { + "participantType": { + "version": "2.3.4", + "name": "org.onap.k8s.controlloop.K8SControlLoopParticipant" + }, + "participant_id": { + "version": "1.0.0", + "name": "K8sParticipant0" + }, + "provider": "ONAP", + "chart": { + "repository": { + "address": "{{chartmuseumIp}}", + "repoName": "chartmuseum", + "port": {{chartmuseumPort}}, + "protocol": "http" + }, + "namespace": "nonrtric", + "chartId": { + "version": "{{chartVersion}}", + "name": "{{chartName}}" + }, + "releaseName": "{{releaseName}}" + } + }, + "description": "Deploy {{chartName}}", + "version": "1.2.3", + "type_version": "1.0.1", + "type": "org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement" + } + } + }, + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", + "node_types": { + "org.onap.policy.clamp.controlloop.ControlLoop": { + "derived_from": "tosca.nodetypes.Root", + "properties": { + "elements": { + "required": true, + "entry_schema": { + "type": "onap.datatypes.ToscaConceptIdentifier" + }, + "type": "list" + }, + "provider": { + "required": false, + "type": "string" + } + }, + "version": "1.0.1" + }, + "org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement": { + "derived_from": "org.onap.policy.clamp.controlloop.ControlLoopElement", + "properties": { + "templates": { + "required": false, + "entry_schema": null, + "type": "list" + }, + "requirements": { + "required": false, + "type": "string" + }, + "values": { + "required": true, + "type": "string" + }, + "configs": { + "required": false, + "type": "list" + }, + "chart": { + "required": true, + "type": "string" + } + }, + "version": "1.0.1" + }, + "org.onap.policy.clamp.controlloop.Participant": { + "derived_from": "tosca.nodetypes.Root", + "properties": { + "provider": { + "required": false, + "type": "string" + } + }, + "version": "1.0.1" + }, + "org.onap.policy.clamp.controlloop.ControlLoopElement": { + "derived_from": "tosca.nodetypes.Root", + "properties": { + "participant_id": { + "required": true, + "type": "onap.datatypes.ToscaConceptIdentifier" + }, + "provider": { + "required": false, + "type": "string" + } + }, + "version": "1.0.1" + } + } +} \ No newline at end of file diff --git a/smo-install/test/pythonsdk/src/orantests/configuration/settings.py b/smo-install/test/pythonsdk/src/orantests/configuration/settings.py index 3b444de2..3de374b2 100644 --- a/smo-install/test/pythonsdk/src/orantests/configuration/settings.py +++ b/smo-install/test/pythonsdk/src/orantests/configuration/settings.py @@ -61,7 +61,6 @@ SO_API_VERSION = "v7" SO_AUTH = "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==" VID_URL = "https://vid.api.simpledemo.onap.org:30200" VID_API_VERSION = "/vid" -CLAMP_URL = "https://clamp.api.simpledemo.onap.org:30258" CLAMP_AUTH = "Basic ZGVtb0BwZW9wbGUub3NhYWYub3JnOmRlbW8xMjM0NTYh" VES_URL = "http://ves.api.simpledemo.onap.org:30417" DMAAP_URL = "http://192.168.1.39:3904" @@ -81,6 +80,7 @@ A1SIM_STD2_URL = "http://"+subprocess.run("kubectl get services a1-sim-std2-0 -n POLICY_PAP_URL = "https://"+subprocess.run("kubectl get services policy-pap -n onap |grep policy-pap | awk '{print $3}'", shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8').strip()+":6969" POLICY_API_URL = "https://"+subprocess.run("kubectl get services policy-api -n onap |grep policy-api | awk '{print $3}'", shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8').strip()+":6969" SDNC_URL = "http://"+subprocess.run("kubectl get services sdnc-oam -n onap |grep sdnc-oam | awk '{print $3}'", shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8').strip()+":8282" +CLAMP_URL = "https://"+subprocess.run("kubectl get services policy-clamp-be -n onap |grep policy-clamp-be | awk '{print $3}'", shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8').strip()+":8443" ### Network simulators topology NETWORK_SIMULATORS_RU_LIST = ["o-ru-11211","o-ru-11221","o-ru-11222","o-ru-11223"] @@ -90,6 +90,8 @@ NETWORK_SIMULATORS_DU_RU_LIST = NETWORK_SIMULATORS_DU_LIST + NETWORK_SIMULATORS_ NETWORK_SIMULATORS_LIST = NETWORK_SIMULATORS_DU_RU_LIST + NETWORK_SIMULATORS_TOPOLOGY_SERVER DMAAP_GROUP = "o1test" DMAAP_USER = "o1test" +DMAAP_CL_GROUP = "cltest" +DMAAP_CL_USER = "cltest" DMAAP_TOPIC_PNFREG = "unauthenticated.VES_PNFREG_OUTPUT" DMAAP_TOPIC_PNFREG_JSON = '{"topicName": "' + DMAAP_TOPIC_PNFREG + '"}' DMAAP_TOPIC_FAULT = "unauthenticated.SEC_FAULT_OUTPUT" @@ -103,3 +105,7 @@ SDNC_CHECK_RETRY = 30 SDNC_CHECK_TIMEOUT = 900 POLICY_CHECK_RETRY = 30 POLICY_CHECK_TIMEOUT = 900 +CLAMP_CHECK_RETRY = 30 +CLAMP_CHECK_TIMEOUT = 900 +NETWORK_SIMULATOR_CHECK_RETRY = 30 +NETWORK_SIMULATOR_CHECK_TIMEOUT = 900 diff --git a/smo-install/test/pythonsdk/src/orantests/conftest.py b/smo-install/test/pythonsdk/src/orantests/conftest.py index 5fea0c0c..dd4e4691 100644 --- a/smo-install/test/pythonsdk/src/orantests/conftest.py +++ b/smo-install/test/pythonsdk/src/orantests/conftest.py @@ -31,6 +31,7 @@ from onapsdk.exceptions import ConnectionFailed, APIError from waiting import wait from urllib3.exceptions import NewConnectionError from oransdk.dmaap.dmaap import OranDmaap +from oransdk.policy.clamp import ClampToscaTemplate from oransdk.policy.policy import OranPolicy from oransdk.sdnc.sdnc import OranSdnc from smo.smo import Smo @@ -46,6 +47,7 @@ logger = logging.getLogger("Test Session setup") network_sims = NetworkSimulators("./resources") smo = Smo() +clamp = ClampToscaTemplate(settings.CLAMP_BASICAUTH) dmaap = OranDmaap() sdnc = OranSdnc() policy = OranPolicy() @@ -81,6 +83,16 @@ def sdnc_component_ready(): return False return response.status_code == 200 +def clamp_component_ready(): + """Check if Clamp component is ready.""" + logger.info("Verify Clamp component is ready") + try: + response = clamp.get_template_instance() + except (RequestException, NewConnectionError, ConnectionFailed, APIError) as e: + logger.error(e) + return False + return response["automationCompositionList"] is not None + ###### Entry points of PYTEST Session def pytest_sessionstart(): """Pytest calls it when starting a test session.""" @@ -89,6 +101,9 @@ def pytest_sessionstart(): logger.info("Check and for for SDNC to be running") wait(lambda: policy_component_ready(), sleep_seconds=settings.POLICY_CHECK_RETRY, timeout_seconds=settings.POLICY_CHECK_TIMEOUT, waiting_for="Policy to be ready") wait(lambda: sdnc_component_ready(), sleep_seconds=settings.SDNC_CHECK_RETRY, timeout_seconds=settings.SDNC_CHECK_TIMEOUT, waiting_for="SDNC to be ready") + # disable for now, until policy/clamp issue has been fixed + ##wait(lambda: clamp_component_ready(), sleep_seconds=settings.CLAMP_CHECK_RETRY, timeout_seconds=settings.CLAMP_CHECK_TIMEOUT, waiting_for="Clamp to be ready") + ## Just kill any simulators that could already be runnin network_sims.stop_network_simulators() ###### END of FIRST start, now we can start the sims for the real tests. diff --git a/smo-install/test/pythonsdk/src/orantests/disable_test_cl_apex.py b/smo-install/test/pythonsdk/src/orantests/disable_test_cl_apex.py new file mode 100644 index 00000000..3a575db4 --- /dev/null +++ b/smo-install/test/pythonsdk/src/orantests/disable_test_cl_apex.py @@ -0,0 +1,132 @@ +#!/usr/bin/env python3 +### +# ============LICENSE_START======================================================= +# ORAN SMO PACKAGE - PYTHONSDK TESTS +# ================================================================================ +# Copyright (C) 2022 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END============================================ +# =================================================================== +# +### +"""Closed Loop Apex usecase tests module.""" + +import time + +import logging +import logging.config +import os +import pytest +from onapsdk.configuration import settings +from onapsdk.exceptions import ResourceNotFound +from waiting import wait +from oransdk.dmaap.dmaap import OranDmaap +from oransdk.policy.clamp import ClampToscaTemplate +from oransdk.policy.policy import OranPolicy, PolicyType +from oransdk.sdnc.sdnc import OranSdnc +from oransdk.utils.jinja import jinja_env +from smo.network_simulators import NetworkSimulators +from smo.dmaap import DmaapUtils +from smo.cl_usecase import ClCommissioningUtils + + +# Set working dir as python script location +abspath = os.path.abspath(__file__) +dname = os.path.dirname(abspath) +os.chdir(dname) + +logging.config.dictConfig(settings.LOG_CONFIG) +logger = logging.getLogger("test Control Loops for O-RU Fronthaul Recovery usecase - Apex policy") +dmaap = OranDmaap() +dmaap_utils = DmaapUtils() +clcommissioning_utils = ClCommissioningUtils() +network_simulators = NetworkSimulators("./resources") +clamp = ClampToscaTemplate(settings.CLAMP_BASICAUTH) +policy = OranPolicy() + +@pytest.fixture(scope="module", autouse=True) +def setup_simulators(): + """Prepare the test environment before the executing the tests.""" + logger.info("Test class setup for Closed Loop Apex test") + + dmaap_utils.clean_dmaap(settings.DMAAP_CL_GROUP, settings.DMAAP_CL_USER) + + network_simulators.start_and_wait_network_simulators() + + # Wait enough time to have at least the SDNR notifications sent + logger.info("Waiting 10s that SDNR sends all registration events to VES...") + time.sleep(10) + logger.info("Test Session setup completed successfully") + + ### Cleanup code + yield + # Finish and delete the cl instance + clcommissioning_utils.clean_instance() + + try: + policy.undeploy_policy("operational.apex.linkmonitor", "1.0.0", settings.POLICY_BASICAUTH) + except ResourceNotFound: + logger.info("Policy already undeployed") + try: + policy.delete_policy(PolicyType(type="onap.policies.controlloop.operational.common.Apex", version="1.0.0"), "operational.apex.linkmonitor", "1.0.0", settings.POLICY_BASICAUTH) + except ResourceNotFound: + logger.info("Policy already deleted") + + network_simulators.stop_network_simulators() + time.sleep(10) + logger.info("Test Session cleanup done") + +def verify_apex_policy_created(): + """ + Verify whether the Apex policy has deployed successfully. + + Returns: + the boolean value indicating whether policy deployed successfully + """ + logger.info("Verify Apex policy is deployed") + policy_status_list = policy.get_policy_status(settings.POLICY_BASICAUTH) + + for status in policy_status_list: + logger.info("the status %s,%s,%s,%s:", status["policy"]["name"], status["policy"]["version"], status["deploy"], status["state"]) + if (status["policy"]["name"] == "operational.apex.linkmonitor" and status["policy"]["version"] == "1.0.0" and status["deploy"] and status["state"] == "SUCCESS"): + logger.info("Policy deployement OK") + return True + + logger.info("Failed to deploy Apex policy") + return False + +def send_dmaap_event(): + """Send a event to Dmaap that should trigger the apex policy.""" + event = jinja_env().get_template("LinkFailureEvent.json.j2").render() + dmaap.send_link_failure_event(event) + +def test_cl_apex(): + """The Closed Loop O-RU Fronthaul Recovery usecase Apex version.""" + logger.info("Upload tosca to commissioning") + tosca_template = jinja_env().get_template("commission_apex.json.j2").render(dmaapGroup=settings.DMAAP_CL_GROUP, dmaapUser=settings.DMAAP_CL_USER) + assert clcommissioning_utils.create_instance(tosca_template) is True + + sdnc = OranSdnc() + status = sdnc.get_odu_oru_status("o-du-1122", "rrm-pol-2", settings.SDNC_BASICAUTH) + assert status["o-ran-sc-du-hello-world:radio-resource-management-policy-ratio"][0]["administrative-state"] == "locked" + + send_dmaap_event() + + wait(lambda: verify_apex_policy_created(), sleep_seconds=10, timeout_seconds=60, waiting_for="Policy Deployment to be OK") + + time.sleep(20) + logger.info("Check O-du/O-ru status again") + status = sdnc.get_odu_oru_status("o-du-1122", "rrm-pol-2", settings.SDNC_BASICAUTH) + assert status["o-ran-sc-du-hello-world:radio-resource-management-policy-ratio"][0]["administrative-state"] == "unlocked" diff --git a/smo-install/test/pythonsdk/src/orantests/disable_test_cl_k8s.py b/smo-install/test/pythonsdk/src/orantests/disable_test_cl_k8s.py new file mode 100644 index 00000000..3830bdaf --- /dev/null +++ b/smo-install/test/pythonsdk/src/orantests/disable_test_cl_k8s.py @@ -0,0 +1,152 @@ +#!/usr/bin/env python3 +### +# ============LICENSE_START======================================================= +# ORAN SMO PACKAGE - PYTHONSDK TESTS +# ================================================================================ +# Copyright (C) 2022 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END============================================ +# =================================================================== +# +### +"""Closed Loop Apex usecase tests module.""" +# This usecase has limitations due to Clamp issue. +# 1. make sure using the policy-clamp-be version 6.2.0-snapshot-latest at this the moment +import time +import logging.config +import subprocess +import os +from subprocess import check_output +import pytest +from waiting import wait +from onapsdk.configuration import settings +from oransdk.utils.jinja import jinja_env +from oransdk.policy.clamp import ClampToscaTemplate +from smo.cl_usecase import ClCommissioningUtils + +# Set working dir as python script location +abspath = os.path.abspath(__file__) +dname = os.path.dirname(abspath) +os.chdir(dname) + +logging.config.dictConfig(settings.LOG_CONFIG) +logger = logging.getLogger("test Control Loops for O-RU Fronthaul Recovery usecase - Clamp K8S usecase") +clcommissioning_utils = ClCommissioningUtils() +clamp = ClampToscaTemplate(settings.CLAMP_BASICAUTH) + +chartmuseum_ip = subprocess.run("kubectl get services -n test | grep test-chartmuseum | awk '{print $3}'", shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8').strip()+":8080" +chartmuseum_port = "8080" +chart_version = "1.0.0" +chart_name = "oru-app" +release_name = "oru-app" + +@pytest.fixture(scope="module", autouse=True) +def setup_simulators(): + """Prepare the test environment before the executing the tests.""" + logger.info("Test class setup for Closed Loop tests") + + deploy_chartmuseum() + + # Add the remote repo to Clamp k8s pod + logger.info("Add the remote repo to Clamp k8s pod") + k8s_pod = subprocess.run("kubectl get pods -n onap | grep k8s | awk '{print $1}'", shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8').strip() + + repo_url = subprocess.run("kubectl get services -n test | grep test-chartmuseum | awk '{print $3}'", shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8').strip()+":8080" + logger.info("k8s: %s, repo_url:%s", k8s_pod, repo_url) + cmd = f"kubectl exec -it -n onap {k8s_pod} -- sh -c \"helm repo add chartmuseum http://{repo_url}\"" + check_output(cmd, shell=True).decode('utf-8') + cmd = f"kubectl exec -it -n onap {k8s_pod} -- sh -c \"helm repo update\"" + check_output(cmd, shell=True).decode('utf-8') + cmd = f"kubectl exec -it -n onap {k8s_pod} -- sh -c \"helm search repo -l oru-app\"" + result = check_output(cmd, shell=True).decode('utf-8') + if result == '': + logger.info("Failed to update the K8s pod repo") + logger.info("Test Session setup completed successfully") + + ### Cleanup code + yield + # Finish and delete the cl instance + clcommissioning_utils.clean_instance() + wait(lambda: is_oru_app_down(), sleep_seconds=5, timeout_seconds=60, waiting_for="Oru app is down") + # Remove the remote repo to Clamp k8s pod + cmd = f"kubectl exec -it -n onap {k8s_pod} -- sh -c \"helm repo remove chartmuseum\"" + check_output(cmd, shell=True).decode('utf-8') + cmd = "kubectl delete namespace test" + check_output(cmd, shell=True).decode('utf-8') + cmd = "helm repo remove test" + check_output(cmd, shell=True).decode('utf-8') + time.sleep(10) + logger.info("Test Session cleanup done") + + +def deploy_chartmuseum(): + """Start chartmuseum pod and populate with the nedded helm chart.""" + logger.info("Start to deploy chartmuseum") + cmd = "helm repo add test https://chartmuseum.github.io/charts" + check_output(cmd, shell=True).decode('utf-8') + cmd = "kubectl create namespace test" + check_output(cmd, shell=True).decode('utf-8') + + cmd = "helm install test test/chartmuseum --version 3.1.0 --namespace test --set env.open.DISABLE_API=false" + check_output(cmd, shell=True).decode('utf-8') + wait(lambda: is_chartmuseum_up(), sleep_seconds=10, timeout_seconds=60, waiting_for="chartmuseum to be ready") + + chartmuseum_url = subprocess.run("kubectl get services -n test | grep test-chartmuseum | awk '{print $3}'", shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8').strip()+":8080" + cmd = f"curl --noproxy '*' -X POST --data-binary @{dname}/resources/cl-test-helm-chart/oru-app-1.0.0.tgz http://{chartmuseum_url}/api/charts" + check_output(cmd, shell=True).decode('utf-8') + + +def is_chartmuseum_up() -> bool: + """Check if the chartmuseum is up.""" + cmd = "kubectl get pods --field-selector status.phase=Running -n test" + result = check_output(cmd, shell=True).decode('utf-8') + logger.info("Checking if chartmuseum is UP: %s", result) + if result == '': + logger.info("chartmuseum is Down") + return False + logger.info("chartmuseum is Up") + return True + + +def is_oru_app_up() -> bool: + """Check if the oru-app is up.""" + cmd = "kubectl get pods -n nonrtric | grep oru-app | wc -l" + result = check_output(cmd, shell=True).decode('utf-8') + logger.info("Checking if oru-app is up :%s", result) + if int(result) == 1: + logger.info("ORU-APP is Up") + return True + logger.info("ORU-APP is Down") + return False + +def is_oru_app_down() -> bool: + """Check if the oru-app is down.""" + cmd = "kubectl get pods -n nonrtric | grep oru-app | wc -l" + result = check_output(cmd, shell=True).decode('utf-8') + logger.info("Checking if oru-app is down :%s", result) + if int(result) == 0: + logger.info("ORU-APP is Down") + return True + logger.info("ORU-APP is Up") + return False + +def test_cl_oru_app_deploy(): + """The Closed Loop O-RU Fronthaul Recovery usecase Apex version.""" + logger.info("Upload tosca to commissioning") + tosca_template = jinja_env().get_template("commission_k8s.json.j2").render(chartmuseumIp=chartmuseum_ip, chartmuseumPort=chartmuseum_port, chartVersion=chart_version, chartName=chart_name, releaseName=release_name) + assert clcommissioning_utils.create_instance(tosca_template) is True + + logger.info("Check if oru-app is up") + wait(lambda: is_oru_app_up(), sleep_seconds=5, timeout_seconds=60, waiting_for="Oru app to be up") diff --git a/smo-install/test/pythonsdk/src/orantests/disabled_test_cl_apex.py b/smo-install/test/pythonsdk/src/orantests/disabled_test_cl_apex.py deleted file mode 100644 index 76edbdca..00000000 --- a/smo-install/test/pythonsdk/src/orantests/disabled_test_cl_apex.py +++ /dev/null @@ -1,222 +0,0 @@ -#!/usr/bin/env python3 -### -# ============LICENSE_START======================================================= -# ORAN SMO PACKAGE - PYTHONSDK TESTS -# ================================================================================ -# Copyright (C) 2022 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# 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. -# ============LICENSE_END============================================ -# =================================================================== -# -### -"""Closed Loop Apex usecase tests module.""" -# This usecase has limitations due to Clamp issue. -# 1. manually change clamp-be settings before running the test: -# - run command "kubectl -n onap edit cm onap-policy-clamp-be-configmap" -# find variable clamp.config.controlloop.runtime.url and change http into https -# - run command "kubectl rollout restart deployment onap-policy-clamp-be -n onap" -# and wait until policy-clamp-be pod restarted successfully -# 2. make sure using the policy-clamp-be version 6.2.0-snapshot-latest at this the moment - -import time -import logging -import logging.config -from onapsdk.configuration import settings -from onapsdk.exceptions import RequestError -from waiting import wait -from oransdk.dmaap.dmaap import OranDmaap -from oransdk.policy.policy import OranPolicy -from oransdk.policy.clamp import ClampToscaTemplate -from oransdk.sdnc.sdnc import OranSdnc -from oransdk.utils.jinja import jinja_env - -logging.config.dictConfig(settings.LOG_CONFIG) -logger = logging.getLogger("test Control Loops for O-RU Fronthaul Recovery usecase - Apex policy") -dmaap = OranDmaap() -clamp = ClampToscaTemplate(settings.CLAMP_BASICAUTH) - -def create_topic(): - """Create the topic in Dmaap.""" - logger.info("Create new topic") - topic = '{ "topicName": "unauthenticated.SEC_FAULT_OUTPUT", "topicDescription": "test topic", "partitionCount": 1, "replicationCnCount": 1, "transactionEnabled": "false"}' - response = dmaap.create_topic(topic) - logger.info("response is: %s", response) - -def verify_topic_created(): - """Verify whether needed topic created.""" - logger.info("Verify topic created") - topiclist = dmaap.get_all_topics({}) - topic_created = False - for topic in topiclist: - if topic["topicName"] == "unauthenticated.SEC_FAULT_OUTPUT": - topic_created = True - break - - if topic_created: - logger.info("Topic created successfully") - else: - logger.info("Topic creation failed") - -def upload_commission(tosca_template): - """ - Upload the tosca to commissioning. - - Args: - tosca_template : the tosca template to upload in json format - Returns: - the response from the upload action - """ - logger.info("Upload tosca to commissioning") - return clamp.upload_commission(tosca_template) - -def create_instance(tosca_template): - """ - Create a instance. - - Args: - tosca_template : the tosca template to create in json format - Returns: - the response from the creation action - """ - logger.info("Create Instance") - return clamp.create_instance(tosca_template) - -def change_instance_status(new_status) -> str: - """ - Change the instance statue. - - Args: - new_status : the new instance to be changed to - Returns: - the new status to be changed to - """ - logger.info("Change Instance Status to %s", new_status) - try: - clamp.change_instance_status(new_status, "PMSH_Instance1", "1.2.3") - except RequestError: - logger.info("Change Instance Status request returned failed. Will query the instance status to double check whether the request is successful or not.") - - # There's a bug in Clamp code, sometimes it returned 500, but actually the status has been changed successfully - # Thus we verify the status to determine whether it was successful or not - time.sleep(2) - response = clamp.get_template_instance() - return response["controlLoopList"][0]["orderedState"] - -def verify_instance_status(new_status): - """ - Verify whether the instance changed to the new status. - - Args: - new_status : the new status of the instance - Returns: - the boolean value indicating whether status changed successfully - """ - logger.info("Verify the Instance Status is updated to the expected status %s", new_status) - response = clamp.get_template_instance() - if response["controlLoopList"][0]["state"] == new_status: - return True - return False - -def verify_apex_policy_created(): - """ - Verify whether the Apex policy has deployed successfully. - - Returns: - the boolean value indicating whether policy deployed successfully - """ - logger.info("Verify Apex policy is deployed") - policy = OranPolicy() - policy_status_list = policy.get_policy_status(settings.POLICY_BASICAUTH) - - for status in policy_status_list: - logger.info("the status %s,%s,%s:", status["policy"]["name"], status["policy"]["version"], status["deploy"]) - if (status["policy"]["name"] == "operational.apex.linkmonitor" and status["policy"]["version"] == "1.0.0" and status["deploy"]): - return True - - logger.info("Failed to deploy Apex policy") - return False - -def delete_template_instance(): - """ - Delete the template instance. - - Returns: - the response from the deletion action - """ - logger.info("Delete Instance") - return clamp.delete_template_instance("PMSH_Instance1", "1.2.3") - -def decommission_tosca(): - """ - Decommission the tosca template. - - Returns: - the response from the decommission action - """ - logger.info("Decommission tosca") - return clamp.decommission_template("ToscaServiceTemplateSimple", "1.0.0") - -def send_dmaap_event(): - """Send a event to Dmaap that should trigger the apex policy.""" - event = jinja_env().get_template("LinkFailureEvent.json.j2").render() - dmaap.send_link_failure_event(event) - -def test_cl_oru_recovery(): - """The Closed Loop O-RU Fronthaul Recovery usecase Apex version.""" - create_topic() - verify_topic_created() - - tosca_template = jinja_env().get_template("commission_apex.json.j2").render() - - response = upload_commission(tosca_template) - assert response["errorDetails"] is None - - response = create_instance(tosca_template) - assert response["errorDetails"] is None - - response = change_instance_status("PASSIVE") - assert response == "PASSIVE" - wait(lambda: verify_instance_status("PASSIVE"), sleep_seconds=5, timeout_seconds=60, waiting_for="Clamp instance switches to PASSIVE") - - response = change_instance_status("RUNNING") - assert response == "RUNNING" - wait(lambda: verify_instance_status("RUNNING"), sleep_seconds=5, timeout_seconds=60, waiting_for="Clamp instance switches to RUNNING") - - sdnc = OranSdnc() - status = sdnc.get_odu_oru_status("o-du-1122", "rrm-pol-2", settings.SDNC_BASICAUTH) - assert status["o-ran-sc-du-hello-world:radio-resource-management-policy-ratio"][0]["administrative-state"] == "locked" - - send_dmaap_event() - - assert verify_apex_policy_created() - - time.sleep(20) - logger.info("Check O-du/O-ru status again") - status = sdnc.get_odu_oru_status("o-du-1122", "rrm-pol-2", settings.SDNC_BASICAUTH) - assert status["o-ran-sc-du-hello-world:radio-resource-management-policy-ratio"][0]["administrative-state"] == "unlocked" - - response = change_instance_status("PASSIVE") - assert response == "PASSIVE" - wait(lambda: verify_instance_status("PASSIVE"), sleep_seconds=5, timeout_seconds=60, waiting_for="Clamp instance switches to PASSIVE") - - response = change_instance_status("UNINITIALISED") - assert response == "UNINITIALISED" - wait(lambda: verify_instance_status("UNINITIALISED"), sleep_seconds=5, timeout_seconds=60, waiting_for="Clamp instance switches to UNINITIALISED") - - response = delete_template_instance() - assert response["errorDetails"] is None - - response = decommission_tosca() - assert response["errorDetails"] is None diff --git a/smo-install/test/pythonsdk/src/orantests/smo/cl_usecase.py b/smo-install/test/pythonsdk/src/orantests/smo/cl_usecase.py new file mode 100644 index 00000000..c2e3f86a --- /dev/null +++ b/smo-install/test/pythonsdk/src/orantests/smo/cl_usecase.py @@ -0,0 +1,77 @@ +#!/usr/bin/env python3 +### +# ============LICENSE_START======================================================= +# ORAN SMO PACKAGE - PYTHONSDK TESTS +# ================================================================================ +# Copyright (C) 2021-2022 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END============================================ +# =================================================================== +# +### + +"""Cl usecase utils module.""" + +import logging.config +from waiting import wait +from onapsdk.configuration import settings +from oransdk.policy.clamp import ClampToscaTemplate + +logging.config.dictConfig(settings.LOG_CONFIG) +logger = logging.getLogger("Cl usecae utils") +clamp = ClampToscaTemplate(settings.CLAMP_BASICAUTH) + + +class ClCommissioningUtils(): + """Can be used to have cl usecase utils methods.""" + + @classmethod + def clean_instance(cls): + """Clean template instance.""" + clamp.change_instance_status("PASSIVE", "PMSH_Instance1", "1.2.3") + wait(lambda: clamp.verify_instance_status("PASSIVE"), sleep_seconds=5, timeout_seconds=60, + waiting_for="Clamp instance switches to PASSIVE") + clamp.change_instance_status("UNINITIALISED", "PMSH_Instance1", "1.2.3") + wait(lambda: clamp.verify_instance_status("UNINITIALISED"), sleep_seconds=5, timeout_seconds=60, + waiting_for="Clamp instance switches to UNINITIALISED") + + logger.info("Delete Instance") + clamp.delete_template_instance("PMSH_Instance1", "1.2.3") + logger.info("Decommission tosca") + clamp.decommission_template("ToscaServiceTemplateSimple", "1.0.0") + + @classmethod + def create_instance(cls, tosca_template) -> bool: + """Create template instance.""" + response = clamp.upload_commission(tosca_template) + if response["errorDetails"] is not None: + return False + + logger.info("Create Instance") + response = clamp.create_instance(tosca_template) + if response["errorDetails"] is not None: + return False + + logger.info("Change Instance Status to PASSIVE") + clamp.change_instance_status("PASSIVE", "PMSH_Instance1", "1.2.3") + wait(lambda: clamp.verify_instance_status("PASSIVE"), sleep_seconds=5, timeout_seconds=60, + waiting_for="Clamp instance switches to PASSIVE") + + logger.info("Change Instance Status to RUNNING") + clamp.change_instance_status("RUNNING", "PMSH_Instance1", "1.2.3") + wait(lambda: clamp.verify_instance_status("RUNNING"), sleep_seconds=5, timeout_seconds=60, + waiting_for="Clamp instance switches to RUNNING") + + return True diff --git a/smo-install/test/pythonsdk/src/orantests/smo/dmaap.py b/smo-install/test/pythonsdk/src/orantests/smo/dmaap.py new file mode 100644 index 00000000..b952ec4a --- /dev/null +++ b/smo-install/test/pythonsdk/src/orantests/smo/dmaap.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 +### +# ============LICENSE_START======================================================= +# ORAN SMO PACKAGE - PYTHONSDK TESTS +# ================================================================================ +# Copyright (C) 2021-2022 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END============================================ +# =================================================================== +# +### + +"""Dmaap utils module.""" +import logging +import logging.config +from onapsdk.configuration import settings +from waiting import wait +from oransdk.dmaap.dmaap import OranDmaap + +logging.config.dictConfig(settings.LOG_CONFIG) +logger = logging.getLogger("DMaap utils") +dmaap = OranDmaap() + +class DmaapUtils(): + """Can be used to have dmaap utils methods.""" + + @classmethod + def clean_dmaap(cls, dmaap_group, dmaap_user): + """Clean DMAAP useful topics.""" + dmaap.create_topic(settings.DMAAP_TOPIC_FAULT_JSON) + dmaap.create_topic(settings.DMAAP_TOPIC_PNFREG_JSON) + # Purge the FAULT TOPIC + wait(lambda: (dmaap.get_message_from_topic(settings.DMAAP_TOPIC_FAULT, 5000, dmaap_group, dmaap_user).json() == []), sleep_seconds=10, timeout_seconds=60, waiting_for="DMaap topic SEC_FAULT_OUTPUT to be empty") + wait(lambda: (dmaap.get_message_from_topic(settings.DMAAP_TOPIC_PNFREG, 5000, dmaap_group, dmaap_user).json() == []), sleep_seconds=10, timeout_seconds=60, waiting_for="DMaap topic unauthenticated.VES_PNFREG_OUTPUT to be empty") diff --git a/smo-install/test/pythonsdk/src/orantests/smo/network_simulators.py b/smo-install/test/pythonsdk/src/orantests/smo/network_simulators.py index af136a2f..56d9b7f8 100644 --- a/smo-install/test/pythonsdk/src/orantests/smo/network_simulators.py +++ b/smo-install/test/pythonsdk/src/orantests/smo/network_simulators.py @@ -52,6 +52,12 @@ class NetworkSimulators(): cmd = f"helm install --debug oran-simulator local/ru-du-simulators --namespace network -f {self.resources_path}/network-simulators-topology/network-simulators-override.yaml -f {self.resources_path}/network-simulators-topology/network-simulators-topology-override.yaml" check_output(cmd, shell=True).decode('utf-8') + def start_and_wait_network_simulators(self): + """Start and wait for all simulators defined in resources_path.""" + logger.info("Start the network simulators") + self.start_network_simulators() + NetworkSimulators.wait_for_network_simulators_to_be_running() + @staticmethod def get_all_simulators(): """Retrieve all simulators defined in k8s services.""" @@ -114,4 +120,4 @@ class NetworkSimulators(): @staticmethod def wait_for_network_simulators_to_be_running(): """Check and wait for the network sims to be running.""" - wait(lambda: NetworkSimulators.is_network_simulators_up(), sleep_seconds=10, timeout_seconds=60, waiting_for="Network simulators to be ready") + wait(lambda: NetworkSimulators.is_network_simulators_up(), sleep_seconds=settings.NETWORK_SIMULATOR_CHECK_RETRY, timeout_seconds=settings.NETWORK_SIMULATOR_CHECK_TIMEOUT, waiting_for="Network simulators to be ready") diff --git a/smo-install/test/pythonsdk/src/orantests/test_apex_policy.py b/smo-install/test/pythonsdk/src/orantests/test_apex_policy.py index 7210dfdb..010ae807 100644 --- a/smo-install/test/pythonsdk/src/orantests/test_apex_policy.py +++ b/smo-install/test/pythonsdk/src/orantests/test_apex_policy.py @@ -33,6 +33,7 @@ from oransdk.dmaap.dmaap import OranDmaap from oransdk.policy.policy import OranPolicy, PolicyType from oransdk.sdnc.sdnc import OranSdnc from oransdk.utils.jinja import jinja_env +from smo.dmaap import DmaapUtils from smo.network_simulators import NetworkSimulators # Set working dir as python script location @@ -44,6 +45,7 @@ os.chdir(dname) logging.config.dictConfig(settings.LOG_CONFIG) logger = logging.getLogger("test APEX policy") dmaap = OranDmaap() +dmaap_utils = DmaapUtils() policy = OranPolicy() network_simulators = NetworkSimulators("./resources") @@ -61,17 +63,11 @@ deployment_port = "12345" def setup_simulators(): """Setup the simulators before the executing the tests.""" logger.info("Test class setup for Apex tests") - - dmaap.create_topic(settings.DMAAP_TOPIC_FAULT_JSON) - dmaap.create_topic(settings.DMAAP_TOPIC_PNFREG_JSON) - # Purge the FAULT TOPIC - wait(lambda: (dmaap.get_message_from_topic(settings.DMAAP_TOPIC_FAULT, 5000, settings.DMAAP_GROUP, settings.DMAAP_USER).json() == []), sleep_seconds=10, timeout_seconds=60, waiting_for="DMaap topic SEC_FAULT_OUTPUT to be empty") - wait(lambda: (dmaap.get_message_from_topic(settings.DMAAP_TOPIC_PNFREG, 5000, settings.DMAAP_GROUP, settings.DMAAP_USER).json() == []), sleep_seconds=10, timeout_seconds=60, waiting_for="DMaap topic unauthenticated.VES_PNFREG_OUTPUT to be empty") - - network_simulators.start_network_simulators() - network_simulators.wait_for_network_simulators_to_be_running() + dmaap_utils.clean_dmaap(settings.DMAAP_GROUP, settings.DMAAP_USER) + network_simulators.start_and_wait_network_simulators() # Wait enough time to have at least the SDNR notifications sent + logger.info("Waiting 10s that SDNR sends all registration events to VES...") time.sleep(10) logger.info("Test Session setup completed successfully") @@ -81,6 +77,7 @@ def setup_simulators(): network_simulators.stop_network_simulators() policy.undeploy_policy(policy_id, policy_version, settings.POLICY_BASICAUTH) policy.delete_policy(policy_type, policy_id, policy_version, settings.POLICY_BASICAUTH) + time.sleep(10) logger.info("Test Session cleanup done") def create_policy(): diff --git a/smo-install/test/pythonsdk/src/orantests/test_o1.py b/smo-install/test/pythonsdk/src/orantests/test_o1.py index 2ba59904..ca904109 100644 --- a/smo-install/test/pythonsdk/src/orantests/test_o1.py +++ b/smo-install/test/pythonsdk/src/orantests/test_o1.py @@ -29,8 +29,8 @@ import os import time import pytest from onapsdk.configuration import settings -from waiting import wait from smo.network_simulators import NetworkSimulators +from smo.dmaap import DmaapUtils from oransdk.dmaap.dmaap import OranDmaap from oransdk.sdnc.sdnc import OranSdnc @@ -44,7 +44,8 @@ logger = logging.getLogger("Test O1") network_simulators = NetworkSimulators("./resources") dmaap = OranDmaap() -test_session_timestamp = datetime.datetime.now() +dmaap_utils = DmaapUtils() +test_session_timestamp = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc) @pytest.fixture(scope="module", autouse=True) @@ -55,12 +56,10 @@ def setup_simulators(): # Do a first get to register the o1test/o1test user in DMAAP # all registration messages will then be stored for the registration tests. # If it exists already it clears all cached events. - dmaap.create_topic(settings.DMAAP_TOPIC_PNFREG_JSON) - dmaap.create_topic(settings.DMAAP_TOPIC_FAULT_JSON) - wait(lambda: (dmaap.get_message_from_topic(settings.DMAAP_TOPIC_PNFREG, 5000, settings.DMAAP_GROUP, settings.DMAAP_USER).json() == []), sleep_seconds=10, timeout_seconds=60, waiting_for="DMaap topic unauthenticated.VES_PNFREG_OUTPUT to be empty") - wait(lambda: (dmaap.get_message_from_topic(settings.DMAAP_TOPIC_FAULT, 5000, settings.DMAAP_GROUP, settings.DMAAP_USER).json() == []), sleep_seconds=10, timeout_seconds=60, waiting_for="DMaap topic unauthenticated.SEC_FAULT_OUTPUT to be empty") - network_simulators.start_network_simulators() - network_simulators.wait_for_network_simulators_to_be_running() + + dmaap_utils.clean_dmaap(settings.DMAAP_GROUP, settings.DMAAP_USER) + + network_simulators.start_and_wait_network_simulators() # ADD DU RESTART just in case # Wait enough time to have at least the SDNR notifications sent logger.info("Waiting 20s that SDNR sends all registration events to VES...") @@ -71,13 +70,14 @@ def setup_simulators(): # time.sleep(20) # Preparing the DMaap to cache all the events for the fault topics. # If it exists already it clears all cached events. - logger.info("Waiting 120s to have registration and faults events in DMaap") - time.sleep(120) + logger.info("Waiting 300s to have registration and faults events in DMaap") + time.sleep(300) logger.info("Test Session setup completed successfully") ### Cleanup code yield network_simulators.stop_network_simulators() + time.sleep(10) logger.info("Test Session cleanup done") def create_registration_structure(events): @@ -115,7 +115,10 @@ def validate_faults_timestamp(faults): """Extract only the faults returned by SDNC that have been raised during this test.""" valid_faults = [] for fault in faults['data-provider:output']['data']: - converted_fault_timestamp = datetime.datetime.strptime(fault['timestamp'], "%Y-%m-%dT%H:%M:%S.%fZ") + try: + converted_fault_timestamp = datetime.datetime.strptime(fault['timestamp'], "%Y-%m-%dT%H:%M:%S.%f%z") + except ValueError: + converted_fault_timestamp = datetime.datetime.strptime(fault['timestamp'], "%Y-%m-%dT%H:%M:%S%z") logger.info("Comparing fault timestamp %s (%s) to session test timestamp %s", converted_fault_timestamp, fault['timestamp'], test_session_timestamp) if converted_fault_timestamp > test_session_timestamp: valid_faults.append(fault) diff --git a/smo-install/test/pythonsdk/tox.ini b/smo-install/test/pythonsdk/tox.ini index 1ceb5a59..3931d706 100644 --- a/smo-install/test/pythonsdk/tox.ini +++ b/smo-install/test/pythonsdk/tox.ini @@ -1,5 +1,5 @@ [tox] -#envlist = pylint,pydocstyle,unit-tests,oran-tests +envlist = pylint,pydocstyle,unit-tests,oran-tests skipsdist=True [testenv] diff --git a/smo-install/test/pythonsdk/unit-tests/test_clamp.py b/smo-install/test/pythonsdk/unit-tests/test_clamp.py new file mode 100644 index 00000000..1efb46a6 --- /dev/null +++ b/smo-install/test/pythonsdk/unit-tests/test_clamp.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: Apache-2.0 +"""Test Clamp module.""" +from unittest import mock +from oransdk.policy.clamp import ClampToscaTemplate + + +HEADER = {"Accept": "application/json", "Content-Type": "application/json"} +BASIC_AUTH = {'username': 'dcae@dcae.onap.org', 'password': 'demo123456!'} +BASE_URL = "http://localhost:8084" +CLAMP = ClampToscaTemplate(BASIC_AUTH) + + +def test_initialization(): + """Class initialization test.""" + clamp = ClampToscaTemplate(BASIC_AUTH) + assert isinstance(clamp, ClampToscaTemplate) + + +@mock.patch.object(ClampToscaTemplate, 'send_message') +def test_get_template_instance(mock_send_message): + """Test Clamp's class method.""" + ClampToscaTemplate.get_template_instance(CLAMP) + url = f"{CLAMP.base_url()}/acm/getToscaInstantiation" + mock_send_message.assert_called_with('GET', + 'Get tosca template instance', + url, + basic_auth=BASIC_AUTH) + + +@mock.patch.object(ClampToscaTemplate, 'send_message') +def test_upload_commission(mock_send_message): + """Test Clamp's class method.""" + tosca_template = {} + ClampToscaTemplate.upload_commission(CLAMP, tosca_template) + url = f"{CLAMP.base_url()}/acm/commissionToscaTemplate" + mock_send_message.assert_called_with('POST', + 'Upload Tosca to commissioning', + url, + data=tosca_template, + headers=HEADER, + basic_auth=BASIC_AUTH) + + +@mock.patch.object(ClampToscaTemplate, 'send_message') +def test_create_instance(mock_send_message): + """Test Clamp's class method.""" + tosca_instance_properties = {} + ClampToscaTemplate.create_instance(CLAMP, tosca_instance_properties) + url = f"{CLAMP.base_url()}/acm/postToscaInstanceProperties" + mock_send_message.assert_called_once_with('POST', 'Create Tosca instance', url, data=tosca_instance_properties, + headers=HEADER, basic_auth=BASIC_AUTH) + + +@mock.patch.object(ClampToscaTemplate,'send_message') +def test_get_template_instance_status(mock_send_message): + """Test Clamp's class method.""" + name = "" + version = "" + ClampToscaTemplate.get_template_instance_status(CLAMP, name, version) + url = f"{CLAMP.base_url()}/acm/getInstantiationOrderState?name={name}&version={version}" + mock_send_message.assert_called_with('GET', + 'Get tosca template instance', + url, + basic_auth=BASIC_AUTH) + + +@mock.patch.object(ClampToscaTemplate, 'send_message') +def test_delete_template_instance(mock_send_message): + name = "" + version = "" + ClampToscaTemplate.delete_template_instance(CLAMP, name, version) + url = f"{CLAMP.base_url()}/acm/deleteToscaInstanceProperties?name={name}&version={version}" + mock_send_message.assert_called_with('DELETE', 'Delete the tosca instance', url, headers=HEADER, + basic_auth=BASIC_AUTH) + + +@mock.patch.object(ClampToscaTemplate, 'send_message') +def test_decommission_template(mock_send_message): + name = "" + version = "" + ClampToscaTemplate.decommission_template(CLAMP, name, version) + url = f"{CLAMP.base_url()}/acm/decommissionToscaTemplate?name={name}&version={version}" + mock_send_message.assert_called_with('DELETE', 'Decommission the tosca template', url, headers=HEADER, + basic_auth=BASIC_AUTH) diff --git a/smo-install/tests_oom/du-simulator/values.yaml b/smo-install/tests_oom/du-simulator/values.yaml index 9d3142d8..2d311982 100644 --- a/smo-install/tests_oom/du-simulator/values.yaml +++ b/smo-install/tests_oom/du-simulator/values.yaml @@ -14,9 +14,9 @@ # Static Defaults image: - repository: 'nexus3.o-ran-sc.org:10001/o-ran-sc' + repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc' name: nts-ng-o-ran-du - tag: 1.4.3 + tag: 1.4.5 pullPolicy: IfNotPresent service: diff --git a/smo-install/tests_oom/oran-tests-suite/requirements.yaml b/smo-install/tests_oom/oran-tests-suite/requirements.yaml index 2bf40123..3577fa73 100644 --- a/smo-install/tests_oom/oran-tests-suite/requirements.yaml +++ b/smo-install/tests_oom/oran-tests-suite/requirements.yaml @@ -14,7 +14,7 @@ dependencies: - name: jenkins - version: ~3.11.3 + version: 3.12.2 repository: https://charts.jenkins.io condition: testsSuite.jenkins - name: oran-tests diff --git a/smo-install/tests_oom/ru-simulator/values.yaml b/smo-install/tests_oom/ru-simulator/values.yaml index 66647786..1b1b07d9 100644 --- a/smo-install/tests_oom/ru-simulator/values.yaml +++ b/smo-install/tests_oom/ru-simulator/values.yaml @@ -14,9 +14,9 @@ # Static Defaults image: - repository: 'nexus3.o-ran-sc.org:10001/o-ran-sc' + repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc' name: nts-ng-o-ran-ru-fh - tag: 1.4.3 + tag: 1.4.5 pullPolicy: IfNotPresent service: -- 2.16.6