From edbdf2e4910c385c3f50538c2a78e266ae694850 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 6 Jun 2023 06:53:08 -0400 Subject: [PATCH 01/16] Roll master for Montreal Roll version to initial snapshot for Montreal release Issue-ID: CCSDK-3903 Signed-off-by: Dan Timoney Change-Id: I874898373e2dd7e6d4a6b82aa714fb52abad194c --- alpine/java11/pom.xml | 2 +- alpine/java17/pom.xml | 2 +- alpine/pom.xml | 2 +- ansible-server/pom.xml | 4 ++-- dependencies/pom.xml | 2 +- dgbuilder-docker/pom.xml | 2 +- dgbuilder/pom.xml | 2 +- docs/sli/apis/sliapi.rst | 2 +- docs/tox.ini | 4 ++-- odlsli/odlsli-alpine/pom.xml | 2 +- odlsli/pom.xml | 2 +- opendaylight/chlorine/chlorine-alpine/pom.xml | 2 +- opendaylight/chlorine/pom.xml | 2 +- opendaylight/pom.xml | 2 +- opendaylight/sulfur/pom.xml | 2 +- opendaylight/sulfur/sulfur-alpine/pom.xml | 2 +- platform-logic/a1Adapter-api/pom.xml | 2 +- platform-logic/asdc-api/pom.xml | 2 +- platform-logic/cMNotify-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/oofpcipoc-api/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/ran-slice-api/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/sliapi/pom.xml | 2 +- pom.xml | 2 +- saltstack-server/pom.xml | 2 +- ubuntu/pom.xml | 2 +- version.properties | 4 ++-- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml index 0b197ce9..0c0c0b73 100644 --- a/alpine/java11/pom.xml +++ b/alpine/java11/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-alpine-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-j11-alpine diff --git a/alpine/java17/pom.xml b/alpine/java17/pom.xml index b497f3c1..5c590f6b 100644 --- a/alpine/java17/pom.xml +++ b/alpine/java17/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-alpine-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-j17-alpine diff --git a/alpine/pom.xml b/alpine/pom.xml index 29031c2c..9f413a5a 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-alpine-root diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 67afe1d7..15faf5ae 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT org.onap.ccsdk.distribution ansible-server - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT pom ccsdk-distribution :: ${project.artifactId} diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 4cc888a1..4d989c7f 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT dependencies diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 968d004d..5f1db7b1 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT org.onap.ccsdk.distribution diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 8648f20f..b7679d3a 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT org.onap.ccsdk.distribution diff --git a/docs/sli/apis/sliapi.rst b/docs/sli/apis/sliapi.rst index 13cdcbd5..5090b8e4 100644 --- a/docs/sli/apis/sliapi.rst +++ b/docs/sli/apis/sliapi.rst @@ -10,6 +10,6 @@ SLI-API(2016-11-11) -.. swaggerv2doc:: https://gerrit.onap.org/r/gitweb?p=ccsdk/sli/core.git;a=blob_plain;f=sliapi/model/src/main/resources/sli-api.20161110.json +.. swaggerv2doc:: https://gerrit.onap.org/r/gitweb?p=ccsdk/sli.git;a=blob_plain;f=core/sliapi/model/swagger/src/main/json/sliapi.json;hb=refs/heads/master diff --git a/docs/tox.ini b/docs/tox.ini index 61b6ccfa..379d8e42 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -12,7 +12,7 @@ deps = commands = sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html echo "Generated docs available in {toxinidir}/_build/html" -whitelist_externals = +allowlist_externals = echo git sh @@ -25,7 +25,7 @@ deps = -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master commands = echo "Link Checking not enforced" #commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck -whitelist_externals = echo +allowlist_externals = echo [testenv:docs-spellcheck] basepython = python3.8 diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index d0b7862f..30c7a906 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odlsli - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odlsli-alpine diff --git a/odlsli/pom.xml b/odlsli/pom.xml index dbbe6fb1..f367103b 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odlsli diff --git a/opendaylight/chlorine/chlorine-alpine/pom.xml b/opendaylight/chlorine/chlorine-alpine/pom.xml index 4ba806db..0762ffe6 100644 --- a/opendaylight/chlorine/chlorine-alpine/pom.xml +++ b/opendaylight/chlorine/chlorine-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odl-chlorine - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odl-chlorine-docker diff --git a/opendaylight/chlorine/pom.xml b/opendaylight/chlorine/pom.xml index 47a185e2..c419929b 100644 --- a/opendaylight/chlorine/pom.xml +++ b/opendaylight/chlorine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-opendaylight - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odl-chlorine diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 3eb28e76..931664a6 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-opendaylight diff --git a/opendaylight/sulfur/pom.xml b/opendaylight/sulfur/pom.xml index 52827111..e1c7071e 100644 --- a/opendaylight/sulfur/pom.xml +++ b/opendaylight/sulfur/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-opendaylight - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odl-sulfur diff --git a/opendaylight/sulfur/sulfur-alpine/pom.xml b/opendaylight/sulfur/sulfur-alpine/pom.xml index 1065e0b2..43821870 100644 --- a/opendaylight/sulfur/sulfur-alpine/pom.xml +++ b/opendaylight/sulfur/sulfur-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odl-sulfur - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odl-sulfur-docker diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml index d3caa0d6..6cabf9ff 100644 --- a/platform-logic/a1Adapter-api/pom.xml +++ b/platform-logic/a1Adapter-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-a1Adapterapi diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index 4e7ec196..63a13ac1 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-asdcapi diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml index fc286e77..551c00d1 100644 --- a/platform-logic/cMNotify-api/pom.xml +++ b/platform-logic/cMNotify-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-cMNotifyai diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 8886d5c3..83f944e4 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-installer diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index ce0be167..ef02a736 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-oofpcipocapi diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 3bebdb6b..738a97db 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-platform-logic diff --git a/platform-logic/ran-slice-api/pom.xml b/platform-logic/ran-slice-api/pom.xml index 2e6a986d..b55a1cef 100644 --- a/platform-logic/ran-slice-api/pom.xml +++ b/platform-logic/ran-slice-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-ranSlice diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 672ce310..8cff9818 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 58ec2921..09cdd000 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-sliapi diff --git a/pom.xml b/pom.xml index 6a663149..62c40807 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT pom ccsdk-distribution diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index bc26dfd0..f79b205f 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT saltstack-server diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index c513c0c8..b9ef1e44 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-ubuntu diff --git a/version.properties b/version.properties index 99005bfb..576a5c90 100644 --- a/version.properties +++ b/version.properties @@ -5,8 +5,8 @@ release_name=1 -sprint_number=5 -feature_revision=2 +sprint_number=6 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6 From 1ba457702deae80530f57bcc9b44a62f53ab34ce Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 14 Jun 2023 09:44:32 -0400 Subject: [PATCH 02/16] Update release notes for London Update release notes for London release Issue-ID: CCSDK-3905 Signed-off-by: Dan Timoney Change-Id: Iba3bfc80d13b77ffda889fc10120de678b840137 --- docs/release-notes.rst | 139 +++++++++++++++++++++++++------------------------ 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 1c184133..7f40550e 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -12,15 +12,15 @@ CCSDK Release Notes Abstract ======== -This document provides the release notes for the Jakarta release of the Common Controller Software +This document provides the release notes for the London release of the Common Controller Software Development Kit (CCSDK). Summary ======= -The Kohn release of CCSDK introduces enhancements to network slicing and extends support +The London release of CCSDK introduces enhancements to network slicing and extends support for ORAN integration via the A1 interface. It also includes a major OpenDaylight release -upgrade (to Sulfur). +upgrade (to Chlorine). Release Data @@ -32,7 +32,7 @@ Release Data +-------------------------+-------------------------------------------+ | **Docker images** | See :ref:`dockercontainers` section below | +-------------------------+-------------------------------------------+ -| **Release designation** | Kohn | +| **Release designation** | London | | | | +-------------------------+-------------------------------------------+ @@ -40,20 +40,21 @@ Release Data New features ------------ -The CCSDK Kohn release includes the following features: +The CCSDK London release includes the following features: -* Upgrade to OpenDaylight Sulfur Release (Jira `CCSDK-3673 `_) -* CCSDK Enhancements for 5G OOF SON use case in Kohn release (Jira `CCSDK-3644 `_) -* A1 Adapter and A1 Policy Managements Enhancements in Kohn Release - CCSDK (Jira `CCSDK-3617 `_) -* Prepare for removal of Bierman RESTCONF in ODL Chlorine release (Jira `CCSDK-3674 `_) +* +* Upgrade to OpenDaylight Chlorine Release (Jira `CCSDK-3812 `_) +* CCSDK Enhancements for 5G OOF SON use case in London release (Jira `CCSDK-3817 `_) +* A1 Adapter and A1 Policy Managements Enhancements in London Release - CCSDK (Jira `CCSDK-3809 `_) -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 CCSDK Kohn release `_ is maintained on the `ONAP Jira`_. +The full list of `bugs fixed in the CCSDK London release `_ is maintained on the `ONAP Jira`_. **Known Issues** @@ -92,45 +93,45 @@ Software Deliverables Docker Containers ````````````````` -The following table lists the docker containers comprising the CCSDK Jakarta -release along with the current stable Jakarta version/tag. Each of these is +The following table lists the docker containers comprising the CCSDK London +release along with the current stable London version/tag. Each of these is available on the ONAP nexus3 site (https://nexus3.onap.org) and can be downloaded with the following command:: docker pull nexus3.onap.org:10001/{image-name}:{version} -Note: users that want to use the latest in-development Jakarta version may use the -tag 1.3-STAGING-latest to pull the latest daily Jakarta build +Note: users that want to use the latest in-development London version may use the +tag 1.3-STAGING-latest to pull the latest daily London build +------------------------------------------+--------------------------------------------+---------+ | Image name | Description | Version | +==========================================+============================================+=========+ -| onap/ccsdk-alpine-j11-image | Base Alpine Linux image for CCSDK | 1.4.2 | +| onap/ccsdk-alpine-j11-image | Base Alpine Linux image for CCSDK | 1.5.2 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-ansible-server-image | Ansible server image | 1.4.2 | +| onap/ccsdk-ansible-server-image | Ansible server image | 1.5.2 | +------------------------------------------+--------------------------------------------+---------+ | onap/ccsdk-apps-ms-neng | Naming microservice | 1.4.1 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-blueprints-processor | CDS blueprint processor | 1.4.1 | +| onap/ccsdk-blueprints-processor | CDS blueprint processor | 1.5.1 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-cds-ui-server | CDS user interface back end | 1.4.1 | +| onap/ccsdk-cds-ui-server | CDS user interface back end | 1.5.1 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-commandexecutor | CDS command executor | 1.4.1 | +| onap/ccsdk-commandexecutor | CDS command executor | 1.5.1 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-controllerblueprint | CDS controller blueprints | 1.4.1 | +| onap/ccsdk-controllerblueprint | CDS controller blueprints | 1.5.1 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-dgbuilder-image | Directed graph builder | 1.4.1 | +| onap/ccsdk-dgbuilder-image | Directed graph builder | 1.5.2 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-odl-sodium-alpine-image | Alpine based OpenDaylight Sodium image | 1.4.2 | +| onap/ccsdk-odl-chlorine-alpine-image | Alpine based OpenDaylight Chlorine image | 1.5.2 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-odlsli-alpine-image | Alpine based OpenDaylight image with CCSDK | 1.4.2 | +| onap/ccsdk-odlsli-alpine-image | Alpine based OpenDaylight image with CCSDK | 1.5.2 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-saltstack-server-image | Saltstack server | 1.4.2 | +| onap/ccsdk-saltstack-server-image | Saltstack server | 1.5.2 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-sdclistener | CDS SDC listener | 1.4.1 | +| onap/ccsdk-sdclistener | CDS SDC listener | 1.5.1 | +------------------------------------------+--------------------------------------------+---------+ -| onap/ccsdk-ubuntu-image | Base Ubuntu image for CCSDK | 1.4.2 | +| onap/ccsdk-ubuntu-image | Base Ubuntu image for CCSDK | 1.5.2 | +------------------------------------------+--------------------------------------------+---------+ Maven Artifacts @@ -153,41 +154,41 @@ Frankfurt version of each. +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ | groupId | artifactId | version | Description | +=======================+===============================+=========+==================================================================================================+ -| org.onap.ccsdk.parent | binding-parent | 2.4.4 | Parent used in place of OpenDaylight binding-parent | +| org.onap.ccsdk.parent | binding-parent | 2.5.4 | Parent used in place of OpenDaylight binding-parent | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | bundle-parent | 2.4.4 | Parent used in place of OpenDaylight bundle-parent | +| org.onap.ccsdk.parent | bundle-parent | 2.5.4 | Parent used in place of OpenDaylight bundle-parent | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | client-parent | 2.4.4 | Parent used for projects that create client libraries for OpenDaylight APIs | +| org.onap.ccsdk.parent | client-parent | 2.5.4 | Parent used for projects that create client libraries for OpenDaylight APIs | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | dependencies-bom | 2.4.4 | Bill of Materials POM that defines versions of third party libraries used outside ODL container. | +| org.onap.ccsdk.parent | dependencies-bom | 2.5.4 | Bill of Materials POM that defines versions of third party libraries used outside ODL container. | | | | | Intended to be imported in dependencyManagement section. | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | dependencies-odl-bom | 2.4.4 | Bill of Materials POM that defines versions of third party libraries used within ODL container. | +| org.onap.ccsdk.parent | dependencies-odl-bom | 2.5.4 | Bill of Materials POM that defines versions of third party libraries used within ODL container. | | | | | Intended to be imported in dependencyManagement section. | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | feature-repo-parent | 2.4.4 | Parent used in place of OpenDaylight feature-repo-parent | +| org.onap.ccsdk.parent | feature-repo-parent | 2.5.4 | Parent used in place of OpenDaylight feature-repo-parent | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | karaf4-parent | 2.4.4 | Parent used in place of OpenDaylight karaf4-parent | +| org.onap.ccsdk.parent | karaf4-parent | 2.5.4 | Parent used in place of OpenDaylight karaf4-parent | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | mdsal-it-parent | 2.4.4 | Parent used in place of OpenDaylight mdsal-it-parent | +| org.onap.ccsdk.parent | mdsal-it-parent | 2.5.4 | Parent used in place of OpenDaylight mdsal-it-parent | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | odlparent | 2.4.4 | Parent used in place of OpenDaylight odlparent | +| org.onap.ccsdk.parent | odlparent | 2.5.4 | Parent used in place of OpenDaylight odlparent | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | odlparent-lite | 2.4.4 | Parent used in place of OpenDaylight odlparent-lite | +| org.onap.ccsdk.parent | odlparent-lite | 2.5.4 | Parent used in place of OpenDaylight odlparent-lite | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | single-feature-parent | 2.4.4 | Parent used in place of OpenDaylight single-feature-parent | +| org.onap.ccsdk.parent | single-feature-parent | 2.5.4 | Parent used in place of OpenDaylight single-feature-parent | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | spring-boot-1-starter-parent | 2.4.4 | Parent used in place of spring-boot-starter-parent for Springboot 1.x. | +| org.onap.ccsdk.parent | spring-boot-1-starter-parent | 2.5.4 | Parent used in place of spring-boot-starter-parent for Springboot 1.x. | | | | | *NOTE* This is deprecated and will be removed in a future release, since springboot 1.x should | | | | | no longer be used due to security issues | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | spring-boot-25-starter-parent | 2.4.4 | Parent used in place of spring-boot-starter-parent for Springboot 2.5.x | +| org.onap.ccsdk.parent | spring-boot-25-starter-parent | 2.5.4 | Parent used in place of spring-boot-starter-parent for Springboot 2.5.x | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | spring-boot-26-starter-parent | 2.4.4 | Parent used in place of spring-boot-starter-parent for Springboot 2.6.x | +| org.onap.ccsdk.parent | spring-boot-26-starter-parent | 2.5.4 | Parent used in place of spring-boot-starter-parent for Springboot 2.6.x | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | spring-boot-starter-parent | 2.4.4 | Parent used in place of spring-boot-starter-parent for Springboot 2.3.x | +| org.onap.ccsdk.parent | spring-boot-starter-parent | 2.5.4 | Parent used in place of spring-boot-starter-parent for Springboot 2.3.x | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ -| org.onap.ccsdk.parent | standalone-parent | 2.4.4 | Parent used for projects that have no need for other third party parent poms | +| org.onap.ccsdk.parent | standalone-parent | 2.5.4 | Parent used for projects that have no need for other third party parent poms | +-----------------------+-------------------------------+---------+--------------------------------------------------------------------------------------------------+ ccsdk/sli @@ -201,55 +202,55 @@ projects. +-------------------------------+------------------------------+---------+--------------------------------------------+ | groupId | artifactId | version | Description | +===============================+==============================+=========+============================================+ -| org.onap.ccsdk.sli.core | dblib-provider | 1.5.2 | Database access library | +| org.onap.ccsdk.sli.core | dblib-provider | 1.6.3 | Database access library | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.core | sli-common | 1.5.2 | Common SLI data objects | +| org.onap.ccsdk.sli.core | sli-common | 1.6.3 | Common SLI data objects | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.core | sli-provider-base | 1.5.2 | ODL-independent SLI implementation objects | +| org.onap.ccsdk.sli.core | sli-provider-base | 1.6.3 | ODL-independent SLI implementation objects | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.core | sli-provider | 1.5.2 | ODL-dependent SLI implementation objects | +| org.onap.ccsdk.sli.core | sli-provider | 1.6.3 | ODL-dependent SLI implementation objects | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.core | sliPluginUtils-provider | 1.5.2 | Utilities for use in SLI adaptors/plugins | +| org.onap.ccsdk.sli.core | sliPluginUtils-provider | 1.6.3 | Utilities for use in SLI adaptors/plugins | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.core | utils-provider | 1.5.2 | Utilities | +| org.onap.ccsdk.sli.core | utils-provider | 1.6.3 | Utilities | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.adaptors | aai-service-provider | 1.5.2 | A&AI interface adaptor | +| org.onap.ccsdk.sli.adaptors | aai-service-provider | 1.6.3 | A&AI interface adaptor | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.adaptors | ansible-adapter-bundle | 1.5.2 | Ansible interface adaptor | +| org.onap.ccsdk.sli.adaptors | ansible-adapter-bundle | 1.6.3 | Ansible interface adaptor | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.adaptors | mdsal-resource-provider | 1.5.2 | MD-SAL interface adaptor | +| org.onap.ccsdk.sli.adaptors | mdsal-resource-provider | 1.6.3 | MD-SAL interface adaptor | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.adaptors | netbox-client-provider | 1.5.2 | netbox interface adaptor | +| org.onap.ccsdk.sli.adaptors | netbox-client-provider | 1.6.3 | netbox interface adaptor | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.adaptors | resource-assignment-provider | 1.5.2 | resource allocator | +| org.onap.ccsdk.sli.adaptors | resource-assignment-provider | 1.6.3 | resource allocator | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.adaptors | saltstack-adaptor-provider | 1.5.2 | saltstack interface adaptor | +| org.onap.ccsdk.sli.adaptors | saltstack-adaptor-provider | 1.6.3 | saltstack interface adaptor | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.adaptors | sql-resource-provider | 1.5.2 | SQL database interface adaptor | +| org.onap.ccsdk.sli.adaptors | sql-resource-provider | 1.6.3 | SQL database interface adaptor | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.northbound | asdcApi-provider | 1.5.2 | ODL-based SDC interface | +| org.onap.ccsdk.sli.northbound | asdcApi-provider | 1.6.3 | ODL-based SDC interface | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.northbound | dataChange-provider | 1.5.2 | A&AI data change notification interface | +| org.onap.ccsdk.sli.northbound | dataChange-provider | 1.6.3 | A&AI data change notification interface | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.northbound | dmaap-listener | 1.5.2 | DMaaP listener interface | +| org.onap.ccsdk.sli.northbound | dmaap-listener | 1.6.3 | DMaaP listener interface | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.northbound | lcm-provider | 1.5.2 | Life Cycle Management event interface | +| org.onap.ccsdk.sli.northbound | lcm-provider | 1.6.3 | Life Cycle Management event interface | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.northbound | ueb-listener | 1.5.2 | SDC event listener | +| org.onap.ccsdk.sli.northbound | ueb-listener | 1.6.3 | SDC event listener | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.plugins | properties-node-provider | 1.5.2 | Used to load a properties file for use in | +| org.onap.ccsdk.sli.plugins | properties-node-provider | 1.6.3 | Used to load a properties file for use in | | | | | a directed graph | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.plugins | restapi-call-node-provider | 1.5.2 | Used to call a generic REST API from a | +| org.onap.ccsdk.sli.plugins | restapi-call-node-provider | 1.6.3 | Used to call a generic REST API from a | | | | | directed graph | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.plugins | restconf-client-provider | 1.5.2 | Used to call a RESTCONF API from a | +| org.onap.ccsdk.sli.plugins | restconf-client-provider | 1.6.3 | Used to call a RESTCONF API from a | | | | | directed graph | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.plugins | sshapi-call-node | 1.5.2 | Used to invoke an SSH interface from a | +| org.onap.ccsdk.sli.plugins | sshapi-call-node | 1.6.3 | Used to invoke an SSH interface from a | | | | | directed graph | +-------------------------------+------------------------------+---------+--------------------------------------------+ -| org.onap.ccsdk.sli.plugins | template-node-provider | 1.5.2 | Provides velocity template support | +| org.onap.ccsdk.sli.plugins | template-node-provider | 1.6.3 | Provides velocity template support | +-------------------------------+------------------------------+---------+--------------------------------------------+ Documentation Deliverables @@ -285,7 +286,7 @@ Security Notes Fixed Security Issues ~~~~~~~~~~~~~~~~~~~~~ -There are no new security fixes in the Jakarta release. +There are no new security fixes in the London release. .. _secissues : @@ -306,7 +307,7 @@ Not applicable References ========== -For more information on the ONAP Jakarta release, please see: +For more information on the ONAP London release, please see: #. `ONAP Home Page`_ #. `ONAP Documentation`_ -- 2.16.6 From 080d79ed50f01191d36752df6e3b616df4ca695f Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 14 Jun 2023 17:35:20 -0400 Subject: [PATCH 03/16] Convert scripts to python3 Convert python2 scripts to python3 Issue-ID: CCSDK-3906 Signed-off-by: Dan Timoney Change-Id: I1435eb3381631a759866cc2e671cd350e12a031e --- .../src/main/ansible-server/UsersRestServer.py | 78 +++++++++++----------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/ansible-server/src/main/ansible-server/UsersRestServer.py b/ansible-server/src/main/ansible-server/UsersRestServer.py index 5b664e40..d4566b88 100755 --- a/ansible-server/src/main/ansible-server/UsersRestServer.py +++ b/ansible-server/src/main/ansible-server/UsersRestServer.py @@ -157,8 +157,8 @@ def RunAnsible_Playbook (callback, Id, Inventory, Playbook, NodeList, TestRecord f = open(Path + "/" + file, "r") resultsData = f.read() # Not to pass vnf instance name OutputP = json.loads(resultsData) - Output['Output'] = OutputP - cherrypy.log("Output = " + str(Output['Output'])) + Output['Output'] = OutputP + cherrypy.log("Output = " + str(Output['Output'])) #Output['Output'][key] = f.read() # To pass vnf instance name f.close() @@ -341,7 +341,7 @@ class TestManager (object): if True: if not input_json['Id'] in TestRecord: - # check if Id exists in previous run dirctory + # check if Id exists in previous run dirctory # if so retun error s_cmd = 'ls ' + ansible_temp + '/*_' + input_json['Id'] #if subprocess.check_output([s_cmd, ]): @@ -359,7 +359,7 @@ class TestManager (object): # cherrypy.log("EnvParameter object: " + i) # cherrypy.log(" EnvParameter Value: " + EnvParameters[ i ]) - # Now get things out of EnvParameters + # Now get things out of EnvParameters VNF_instance = None VNF_instance = EnvParameters.get('vnf_instance') @@ -392,42 +392,42 @@ class TestManager (object): # Verify VNF_instance was passed in EnvParameters if VNF_instance != None: - cherrypy.log( "Request Decode: VnfInstance " + VNF_instance) + cherrypy.log( "Request Decode: VnfInstance " + VNF_instance) else: - cherrypy.log( "StatusCode: 107, StatusMessage: VNF_instance NOT PROVIDED" ) + cherrypy.log( "StatusCode: 107, StatusMessage: VNF_instance NOT PROVIDED" ) return {"StatusCode": 107, "StatusMessage": "VNF_instance NOT PROVIDED"} if inventory_names != None: - cherrypy.log( "Request Decode: Inventory Names " + inventory_names) + cherrypy.log( "Request Decode: Inventory Names " + inventory_names) else: - cherrypy.log( "Request Decode: Inventory Names " + "Not provided") - - cherrypy.log( "Request Decode: PlaybookName " + PlaybookName) - PlayBookFunction = PlaybookName.rsplit("/",2)[1] - PlayBookFile = PlayBookFunction + "/site.yml" - cherrypy.log( "Request Decode: PlaybookFunction " + PlayBookFunction) - cherrypy.log( "Request Decode: Playbook file " + PlayBookFile) - + cherrypy.log( "Request Decode: Inventory Names " + "Not provided") + + cherrypy.log( "Request Decode: PlaybookName " + PlaybookName) + PlayBookFunction = PlaybookName.rsplit("/",2)[1] + PlayBookFile = PlayBookFunction + "/site.yml" + cherrypy.log( "Request Decode: PlaybookFunction " + PlayBookFunction) + cherrypy.log( "Request Decode: Playbook file " + PlayBookFile) + BaseDir = ansible_path + "/" + PlaybookName.rsplit("/",1)[0] CopyDir = ansible_path + "/" + PlaybookName.rsplit("/",2)[0] - cherrypy.log( "Request Decode: Basedir " + BaseDir) - cherrypy.log( "Request Decode: Copydir " + CopyDir) - + cherrypy.log( "Request Decode: Basedir " + BaseDir) + cherrypy.log( "Request Decode: Copydir " + CopyDir) + PlaybookDir = ansible_temp + "/" + \ VNF_instance + "_" + str_uuid + "_" + str(Id) - # AnsibleInv is the directory where the host file to be run exsists + # AnsibleInv is the directory where the host file to be run exsists AnsibleInv = ansible_path + "/" + VnfType + "/latest/ansible/inventory/" + VNF_instance ArchiveFlag = False - # Create base run directory if it doesn't exist + # Create base run directory if it doesn't exist if not os.path.exists(ansible_temp): cherrypy.log( "Creating Base Run Directory: " + ansible_temp) os.makedirs(ansible_temp) - if not os.path.exists( CopyDir ): + if not os.path.exists( CopyDir ): cherrypy.log("Playbook Not Found") return {"StatusCode": 101, "StatusMessage": "PLAYBOOK NOT FOUND"} @@ -443,7 +443,7 @@ class TestManager (object): cherrypy.log( "PlaybookDir: " + PlaybookDir) cherrypy.log( "AnsibleInv: " + AnsibleInv) - #location of host file + #location of host file #HostFile = PlaybookDir + "/inventory/" + VNF_instance + "hosts" #cherrypy.log("HostFile: " + HostFile) @@ -467,14 +467,14 @@ class TestManager (object): #AnsibleInvFail = False # ??? HaveNodeList = True - ############################################################################### - ##### Host file processing ########################### - ##### 1. Use file delivered with playbook ########################### - ##### 2. If HostNames + NodeList generate and use ########################### - ##### 3. If HostNames = VM or NVF copy and use. ########################### - ############################################################################### + ############################################################################### + ##### Host file processing ########################### + ##### 1. Use file delivered with playbook ########################### + ##### 2. If HostNames + NodeList generate and use ########################### + ##### 3. If HostNames = VM or NVF copy and use. ########################### + ############################################################################### - #location of host file - Default + #location of host file - Default HostFile = PlaybookDir + "/inventory/" + VNF_instance + "hosts" cherrypy.log("HostFile: " + HostFile) @@ -545,9 +545,9 @@ class TestManager (object): if 'CallBack' in input_json: callback_flag = input_json['CallBack'] - # if AnsibleServer is not set to 'na' don't send AnsibleServer in PENDING responce. - if AnsibleServer != 'na': - TestRecord[Id] = {'PlaybookName': PlaybookName, + # if AnsibleServer is not set to 'na' don't send AnsibleServer in PENDING responce. + if AnsibleServer != 'na': + TestRecord[Id] = {'PlaybookName': PlaybookName, 'Version': version, 'NodeList': NodeList, 'HostGroupList': hostgrouplist, @@ -567,8 +567,8 @@ class TestManager (object): 'Output': {}, 'Path': PlaybookDir, 'Mandatory': None} - else: - TestRecord[Id] = {'PlaybookName': PlaybookName, + else: + TestRecord[Id] = {'PlaybookName': PlaybookName, 'Version': version, 'NodeList': NodeList, 'HostGroupList': hostgrouplist, @@ -601,7 +601,7 @@ class TestManager (object): # Process playbook - if os.path.exists( ansible_path + '/' + PlaybookName): + if os.path.exists( ansible_path + '/' + PlaybookName): AnsiblePlaybookFail = False if AnsiblePlaybookFail: @@ -713,8 +713,8 @@ class TestManager (object): cherrypy.log("Payload: " + str(input_data) + " Type " + input_data['Type']) if 'LogRest' in input_data['Type']: - sys.stdout.close() - sys.stdout = open("/var/log/RestServer.log", "w") + sys.stdout.close() + sys.stdout = open("/var/log/RestServer.log", "w") # Just a debug to dump any records if 'GetStatus' in input_data['Type']: @@ -885,7 +885,7 @@ class TestManager (object): else: playbooknametxt = "NA" - # Add code to get other items not just output.log from files + # Add code to get other items not just output.log from files if os.path.exists( rdir + "/log.file"): cherrypy.log("Found log.file") out_results = "NA:" @@ -893,7 +893,7 @@ class TestManager (object): line = f.readline() while line : - if "fatal" in line: + if "fatal" in line: out_results = out_results + line elif "RECAP" in line: out_results = out_results + line -- 2.16.6 From 3eb23368a84f41491105f53c9c3abf095797f65c Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Mon, 19 Jun 2023 17:09:11 +0200 Subject: [PATCH 04/16] Update .readthedocs.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Issue-ID: DOC-811 Signed-off-by: Cédric Ollivier Change-Id: Ibfd7272a646f426f653d3a02f90861a4c5d1cbe9 --- .readthedocs.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 3797dc8b..f56b3b71 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,18 +3,16 @@ # Read the Docs configuration file # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details # Required -version: 2 - -formats: - - htmlzip +version: 2 build: - image: latest + os: ubuntu-20.04 + tools: + python: "3.8" python: - version: 3.7 install: - - requirements: docs/requirements-docs.txt + - requirements: docs/requirements-docs.txt sphinx: configuration: docs/conf.py -- 2.16.6 From 1cd7d6526c05daed8c2de0452479ece1b12b62fd Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 19 Jun 2023 10:30:12 -0400 Subject: [PATCH 05/16] Create ODL Argon docker Added code to create base OpenDaylight Argon SR1 docker Issue-ID: CCSDK-3913 Signed-off-by: Dan Timoney Change-Id: I9459a36e35d6291e9d85a7a907091b61610a971c --- .../{sulfur/sulfur-alpine => argon/argon-alpine}/pom.xml | 10 +++++----- .../argon-alpine}/src/main/docker/Dockerfile | 2 +- opendaylight/{sulfur => argon}/pom.xml | 8 ++++---- opendaylight/pom.xml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename opendaylight/{sulfur/sulfur-alpine => argon/argon-alpine}/pom.xml (96%) rename opendaylight/{sulfur/sulfur-alpine => argon/argon-alpine}/src/main/docker/Dockerfile (96%) rename opendaylight/{sulfur => argon}/pom.xml (82%) diff --git a/opendaylight/sulfur/sulfur-alpine/pom.xml b/opendaylight/argon/argon-alpine/pom.xml similarity index 96% rename from opendaylight/sulfur/sulfur-alpine/pom.xml rename to opendaylight/argon/argon-alpine/pom.xml index 43821870..a7ca5cc2 100644 --- a/opendaylight/sulfur/sulfur-alpine/pom.xml +++ b/opendaylight/argon/argon-alpine/pom.xml @@ -4,23 +4,23 @@ org.onap.ccsdk.distribution - distribution-odl-sulfur + distribution-odl-argon 1.6.0-SNAPSHOT - distribution-odl-sulfur-docker + distribution-odl-chlorine-argon pom - ccsdk-distribution :: opendaylight :: sulfur :: docker + ccsdk-distribution :: opendaylight :: argon :: docker Creates OpenDaylight container ONAP - onap/ccsdk-odl-sulfur-alpine-image + onap/ccsdk-odl-argon-alpine-image onap-karaf - 0.15.5 + 0.16.6 diff --git a/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile b/opendaylight/argon/argon-alpine/src/main/docker/Dockerfile similarity index 96% rename from opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile rename to opendaylight/argon/argon-alpine/src/main/docker/Dockerfile index 15b17d80..45063110 100644 --- a/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile +++ b/opendaylight/argon/argon-alpine/src/main/docker/Dockerfile @@ -1,6 +1,6 @@ # Prepare stage for multistage image build ## START OF STAGE0 ## -FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} AS stage0 +FROM onap/ccsdk-alpine-j17-image:${project.docker.latestfulltag.version} AS stage0 USER root ENV ODL_HOME /opt/opendaylight/current diff --git a/opendaylight/sulfur/pom.xml b/opendaylight/argon/pom.xml similarity index 82% rename from opendaylight/sulfur/pom.xml rename to opendaylight/argon/pom.xml index e1c7071e..7b21e3a1 100644 --- a/opendaylight/sulfur/pom.xml +++ b/opendaylight/argon/pom.xml @@ -8,18 +8,18 @@ 1.6.0-SNAPSHOT - distribution-odl-sulfur + distribution-odl-argon pom - ccsdk-distribution :: opendaylight :: sulfur + ccsdk-distribution :: opendaylight :: argon Creates OpenDaylight container - sulfur-alpine + argon-alpine - 0.16.1 + 0.18.1 diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 931664a6..999001f3 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -15,7 +15,7 @@ Creates OpenDaylight container - sulfur chlorine + argon -- 2.16.6 From 1dd9578b9109223a957fd1bfd1ded4f00d072614 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 26 Jul 2023 10:30:18 -0400 Subject: [PATCH 06/16] Update ccsdk/distribution for ODL Argon Update ccsdk/distribution to use OpenDaylight Argon release Issue-ID: CCSDK-3926 Signed-off-by: Dan Timoney Change-Id: I52287f7f0f12dd920ed4d4bb9c7034b7f72078a8 --- .gitignore | 4 ++++ alpine/java17/pom.xml | 20 +++++++++++++++++++ alpine/java17/src/main/docker/Dockerfile | 23 ++++++++++++++++------ .../src/main/resources/README-custom-certs.md | 3 +++ dependencies/pom.xml | 2 +- odlsli/odlsli-alpine/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 alpine/java17/src/main/resources/README-custom-certs.md diff --git a/.gitignore b/.gitignore index 4ca286c2..4a62595f 100755 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,7 @@ blackDuckHubProjectVersionName.txt # Generated dependency list direct-dependencies.txt + +# Ignore pems - these are only intended to aid in local compiles +# and should not be shared +*.pem diff --git a/alpine/java17/pom.xml b/alpine/java17/pom.xml index 5c590f6b..8a09a0be 100644 --- a/alpine/java17/pom.xml +++ b/alpine/java17/pom.xml @@ -64,6 +64,26 @@ + + copy-certificates + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/resources + + *.pem + *.md + + false + + + + diff --git a/alpine/java17/src/main/docker/Dockerfile b/alpine/java17/src/main/docker/Dockerfile index 192d618b..5018e1af 100644 --- a/alpine/java17/src/main/docker/Dockerfile +++ b/alpine/java17/src/main/docker/Dockerfile @@ -3,16 +3,27 @@ FROM ${base.image}:${base.image.version} MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) USER root -ARG HTTP_PROXY -ARG HTTPS_PROXY +ARG http_proxy +ARG https_proxy +ARG no_proxy -ENV HTTP_PROXY ${HTTP_PROXY} -ENV http_proxy ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} -ENV https_proxy ${HTTPS_PROXY} +ENV HTTP_PROXY $http_proxy +ENV http_proxy $http_proxy +ENV HTTPS_PROXY $https_proxy +ENV https_proxy $https_proxy +ENV NO_PROXY $no_proxy +ENV no_proxy $no_proxy ENV JAVA_HOME /opt/java/openjdk +# Copy any certs +COPY *.md *.pem /etc/ssl/certs/ + +# Install certs +RUN update-ca-certificates + +RUN echo "http_proxy = $http_proxy" && echo "https_proxy = $https_proxy" && echo "no_proxy = $no_proxy" && echo "HTTP_PROXY = $HTTP_PROXY" && echo "HTTPS_PROXY = $HTTPS_PROXY" && echo "NO_PROXY = $NO_PROXY" + # Add tools needed for OpenDaylight RUN apk update && apk --no-cache add sudo bash iputils openssl git mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss diff --git a/alpine/java17/src/main/resources/README-custom-certs.md b/alpine/java17/src/main/resources/README-custom-certs.md new file mode 100644 index 00000000..ac414c11 --- /dev/null +++ b/alpine/java17/src/main/resources/README-custom-certs.md @@ -0,0 +1,3 @@ +Any .pem files in this directory will be copied to /etc/ssl/certs on the +docker container and installed prior to running apk. This might be needed, +for example, for docker builds to work properly behind a corporate firewall. diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 4d989c7f..3b18df4a 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -216,7 +216,7 @@ com.google.errorprone error_prone_annotations - 2.16 + 2.18.0 diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 30c7a906..8d7b69a2 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -18,7 +18,7 @@ - onap/ccsdk-odl-chlorine-alpine-image + onap/ccsdk-odl-argon-alpine-image onap/ccsdk-odlsli-alpine-image ${project.version} diff --git a/pom.xml b/pom.xml index 62c40807..8766bac6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent oparent - 2.5.4 + 2.6.0 org.onap.ccsdk.distribution @@ -31,7 +31,7 @@ distribution - 1.6.2 + 1.7.1-SNAPSHOT ${project.version} ${project.version} -- 2.16.6 From 9d493620847865c73d12e73df5a25d5b70d298f8 Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Sat, 7 Oct 2023 13:15:24 +0530 Subject: [PATCH 07/16] Include kafka client dependency Include kafka client dependency Issue-ID: CCSDK-3936 Change-Id: Ic3498ad22750af97344ee8dbae004bf7a00b6502 Signed-off-by: Ravi Pendurty --- dependencies/pom.xml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 3b18df4a..1f203990 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -95,7 +95,7 @@ javax javaee-api - + javax.annotation javax.annotation-api 1.3.1 @@ -136,10 +136,10 @@ org.dom4j dom4j - - org.glassfish.jaxb - jaxb-runtime - + + org.glassfish.jaxb + jaxb-runtime + org.glassfish.jersey.bundles.repackaged jersey-guava @@ -160,11 +160,11 @@ org.glassfish.jersey.security oauth1-client - - org.json - json - 20201115 - + + org.json + json + 20201115 + org.mariadb.jdbc mariadb-java-client @@ -218,6 +218,12 @@ error_prone_annotations 2.18.0 + + + org.apache.kafka + kafka-clients + 3.0.0 + -- 2.16.6 From ae4d13533f8866c740b70ddc93fb535255fe10f5 Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Thu, 12 Oct 2023 13:28:25 +0530 Subject: [PATCH 08/16] Login not working with Custom credentials due to wrong aaa-authn-api version aaa-authn-api version to be updated from 0.16.6 to 0.17.8 Issue-ID: SDNC-1823 Change-Id: I27b5fa043d525bdeb60378ee05aeded9e23734ea Signed-off-by: Ravi Pendurty --- opendaylight/argon/argon-alpine/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendaylight/argon/argon-alpine/pom.xml b/opendaylight/argon/argon-alpine/pom.xml index a7ca5cc2..6b29e7a3 100644 --- a/opendaylight/argon/argon-alpine/pom.xml +++ b/opendaylight/argon/argon-alpine/pom.xml @@ -20,7 +20,7 @@ onap/ccsdk-odl-argon-alpine-image onap-karaf - 0.16.6 + 0.17.8 -- 2.16.6 From 6fbbadb867a69d65761086789a0b411452e8ea3a Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 16 Aug 2023 14:06:36 -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 and support local build of ansible-server Issue-ID: CCSDK-3944 Signed-off-by: Dan Timoney Change-Id: I6d454ecc4ec3d1fecd10bf823ca5b828718e5fea --- ansible-server/pom.xml | 20 +++++++++++++++++ ansible-server/src/main/Dockerfile | 25 +++++++++++++++++----- .../src/main/resources/README-custom-certs.md | 3 +++ dependencies/pom.xml | 2 +- opendaylight/argon/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 ansible-server/src/main/resources/README-custom-certs.md diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 15faf5ae..1a56fee6 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -71,6 +71,26 @@ + + copy-certificates + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/resources + + *.pem + *.md + + false + + + + diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile index 1aeb186f..984333da 100644 --- a/ansible-server/src/main/Dockerfile +++ b/ansible-server/src/main/Dockerfile @@ -2,10 +2,17 @@ FROM onap/integration-python:8.0.0 LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)" USER root -ENV http_proxy ${http_proxy} -ENV https_proxy ${https_proxy} +ARG http_proxy +ARG https_proxy +ARG no_proxy +ARG CURL_CA_BUNDLE + +ENV http_proxy $http_proxy +ENV https_proxy $https_proxy +ENV no_proxy $no_proxy ENV PIP_EXTRA_OPTS ${https_proxy:+"--trusted-host pypi.org --trusted-host files.pythonhosted.org --proxy=${https_proxy}"} ENV PIP_EXTRA_OPTS ${PIP_EXTRA_OPTS:-""} +ENV CURL_CA_BUNDLE=$CURL_CA_BUNDLE ARG PIP_TAG=18.0 @@ -13,12 +20,20 @@ RUN addgroup -S ansible && adduser -S ansible -G ansible COPY --chown=ansible:ansible ansible-server /opt/ansible-server COPY --chown=ansible:ansible configuration/ansible.cfg /etc/ansible/ansible.cfg +# Copy any certs +COPY *.md *.pem /etc/ssl/certs/ + +# Install certs +RUN update-ca-certificates + +RUN echo $CURL_CA_BUNDLE && ls -l $CURL_CA_BUNDLE + RUN apk add --no-cache curl iputils bash openssh-client \ - && curl https://sh.rustup.rs -sSf | sh -s -- -y \ + && curl -k https://sh.rustup.rs -sSf | sh -s -- -y \ && source $HOME/.cargo/env \ && apk add --no-cache --virtual .build-deps build-base libffi-dev openssl-dev python3-dev \ - && pip3 install --no-cache-dir --upgrade pip ${PIP_EXTRA_OPTS} \ - && pip3 install --no-cache-dir -r /opt/ansible-server/requirements.txt ${PIP_EXTRA_OPTS} \ + && pip3 install --no-cache-dir --trusted-host pypi.org --trusted-host files.pythonhosted.org --upgrade pip ${PIP_EXTRA_OPTS} \ + && pip3 install --no-cache-dir --trusted-host pypi.org --trusted-host files.pythonhosted.org -r /opt/ansible-server/requirements.txt ${PIP_EXTRA_OPTS} \ && apk del .build-deps \ && mkdir -p /opt/onap \ && touch /var/log/ansible-server.log \ diff --git a/ansible-server/src/main/resources/README-custom-certs.md b/ansible-server/src/main/resources/README-custom-certs.md new file mode 100644 index 00000000..ac414c11 --- /dev/null +++ b/ansible-server/src/main/resources/README-custom-certs.md @@ -0,0 +1,3 @@ +Any .pem files in this directory will be copied to /etc/ssl/certs on the +docker container and installed prior to running apk. This might be needed, +for example, for docker builds to work properly behind a corporate firewall. diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 3b18df4a..8eea86a9 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -216,7 +216,7 @@ com.google.errorprone error_prone_annotations - 2.18.0 + 2.19.1 diff --git a/opendaylight/argon/pom.xml b/opendaylight/argon/pom.xml index 7b21e3a1..07003689 100644 --- a/opendaylight/argon/pom.xml +++ b/opendaylight/argon/pom.xml @@ -19,7 +19,7 @@ - 0.18.1 + 0.18.2 diff --git a/pom.xml b/pom.xml index 8766bac6..cfcc1dfd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent oparent - 2.6.0 + 2.6.1 org.onap.ccsdk.distribution @@ -31,7 +31,7 @@ distribution - 1.7.1-SNAPSHOT + 1.7.1 ${project.version} ${project.version} -- 2.16.6 From 41f2b5191a3d0929ce93a2e57c494a91fb90c2b6 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 9 Nov 2023 11:01:52 -0500 Subject: [PATCH 10/16] Release version 1.6.0 docker containers Release version 1.6.0 (Montreal) docker containers Issue-ID: CCSDK-3956 Signed-off-by: Dan Timoney Change-Id: I326f46f36e74a910b6ec8c9f164026e7015542fb --- releases/1.6.0-container.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 releases/1.6.0-container.yaml diff --git a/releases/1.6.0-container.yaml b/releases/1.6.0-container.yaml new file mode 100644 index 00000000..bfea76a1 --- /dev/null +++ b/releases/1.6.0-container.yaml @@ -0,0 +1,21 @@ +--- +distribution_type: 'container' +container_release_tag: '1.6.0' +project: 'ccsdk-distribution' +log_dir: 'ccsdk-distribution-maven-docker-stage-master/1617/' +ref: 4c73c71183c1f445abc0832de5d4045fc383810e +containers: + - name: 'ccsdk-alpine-j11-image' + version: '1.6.0-STAGING-20231109T153658Z' + - name: 'ccsdk-ubuntu-image' + version: '1.6.0-STAGING-20231109T153658Z' + - name: 'ccsdk-odl-argon-alpine-image' + version: '1.6.0-STAGING-20231109T153658Z' + - name: 'ccsdk-odlsli-alpine-image' + version: '1.6.0-SNAPSHOT-20231109T153658Z' + - name: 'ccsdk-dgbuilder-image' + version: '1.6.0-SNAPSHOT-20231109T153658Z' + - name: 'ccsdk-ansible-server-image' + version: '1.6.0-STAGING-20231109T153658Z' + - name: 'ccsdk-saltstack-server-image' + version: '1.6.0-STAGING-20231109T153658Z' -- 2.16.6 From fce1601adb375ffc798e1fb954e3f42cf72a5177 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 9 Nov 2023 11:03:22 -0500 Subject: [PATCH 11/16] Release version 1.6.0 maven artifacts Release version 1.6.0 (Montreal) maven artifacts and roll to next snapshot Issue-ID: CCSDK-3956 Signed-off-by: Dan Timoney Change-Id: I371dfa10e265c130d80b397a60debb3ebb650558 --- alpine/java11/pom.xml | 2 +- alpine/java17/pom.xml | 2 +- alpine/pom.xml | 2 +- ansible-server/pom.xml | 4 ++-- dependencies/pom.xml | 2 +- dgbuilder-docker/pom.xml | 2 +- dgbuilder/pom.xml | 2 +- odlsli/odlsli-alpine/pom.xml | 2 +- odlsli/pom.xml | 2 +- opendaylight/argon/argon-alpine/pom.xml | 2 +- opendaylight/argon/pom.xml | 2 +- opendaylight/chlorine/chlorine-alpine/pom.xml | 2 +- opendaylight/chlorine/pom.xml | 2 +- opendaylight/pom.xml | 2 +- platform-logic/a1Adapter-api/pom.xml | 2 +- platform-logic/asdc-api/pom.xml | 2 +- platform-logic/cMNotify-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/oofpcipoc-api/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/ran-slice-api/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/sliapi/pom.xml | 2 +- pom.xml | 2 +- releases/1.6.0.yaml | 5 +++++ saltstack-server/pom.xml | 2 +- ubuntu/pom.xml | 2 +- version.properties | 2 +- 28 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 releases/1.6.0.yaml diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml index 0c0c0b73..1c409ace 100644 --- a/alpine/java11/pom.xml +++ b/alpine/java11/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-alpine-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-j11-alpine diff --git a/alpine/java17/pom.xml b/alpine/java17/pom.xml index 8a09a0be..2d2aa547 100644 --- a/alpine/java17/pom.xml +++ b/alpine/java17/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-alpine-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-j17-alpine diff --git a/alpine/pom.xml b/alpine/pom.xml index 9f413a5a..3e75d02e 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-alpine-root diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 1a56fee6..2def3872 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT org.onap.ccsdk.distribution ansible-server - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT pom ccsdk-distribution :: ${project.artifactId} diff --git a/dependencies/pom.xml b/dependencies/pom.xml index fa979277..40b183da 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT dependencies diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 5f1db7b1..685cd1ec 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT org.onap.ccsdk.distribution diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index b7679d3a..f18341c8 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT org.onap.ccsdk.distribution diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 8d7b69a2..3973349c 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odlsli - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-odlsli-alpine diff --git a/odlsli/pom.xml b/odlsli/pom.xml index f367103b..31504b51 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-odlsli diff --git a/opendaylight/argon/argon-alpine/pom.xml b/opendaylight/argon/argon-alpine/pom.xml index 6b29e7a3..99e7bb7d 100644 --- a/opendaylight/argon/argon-alpine/pom.xml +++ b/opendaylight/argon/argon-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odl-argon - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-odl-chlorine-argon diff --git a/opendaylight/argon/pom.xml b/opendaylight/argon/pom.xml index 07003689..d6df59b7 100644 --- a/opendaylight/argon/pom.xml +++ b/opendaylight/argon/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-opendaylight - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-odl-argon diff --git a/opendaylight/chlorine/chlorine-alpine/pom.xml b/opendaylight/chlorine/chlorine-alpine/pom.xml index 0762ffe6..36c486f6 100644 --- a/opendaylight/chlorine/chlorine-alpine/pom.xml +++ b/opendaylight/chlorine/chlorine-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odl-chlorine - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-odl-chlorine-docker diff --git a/opendaylight/chlorine/pom.xml b/opendaylight/chlorine/pom.xml index c419929b..1afe7ca8 100644 --- a/opendaylight/chlorine/pom.xml +++ b/opendaylight/chlorine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-opendaylight - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-odl-chlorine diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 999001f3..6b0ddc6a 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-opendaylight diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml index 6cabf9ff..f0a3fb87 100644 --- a/platform-logic/a1Adapter-api/pom.xml +++ b/platform-logic/a1Adapter-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT platform-logic-a1Adapterapi diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index 63a13ac1..cd396643 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT platform-logic-asdcapi diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml index 551c00d1..d2be4171 100644 --- a/platform-logic/cMNotify-api/pom.xml +++ b/platform-logic/cMNotify-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT platform-logic-cMNotifyai diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 83f944e4..d21344e0 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT platform-logic-installer diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index ef02a736..944bd1b6 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT platform-logic-oofpcipocapi diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 738a97db..52915909 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-platform-logic diff --git a/platform-logic/ran-slice-api/pom.xml b/platform-logic/ran-slice-api/pom.xml index b55a1cef..70501842 100644 --- a/platform-logic/ran-slice-api/pom.xml +++ b/platform-logic/ran-slice-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT platform-logic-ranSlice diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 8cff9818..55111651 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 09cdd000..5fcd9ff3 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT platform-logic-sliapi diff --git a/pom.xml b/pom.xml index cfcc1dfd..586147ac 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT pom ccsdk-distribution diff --git a/releases/1.6.0.yaml b/releases/1.6.0.yaml new file mode 100644 index 00000000..8682d356 --- /dev/null +++ b/releases/1.6.0.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '1.6.0' +project: 'ccsdk-distribution' +log_dir: 'ccsdk-distribution-maven-stage-master/376/' diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index f79b205f..bd9a0cda 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT saltstack-server diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index b9ef1e44..17abf072 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT distribution-ubuntu diff --git a/version.properties b/version.properties index 576a5c90..acbf084d 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=1 sprint_number=6 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6 From fed381043f80e3e24f15ea299acbd15c8b7242ce Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Thu, 16 Nov 2023 22:56:46 +0530 Subject: [PATCH 12/16] Support for custom password Use a previous version of custom aaa-authn-api artifact Issue-ID: SDNC-1831 Change-Id: Ibe87206580e65caf6b1f22c2cf66f140c3f4df95 Signed-off-by: Ravi Pendurty --- opendaylight/argon/argon-alpine/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendaylight/argon/argon-alpine/pom.xml b/opendaylight/argon/argon-alpine/pom.xml index 99e7bb7d..a73143a5 100644 --- a/opendaylight/argon/argon-alpine/pom.xml +++ b/opendaylight/argon/argon-alpine/pom.xml @@ -81,7 +81,7 @@ com.highstreet-technologies.aaa aaa-authn-api - ${odl.shiro.version} + 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 * -- 2.16.6 From 7e583fabe6ad63756ab65e3153bb77ba39877c9d Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Mon, 20 Nov 2023 09:58:40 +0530 Subject: [PATCH 13/16] Update odl.shiro.version to 0.17.11 Version to be inline with ODL argon SR2 Issue-ID: SDNC-1831 Change-Id: I2c9003d199daca45e69c2f5bf4aee442cb9e2550 Signed-off-by: Ravi Pendurty --- opendaylight/argon/argon-alpine/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendaylight/argon/argon-alpine/pom.xml b/opendaylight/argon/argon-alpine/pom.xml index a73143a5..bfa0b515 100644 --- a/opendaylight/argon/argon-alpine/pom.xml +++ b/opendaylight/argon/argon-alpine/pom.xml @@ -20,7 +20,7 @@ onap/ccsdk-odl-argon-alpine-image onap-karaf - 0.17.8 + 0.17.11 -- 2.16.6 From 5e84be977662570fc2fea2c17a231eaab896875d Mon Sep 17 00:00:00 2001 From: thmsdt Date: Tue, 20 Feb 2024 14:04:50 +0100 Subject: [PATCH 14/16] add python compatibility module Issue-ID: DOC-823 Change-Id: I45c93f8cf30d42516832e210a8d93a6ee4f4bba4 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 b8159ed0db0b4ecdee533035811f114f0ee31e97 Mon Sep 17 00:00:00 2001 From: thmsdt Date: Tue, 27 Feb 2024 10:56:29 +0100 Subject: [PATCH 15/16] update link to upper-constraints.txt Issue-ID: DOC-823 Change-Id: I2bca6dfe085ae21a6ba42dbc0da4ce1bea266ee2 Signed-off-by: thmsdt --- docs/tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/tox.ini b/docs/tox.ini index 379d8e42..102f6754 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?h=master commands = sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html @@ -21,7 +21,7 @@ allowlist_externals = 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 = echo "Link Checking not enforced" #commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck @@ -31,7 +31,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 78a6ceb2c78f0419a0a00839ea530eb8403b908e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20D=C3=BCrre?= Date: Tue, 26 Mar 2024 13:32:36 +0100 Subject: [PATCH 16/16] fix odl patches MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit fix aaa-authn api version and add pax fix Issue-ID: CCSDK-4002 Change-Id: I4e8ef736c48fd2fa5510a25ea90a5edc9dcfaa04 Signed-off-by: Michael Dürre --- opendaylight/argon/argon-alpine/pom.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/opendaylight/argon/argon-alpine/pom.xml b/opendaylight/argon/argon-alpine/pom.xml index bfa0b515..fb73c666 100644 --- a/opendaylight/argon/argon-alpine/pom.xml +++ b/opendaylight/argon/argon-alpine/pom.xml @@ -21,6 +21,7 @@ onap/ccsdk-odl-argon-alpine-image onap-karaf 0.17.11 + 8.0.15 @@ -78,14 +79,22 @@ - + com.highstreet-technologies.aaa aaa-authn-api - 0.17.8 + ${odl.shiro.version} ${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version} aaa-authn-api-${odl.shiro.version}.jar * + + com.highstreet-technologies.ops4j.pax.web + pax-web-jetty + ${odl.ops4j.version} + ${project.build.directory}/docker-stage/system/org/ops4j/pax/web/pax-web-jetty/${odl.ops4j.version} + pax-web-jetty-${odl.ops4j.version}.jar + * + false true -- 2.16.6