From adbef0111a8690942058eb08e824feeb551cef56 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 14 Jun 2023 15:28:52 -0400 Subject: [PATCH 01/16] Release version 2.5.4 SDNC maven artifacts Release version 2.5.4 SDNC maven artifacts Issue-ID: CCSDK-3908 Signed-off-by: Dan Timoney Change-Id: I83c7399236704a4bad3c89a9ac7166a6afe3095f Former-commit-id: c4a6764f015afc9c8236d2c5d6384ef330fd4397 --- installation/ansible-server/pom.xml | 2 +- installation/dmaap-listener/pom.xml | 2 +- installation/pom.xml | 2 +- installation/sdnc-web/pom.xml | 2 +- installation/sdnc/pom.xml | 2 +- installation/ueb-listener/pom.xml | 2 +- platform-logic/datachange/pom.xml | 2 +- platform-logic/generic-resource-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/lcm/pom.xml | 2 +- platform-logic/optical-service/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/restconfapi-yang/pom.xml | 2 +- platform-logic/setup/pom.xml | 2 +- platform-logic/vnfapi/pom.xml | 2 +- pom.xml | 2 +- releases/2.5.4.yaml | 5 +++++ version.properties | 2 +- 19 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 releases/2.5.4.yaml diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 679e0516..72d32c52 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT installation-ansible-server diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index d57d1705..021a122d 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT installation-dmaap-listener diff --git a/installation/pom.xml b/installation/pom.xml index 367a1ebf..f9229349 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT installation diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 921293fc..6b6fc0bd 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT installation-sdnc-web diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 97de9ba1..9fdcf0f0 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT installation-sdnc diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 27bb7f95..6e9d9889 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT installation-ueb-listener diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index e4a4373f..fa1d47e0 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT platform-logic-datachange diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index cba5422e..67fa6933 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT platform-logic-generic-resource-api diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 7b97c062..fe7efee8 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT platform-logic-installer diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index abc2ae8b..931a5373 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT platform-logic-lcm diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index dca026d2..5d797701 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT platform-logic-optical-service diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 7f9923c8..6c07dffa 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 81c4b2a2..cb5bed70 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index 0d49d194..67dc294a 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT platform-logic-restconfapi-yang diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 9435880c..c42f1571 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT platform-logic-setup diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index e2f1dbb5..7cdaa503 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT platform-logic-vnfapi diff --git a/pom.xml b/pom.xml index f1168fa2..e4be142f 100755 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam sdnc-oam - 2.5.4-SNAPSHOT + 2.5.5-SNAPSHOT pom sdnc-oam diff --git a/releases/2.5.4.yaml b/releases/2.5.4.yaml new file mode 100644 index 00000000..3237129c --- /dev/null +++ b/releases/2.5.4.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '2.5.4' +project: 'sdnc-oam' +log_dir: 'sdnc-oam-maven-stage-master/350/' diff --git a/version.properties b/version.properties index abce9441..2ff3e2b6 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=2 sprint_number=5 -feature_revision=4 +feature_revision=5 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6 From f3488d64618cdc1ecd2554250644da6541f44dc4 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 14 Jun 2023 15:50:16 -0400 Subject: [PATCH 02/16] Update release notes for London Update versions in release notes for London release Issue-ID: SDNC-1807 Signed-off-by: Dan Timoney Change-Id: I9ff4809a2e33a28c892c3e05f14683b6fbf824ba Former-commit-id: fc995cf98bdc0adccdee7f71ba42cc05005e05b3 --- docs/release-notes.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 8b57e69b..ca97e299 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -45,13 +45,13 @@ The SDNC London release includes the following features, which are inherited fr * Upgrade to OpenDaylight Chlorine Release (Jira `CCSDK-3812 `_) -For the complete list of `CCSDK Kohn release epics `_ and -`CCSDK Kohn release user stories `_ , please see the `ONAP Jira`_. +For the complete list of `CCSDK London release epics `_ and +`CCSDK London release user stories `_ , please see the `ONAP Jira`_. **Bug fixes** -The full list of `bugs fixed in the SDNC Kohn release `_ is maintained on the `ONAP Jira`_. +The full list of `bugs fixed in the SDNC London release `_ is maintained on the `ONAP Jira`_. **Known Issues** @@ -84,17 +84,17 @@ with the following command:: +--------------------------------+-----------------------------------------------------+---------+ | Image name | Description | Version | +================================+=====================================================+=========+ -| onap/sdnc-aaf-image | SDNC controller image, integrated with AAF for RBAC | 2.5.0 | +| onap/sdnc-aaf-image | SDNC controller image, integrated with AAF for RBAC | 2.5.4 | +--------------------------------+-----------------------------------------------------+---------+ -| onap/sdnc-ansible-server-image | Ansible server | 2.5.0 | +| onap/sdnc-ansible-server-image | Ansible server | 2.5.4 | +--------------------------------+-----------------------------------------------------+---------+ -| onap/sdnc-dmaap-listener-image | DMaaP listener | 2.5.0 | +| onap/sdnc-dmaap-listener-image | DMaaP listener | 2.5.4 | +--------------------------------+-----------------------------------------------------+---------+ -| onap/sdnc-image | SDNC controller image, without AAF integration | 2.5.0 | +| onap/sdnc-image | SDNC controller image, without AAF integration | 2.5.4 | +--------------------------------+-----------------------------------------------------+---------+ -| onap/sdnc-ueb-listener-image | SDC listener | 2.5.0 | +| onap/sdnc-ueb-listener-image | SDC listener | 2.5.4 | +--------------------------------+-----------------------------------------------------+---------+ -| onap/sdnc-web-image | Web tier (currently only used by SDN-R persona) | 2.5.0 | +| onap/sdnc-web-image | Web tier (currently only used by SDN-R persona) | 2.5.4 | +--------------------------------+-----------------------------------------------------+---------+ -- 2.16.6 From 6148bb7d53b1dea484bbd2715e91548a9137bf2a Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 15 Jun 2023 09:03:33 -0400 Subject: [PATCH 03/16] Roll snapshot for Montreal Roll snapshot version for Montreal release Issue-ID: SDNC-1805 Signed-off-by: Dan Timoney Change-Id: I652f31c7de27a735b8d20c86f45829df7bd7bd34 Former-commit-id: dbb00177ab26d9ba284ca3db7c54c7b327292a85 --- installation/ansible-server/pom.xml | 2 +- installation/dmaap-listener/pom.xml | 2 +- installation/pom.xml | 2 +- installation/sdnc-web/pom.xml | 2 +- installation/sdnc/pom.xml | 2 +- installation/ueb-listener/pom.xml | 2 +- platform-logic/datachange/pom.xml | 2 +- platform-logic/generic-resource-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/lcm/pom.xml | 2 +- platform-logic/optical-service/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/restconfapi-yang/pom.xml | 2 +- platform-logic/setup/pom.xml | 2 +- platform-logic/vnfapi/pom.xml | 2 +- pom.xml | 2 +- version.properties | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 72d32c52..8bb5201c 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT installation-ansible-server diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 021a122d..c7e06c15 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT installation-dmaap-listener diff --git a/installation/pom.xml b/installation/pom.xml index f9229349..8e33c417 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT installation diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 6b6fc0bd..aa06272a 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT installation-sdnc-web diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 9fdcf0f0..be89a321 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT installation-sdnc diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 6e9d9889..82613b7f 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT installation-ueb-listener diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index fa1d47e0..42ce064a 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT platform-logic-datachange diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index 67fa6933..78fe7bcc 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT platform-logic-generic-resource-api diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index fe7efee8..2da90582 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT platform-logic-installer diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index 931a5373..36cce85c 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT platform-logic-lcm diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index 5d797701..99e1fc97 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT platform-logic-optical-service diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 6c07dffa..d6b18e9f 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index cb5bed70..3ad89c67 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index 67dc294a..5358f42c 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT platform-logic-restconfapi-yang diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index c42f1571..42f85744 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT platform-logic-setup diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 7cdaa503..1cba0f66 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT platform-logic-vnfapi diff --git a/pom.xml b/pom.xml index e4be142f..4f39fa1a 100755 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam sdnc-oam - 2.5.5-SNAPSHOT + 2.6.0-SNAPSHOT pom sdnc-oam diff --git a/version.properties b/version.properties index 2ff3e2b6..5de7abbd 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support release_name=2 -sprint_number=5 -feature_revision=5 +sprint_number=6 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6 From 927ba7bf9f3a1d89279bf231cc269fb8992c8ce9 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 20 Jun 2023 13:29:25 -0400 Subject: [PATCH 04/16] Fix .readthedocs.yaml Update .readthedocs.yaml Issue-ID: DOC-811 Signed-off-by: Dan Timoney Change-Id: I8d3ca402600c884cb063de1b241b2be83481e45f Former-commit-id: 7b692bf2003db8bb4cac6b33b35ea07f6dac01d5 --- .readthedocs.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 3797dc8b..192952d2 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -5,14 +5,12 @@ # Required version: 2 -formats: - - htmlzip - build: - image: latest + os: ubuntu-20.04 + tools: + python: "3.8" python: - version: 3.7 install: - requirements: docs/requirements-docs.txt -- 2.16.6 From c9b819e3e5dfea73764f816c9845f105b9a14563 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 11 Aug 2023 16:50:05 -0400 Subject: [PATCH 05/16] Update sdnc/oam for ODL Argon Update sdnc/oam to use Montreal / ODL Argon versions of parent poms and CCSDK artifacts and docker containers. Remove code to install biermann API Issue-ID: SDNC-1817 Change-Id: Ie271fdd18550769d6805752bb015c1ab0ff8da28 Signed-off-by: Dan Timoney Signed-off-by: highstreetherbert --- SdncReports/pom.xml | 2 +- admportal/pom.xml | 2 +- configbackuprestore/pom.xml | 2 +- csit/plans/sdnr/setup.sh | 2 +- csit/plans/sdnr/testplan.txt | 2 +- installation/sdnc/pom.xml | 9 ++++++--- pom.xml | 22 +++++++++++----------- 7 files changed, 22 insertions(+), 19 deletions(-) diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index 9d5f4c36..7dd49b08 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.5.4 + 2.6.0 diff --git a/admportal/pom.xml b/admportal/pom.xml index 34ef718f..3218f32a 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index ac9213d6..8de3beda 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.5.4 + 2.6.0 org.onap.sdnc.oam.vnfbackup diff --git a/csit/plans/sdnr/setup.sh b/csit/plans/sdnr/setup.sh index 8fef610a..ea780b90 100755 --- a/csit/plans/sdnr/setup.sh +++ b/csit/plans/sdnr/setup.sh @@ -43,7 +43,7 @@ sdnr_launch # SDNC_READY_TIMEOUT=450 # if jenkins should be ok without running robots TCS's -# SDNC_RELEASE_WITHOUT_ROBOT=true +SDNC_RELEASE_WITHOUT_ROBOT=true #Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="--variablefile=${WORKSPACE}/plans/sdnr/testdata/localhost.py" diff --git a/csit/plans/sdnr/testplan.txt b/csit/plans/sdnr/testplan.txt index dcbd829a..c8c1d4dc 100644 --- a/csit/plans/sdnr/testplan.txt +++ b/csit/plans/sdnr/testplan.txt @@ -4,5 +4,5 @@ ## To skip sdnr robot test suite ## set in .setup.sh SDNC_RELEASE_WITHOUT_ROBOT=true -sdnr/healthcheck +# sdnr/healthcheck sdnr/functional diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index be89a321..06d4ac26 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -45,21 +45,24 @@ sdnc-northbound-all,odl-restconf-nb-bierman02- - + + + mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features - + org.onap.sdnc.northbound generic-resource-api-installer diff --git a/pom.xml b/pom.xml index 4f39fa1a..a1b7b057 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 @@ -25,18 +25,18 @@ ${project.version} - 1.5.0 - 2.5.0 - 1.5.2 - 1.6.3 - 1.5.1 + 1.6.0-SNAPSHOT + 2.6.0-SNAPSHOT + 1.6.0-SNAPSHOT + 1.7.1-SNAPSHOT + 1.6.0-SNAPSHOT ${ccsdk.sli.version} - 1.0.0 + 1.0.0 - 1.5.1 - 1.5.1 - 1.5.1 - 1.5.1 + 1.6.0-STAGING-latest + 1.6.0-SNAPSHOT-latest + 1.6.0-STAGING-latest + 1.6.0-STAGING-latest -- 2.16.6 From 8fc94e40c76df15d369300ba70267ab1f844f3c1 Mon Sep 17 00:00:00 2001 From: demskeq8 Date: Wed, 23 Aug 2023 14:03:23 +0200 Subject: [PATCH 06/16] [CSIT] Change SDNC/sdnr csit to use mariaDB add docker-compose for mariaDB and set default sdnrdb Issue-ID: SDNC-1819 Change-Id: Idab44253fa7a3cf10ea40c5eb46b8b3c207caca1 Signed-off-by: demskeq8 --- csit/plans/sdnr/setup.sh | 4 +- csit/scripts/sdnr/docker-compose/.env | 7 ++-- .../docker-compose-sdnrdb-mariadb.yaml | 44 ++++++++++++++++++++++ .../docker-compose/docker-compose-single-sdnr.yaml | 4 ++ csit/scripts/sdnr/sdnr-launch.sh | 2 +- installation/sdnc/src/main/scripts/startODL.sh | 1 + 6 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 csit/scripts/sdnr/docker-compose/docker-compose-sdnrdb-mariadb.yaml diff --git a/csit/plans/sdnr/setup.sh b/csit/plans/sdnr/setup.sh index ea780b90..8de39cda 100755 --- a/csit/plans/sdnr/setup.sh +++ b/csit/plans/sdnr/setup.sh @@ -42,8 +42,8 @@ sdnr_launch ## SDNC ready state will be checked max SDNC_READY_TIMEOUT seconds # SDNC_READY_TIMEOUT=450 -# if jenkins should be ok without running robots TCS's -SDNC_RELEASE_WITHOUT_ROBOT=true +## if jenkins should be ok without running robots TCS's +#SDNC_RELEASE_WITHOUT_ROBOT=true #Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="--variablefile=${WORKSPACE}/plans/sdnr/testdata/localhost.py" diff --git a/csit/scripts/sdnr/docker-compose/.env b/csit/scripts/sdnr/docker-compose/.env index e75351ae..6bd94553 100644 --- a/csit/scripts/sdnr/docker-compose/.env +++ b/csit/scripts/sdnr/docker-compose/.env @@ -23,9 +23,10 @@ SDNR_DM=true SDNR_WEBSOCKET_PORT=8182 # sdnrdb -ES_VERSION=7.9.3 -ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch-oss -ESDB_IP=172.40.0.71 +MARIADB_VERSION=10.5 +MARIADB_IMAGE=bitnami/mariadb +MARIADB_IP=172.40.0.71 + # sdnc-web #NEXUS_DOCKER_REPO see sdnc section diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-sdnrdb-mariadb.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-sdnrdb-mariadb.yaml new file mode 100644 index 00000000..686ae7d4 --- /dev/null +++ b/csit/scripts/sdnr/docker-compose/docker-compose-sdnrdb-mariadb.yaml @@ -0,0 +1,44 @@ +# ******************************************************************************* +# * ============LICENSE_START======================================================================== +# * Copyright (C) 2021 highstreet technologies GmbH 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========================================================================== +version: "2.2" +services: + sdnrdb: + image: ${MARIADB_IMAGE}:${MARIADB_VERSION} + container_name: sdnrdb + ports: + - 3306:3306 + environment: + - MARIADB_ROOT_PASSWORD=admin + - MARIADB_DATABASE=sdnrdb + - MARIADB_USER=sdnrdb + - MARIADB_PASSWORD=sdnrdb + - MARIADB_EXTRA_FLAGS=--bind-address=* --max_connections=400 + - MYSQL_ROOT_PASSWORD=admin + - MYSQL_DATABASE=sdnrdb + - MYSQL_USER=sdnrdb + - MYSQL_PASSWORD=sdnrdb + networks: + integration: + ipv4_address: ${MARIADB_IP} + +networks: + integration: + name: ${NETWORK_NAME} + driver: bridge + ipam: + driver: default + config: + - subnet: ${NETWORK_SUBNET} + gateway: ${GATEWAY_IP} diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml index cb44a7f0..48c32ba0 100644 --- a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml +++ b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml @@ -28,6 +28,10 @@ services: - SDNR_KAFKA_SASL_JAAS_CONFIG=PLAIN - SDNRUSERNAME=${ODL_ADMIN_USERNAME} - SDNRPASSWORD=${ODL_ADMIN_PASSWORD} + - SDNRDBTYPE=MARIADB + - SDNRDBURL=jdbc:mysql://sdnrdb:3306/sdnrdb + - SDNRDBUSERNAME=sdnrdb + - SDNRDBPASSWORD=sdnrdb volumes: - ./sdnr/certs/certs.properties:${ODL_CERT_DIR}/certs.properties - ./sdnr/certs/keys0.zip:${ODL_CERT_DIR}/keys0.zip diff --git a/csit/scripts/sdnr/sdnr-launch.sh b/csit/scripts/sdnr/sdnr-launch.sh index 39ca8081..acc15dee 100755 --- a/csit/scripts/sdnr/sdnr-launch.sh +++ b/csit/scripts/sdnr/sdnr-launch.sh @@ -55,7 +55,7 @@ echo $env_file # Define sdnrdb type # default: ESDB # alternative: MARIADB -SDNRDB_TYPE="${SDNRDB_TYPE:-ESDB}" +SDNRDB_TYPE="${SDNRDB_TYPE:-MARIADB}" if [[ "$SDNRDB_TYPE" == "ESDB" ]]; then sdnrdb_compose_file="docker-compose-sdnrdb-elasticsearch.yaml" else diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index 65992be2..644ec50f 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -310,6 +310,7 @@ printf "%s\n" " SDNRDM=$SDNRDM" printf "%s\n" " SDNRONLY=$SDNRONLY" printf "%s\n" " SDNRINIT=$SDNRINIT" printf "%s\n" " SDNRDBURL=$SDNRDBURL" +printf "%s\n" " SDNRDBTYPE=$SDNRDBTYPE" printf "%s\n" " SDNRDBUSERNAME=$SDNRDBUSERNAME" printf "%s\n" " GEO_ENABLED=$GEO_ENABLED" printf "%s\n" " IS_PRIMARY_CLUSTER=$IS_PRIMARY_CLUSTER" -- 2.16.6 From 5f9f3ccf917d91e2af7f29a467a451d6274912a7 Mon Sep 17 00:00:00 2001 From: demskeq8 Date: Mon, 4 Sep 2023 17:59:57 +0200 Subject: [PATCH 07/16] [CSIT] update SDNR tests for mariaDB based sdnrdb update SDNC test image deploy sdnc-web-image for sdnr test setup add healthcheck add basic odlux tests Issue-ID: SDNC-1820 Change-Id: Ib89d097f301bfe4803bf3006549bee9a78fb6c19 Signed-off-by: demskeq8 --- csit/plans/sdnr/setup.sh | 8 ++-- csit/plans/sdnr/testdata/localhost.py | 14 +++--- csit/plans/sdnr/testplan.txt | 3 +- csit/run-csit.sh | 4 +- .../docker-compose-single-sdnr-web.override.yaml | 19 -------- csit/scripts/sdnr/docker-compose/wait-for-sdnc.sh | 30 ++++++++++++ .../tests/sdnr/healthcheck/20_healthcheckSUT.robot | 10 ++-- .../odlux/50_side_bar_elements_ODLUX_check.robot | 53 ++++++++++++++++++++++ .../onfcore14-basic-odlux/10_lifecycleNetconfSsh | 1 + .../22_alarmNotificationNETCONF | 1 + .../onfcore14-basic-odlux/90_resetSimulatedDevices | 1 + .../odlux/onfcore14-basic-odlux/__init__.robot | 20 ++++++++ .../onfcore14-basic-odlux/yangCapabilities.txt | 51 +++++++++++++++++++++ 13 files changed, 181 insertions(+), 34 deletions(-) create mode 100755 csit/scripts/sdnr/docker-compose/wait-for-sdnc.sh create mode 100644 csit/tests/sdnr/odlux/50_side_bar_elements_ODLUX_check.robot create mode 120000 csit/tests/sdnr/odlux/onfcore14-basic-odlux/10_lifecycleNetconfSsh create mode 120000 csit/tests/sdnr/odlux/onfcore14-basic-odlux/22_alarmNotificationNETCONF create mode 120000 csit/tests/sdnr/odlux/onfcore14-basic-odlux/90_resetSimulatedDevices create mode 100644 csit/tests/sdnr/odlux/onfcore14-basic-odlux/__init__.robot create mode 100644 csit/tests/sdnr/odlux/onfcore14-basic-odlux/yangCapabilities.txt diff --git a/csit/plans/sdnr/setup.sh b/csit/plans/sdnr/setup.sh index 8de39cda..94e367be 100755 --- a/csit/plans/sdnr/setup.sh +++ b/csit/plans/sdnr/setup.sh @@ -34,7 +34,7 @@ echo "Start plan sdnr" source ${WORKSPACE}/scripts/sdnr/sdnr-launch.sh onap_dependent_components_launch nts_networkfunctions_launch ${WORKSPACE}/plans/sdnr/testdata/nts-networkfunctions.csv -sdnr_launch +sdnr_web_launch ## environment for SDNC/R specific robot test runs ## Ready state will be checked every SDNC_READY_RETRY_PERIOD seconds @@ -46,6 +46,8 @@ sdnr_launch #SDNC_RELEASE_WITHOUT_ROBOT=true #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="--variablefile=${WORKSPACE}/plans/sdnr/testdata/localhost.py" -ROBOT_IMAGE="hightec/sdnc-test-lib:v0.11.0" +ROBOT_DEBUG_LEVEL=DEBUG # INFO or DEBUG + +ROBOT_VARIABLES="--variablefile=${WORKSPACE}/plans/sdnr/testdata/localhost.py -L ${ROBOT_DEBUG_LEVEL}" +ROBOT_IMAGE="hightec/sdnc-test-lib:v0.12.0" diff --git a/csit/plans/sdnr/testdata/localhost.py b/csit/plans/sdnr/testdata/localhost.py index c74d3f1a..5e0d4a79 100644 --- a/csit/plans/sdnr/testdata/localhost.py +++ b/csit/plans/sdnr/testdata/localhost.py @@ -8,20 +8,22 @@ ## Access SDNR cluster SDNR_PROTOCOL = "http://" SDNR_HOST = "127.0.0.1" -SDNR_PORT = "8181" +SDNR_PORT = "8282" SDNR_USER = "admin" #SDNR_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" SDNR_PASSWORD = "admin" WEBSOCKET_PORT = "8182" +RELEASE_VERSION="argon" # expected opendaylight version + # for odlux gui testing WEBDRIVER_PATH = "/usr/local/bin/chromedriver" -# Access to elastic search SDNRDB -SDNRDB = {'PROTOCOL': 'http', 'IP': '127.0.0.1', 'PORT': '8181', 'USE_API_GATEWAY': True, 'USE_SSL': False, - 'VERIFY_CERTS': False} -# elastic DB to store statistic datas -ELASTIC_LOG_DB = SDNRDB +# sdnrdb is based on mariaDB + +USE_MARIA_DB=True +MARIADB = {'IP': SDNR_HOST, 'PORT': 3306} + RESTCONF_TIMEOUT = '90 s' # Restconf response time longer than VALID_RESPONSE_TIME in s will be notified as warning in the robot logs VALID_RESPONSE_TIME = 5 diff --git a/csit/plans/sdnr/testplan.txt b/csit/plans/sdnr/testplan.txt index c8c1d4dc..4c07c7fb 100644 --- a/csit/plans/sdnr/testplan.txt +++ b/csit/plans/sdnr/testplan.txt @@ -4,5 +4,6 @@ ## To skip sdnr robot test suite ## set in .setup.sh SDNC_RELEASE_WITHOUT_ROBOT=true -# sdnr/healthcheck +sdnr/healthcheck sdnr/functional +sdnr/odlux diff --git a/csit/run-csit.sh b/csit/run-csit.sh index ba3fb9a9..7021f0f9 100755 --- a/csit/run-csit.sh +++ b/csit/run-csit.sh @@ -211,7 +211,7 @@ if [[ -z $SDNC_RELEASE_WITHOUT_ROBOT ]] ; then docker run --rm --net="host" \ --env-file ${WORKSPACE}/sdnc-csit-robot.env \ -v ${WORKSPACE}:${WORKSPACE} -v ${WORKDIR}:${WORKDIR} $ROBOT_IMAGE \ - python3 -B -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp --outputdir ${WORKDIR} ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES} + python3 -B -m robot -N ${TESTPLAN} -v WORKSPACE:/tmp --outputdir ${WORKDIR} ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES} fi else echo "[INFO] Skip Robot test suite, because SDNC is not in ready state" @@ -223,7 +223,7 @@ else echo "[WARNING] Dummy Robot test suite is executed, job remains ok. " docker run --rm --net="host" \ -v ${WORKSPACE}:${WORKSPACE} -v ${WORKDIR}:${WORKDIR} $ROBOT_IMAGE \ - python3 -B -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp --outputdir ${WORKDIR} ${ROBOT_VARIABLES} ${TESTOPTIONS} ${WORKSPACE}/tests/sdnr/debug/10_dummy.robot + python3 -B -m robot -N ${TESTPLAN} -v WORKSPACE:/tmp --outputdir ${WORKDIR} ${ROBOT_VARIABLES} ${TESTOPTIONS} ${WORKSPACE}/tests/sdnr/debug/10_dummy.robot true fi RESULT=$? diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml index 5f3e8819..0f547e8f 100644 --- a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml +++ b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml @@ -3,22 +3,6 @@ services: sdnr: environment: - SDNRDM="true" - topology-api: - image: ${TOPOLOGY_DOCKER_REPO}/${TOPOLOGY_DOCKER_IMAGE_NAME}:${TOPOLOGY_DOCKER_IMAGE_TAG} - container_name: topology-api - ports: - - "3001:3001" - environment: - - AUTH_ENABLED=${AUTH_ENABLED} - - AUTH_HOST_URL=${IDENTITY_PROVIDER_URL} - # - AUTH_CONFIG_FILE - - PROVIDERS=${TOPOLOGY_PROVIDERS} - - LOAD_PACKAGES=${LOAD_PACKAGES} - depends_on: - - sdnr - networks: - integration: - ipv4_address: ${TOPOLOGY_IP} sdnr-web: image: ${NEXUS_DOCKER_WEB_IMAGE_NAME}:${NEXUS_DOCKER_IMAGE_TAG} container_name: sdnr-web @@ -30,10 +14,7 @@ services: - SDNRPROTOCOL=HTTP - SDNRHOST=sdnr - SDNRPORT=${SDNRPORT} - - TOPOURL=${TOPOURL} - - TILEURL=${TILEURL} depends_on: - - topology-api - sdnr command: ["/wait-for-sdnc.sh", "sdnr:${SDNRPORT}/ready", "/opt/bitnami/nginx/sbin/run.sh"] volumes: diff --git a/csit/scripts/sdnr/docker-compose/wait-for-sdnc.sh b/csit/scripts/sdnr/docker-compose/wait-for-sdnc.sh new file mode 100755 index 00000000..26302622 --- /dev/null +++ b/csit/scripts/sdnr/docker-compose/wait-for-sdnc.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# wait-for-sdnc.sh +# ******************************************************************************* +# * ============LICENSE_START======================================================================== +# * Copyright (C) 2023 highstreet technologies GmbH 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========================================================================== +set -e + +url="$1" +shift +cmd="$@" + +while [ "$(curl -s -o /dev/null -w ''%{http_code}'' $url)" != "200" ]; do + >&2 echo "sdnc is not ready - sleeping" + sleep 1 +done + +>&2 echo "sdnc is up - executing command" +exec $cmd + diff --git a/csit/tests/sdnr/healthcheck/20_healthcheckSUT.robot b/csit/tests/sdnr/healthcheck/20_healthcheckSUT.robot index 2d29c9f0..7eee7ad7 100644 --- a/csit/tests/sdnr/healthcheck/20_healthcheckSUT.robot +++ b/csit/tests/sdnr/healthcheck/20_healthcheckSUT.robot @@ -3,7 +3,7 @@ Documentation healthcheck of system under test: sdnc server, sdnrdb are availab Library ConnectLibrary Library SDNCBaseLibrary Library Collections -Library ElasticSearchLibrary +Library SDNRDBLib Library ConnectApp Library RequestsLibrary @@ -12,7 +12,6 @@ Suite Teardown global suite teardown *** Variables *** &{headers} Content-Type=application/json Authorization=Basic - *** Test Cases *** Test Is SDNR Node Available ${server_status}= Server Is Ready @@ -25,7 +24,7 @@ Test Is SDNRDB Available Test Is SDNRDB Initialized ${res}= Check Aliases - Log ${res} level=INFO html=False console=False repr=False + Log ${res} level=INFO Test Is VES Collector available # curl -k -u sample1:sample1 https://172.40.0.1:8443 @@ -42,3 +41,8 @@ Test Is VES Collector available Should Be Equal As Strings ${resp.status_code} 200 RequestsLibrary.Delete All Sessions +Test Version Info Contains Correct release + ${VERSION_INFO_DICT}= get_version_info_as_dict + ${release}= Get From Dictionary ${VERSION_INFO_DICT["""version-info"""]} Opendaylight-release + Should Contain ${release} ${RELEASE_VERSION} + diff --git a/csit/tests/sdnr/odlux/50_side_bar_elements_ODLUX_check.robot b/csit/tests/sdnr/odlux/50_side_bar_elements_ODLUX_check.robot new file mode 100644 index 00000000..7b3116bd --- /dev/null +++ b/csit/tests/sdnr/odlux/50_side_bar_elements_ODLUX_check.robot @@ -0,0 +1,53 @@ +*** Settings *** +Documentation Test to verify the existence and functionality of the ODLUX Side-Bar Elements. + ... Opens ODLUX and clicks on each Side-Bar Element (Data-driven), given in the SIDE_BAR_ELEMENT + ... column. Once clicking on the Side-Bar Element has been successful, a clickable web-element + ... given by the locator in the CHECK_CLICKABLE_BUTTON_VALUE column, will be checked for existence. + ... The web-element's By strategy to find the element, given by the CHECK_CLICKABLE_BUTTON_BY column, + ... (either Xpath or CSS_SELECTOR) has to be provided and is depended on the variable locator. + ... The test will Pass if both the Side-Bar Element and the clickable web-element exist, else Fail. +Library UILib +Library Collections + +Test Template Check Side Bar Elements + +*** Variables *** +${MAKE_SCREENSHOTS} ${True} +${ELEMENT_COUNT} ${0} + +*** Test Cases *** SIDE_BAR_ELEMENT CHECK_WEBELEMENT_BY CHECK_WEBELEMENT_VALUE CLICK_ON_WEB_ELEMET +Check if Side Bar Element Home exists Home CSS_SELECTOR ODLUX_WELCOME_TO_ODLUX_LABEL False +Check if Side Bar Element Connect exists Connect CSS_SELECTOR ODLUX_NETWORK_ELEMENTS_LIST_TAB_LABEL False +Check if Side Bar Element Fault exists Fault CSS_SELECTOR ODLUX_CURRENT_ALARMS_TABLE_LABEL False +Check if Side Bar Element Maintenance exists Maintenance CSS_SELECTOR ODLUX_MAINTENANCE_TABLE_FILTER_LIST_BUTTON_LABEL False +Check if Side Bar Element Configuration exists Configuration CSS_SELECTOR ODLUX_TABLE_FILTER_LIST_BUTTON_LABEL False +Check if Side Bar Element Performance exists Performance CSS_SELECTOR ODLUX_PERFORMANCE_TABLE_FILTER_LIST_BUTTON_LABEL False +Check if Side Bar Element Inventory exists Inventory CSS_SELECTOR ODLUX_INVENTORY_TABLE_LABEL False +Check if Side Bar Element Event_Log exists Event_Log CSS_SELECTOR ODLUX_EVENT_LOG_TABLE_FILTER_LIST_BUTTON_LABEL False +Check if Side Bar Element Help exists Help CSS_SELECTOR ODLUX_HELP_AND_FAQ_LABEL False +Check if Side Bar Element About exists About CSS_SELECTOR ODLUX_ABOUT_COPY_TO_CLIPBOARD_LABEL False + +Sidebar Elements Count + [Template] Check Side Bar Elements Count + ${ELEMENT_COUNT} + +*** Keywords *** +Check Side Bar Elements + [Arguments] ${side_bar_element} ${check_webelement_by} ${check_webelement_value} ${click_on_web_element} + ${ELEMENT_COUNT}= Set Variable ${${ELEMENT_COUNT}+${1}} + Set Suite Variable ${ELEMENT_COUNT} + Refresh Current Browser Tab + Log ${side_bar_element} + UILib.Click On Site Bar Element side_bar_element=${side_bar_element} + ${is_exist}= Check If Web Element Exists by=${check_webelement_by} value=${check_webelement_value} + ... click_on_web_element=${click_on_web_element} + Should Be True ${is_exist} + +Check Sidebar Elements Count + [Arguments] ${elements_count} + ${sidebar_elements}= Get All Sidebar Elements + Log ${sidebar_elements} + ${current_sidebar_elements_count}= Get Length ${sidebar_elements} + Should Be Equal As Integers ${elements_count} ${current_sidebar_elements_count} + + diff --git a/csit/tests/sdnr/odlux/onfcore14-basic-odlux/10_lifecycleNetconfSsh b/csit/tests/sdnr/odlux/onfcore14-basic-odlux/10_lifecycleNetconfSsh new file mode 120000 index 00000000..fe272974 --- /dev/null +++ b/csit/tests/sdnr/odlux/onfcore14-basic-odlux/10_lifecycleNetconfSsh @@ -0,0 +1 @@ +../../functional/devicemanager/_templates/10_lifecycleNetconfSsh \ No newline at end of file diff --git a/csit/tests/sdnr/odlux/onfcore14-basic-odlux/22_alarmNotificationNETCONF b/csit/tests/sdnr/odlux/onfcore14-basic-odlux/22_alarmNotificationNETCONF new file mode 120000 index 00000000..4a3946f9 --- /dev/null +++ b/csit/tests/sdnr/odlux/onfcore14-basic-odlux/22_alarmNotificationNETCONF @@ -0,0 +1 @@ +../../functional/devicemanager/_templates/22_alarmNotificationNETCONF \ No newline at end of file diff --git a/csit/tests/sdnr/odlux/onfcore14-basic-odlux/90_resetSimulatedDevices b/csit/tests/sdnr/odlux/onfcore14-basic-odlux/90_resetSimulatedDevices new file mode 120000 index 00000000..423c96aa --- /dev/null +++ b/csit/tests/sdnr/odlux/onfcore14-basic-odlux/90_resetSimulatedDevices @@ -0,0 +1 @@ +../../functional/devicemanager/_templates/90_resetSimulatedDevices/ \ No newline at end of file diff --git a/csit/tests/sdnr/odlux/onfcore14-basic-odlux/__init__.robot b/csit/tests/sdnr/odlux/onfcore14-basic-odlux/__init__.robot new file mode 100644 index 00000000..15e6f2ef --- /dev/null +++ b/csit/tests/sdnr/odlux/onfcore14-basic-odlux/__init__.robot @@ -0,0 +1,20 @@ +*** Settings *** +Documentation Test suite for onf core 1.4 devices via odlux +Suite Setup My Setup +Force Tags onf-core-14 +Library OperatingSystem + +*** Variables *** + + +*** Keywords *** +My Setup + Set Suite Variable ${USE_SELENIUM} ${True} + Set Suite Variable ${DEVICE_TYPE} ONF_CORE_1_4 children=true + Set Suite Variable ${CORE_MODEL} 2019-11-27 children=true + Set Suite Variable ${DEVICE_TYPE_GUI} Wireless children=true + ${yang_file} = Get File ${CURDIR}/yangCapabilities.txt + Set Suite Variable ${YANG_CAPABILITIES_FILE} ${yang_file} children=true + Set Suite Variable ${IS_SUPERVISION_ALARM} ${True} + + diff --git a/csit/tests/sdnr/odlux/onfcore14-basic-odlux/yangCapabilities.txt b/csit/tests/sdnr/odlux/onfcore14-basic-odlux/yangCapabilities.txt new file mode 100644 index 00000000..ddc11cca --- /dev/null +++ b/csit/tests/sdnr/odlux/onfcore14-basic-odlux/yangCapabilities.txt @@ -0,0 +1,51 @@ +[["ethernet-container-2-0", "2020-01-21"], + ["ietf-crypto-types", "2019-07-02"], + ["ietf-netconf-notifications", "2012-02-06"], + ["ietf-yang-types", "2013-07-15"], + ["vlan-fd-1-0", "2021-01-05"], + ["ietf-tcp-server", "2019-07-02"], + ["yang", "2017-02-20"], + ["notifications", "2008-07-14"], + ["iana-crypt-hash", "2014-08-06"], + ["ietf-origin", "2018-02-14"], + ["wred-profile-1-0", "2020-01-24"], + ["ietf-netconf-monitoring", "2010-10-04"], + ["ietf-tls-common", "2019-07-02"], + ["ietf-netconf-server", "2019-07-02"], + ["mac-fd-1-0", "2020-08-26"], + ["wire-interface-2-0", "2020-01-23"], + ["ietf-ssh-common", "2019-07-02"], + ["qos-profile-1-0", "2020-01-24"], + ["mac-interface-1-0", "2020-01-23"], + ["ietf-ssh-server", "2019-07-02"], + ["ietf-netconf-with-defaults", "2011-06-01"], + ["ietf-tls-server", "2019-07-02"], + ["ietf-tcp-client", "2019-07-02"], + ["onap-system", "2020-10-26"], + ["l-3vpn-profile-1-0", "2020-01-27"], + ["ietf-netconf", "2013-09-29"], + ["nts-common", "2021-06-08"], + ["mac-fc-1-0", "2020-08-26"], + ["ltp-augment-1-0", "2020-07-30"], + ["ietf-keystore", "2019-07-02"], + ["co-channel-profile-1-0", "2020-01-27"], + ["vlan-interface-1-0", "2021-01-04"], + ["ietf-yang-library", "2019-01-04"], + ["ietf-netconf-acm", "2018-02-14"], + ["ietf-x509-cert-to-name", "2014-12-10"], + ["ietf-tcp-common", "2019-07-02"], + ["tdm-container-2-0", "2020-01-23"], + ["vlan-fc-1-0", "2021-01-05"], + ["ietf-truststore", "2019-07-02"], + ["pure-ethernet-structure-2-0", "2020-01-22"], + ["ietf-system", "2014-08-06"], + ["core-model-1-4", "2019-11-27"], + ["hybrid-mw-structure-2-0", "2020-01-22"], + ["air-interface-2-0", "2020-01-21"], + ["ietf-yang-metadata", "2016-08-05"], + ["ietf-datastores", "2018-02-14"], + ["nc-notifications", "2008-07-14"], + ["ietf-netconf-nmda", "2019-01-07"], + ["ip-interface-1-0", "2020-01-24"], + ["ietf-inet-types", "2013-07-15"], + ["nts-network-function", "2021-06-18"]] \ No newline at end of file -- 2.16.6 From 38c044d1b25a5702220e5be32111ca7e71f87139 Mon Sep 17 00:00:00 2001 From: demskeq8 Date: Mon, 16 Oct 2023 11:12:52 +0200 Subject: [PATCH 08/16] [CSIT] Use complex odl password use complex password instead of odl default password Issue-ID: SDNC-1824 Change-Id: I42b18559d3ca4e5a15b947b5400f7b3a5552ab2a Signed-off-by: demskeq8 --- csit/plans/sdnr/testdata/localhost.py | 4 ++-- csit/scripts/sdnr/docker-compose/.env | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csit/plans/sdnr/testdata/localhost.py b/csit/plans/sdnr/testdata/localhost.py index 5e0d4a79..373d90c9 100644 --- a/csit/plans/sdnr/testdata/localhost.py +++ b/csit/plans/sdnr/testdata/localhost.py @@ -10,8 +10,8 @@ SDNR_PROTOCOL = "http://" SDNR_HOST = "127.0.0.1" SDNR_PORT = "8282" SDNR_USER = "admin" -#SDNR_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" -SDNR_PASSWORD = "admin" +SDNR_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" +#SDNR_PASSWORD = "admin" WEBSOCKET_PORT = "8182" RELEASE_VERSION="argon" # expected opendaylight version diff --git a/csit/scripts/sdnr/docker-compose/.env b/csit/scripts/sdnr/docker-compose/.env index 6bd94553..a6b0b92b 100644 --- a/csit/scripts/sdnr/docker-compose/.env +++ b/csit/scripts/sdnr/docker-compose/.env @@ -13,8 +13,8 @@ NEXUS_DOCKER_REPO=nexus3.onap.org:10001 NEXUS_DOCKER_IMAGE_NAME=onap/sdnc-image NEXUS_DOCKER_IMAGE_TAG=latest ODL_ADMIN_USERNAME=admin -#ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -ODL_ADMIN_PASSWORD=admin +ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +#ODL_ADMIN_PASSWORD=admin ODL_CERT_DIR=/opt/opendaylight/current/certs SDN_CONTROLLER_PROTOCOL="http" SDNR_IP=172.40.0.21 -- 2.16.6 From 013bee7cdc2f2db170fa9235d29958a7fc5b1104 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 13 Oct 2023 16:39:54 -0400 Subject: [PATCH 09/16] Update to version 2.6.1 of parent pom Update to version 2.6.1 of parent pom to pick up Argon SR2 versions Issue-ID: CCSDK-3944 Change-Id: Idba0a162fd079f35d420e62f3026f6c8dfc1d983 Signed-off-by: Dan Timoney Signed-off-by: highstreetherbert --- SdncReports/pom.xml | 2 +- admportal/pom.xml | 2 +- configbackuprestore/pom.xml | 2 +- csit/plans/sdnc/generate_certs.sh | 35 +++++++++++++++++++++++++++ csit/plans/sdnc/setup.sh | 3 +++ csit/tests/sdnc/resources/sdnc-keywords.robot | 2 +- csit/tests/sdnc/sdnc_csit.robot | 6 ++--- installation/sdnc/pom.xml | 24 +++++++++++++++++- pom.xml | 20 +++++++-------- 9 files changed, 78 insertions(+), 18 deletions(-) create mode 100755 csit/plans/sdnc/generate_certs.sh diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index 7dd49b08..ce15a0f1 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.6.0 + 2.6.1 diff --git a/admportal/pom.xml b/admportal/pom.xml index 3218f32a..3218e49b 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.6.0 + 2.6.1 diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 8de3beda..43157f2c 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.6.0 + 2.6.1 org.onap.sdnc.oam.vnfbackup diff --git a/csit/plans/sdnc/generate_certs.sh b/csit/plans/sdnc/generate_certs.sh new file mode 100755 index 00000000..d5b80179 --- /dev/null +++ b/csit/plans/sdnc/generate_certs.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# +# Copyright (c) 2022 highstreet technologies GmbH Property +# +# 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. +# +# generates fresh certificates for netconfserver + + +tls_dir=$1 + +cd $tls_dir +echo "generate all required certificates and store in $tls_dir" +openssl version +openssl req -newkey rsa:4096 -keyform PEM -keyout ca.key -x509 -days 3650 -outform PEM -out ca.crt -nodes \ + -subj "/C=DE/ST=Berlin/L=Berlin/O=ONAP/OU=SDNC/CN=www.onap.org/emailAddress=dev@www.example.com" +openssl genrsa -out client.key 4096 +openssl req -new -key client.key -out client.req -nodes \ + -subj "/C=PL/ST=DS/L=Wroclaw/O=ONAP/OU=SDNC/CN=www.onap.org" +openssl x509 -req -in client.req -CA ca.crt -CAkey ca.key -set_serial 101 -extensions client -days 365 -outform PEM -out client.crt +openssl genrsa -out server_key.pem 4096 +openssl req -new -key server_key.pem -out server.req -sha256 -nodes \ + -subj "/C=PL/ST=DS/L=Wroclaw/O=ONAP/OU=SDNC/CN=www.onap.org" +openssl x509 -req -in server.req -CA ca.crt -CAkey ca.key -set_serial 100 -extensions server -days 1460 -outform PEM -out server_cert.crt -sha256 + diff --git a/csit/plans/sdnc/setup.sh b/csit/plans/sdnc/setup.sh index 3212f981..7c953a3c 100644 --- a/csit/plans/sdnc/setup.sh +++ b/csit/plans/sdnc/setup.sh @@ -49,6 +49,9 @@ mv ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netop cat ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netopeer.sh.orig | sed -e "s/\r$//g" > ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netopeer.sh chmod 755 ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netopeer.sh +# generate fresh certificates for netconfserver [INT-2269] + +./generate_certs.sh "${WORKSPACE}"/archives/pnf-simulator/netconfsimulator/tls # Start Netconf Simulator Container with docker-compose and configuration from docker-compose.yml docker-compose -f "${WORKSPACE}"/archives/pnf-simulator/netconfsimulator/docker-compose.yml up -d diff --git a/csit/tests/sdnc/resources/sdnc-keywords.robot b/csit/tests/sdnc/resources/sdnc-keywords.robot index 8c417bc3..4c4750db 100644 --- a/csit/tests/sdnc/resources/sdnc-keywords.robot +++ b/csit/tests/sdnc/resources/sdnc-keywords.robot @@ -45,7 +45,7 @@ Send Get Request And Validate TLS Connection Response ${mount}= Get File ${REQUEST_DATA_PATH}${/}mount.xml &{headers}= Create Dictionary Content-Type=application/xml Accept=application/xml ${resp}= PUT On Session sdnc_restconf ${url} data=${mount} headers=${headers} expected_status=201 - Sleep 30 + Sleep 120 &{headers1}= Create Dictionary Content-Type=application/json Accept=application/json ${resp1}= GET On Session sdnc_restconf ${PNFSIM_MOUNT_PATH} headers=${headers1} expected_status=${resp_code} diff --git a/csit/tests/sdnc/sdnc_csit.robot b/csit/tests/sdnc/sdnc_csit.robot index 6b49b0f7..bcd2f013 100644 --- a/csit/tests/sdnc/sdnc_csit.robot +++ b/csit/tests/sdnc/sdnc_csit.robot @@ -16,17 +16,17 @@ Check SDNC Keystore For PNF Simulator Certificates [Tags] SDNC-PNFSIM-CERT-DEPLOYMENT [Documentation] Checking Keystore after SDNC installation Send Get Request And Validate Response Sdnc ${SDNC_KEYSTORE_CONFIG_PATH} 200 - + Check SDNC NETCONF/TLS Connection to PNF Simulator [Tags] SDNC-PNFSIM-TLS-CONNECTION-CHECK - [Documentation] Checking NETCONF/TLS connection to PNF Simulator + [Documentation] Checking NETCONF/TLS connection to PNF Simulator Send Get Request And Validate TLS Connection Response ${SDNC_MOUNT_PATH} 200 Check Dropping NETCONF/TLS Connection [Tags] SDNC-PNFSIM-TLS-DISCONNECT-CHECK [Documentation] Checking PNF Simulator Mount Delete from SDNC - Send Delete Request And Validate PNF Mount Deleted ${SDNC_MOUNT_PATH} 204 + Send Delete Request And Validate PNF Mount Deleted ${SDNC_MOUNT_PATH} 204 Load network preload data [Tags] SDNC-GRA-PRELOAD-NETWORK diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 06d4ac26..5d1fa8f7 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -30,6 +30,7 @@ ${https_proxy} true + 0.17.11 ccsdk-features-all @@ -38,7 +39,6 @@ mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features,\ mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features,\ mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features,\ - mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-oauth/${ccsdk.features.version}/xml/features,\ mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features,\ mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/${ccsdk.features.version}/xml/features @@ -400,6 +400,28 @@ + + copy-with-alternalte-repo-2 + generate-sources + + copy + + + + + com.highstreet-technologies.aaa + aaa-authn-api + 0.17.8 + ${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version} + aaa-authn-api-${odl.shiro.version}.jar + * + + + false + true + true + + diff --git a/pom.xml b/pom.xml index a1b7b057..60755ca7 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.6.0 + 2.6.1 @@ -25,18 +25,18 @@ ${project.version} - 1.6.0-SNAPSHOT - 2.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.7.1-SNAPSHOT - 1.6.0-SNAPSHOT + 1.6.0 + 2.6.0 + 1.6.1-SNAPSHOT + 1.7.1 + 1.6.1 ${ccsdk.sli.version} 1.0.0 - 1.6.0-STAGING-latest - 1.6.0-SNAPSHOT-latest - 1.6.0-STAGING-latest - 1.6.0-STAGING-latest + 1.6.1-STAGING-latest + 1.6.1-SNAPSHOT-latest + 1.6.1-STAGING-latest + 1.6.1-STAGING-latest -- 2.16.6 From a8daa6c0bda63e20eb980d940e66f69430d767f8 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 27 Nov 2023 08:48:40 -0500 Subject: [PATCH 10/16] Roll version for New Delhi release Update version in master to New Delhi initial version Issue-ID: SDNC-1827 Change-Id: I7e283df51e84794b6c22690b1d16dd8d3722bfae Signed-off-by: Dan Timoney --- installation/ansible-server/pom.xml | 2 +- installation/dmaap-listener/pom.xml | 2 +- installation/pom.xml | 2 +- installation/sdnc-web/pom.xml | 2 +- installation/sdnc/pom.xml | 2 +- installation/ueb-listener/pom.xml | 2 +- platform-logic/datachange/pom.xml | 2 +- platform-logic/generic-resource-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/lcm/pom.xml | 2 +- platform-logic/optical-service/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/restconfapi-yang/pom.xml | 2 +- platform-logic/setup/pom.xml | 2 +- platform-logic/vnfapi/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 8bb5201c..fb595cd2 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT installation-ansible-server diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index c7e06c15..a0f6458a 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT installation-dmaap-listener diff --git a/installation/pom.xml b/installation/pom.xml index 8e33c417..64855630 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT installation diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index aa06272a..939c7771 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT installation-sdnc-web diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 5d1fa8f7..18994cdc 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT installation-sdnc diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 82613b7f..585b423a 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT installation-ueb-listener diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index 42ce064a..124920f1 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT platform-logic-datachange diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index 78fe7bcc..b8463e91 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT platform-logic-generic-resource-api diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 2da90582..37af04c9 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT platform-logic-installer diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index 36cce85c..e1f91d6a 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT platform-logic-lcm diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index 99e1fc97..b8520f03 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT platform-logic-optical-service diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index d6b18e9f..ed93179b 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 3ad89c67..79c2dd96 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index 5358f42c..ee8a6dbf 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT platform-logic-restconfapi-yang diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 42f85744..0512f57b 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT platform-logic-setup diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 1cba0f66..137b0f93 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT platform-logic-vnfapi diff --git a/pom.xml b/pom.xml index 60755ca7..ca40a907 100755 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam sdnc-oam - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT pom sdnc-oam diff --git a/version.properties b/version.properties index 5de7abbd..80c69222 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ # because they are used in Jenkins, whose plug-in doesn't support release_name=2 -sprint_number=6 +sprint_number=7 feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6 From 1608b5e23d87d464b02978c7cbd2287856bea146 Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Thu, 14 Dec 2023 16:06:17 +0530 Subject: [PATCH 11/16] Update artifact name New name reflects the changed directory structure for ODLUX Issue-ID: SDNC-1834 Change-Id: I3c1af9e89201a11ba393505d8f4da3ecdad3cc76 Signed-off-by: Ravi Pendurty --- installation/sdnc-web/pom.xml | 4 ++-- installation/sdnc/src/main/scripts/startODL.sh | 4 ---- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 939c7771..3a096ffd 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -25,8 +25,8 @@ - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-installer + org.onap.ccsdk.features.sdnr.odlux + sdnr-odlux-installer ${ccsdk.features.version} zip repo diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index 644ec50f..eb27e0f8 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -104,9 +104,6 @@ install_sdnrwt_features() { cleanupFeatureBoot fi addToFeatureBoot "$SDNRDM_BOOTFEATURES" - if ! $SDNRDM; then - addToFeatureBoot "$SDNRODLUX_BOOTFEATURES" - fi if $SDNR_NETCONF_CALLHOME_ENABLED; then addToFeatureBoot "$SDNR_NETCONF_CALLHOME_FEATURE" fi @@ -247,7 +244,6 @@ GEO_ENABLED=${GEO_ENABLED:-false} SDNRWT=${SDNRWT:-false} SDNRDM=${SDNRDM:-false} -SDNRODLUX_BOOTFEATURES=${SDNRODLUX_BOOTFEATURES:-sdnr-wt-helpserver-feature,sdnr-wt-odlux-core-feature,sdnr-wt-odlux-apps-feature} SDNROAUTH_BOOTFEATURES=${SDNROAUTH_BOOTFEATURES:-sdnr-wt-feature-aggregator-oauth} SDNR_NETCONF_CALLHOME_ENABLED=${SDNR_NETCONF_CALLHOME_ENABLED:-false} diff --git a/pom.xml b/pom.xml index ca40a907..b4bbeb6d 100755 --- a/pom.xml +++ b/pom.xml @@ -27,9 +27,9 @@ 1.6.0 2.6.0 - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT 1.7.1 - 1.6.1 + 1.7.0-SNAPSHOT ${ccsdk.sli.version} 1.0.0 -- 2.16.6 From 1a2fb8becf889ae643cd18540153bca02f770ea8 Mon Sep 17 00:00:00 2001 From: thmsdt Date: Tue, 20 Feb 2024 14:16:53 +0100 Subject: [PATCH 12/16] add python compatibility module Issue-ID: DOC-823 Change-Id: I9812e7eee5bb3f34451ff8896e652e612e47b36b Signed-off-by: thmsdt --- docs/requirements-docs.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index ba3e0ec0..097282b9 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -4,4 +4,5 @@ sphinxcontrib-blockdiag # BSD sphinxcontrib-seqdiag # BSD sphinxcontrib-swaggerdoc sphinxcontrib-spelling -sphinxcontrib-plantuml \ No newline at end of file +sphinxcontrib-plantuml +six -- 2.16.6 From 77eac465e8bf46b40dee82f00db9af902947c4c2 Mon Sep 17 00:00:00 2001 From: thmsdt Date: Tue, 27 Feb 2024 11:26:42 +0100 Subject: [PATCH 13/16] update link to upper-constraints.txt Issue-ID: DOC-823 Change-Id: I640dc23d4cc742144af2e9c9a561f2a9ee1c34a7 Signed-off-by: thmsdt --- docs/tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tox.ini b/docs/tox.ini index 0465b384..5200df4f 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -7,7 +7,7 @@ skipsdist = true basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt - -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt + -chttps://releases.openstack.org/constraints/upper/yoga -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html @@ -28,7 +28,7 @@ allowlist_externals = echo basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt - -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt + -chttps://releases.openstack.org/constraints/upper/yoga -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master commands = sphinx-build -W -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck -- 2.16.6 From a8709a236ce96f310002d7de37363ae492d850c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20D=C3=BCrre?= Date: Fri, 22 Mar 2024 12:01:26 +0100 Subject: [PATCH 14/16] fix oauth startup issues MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit add boot feature into repo. fix oauth config Issue-ID: SDNC-1838 Change-Id: I638a2de35d7725d6e4136bf9f10e00102764acc2 Signed-off-by: Michael Dürre --- installation/sdnc/pom.xml | 3 ++- .../sdnc/src/main/resources/oauth-aaa-app-config.xml | 19 ++++++++----------- installation/sdnc/src/main/scripts/startODL.sh | 14 +++++++++++--- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 18994cdc..63c20f49 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -40,7 +40,8 @@ mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features,\ mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features,\ mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features,\ - mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/${ccsdk.features.version}/xml/features + mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/${ccsdk.features.version}/xml/features,\ + mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-oauth/${ccsdk.features.version}/xml/features diff --git a/installation/sdnc/src/main/resources/oauth-aaa-app-config.xml b/installation/sdnc/src/main/resources/oauth-aaa-app-config.xml index 643ed4de..65e34db7 100644 --- a/installation/sdnc/src/main/resources/oauth-aaa-app-config.xml +++ b/installation/sdnc/src/main/resources/oauth-aaa-app-config.xml @@ -26,6 +26,7 @@
tokenAuthRealm + org.onap.ccsdk.features.sdnr.wt.oauthprovider.OAuth2Realm
@@ -34,17 +35,14 @@ $tokenAuthRealm -
- authcBasic - org.opendaylight.aaa.shiro.filters.ODLHttpAuthenticationFilter -
anyroles - org.opendaylight.aaa.shiro.filters.AnyRoleHttpAuthenticationFilter + org.onap.ccsdk.features.sdnr.wt.oauthprovider.filters.AnyRoleHttpAuthenticationFilter
authcBearer - org.opendaylight.aaa.shiro.filters.ODLHttpAuthenticationFilter2 + + org.onap.ccsdk.features.sdnr.wt.oauthprovider.filters.BearerAndBasicHttpAuthenticationFilter
@@ -60,7 +58,7 @@
dynamicAuthorization - org.opendaylight.aaa.shiro.realm.MDSALDynamicAuthorizationFilter + org.onap.ccsdk.features.sdnr.wt.oauthprovider.filters.CustomizedMDSALDynamicAuthorizationFilter
@@ -70,11 +68,11 @@ /**/v1/** - authcBearer, roles[admin] + authcBasic, roles[admin] /**/config/aaa*/** - authcBearer, roles[admin] + authcBasic, roles[admin] /oauth/** @@ -94,7 +92,6 @@ /** - authcBearer, anyroles["admin,provision"] + authcBearer, roles[admin] - diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index eb27e0f8..7de8e508 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -90,11 +90,15 @@ initialize_sdnrdb() { printf "%s\n" "Execute: $INITCMD" n=0 until [ $n -ge 5 ] ; do - $INITCMD && break + $INITCMD + ret=$? + if [ $ret -eq 0 ] ; then + break; + fi n=$((n+1)) sleep 15 done - return $? + return $ret } install_sdnrwt_features() { @@ -340,6 +344,10 @@ if $SDNRINIT ; then init_result=$? printf "%s\n" "Result of init script: $init_result" if $SDNRWT ; then + if [ $init_result -ne 0 ]; then + echo "db not initialized. stopping container" + exit $init_result + fi printf "Proceed to initialize sdnr\n" else exit $init_result @@ -393,7 +401,7 @@ then if $SDNRWT ; then install_sdnrwt_features ; fi if $ENABLE_OAUTH ; then cp $SDNC_HOME/data/oauth-aaa-app-config.xml $(find $ODL_HOME/system/org/opendaylight/aaa/ -name *aaa-app-config.xml) - echo -e "\norg.ops4j.pax.web.session.cookie = none" >> $ODL_HOME/etc/org.ops4j.pax.web.cfg + echo -e "\norg.ops4j.pax.web.session.cookie.comment = disable" >> $ODL_HOME/etc/org.ops4j.pax.web.cfg install_sdnr_oauth_features fi -- 2.16.6 From b288a302100fb4f843cc494b73c0c3ec4be4a413 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20D=C3=BCrre?= Date: Tue, 26 Mar 2024 13:36:10 +0100 Subject: [PATCH 15/16] removed duplicated odl patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit removed aaa authn patch overwrite from ccsdk Issue-ID: SDNC-1839 Change-Id: Id6194166b2a81ff34727a035759a31ed4d06eef1 Signed-off-by: Michael Dürre --- installation/sdnc/pom.xml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 63c20f49..03b3af6a 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -30,7 +30,6 @@ ${https_proxy} true - 0.17.11 ccsdk-features-all @@ -401,28 +400,6 @@ - - copy-with-alternalte-repo-2 - generate-sources - - copy - - - - - com.highstreet-technologies.aaa - aaa-authn-api - 0.17.8 - ${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version} - aaa-authn-api-${odl.shiro.version}.jar - * - - - false - true - true - - -- 2.16.6 From 5b0dda6c50e07e4d02cbf144f321b26440b7d3b5 Mon Sep 17 00:00:00 2001 From: Kevin Sandi Date: Tue, 9 Apr 2024 14:44:07 -0600 Subject: [PATCH 16/16] Chore: Add gerrit maven verify GHA workflow Issue-ID: CIMAN-33 Change-Id: I08d63083ec1544936a131a54d519369183d54f0f Signed-off-by: Kevin Sandi --- .github/workflows/gerrit-verify.yaml | 114 +++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 .github/workflows/gerrit-verify.yaml diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml new file mode 100644 index 00000000..28a59b21 --- /dev/null +++ b/.github/workflows/gerrit-verify.yaml @@ -0,0 +1,114 @@ +--- +name: Gerrit Composed Maven Verify + +# yamllint disable-line rule:truthy +on: + workflow_dispatch: + inputs: + GERRIT_BRANCH: + description: "Branch that change is against" + required: true + type: string + GERRIT_CHANGE_ID: + description: "The ID for the change" + required: true + type: string + GERRIT_CHANGE_NUMBER: + description: "The Gerrit number" + required: true + type: string + GERRIT_CHANGE_URL: + description: "URL to the change" + required: true + type: string + GERRIT_EVENT_TYPE: + description: "Type of Gerrit event" + required: true + type: string + GERRIT_PATCHSET_NUMBER: + description: "The patch number for the change" + required: true + type: string + GERRIT_PATCHSET_REVISION: + description: "The revision sha" + required: true + type: string + GERRIT_PROJECT: + description: "Project in Gerrit" + required: true + type: string + GERRIT_REFSPEC: + description: "Gerrit refspec of change" + required: true + type: string + +concurrency: + # yamllint disable-line rule:line-length + group: compose-maven-verify-${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} + cancel-in-progress: true + +jobs: + prepare: + runs-on: ubuntu-latest + steps: + - name: Clear votes + # yamllint disable-line rule:line-length + uses: lfit/gerrit-review-action@6ac4c2322b68c0120a9b516eb0421491ee1b3fdf # v0.4 + with: + host: ${{ vars.GERRIT_SERVER }} + username: ${{ vars.GERRIT_SSH_USER }} + key: ${{ secrets.GERRIT_SSH_PRIVKEY }} + known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} + gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} + gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + vote-type: clear + comment-only: true + - name: Allow replication + run: sleep 10s + + maven-verify: + needs: prepare + # use compose-jjb-verify from the v0.4 series of releng-reusable-workflows + # yamllint disable-line rule:line-length + uses: lfit/releng-reusable-workflows/.github/workflows/compose-maven-verify.yaml@main + with: + GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }} + GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }} + GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }} + GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }} + GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }} + GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }} + GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }} + GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }} + JDK_VERSION: "17" + MVN_VERSION: "3.8.2" + MVN_PROFILES: "docker" + MVN_OPTS: >- + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r + -DaltDeploymentRepository=staging::default::file:"${GITHUB_WORKSPACE}"/m2repo + -Dkaraf.keep.unpack + -Ddocker.skip.push=true + + vote: + if: ${{ always() }} + # yamllint enable rule:line-length + needs: [prepare, maven-verify] + runs-on: ubuntu-latest + steps: + - name: Get conclusion + # yamllint disable-line rule:line-length + uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5 # v3.0.3 + - name: Set vote + # yamllint disable-line rule:line-length + uses: lfit/gerrit-review-action@6ac4c2322b68c0120a9b516eb0421491ee1b3fdf # v0.4 + with: + host: ${{ vars.GERRIT_SERVER }} + username: ${{ vars.GERRIT_SSH_USER }} + key: ${{ secrets.GERRIT_SSH_PRIVKEY }} + known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} + gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} + gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + vote-type: ${{ env.WORKFLOW_CONCLUSION }} + comment-only: true -- 2.16.6