From 28b4c485e428b4ab119ffcfd220002b8ea661145 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Wed, 27 Jul 2022 14:23:29 +0800 Subject: [PATCH 01/16] Bump up version after release 1.8.0 Issue-ID: MULTICLOUD-1476 Signed-off-by: Bin Yang Change-Id: I894a0cfc8328e5223920ddde838ca40b3ca46d52 --- artifactbroker/forwarding/pom.xml | 2 +- artifactbroker/main/pom.xml | 2 +- artifactbroker/model/pom.xml | 2 +- artifactbroker/packages/docker/build_image.sh | 4 ++-- artifactbroker/packages/pom.xml | 2 +- artifactbroker/plugins/forwarding-plugins/pom.xml | 2 +- artifactbroker/plugins/pom.xml | 2 +- artifactbroker/plugins/reception-plugins/pom.xml | 2 +- artifactbroker/pom.xml | 4 ++-- artifactbroker/reception/pom.xml | 2 +- multivimbroker/docker/build_image.sh | 4 ++-- multivimbroker/pom.xml | 4 ++-- pom.xml | 2 +- version.properties | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml index 2203703..3eecfbf 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT multicloud-framework-artifactbroker-forwarding diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index 7d4a1a0..aef5430 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT 4.0.0 multicloud-framework-artifactbroker-main diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index 6425cce..f8092b4 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT multicloud-framework-artifactbroker-model diff --git a/artifactbroker/packages/docker/build_image.sh b/artifactbroker/packages/docker/build_image.sh index e7059a1..62fc553 100755 --- a/artifactbroker/packages/docker/build_image.sh +++ b/artifactbroker/packages/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.8.0-SNAPSHOT" -STAGING_VERSION="1.8.0-STAGING" +VERSION="1.8.1-SNAPSHOT" +STAGING_VERSION="1.8.1-STAGING" PROJECT="multicloud" IMAGE="framework-artifactbroker" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index 9b7bf85..1c1eabe 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT multicloud-framework-artifactbroker-package diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index 1fc35e8..5e3e8af 100644 --- a/artifactbroker/plugins/forwarding-plugins/pom.xml +++ b/artifactbroker/plugins/forwarding-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT multicloud-framework-artifactbroker-forwarding-plugins diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index 74603f7..f08cc53 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT multicloud-framework-artifactbroker-plugins diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index ad29cd0..3b4c6f2 100644 --- a/artifactbroker/plugins/reception-plugins/pom.xml +++ b/artifactbroker/plugins/reception-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT multicloud-framework-artifactbroker-reception-plugins diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index a4af4fe..e9dbbc9 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -17,12 +17,12 @@ org.onap.multicloud.framework multicloud-framework - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT 4.0.0 org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT pom multicloud-framework-artifactbroker artifact broker diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index e8d1f72..8911ba2 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT multicloud-framework-artifactbroker-reception diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh index 11c87d5..fa0cffb 100644 --- a/multivimbroker/docker/build_image.sh +++ b/multivimbroker/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.8.0-SNAPSHOT" -STAGING_VERSION="1.8.0-STAGING" +VERSION="1.8.1-SNAPSHOT" +STAGING_VERSION="1.8.1-STAGING" PROJECT="multicloud" IMAGE="framework" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index f31f636..5939318 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -18,12 +18,12 @@ org.onap.multicloud.framework multicloud-framework - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT 4.0.0 org.onap.multicloud.framework multicloud-framework-broker - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/pom.xml b/pom.xml index 8fed09d..11602cf 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.8.0-SNAPSHOT + 1.8.1-SNAPSHOT pom multicloud-framework multicloud broker diff --git a/version.properties b/version.properties index c035a75..3d26cc5 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=8 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} -- 2.16.6 From 781e93f42dfd17296f2027547ab7b2286b596650 Mon Sep 17 00:00:00 2001 From: "git config --global user.name" Date: Mon, 1 Aug 2022 22:57:19 +0000 Subject: [PATCH 02/16] Fix missing isUseHttpsWithSDC config override Adding missing ability to configure SDC client to use HTTP to connect to SDC-BE Issue-ID: MULTICLOUD-1476 Signed-off-by: Radoslaw Chmiel Change-Id: I1a49bfbb6b4898c38552155a0011917a3141a30a --- .../policy/distribution/reception/handling/sdc/SdcConfiguration.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java index d2ff9ff..d65f9d6 100644 --- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java +++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java @@ -115,6 +115,11 @@ public class SdcConfiguration implements IConfiguration { return configParameters.isUseHttpsWithDmaap(); } + @Override + public Boolean isUseHttpsWithSDC() { + return configParameters.isUseHttpsWithSDC(); + } + @Override public int getHttpsProxyPort() { return configParameters.getHttpsProxyPort(); -- 2.16.6 From 3268f773a365f114300cfb8d79ac56069dda9dc3 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Fri, 5 Aug 2022 11:29:43 +0800 Subject: [PATCH 03/16] Release artifactbroker after fixing isUseHttpsWithSDC issue Issue-ID: MULTICLOUD-1476 Signed-off-by: Bin Yang Change-Id: I513fb04ec5fc657708c594484e24cf1453a78e02 --- releases/container-1.8.1.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 releases/container-1.8.1.yaml diff --git a/releases/container-1.8.1.yaml b/releases/container-1.8.1.yaml new file mode 100644 index 0000000..5198de3 --- /dev/null +++ b/releases/container-1.8.1.yaml @@ -0,0 +1,10 @@ +distribution_type: 'container' +container_release_tag: '1.8.1' +project: 'multicloud-framework' +log_dir: 'multicloud-framework-maven-docker-stage-master/1128/' +ref: 781e93f42dfd17296f2027547ab7b2286b596650 +containers: + - name: 'multicloud/framework' + version: '1.8.1' + - name: 'multicloud/framework-artifactbroker' + version: '1.8.1' -- 2.16.6 From e90fc47d3642ff838838642482d878a850f965e2 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Fri, 5 Aug 2022 11:38:26 +0800 Subject: [PATCH 04/16] bump up version after release 1.8.1 Issue-ID: MULTICLOUD-1476 Signed-off-by: Bin Yang Change-Id: I71726e36b5faf8d8d5cf464667a7b6d62f04ec94 --- artifactbroker/forwarding/pom.xml | 2 +- artifactbroker/main/pom.xml | 2 +- artifactbroker/model/pom.xml | 2 +- artifactbroker/packages/docker/build_image.sh | 4 ++-- artifactbroker/packages/pom.xml | 2 +- artifactbroker/plugins/forwarding-plugins/pom.xml | 2 +- artifactbroker/plugins/pom.xml | 2 +- artifactbroker/plugins/reception-plugins/pom.xml | 2 +- artifactbroker/pom.xml | 4 ++-- artifactbroker/reception/pom.xml | 2 +- multivimbroker/docker/build_image.sh | 4 ++-- multivimbroker/pom.xml | 4 ++-- pom.xml | 2 +- version.properties | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml index 3eecfbf..3c508f6 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT multicloud-framework-artifactbroker-forwarding diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index aef5430..4df8a98 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT 4.0.0 multicloud-framework-artifactbroker-main diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index f8092b4..2b146a2 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT multicloud-framework-artifactbroker-model diff --git a/artifactbroker/packages/docker/build_image.sh b/artifactbroker/packages/docker/build_image.sh index 62fc553..78a9cf5 100755 --- a/artifactbroker/packages/docker/build_image.sh +++ b/artifactbroker/packages/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.8.1-SNAPSHOT" -STAGING_VERSION="1.8.1-STAGING" +VERSION="1.8.2-SNAPSHOT" +STAGING_VERSION="1.8.2-STAGING" PROJECT="multicloud" IMAGE="framework-artifactbroker" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index 1c1eabe..bb36fe9 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT multicloud-framework-artifactbroker-package diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index 5e3e8af..5e5f14e 100644 --- a/artifactbroker/plugins/forwarding-plugins/pom.xml +++ b/artifactbroker/plugins/forwarding-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT multicloud-framework-artifactbroker-forwarding-plugins diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index f08cc53..46b3102 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT multicloud-framework-artifactbroker-plugins diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index 3b4c6f2..bce1568 100644 --- a/artifactbroker/plugins/reception-plugins/pom.xml +++ b/artifactbroker/plugins/reception-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT multicloud-framework-artifactbroker-reception-plugins diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index e9dbbc9..9e27aba 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -17,12 +17,12 @@ org.onap.multicloud.framework multicloud-framework - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT 4.0.0 org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT pom multicloud-framework-artifactbroker artifact broker diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index 8911ba2..85a9ab8 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT multicloud-framework-artifactbroker-reception diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh index fa0cffb..d4e11c4 100644 --- a/multivimbroker/docker/build_image.sh +++ b/multivimbroker/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.8.1-SNAPSHOT" -STAGING_VERSION="1.8.1-STAGING" +VERSION="1.8.2-SNAPSHOT" +STAGING_VERSION="1.8.2-STAGING" PROJECT="multicloud" IMAGE="framework" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index 5939318..0820abe 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -18,12 +18,12 @@ org.onap.multicloud.framework multicloud-framework - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT 4.0.0 org.onap.multicloud.framework multicloud-framework-broker - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/pom.xml b/pom.xml index 11602cf..78b53ac 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.8.1-SNAPSHOT + 1.8.2-SNAPSHOT pom multicloud-framework multicloud broker diff --git a/version.properties b/version.properties index 3d26cc5..e9704bb 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=8 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} -- 2.16.6 From 373c3674f7c2491bb6789272373a323136fd2208 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Wed, 31 Aug 2022 21:55:24 +0200 Subject: [PATCH 05/16] Force py3.8 in tox.ini MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It allows leveraging on OpenStack Yoga's upper-contraints without any exception. Issue-ID: DOC-782 Signed-off-by: Cédric Ollivier Change-Id: Ia5abb2762abe245b741129661b4d4eea194cd0b5 --- docs/tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/tox.ini b/docs/tox.ini index 42ffa68..49bbe01 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -4,10 +4,10 @@ envlist = docs, skipsdist = true [testenv:docs] -basepython = python3 +basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html @@ -18,7 +18,7 @@ whitelist_externals = sh [testenv:docs-linkcheck] -basepython = python3 +basepython = python3.8 #deps = -r{toxinidir}/requirements-docs.txt commands = echo "Link Checking not enforced" #commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck -- 2.16.6 From aa75c52fb2cfe333bd8fdfdb24b9bfb4589f5b10 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Tue, 8 Nov 2022 10:01:54 +0100 Subject: [PATCH 06/16] Fix AAI protocol setting problem for ServiceMesh AAI access protocol is hardcoded to https in the vimbroker This patch enables the configuration setting for AAI_PROTOCOL Issue-ID: MULTICLOUD-1495 Signed-off-by: Andreas Geissler Change-Id: I7e7d3d22ff11f154ddd8ba10bf05c4b0e09999c2 --- multivimbroker/docker/Dockerfile | 1 + multivimbroker/docker/pecan/Dockerfile | 1 + multivimbroker/multivimbroker/pub/config/config.py | 3 ++- multivimbroker/run.sh | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile index 86841de..8bcd6e5 100644 --- a/multivimbroker/docker/Dockerfile +++ b/multivimbroker/docker/Dockerfile @@ -9,6 +9,7 @@ ENV AAI_PORT "8443" ENV AAI_SCHEMA_VERSION "v11" ENV AAI_USERNAME "AAI" ENV AAI_PASSWORD "AAI" +ENV AAI_PROTOCOL "https" EXPOSE 9001 diff --git a/multivimbroker/docker/pecan/Dockerfile b/multivimbroker/docker/pecan/Dockerfile index 5230182..ae225b6 100644 --- a/multivimbroker/docker/pecan/Dockerfile +++ b/multivimbroker/docker/pecan/Dockerfile @@ -7,6 +7,7 @@ ENV AAI_PORT "8443" ENV AAI_SCHEMA_VERSION "v11" ENV AAI_USERNAME "AAI" ENV AAI_PASSWORD "AAI" +ENV AAI_PROTOCOL "https" EXPOSE 9001 diff --git a/multivimbroker/multivimbroker/pub/config/config.py b/multivimbroker/multivimbroker/pub/config/config.py index 350bc92..90c38ec 100644 --- a/multivimbroker/multivimbroker/pub/config/config.py +++ b/multivimbroker/multivimbroker/pub/config/config.py @@ -24,7 +24,8 @@ MSB_SERVICE_PORT = '10080' # [A&AI] AAI_ADDR = "aai.api.simpledemo.openecomp.org" AAI_PORT = "8443" -AAI_SERVICE_URL = 'https://%s:%s/aai' % (AAI_ADDR, AAI_PORT) +AAI_PROTOCOL = "https" +AAI_SERVICE_URL = '%s://%s:%s/aai' % (AAI_PROTOCOL, AAI_ADDR, AAI_PORT) AAI_SCHEMA_VERSION = "v13" AAI_USERNAME = 'AAI' AAI_PASSWORD = 'AAI' diff --git a/multivimbroker/run.sh b/multivimbroker/run.sh index 1079cf1..9dc4c9e 100755 --- a/multivimbroker/run.sh +++ b/multivimbroker/run.sh @@ -21,6 +21,7 @@ sed -i "s/AAI_PORT =.*/AAI_PORT = \"${AAI_PORT}\"/g" multivimbroker/pub/config/c sed -i "s/AAI_SCHEMA_VERSION =.*/AAI_SCHEMA_VERSION = \"${AAI_SCHEMA_VERSION}\"/g" multivimbroker/pub/config/config.py sed -i "s/AAI_USERNAME =.*/AAI_USERNAME = \"${AAI_USERNAME}\"/g" multivimbroker/pub/config/config.py sed -i "s/AAI_PASSWORD =.*/AAI_PASSWORD = \"${AAI_PASSWORD}\"/g" multivimbroker/pub/config/config.py +sed -i "s/AAI_PROTOCOL =.*/AAI_PROTOCOL = \"${AAI_PROTOCOL}\"/g" multivimbroker/pub/config/config.py logDir="/var/log/onap/multicloud/multivimbroker" if [ ! -x $logDir ]; then -- 2.16.6 From b95e90ad1be8a8aa9c80b987d446010a9e34cc7a Mon Sep 17 00:00:00 2001 From: marineMD Date: Wed, 16 Nov 2022 11:34:20 +0100 Subject: [PATCH 07/16] Fix DOC config files Issue-ID: DOC-798 Signed-off-by: marineMD Change-Id: I20aa6e942b6afc25a74f0b7d17ae8db44e8d0a23 --- .gitreview | 1 + docs/_static/css/ribbon.css | 122 ++++++++++++++++++++++---------------------- docs/conf.py | 51 +++++++++++++++--- docs/conf.yaml | 7 --- docs/requirements-docs.txt | 6 ++- docs/tox.ini | 9 ++++ 6 files changed, 121 insertions(+), 75 deletions(-) delete mode 100644 docs/conf.yaml diff --git a/.gitreview b/.gitreview index dbe990d..882cce2 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=gerrit.onap.org port=29418 project=multicloud/framework +defaultbranch=master diff --git a/docs/_static/css/ribbon.css b/docs/_static/css/ribbon.css index 6008cb1..d03a26b 100644 --- a/docs/_static/css/ribbon.css +++ b/docs/_static/css/ribbon.css @@ -1,63 +1,63 @@ .ribbon { - z-index: 1000; - background-color: #a00; - overflow: hidden; - white-space: nowrap; - position: fixed; - top: 25px; - right: -50px; - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - -webkit-box-shadow: 0 0 10px #888; - -moz-box-shadow: 0 0 10px #888; - box-shadow: 0 0 10px #888; - -} - -.ribbon a { - border: 1px solid #faa; - color: #fff; - display: block; - font: bold 81.25% 'Helvetica Neue', Helvetica, Arial, sans-serif; - margin: 1px 0; - padding: 10px 50px; - text-align: center; - text-decoration: none; - text-shadow: 0 0 5px #444; - transition: 0.5s; -} - -.ribbon a:hover { - background: #c11; - color: #fff; -} - - -/* override table width restrictions */ -@media screen and (min-width: 767px) { - - .wy-table-responsive table td, .wy-table-responsive table th { - /* !important prevents the common CSS stylesheets from overriding - this as on RTD they are loaded after this stylesheet */ - white-space: normal !important; - } - - .wy-table-responsive { - overflow: visible !important; - } -} - -@media screen and (max-width: 767px) { - .wy-table-responsive table td { - white-space: nowrap; + z-index: 1000; + background-color: #a00; + overflow: hidden; + white-space: nowrap; + position: fixed; + top: 25px; + right: -50px; + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-box-shadow: 0 0 10px #888; + -moz-box-shadow: 0 0 10px #888; + box-shadow: 0 0 10px #888; + + } + + .ribbon a { + border: 1px solid #faa; + color: #fff; + display: block; + font: bold 81.25% 'Helvetica Neue', Helvetica, Arial, sans-serif; + margin: 1px 0; + padding: 10px 50px; + text-align: center; + text-decoration: none; + text-shadow: 0 0 5px #444; + transition: 0.5s; + } + + .ribbon a:hover { + background: #c11; + color: #fff; + } + + + /* override table width restrictions */ + @media screen and (min-width: 767px) { + + .wy-table-responsive table td, .wy-table-responsive table th { + /* !important prevents the common CSS stylesheets from overriding + this as on RTD they are loaded after this stylesheet */ + white-space: normal !important; } -} - -/* fix width of the screen */ - -.wy-nav-content { - max-width: none; -} + + .wy-table-responsive { + overflow: visible !important; + } + } + + @media screen and (max-width: 767px) { + .wy-table-responsive table td { + white-space: nowrap; + } + } + + /* fix width of the screen */ + + .wy-nav-content { + max-width: 800px; + } \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py index 472b9cc..667f168 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,17 +1,56 @@ -from docs_conf.conf import * +roject = "onap" +release = "master" +version = "master" -branch = 'latest' -master_doc = 'index' +author = "Open Network Automation Platform" +# yamllint disable-line rule:line-length +copyright = "ONAP. Licensed under Creative Commons Attribution 4.0 International License" -linkcheck_ignore = [ - 'http://localhost', +pygments_style = "sphinx" +html_theme = "sphinx_rtd_theme" +html_theme_options = { + "style_nav_header_background": "white", + "sticky_navigation": "False" } +html_logo = "_static/logo_onap_2017.png" +html_favicon = "_static/favicon.ico" +html_static_path = ["_static"] +html_show_sphinx = False + +extensions = [ + 'sphinx.ext.intersphinx', + 'sphinx.ext.graphviz', + 'sphinxcontrib.blockdiag', + 'sphinxcontrib.seqdiag', + 'sphinxcontrib.swaggerdoc', + 'sphinxcontrib.plantuml' ] -extensions = ['sphinxcontrib.swaggerdoc'] +# +# Map to 'latest' if this file is used in 'latest' (master) 'doc' branch. +# Change to {releasename} after you have created the new 'doc' branch. +# + +branch = 'latest' intersphinx_mapping = {} +doc_url = 'https://docs.onap.org/projects' +master_doc = 'index' + +exclude_patterns = ['.tox'] + +spelling_word_list_filename='spelling_wordlist.txt' +spelling_lang = "en_GB" + +# +# Example: +# intersphinx_mapping['onap-aai-aai-common'] = ('{}/onap-aai-aai-common/en/%s'.format(doc_url) % branch, None) +# html_last_updated_fmt = '%d-%b-%y %H:%M' def setup(app): app.add_css_file("css/ribbon.css") + +linkcheck_ignore = [ + r'http://localhost:\d+/' +] \ No newline at end of file diff --git a/docs/conf.yaml b/docs/conf.yaml deleted file mode 100644 index ab59281..0000000 --- a/docs/conf.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -project_cfg: onap -project: onap - -# Change this to ReleaseBranchName to modify the header -default-version: latest -# diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 3b3441a..ba3e0ec 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,3 +1,7 @@ -lfdocs-conf sphinx>=4.2.0 # BSD sphinx-rtd-theme>=1.0.0 # MIT +sphinxcontrib-blockdiag # BSD +sphinxcontrib-seqdiag # BSD +sphinxcontrib-swaggerdoc +sphinxcontrib-spelling +sphinxcontrib-plantuml \ No newline at end of file diff --git a/docs/tox.ini b/docs/tox.ini index 49bbe01..4bbc640 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -23,3 +23,12 @@ basepython = python3.8 commands = echo "Link Checking not enforced" #commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck whitelist_externals = echo + +[testenv:docs-spellcheck] +basepython = python3.8 +deps = + -r{toxinidir}/requirements-docs.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt + -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 eb49e5dea9a76c8bd9c246f492357620da57c5d9 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Fri, 25 Nov 2022 09:05:50 +0800 Subject: [PATCH 08/16] Release after fixing service mesh issue Issue-ID: MULTICLOUD-1476 Signed-off-by: Bin Yang Change-Id: Id6e0f70b51fad22483d5f056173d8f1809566afa --- releases/container-1.8.2.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 releases/container-1.8.2.yaml diff --git a/releases/container-1.8.2.yaml b/releases/container-1.8.2.yaml new file mode 100644 index 0000000..ccb526a --- /dev/null +++ b/releases/container-1.8.2.yaml @@ -0,0 +1,10 @@ +distribution_type: 'container' +container_release_tag: '1.8.2' +project: 'multicloud-framework' +log_dir: 'multicloud-framework-maven-docker-stage-master/1240/' +ref: b95e90ad1be8a8aa9c80b987d446010a9e34cc7a +containers: + - name: 'multicloud/framework' + version: '1.8.2' + - name: 'multicloud/framework-artifactbroker' + version: '1.8.2' -- 2.16.6 From 55d29b46ab9f585b79ccf713aada7f77eee5f3fd Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Fri, 25 Nov 2022 09:01:48 +0800 Subject: [PATCH 09/16] Bump version to 1.8.3 after fixing service mesh issue Issue-ID: MULTICLOUD-1495 Signed-off-by: Bin Yang Change-Id: Ifb3250d3ab3658e502d2e4cc6193fdac4e879ccc --- artifactbroker/forwarding/pom.xml | 2 +- artifactbroker/main/pom.xml | 2 +- artifactbroker/model/pom.xml | 2 +- artifactbroker/packages/docker/build_image.sh | 4 ++-- artifactbroker/packages/pom.xml | 2 +- artifactbroker/plugins/forwarding-plugins/pom.xml | 2 +- artifactbroker/plugins/pom.xml | 2 +- artifactbroker/plugins/reception-plugins/pom.xml | 2 +- artifactbroker/pom.xml | 4 ++-- artifactbroker/reception/pom.xml | 2 +- multivimbroker/docker/build_image.sh | 4 ++-- multivimbroker/pom.xml | 4 ++-- pom.xml | 2 +- version.properties | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml index 3c508f6..81ae4ce 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT multicloud-framework-artifactbroker-forwarding diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index 4df8a98..6c8fc71 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT 4.0.0 multicloud-framework-artifactbroker-main diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index 2b146a2..0f08d40 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT multicloud-framework-artifactbroker-model diff --git a/artifactbroker/packages/docker/build_image.sh b/artifactbroker/packages/docker/build_image.sh index 78a9cf5..f9a635e 100755 --- a/artifactbroker/packages/docker/build_image.sh +++ b/artifactbroker/packages/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.8.2-SNAPSHOT" -STAGING_VERSION="1.8.2-STAGING" +VERSION="1.8.3-SNAPSHOT" +STAGING_VERSION="1.8.3-STAGING" PROJECT="multicloud" IMAGE="framework-artifactbroker" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index bb36fe9..940e980 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT multicloud-framework-artifactbroker-package diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index 5e5f14e..9c88f8f 100644 --- a/artifactbroker/plugins/forwarding-plugins/pom.xml +++ b/artifactbroker/plugins/forwarding-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT multicloud-framework-artifactbroker-forwarding-plugins diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index 46b3102..afafbf7 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT multicloud-framework-artifactbroker-plugins diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index bce1568..79da5e4 100644 --- a/artifactbroker/plugins/reception-plugins/pom.xml +++ b/artifactbroker/plugins/reception-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT multicloud-framework-artifactbroker-reception-plugins diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index 9e27aba..4123057 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -17,12 +17,12 @@ org.onap.multicloud.framework multicloud-framework - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT 4.0.0 org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT pom multicloud-framework-artifactbroker artifact broker diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index 85a9ab8..30f7e59 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT multicloud-framework-artifactbroker-reception diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh index d4e11c4..fcdc617 100644 --- a/multivimbroker/docker/build_image.sh +++ b/multivimbroker/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.8.2-SNAPSHOT" -STAGING_VERSION="1.8.2-STAGING" +VERSION="1.8.3-SNAPSHOT" +STAGING_VERSION="1.8.3-STAGING" PROJECT="multicloud" IMAGE="framework" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index 0820abe..ec49c47 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -18,12 +18,12 @@ org.onap.multicloud.framework multicloud-framework - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT 4.0.0 org.onap.multicloud.framework multicloud-framework-broker - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/pom.xml b/pom.xml index 78b53ac..ae2c334 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.8.2-SNAPSHOT + 1.8.3-SNAPSHOT pom multicloud-framework multicloud broker diff --git a/version.properties b/version.properties index e9704bb..b0a1810 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=8 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} -- 2.16.6 From e127b3c32c81390e0c8d928f1266360802fc7071 Mon Sep 17 00:00:00 2001 From: efiacor Date: Wed, 23 Nov 2022 12:29:39 +0000 Subject: [PATCH 10/16] [ARTIFACT-BROKER] Upgrade sdc-distro-client to 2.0.0 Signed-off-by: efiacor Change-Id: I3c726357fe3760724f64e71f09749d939f74d7be Issue-ID: DMAAP-1806 --- .gitignore | 3 +- artifactbroker/forwarding/pom.xml | 9 +--- artifactbroker/main/pom.xml | 2 +- artifactbroker/model/pom.xml | 9 +--- artifactbroker/packages/docker/build_image.sh | 4 +- artifactbroker/packages/pom.xml | 2 +- .../src/main/resources/etc/defaultConfig.json | 6 +-- artifactbroker/plugins/forwarding-plugins/pom.xml | 2 +- artifactbroker/plugins/pom.xml | 2 +- artifactbroker/plugins/reception-plugins/pom.xml | 9 +--- .../reception/handling/sdc/SdcConfiguration.java | 14 +---- ...eptionHandlerConfigurationParameterBuilder.java | 56 +++----------------- ...eceptionHandlerConfigurationParameterGroup.java | 59 +++++++++------------- ...eceptionHandlerConfigurationParameterGroup.java | 42 +++------------ .../src/test/resources/handling-sdc.json | 10 +--- .../src/test/resources/handling-sdcInvalid.json | 10 +--- artifactbroker/pom.xml | 18 ++++++- artifactbroker/reception/pom.xml | 2 +- multivimbroker/docker/build_image.sh | 4 +- multivimbroker/pom.xml | 5 +- pom.xml | 2 +- version.properties | 4 +- 22 files changed, 82 insertions(+), 192 deletions(-) diff --git a/.gitignore b/.gitignore index a49966f..5abd1e9 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,8 @@ target/ logs/*.log *.pyc *.swp - +*_target/ +*.orig # Test related files multivimbroker/.coverage diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml index 81ae4ce..2a675ff 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT multicloud-framework-artifactbroker-forwarding @@ -39,13 +39,6 @@ org.onap.sdc.sdc-distribution-client sdc-distribution-client - 1.4.5 - - - org.slf4j - slf4j-log4j12 - - diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index 6c8fc71..2135245 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT 4.0.0 multicloud-framework-artifactbroker-main diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index 0f08d40..6400c0f 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT multicloud-framework-artifactbroker-model @@ -33,13 +33,6 @@ org.onap.sdc.sdc-distribution-client sdc-distribution-client - 1.4.5 - - - org.slf4j - slf4j-log4j12 - - diff --git a/artifactbroker/packages/docker/build_image.sh b/artifactbroker/packages/docker/build_image.sh index f9a635e..4635f5c 100755 --- a/artifactbroker/packages/docker/build_image.sh +++ b/artifactbroker/packages/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.8.3-SNAPSHOT" -STAGING_VERSION="1.8.3-STAGING" +VERSION="1.9.0-SNAPSHOT" +STAGING_VERSION="1.9.0-STAGING" PROJECT="multicloud" IMAGE="framework-artifactbroker" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index 940e980..60dbebd 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT multicloud-framework-artifactbroker-package diff --git a/artifactbroker/packages/src/main/resources/etc/defaultConfig.json b/artifactbroker/packages/src/main/resources/etc/defaultConfig.json index 3497a5f..adfcdac 100644 --- a/artifactbroker/packages/src/main/resources/etc/defaultConfig.json +++ b/artifactbroker/packages/src/main/resources/etc/defaultConfig.json @@ -27,10 +27,7 @@ "sdcConfiguration":{ "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup", "parameters":{ - "asdcAddress": "sdc-be.onap:8443", - "messageBusAddress": [ - "message-router.onap" - ], + "sdcAddress": "sdc-be.onap:8443", "user": "policy", "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U", "pollingInterval":20, @@ -49,7 +46,6 @@ "keystorePassword": "null", "activeserverTlsAuth": false, "isFilterinEmptyResources": true, - "isUseHttpsWithDmaap": false, "isUseHttpsWithSDC": true, "httpsproxyHost": "null", "httpproxyHost": "null", diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index 9c88f8f..ceeac00 100644 --- a/artifactbroker/plugins/forwarding-plugins/pom.xml +++ b/artifactbroker/plugins/forwarding-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT multicloud-framework-artifactbroker-forwarding-plugins diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index afafbf7..010cff3 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT multicloud-framework-artifactbroker-plugins diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index 79da5e4..9fb2633 100644 --- a/artifactbroker/plugins/reception-plugins/pom.xml +++ b/artifactbroker/plugins/reception-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT multicloud-framework-artifactbroker-reception-plugins @@ -38,13 +38,6 @@ org.onap.sdc.sdc-distribution-client sdc-distribution-client - 1.4.5 - - - org.slf4j - slf4j-log4j12 - - diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java index d65f9d6..cc30f40 100644 --- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java +++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java @@ -41,13 +41,8 @@ public class SdcConfiguration implements IConfiguration { } @Override - public String getAsdcAddress() { - return configParameters.getAsdcAddress(); - } - - @Override - public List getMsgBusAddress() { - return configParameters.getMessageBusAddress(); + public String getSdcAddress() { + return configParameters.getSdcAddress(); } @Override @@ -110,11 +105,6 @@ public class SdcConfiguration implements IConfiguration { return configParameters.isFilterInEmptyResources(); } - @Override - public Boolean isUseHttpsWithDmaap() { - return configParameters.isUseHttpsWithDmaap(); - } - @Override public Boolean isUseHttpsWithSDC() { return configParameters.isUseHttpsWithSDC(); diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java index 2476b07..24a27c9 100644 --- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java +++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java @@ -31,7 +31,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { private boolean activeserverTlsAuth; private boolean filterinEmptyResources; - private boolean useHttpsWithDmaap; private boolean useHttpsWithSDC; private int pollingTimeout; private int pollingInterval; @@ -39,7 +38,7 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { private String password; private String consumerId; private String consumerGroup; - private String asdcAddress; + private String sdcAddress; private String environmentName; private String keystorePath; private String keystorePassword; @@ -47,7 +46,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { private int httpproxyPort; private String httpsproxyHost; private String httpproxyHost; - private List messageBusAddress; private List artifactTypes; private int retryDelay; @@ -72,16 +70,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { return this; } - /** - * Set useHttpsWithDmaap to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @param useHttpsWithDmaap the useHttpsWithDmaap - */ - public SdcReceptionHandlerConfigurationParameterBuilder setUseHttpsWithDmaap(final Boolean useHttpsWithDmaap) { - this.useHttpsWithDmaap = useHttpsWithDmaap; - return this; - } - /** * Set pollingInterval to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * @@ -103,12 +91,12 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Set asdcAddress to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. + * Set sdcAddress to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * - * @param asdcAddress the asdcAddress + * @param sdcAddress the sdcAddress */ - public SdcReceptionHandlerConfigurationParameterBuilder setAsdcAddress(final String asdcAddress) { - this.asdcAddress = asdcAddress; + public SdcReceptionHandlerConfigurationParameterBuilder setSdcAddress(final String sdcAddress) { + this.sdcAddress = sdcAddress; return this; } @@ -182,16 +170,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { return this; } - /** - * Set messageBusAddress to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @param messageBusAddress the messageBusAddress - */ - public SdcReceptionHandlerConfigurationParameterBuilder setMessageBusAddress(final List messageBusAddress) { - this.messageBusAddress = messageBusAddress; - return this; - } - /** * Set artifactTypes to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * @@ -231,15 +209,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { return filterinEmptyResources; } - /** - * Returns the isUseHttpsWithDmaap flag of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @return the isUseHttpsWithDmaap - */ - public Boolean getIsUseHttpsWithDmaap() { - return useHttpsWithDmaap; - } - /** * Returns the isUseHttpsWithSDC flag of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * @@ -270,10 +239,10 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { /** * Returns the asdc address of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * - * @return the asdcAddress + * @return the sdcAddress */ - public String getAsdcAddress() { - return asdcAddress; + public String getSdcAddress() { + return sdcAddress; } /** @@ -339,15 +308,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { return keystorePassword; } - /** - * Returns the message bus address of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @return the messageBusAddress - */ - public List getMessageBusAddress() { - return messageBusAddress; - } - /** * Returns the artifact types of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java index c204d75..16cb612 100644 --- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java +++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java @@ -33,27 +33,25 @@ import org.onap.policy.distribution.reception.parameters.ReceptionHandlerConfigu */ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHandlerConfigurationParameterGroup { - private String asdcAddress; - private List messageBusAddress; - private String user; - private String password; - private int pollingInterval; - private int pollingTimeout; - private int retryDelay; - private int httpsProxyPort; - private int httpProxyPort; - private String httpsProxyHost; - private String httpProxyHost; - private String consumerId; - private List artifactTypes; - private String consumerGroup; - private String environmentName; - private String keyStorePath; - private String keyStorePassword; - private boolean activeServerTlsAuth; - private boolean isFilterInEmptyResources; - private boolean isUseHttpsWithDmaap; - private boolean isUseHttpsWithSDC; + private final String sdcAddress; + private final String user; + private final String password; + private final int pollingInterval; + private final int pollingTimeout; + private final int retryDelay; + private final int httpsProxyPort; + private final int httpProxyPort; + private final String httpsProxyHost; + private final String httpProxyHost; + private final String consumerId; + private final List artifactTypes; + private final String consumerGroup; + private final String environmentName; + private final String keyStorePath; + private final String keyStorePassword; + private final boolean activeServerTlsAuth; + private final boolean isFilterInEmptyResources; + private final boolean isUseHttpsWithSDC; /** * The constructor for instantiating {@link SdcReceptionHandlerConfigurationParameterGroup} class. @@ -62,8 +60,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan */ public SdcReceptionHandlerConfigurationParameterGroup( final SdcReceptionHandlerConfigurationParameterBuilder builder) { - asdcAddress = builder.getAsdcAddress(); - messageBusAddress = builder.getMessageBusAddress(); + sdcAddress = builder.getSdcAddress(); user = builder.getUser(); password = builder.getPassword(); pollingInterval = builder.getPollingInterval(); @@ -81,17 +78,12 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan keyStorePassword = builder.getKeystorePassword(); activeServerTlsAuth = builder.isActiveserverTlsAuth(); isFilterInEmptyResources = builder.isFilterinEmptyResources(); - isUseHttpsWithDmaap = builder.getIsUseHttpsWithDmaap(); isUseHttpsWithSDC = builder.getIsUseHttpsWithSDC(); } - public String getAsdcAddress() { - return asdcAddress; - } - - public List getMessageBusAddress() { - return messageBusAddress; + public String getSdcAddress() { + return sdcAddress; } public String getUser() { @@ -146,10 +138,6 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan return isFilterInEmptyResources; } - public boolean isUseHttpsWithDmaap() { - return isUseHttpsWithDmaap; - } - public boolean isUseHttpsWithSDC() { return isUseHttpsWithSDC; } @@ -176,7 +164,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan @Override public GroupValidationResult validate() { final GroupValidationResult validationResult = new GroupValidationResult(this); - validateStringElement(validationResult, asdcAddress, "asdcAddress"); + validateStringElement(validationResult, sdcAddress, "sdcAddress"); validateStringElement(validationResult, user, "user"); validateStringElement(validationResult, consumerId, "consumerId"); validateStringElement(validationResult, consumerGroup, "consumerGroup"); @@ -185,7 +173,6 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan validateIntElement(validationResult, pollingInterval, "pollingInterval"); validateIntElement(validationResult, pollingTimeout, "pollingTimeout"); validateIntElement(validationResult, retryDelay, "retryDelay"); - validateStringListElement(validationResult, messageBusAddress, "messageBusAddress"); validateStringListElement(validationResult, artifactTypes, "artifactTypes"); return validationResult; } diff --git a/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java b/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java index 8f16708..d4f029f 100644 --- a/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java +++ b/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java @@ -54,9 +54,8 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { final GroupValidationResult validationResult = configParameters.validate(); assertTrue(validationResult.isValid()); final SdcConfiguration config = new SdcConfiguration(configParameters); - assertEquals(Arrays.asList("a.com", "b.com", "c.com"), config.getMsgBusAddress()); assertEquals(Arrays.asList("TOSCA_CSAR", "HEAT", "HELM"), config.getRelevantArtifactTypes()); - assertEquals("localhost", config.getAsdcAddress()); + assertEquals("localhost", config.getSdcAddress()); assertEquals("policy", config.getUser()); assertEquals("policy", config.getPassword()); assertEquals(20, config.getPollingInterval()); @@ -68,7 +67,6 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { assertEquals("null", config.getKeyStorePassword()); assertEquals(false, config.activateServerTLSAuth()); assertEquals(true, config.isFilterInEmptyResources()); - assertEquals(false, config.isUseHttpsWithDmaap()); } @Test @@ -89,19 +87,18 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { public void testSdcConfigurationBuilder() { final SdcReceptionHandlerConfigurationParameterBuilder builder = - new SdcReceptionHandlerConfigurationParameterBuilder().setAsdcAddress("localhost") + new SdcReceptionHandlerConfigurationParameterBuilder().setSdcAddress("localhost") .setConsumerGroup("policy-group").setConsumerId("policy-id").setEnvironmentName("TEST") .setKeystorePassword("password").setKeystorePath("dummyPath").setPassword("policy") .setPollingInterval(10).setPollingTimeout(20).setRetryDelay(30).setUser("policy") - .setUseHttpsWithDmaap(false).setActiveserverTlsAuth(false).setFilterinEmptyResources(true) - .setArtifactTypes(Arrays.asList("TOSCA_CSAR")).setMessageBusAddress(Arrays.asList("localhost")); + .setActiveserverTlsAuth(false).setFilterinEmptyResources(true) + .setArtifactTypes(Arrays.asList("TOSCA_CSAR")); final SdcReceptionHandlerConfigurationParameterGroup configParameters = new SdcReceptionHandlerConfigurationParameterGroup(builder); configParameters.setName("SDCConfiguration"); - assertEquals(Arrays.asList("localhost"), configParameters.getMessageBusAddress()); assertEquals(Arrays.asList("TOSCA_CSAR"), configParameters.getArtifactTypes()); - assertEquals("localhost", configParameters.getAsdcAddress()); + assertEquals("localhost", configParameters.getSdcAddress()); assertEquals("policy", configParameters.getUser()); assertEquals("policy", configParameters.getPassword()); assertEquals(10, configParameters.getPollingInterval()); @@ -114,41 +111,18 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { assertEquals("password", configParameters.getKeyStorePassword()); assertEquals(false, configParameters.isActiveServerTlsAuth()); assertEquals(true, configParameters.isFilterInEmptyResources()); - assertEquals(false, configParameters.isUseHttpsWithDmaap()); - } - - @Test - public void testSdcConfigurationWithNullList() { - - final SdcReceptionHandlerConfigurationParameterBuilder builder = - new SdcReceptionHandlerConfigurationParameterBuilder().setAsdcAddress("localhost") - .setConsumerGroup("policy-group").setConsumerId("policy-id").setEnvironmentName("TEST") - .setKeystorePassword("password").setKeystorePath("dummyPath").setPassword("policy") - .setPollingInterval(10).setPollingTimeout(20).setUser("policy").setUseHttpsWithDmaap(false) - .setActiveserverTlsAuth(false).setFilterinEmptyResources(true) - .setArtifactTypes(Arrays.asList("TOSCA_CSAR")).setMessageBusAddress(null); - final SdcReceptionHandlerConfigurationParameterGroup configParameters = - new SdcReceptionHandlerConfigurationParameterGroup(builder); - configParameters.setName("SDCConfiguration"); - - try { - configParameters.validate(); - fail("Test must throw an exception"); - } catch (final Exception exp) { - assertTrue(exp.getMessage().contains("collection parameter \"messageBusAddress\" is null")); - } } @Test public void testSdcConfigurationWithEmptyStringList() { final SdcReceptionHandlerConfigurationParameterBuilder builder = - new SdcReceptionHandlerConfigurationParameterBuilder().setAsdcAddress("localhost") + new SdcReceptionHandlerConfigurationParameterBuilder().setSdcAddress("localhost") .setConsumerGroup("policy-group").setConsumerId("policy-id").setEnvironmentName("TEST") .setKeystorePassword("password").setKeystorePath("dummyPath").setPassword("policy") - .setPollingInterval(10).setPollingTimeout(20).setUser("policy").setUseHttpsWithDmaap(false) + .setPollingInterval(10).setPollingTimeout(20).setUser("policy") .setActiveserverTlsAuth(false).setFilterinEmptyResources(true) - .setArtifactTypes(Arrays.asList("")).setMessageBusAddress(Arrays.asList("localhost")); + .setArtifactTypes(Arrays.asList("")); final SdcReceptionHandlerConfigurationParameterGroup configParameters = new SdcReceptionHandlerConfigurationParameterGroup(builder); configParameters.setName("SDCConfiguration"); diff --git a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json index aa548e4..6f0d050 100644 --- a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json +++ b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json @@ -1,11 +1,6 @@ { "name" : "parameterConfig1", - "asdcAddress": "localhost", - "messageBusAddress": [ - "a.com", - "b.com", - "c.com" - ], + "sdcAddress": "localhost", "user": "policy", "password": "policy", "pollingInterval":20, @@ -22,7 +17,6 @@ "keyStorePath": "null", "keyStorePassword": "null", "activeServerTlsAuth": false, - "isFilterInEmptyResources": true, - "isUseHttpsWithDmaap": false + "isFilterInEmptyResources": true } diff --git a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json index 65201d1..2e41017 100644 --- a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json +++ b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json @@ -1,11 +1,6 @@ { "name" : "parameterConfig1", - "asdcAddress": "", - "messageBusAddress": [ - "a.com", - "b.com", - "c.com" - ], + "sdcAddress": "", "user": "tbdsdc-1480", "password": "tbdsdc-1480", "pollingInterval":-1, @@ -21,7 +16,6 @@ "keyStorePath": "null", "keyStorePassword": "null", "activeserverTlsAuth": false, - "isFilterInEmptyResources": true, - "isUseHttpsWithDmaap": false + "isFilterInEmptyResources": true } diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index 4123057..6f9ea2e 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT pom multicloud-framework-artifactbroker artifact broker @@ -38,6 +38,7 @@ ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + 2.0.0 model @@ -47,6 +48,21 @@ plugins packages + + + + org.onap.sdc.sdc-distribution-client + sdc-distribution-client + ${sdc-dist-client-version} + + + org.slf4j + slf4j-log4j12 + + + + + junit diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index 30f7e59..804c17d 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT multicloud-framework-artifactbroker-reception diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh index fcdc617..5c8e876 100644 --- a/multivimbroker/docker/build_image.sh +++ b/multivimbroker/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.8.3-SNAPSHOT" -STAGING_VERSION="1.8.3-STAGING" +VERSION="1.9.0-SNAPSHOT" +STAGING_VERSION="1.9.0-STAGING" PROJECT="multicloud" IMAGE="framework" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index ec49c47..052717a 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -18,12 +18,11 @@ org.onap.multicloud.framework multicloud-framework - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT 4.0.0 - org.onap.multicloud.framework multicloud-framework-broker - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/pom.xml b/pom.xml index ae2c334..58d3041 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT pom multicloud-framework multicloud broker diff --git a/version.properties b/version.properties index b0a1810..82e93e2 100644 --- a/version.properties +++ b/version.properties @@ -18,8 +18,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=8 -patch=3 +minor=9 +patch=0 base_version=${major}.${minor}.${patch} -- 2.16.6 From da3e3d7abf5d1c01774c15329ad200fb004fff3d Mon Sep 17 00:00:00 2001 From: efiacor Date: Mon, 28 Nov 2022 08:57:18 +0000 Subject: [PATCH 11/16] [ARTIFACT-BROKER] Release img 1.9.0 Signed-off-by: efiacor Change-Id: I5ceeb05f5669bc64c26f236bf9914f32490967f6 Issue-ID: DMAAP-1806 --- releases/container-1.9.0.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 releases/container-1.9.0.yaml diff --git a/releases/container-1.9.0.yaml b/releases/container-1.9.0.yaml new file mode 100644 index 0000000..dba9e49 --- /dev/null +++ b/releases/container-1.9.0.yaml @@ -0,0 +1,10 @@ +distribution_type: 'container' +container_release_tag: '1.9.0' +project: 'multicloud-framework' +log_dir: 'multicloud-framework-maven-docker-stage-master/1244/' +ref: e127b3c32c81390e0c8d928f1266360802fc7071 +containers: + - name: 'multicloud/framework' + version: '1.9.0' + - name: 'multicloud/framework-artifactbroker' + version: '1.9.0-SNAPSHOT' -- 2.16.6 From d663a167358e883d8a97c50bd961f7996662effb Mon Sep 17 00:00:00 2001 From: efiacor Date: Mon, 28 Nov 2022 09:18:35 +0000 Subject: [PATCH 12/16] [MULTI] Bump version to 1.9.1 Signed-off-by: efiacor Change-Id: If5add7cbb42b9af18f4d04199d2bd074e156fea0 Issue-ID: DMAAP-1806 --- artifactbroker/forwarding/pom.xml | 2 +- artifactbroker/main/pom.xml | 2 +- artifactbroker/model/pom.xml | 2 +- artifactbroker/packages/docker/build_image.sh | 4 ++-- artifactbroker/packages/pom.xml | 2 +- artifactbroker/plugins/forwarding-plugins/pom.xml | 2 +- artifactbroker/plugins/pom.xml | 2 +- artifactbroker/plugins/reception-plugins/pom.xml | 2 +- artifactbroker/pom.xml | 2 +- artifactbroker/reception/pom.xml | 2 +- multivimbroker/docker/build_image.sh | 4 ++-- multivimbroker/pom.xml | 4 ++-- pom.xml | 2 +- version.properties | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml index 2a675ff..3c88efa 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT multicloud-framework-artifactbroker-forwarding diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index 2135245..5fa8265 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT 4.0.0 multicloud-framework-artifactbroker-main diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index 6400c0f..d60dd10 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT multicloud-framework-artifactbroker-model diff --git a/artifactbroker/packages/docker/build_image.sh b/artifactbroker/packages/docker/build_image.sh index 4635f5c..bd91f21 100755 --- a/artifactbroker/packages/docker/build_image.sh +++ b/artifactbroker/packages/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.9.0-SNAPSHOT" -STAGING_VERSION="1.9.0-STAGING" +VERSION="1.9.1-SNAPSHOT" +STAGING_VERSION="1.9.1-STAGING" PROJECT="multicloud" IMAGE="framework-artifactbroker" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index 60dbebd..36d2d60 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT multicloud-framework-artifactbroker-package diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index ceeac00..d0efd65 100644 --- a/artifactbroker/plugins/forwarding-plugins/pom.xml +++ b/artifactbroker/plugins/forwarding-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT multicloud-framework-artifactbroker-forwarding-plugins diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index 010cff3..717a612 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT multicloud-framework-artifactbroker-plugins diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index 9fb2633..ab2e5fa 100644 --- a/artifactbroker/plugins/reception-plugins/pom.xml +++ b/artifactbroker/plugins/reception-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT multicloud-framework-artifactbroker-reception-plugins diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index 6f9ea2e..7cd8c94 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT pom multicloud-framework-artifactbroker artifact broker diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index 804c17d..8fc5683 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT multicloud-framework-artifactbroker-reception diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh index 5c8e876..f399646 100644 --- a/multivimbroker/docker/build_image.sh +++ b/multivimbroker/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.9.0-SNAPSHOT" -STAGING_VERSION="1.9.0-STAGING" +VERSION="1.9.1-SNAPSHOT" +STAGING_VERSION="1.9.1-STAGING" PROJECT="multicloud" IMAGE="framework" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index 052717a..b63ce14 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -18,11 +18,11 @@ org.onap.multicloud.framework multicloud-framework - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT 4.0.0 multicloud-framework-broker - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/pom.xml b/pom.xml index 58d3041..f9847db 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.9.0-SNAPSHOT + 1.9.1-SNAPSHOT pom multicloud-framework multicloud broker diff --git a/version.properties b/version.properties index 82e93e2..e0453f1 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=9 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} -- 2.16.6 From e656ed0f0594af51d1689f0f9bae29b5710aece3 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Mon, 5 Dec 2022 09:13:47 +0800 Subject: [PATCH 13/16] Update release note for kohn release Issue-ID: MULTICLOUD-1498 Signed-off-by: Bin Yang Change-Id: Ia43c5e710bac029d3034685d8062770758f8ec34 --- docs/release-notes.rst | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 085252f..927ca32 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -17,14 +17,11 @@ Summary ======= -Version: 10.0.0 +Version: 11.0.0 -------------- -The ``jakarta`` release introduces following enhancements in k8splugin. +There are no updates to the Multicloud project for the Kohn release -- Better Configuration API support including rollback, improved deletion of the configuration with or without removal of the configuration resources in the cluster. -- Creation of the configuration template without a dedicated helm chart which allows for easy update of the override values by configuration API without a need to duplicate the configuration template helm chart from the main helm chart. The configuration template (Helm chart) is taken from the main definition. -- Instance upgrade endpoint that allows upgrading existing CNF instance. We can change the definition (Helm chart), and override values of even the cluster in which the instance is deployed which in consequence allows the realization of the migration procedure. Release Data ============ @@ -33,15 +30,15 @@ Release Data | **Project** | MultiCloud | | | | +---------------------------+-------------------------------------------------+ -| **Docker images** | onap/multicloud-framework:1.7.3 | -| | onap/multicloud-framework-artifactbroker:1.7.3 | +| **Docker images** | onap/multicloud-framework:1.9.0 | +| | onap/multicloud-framework-artifactbroker:1.9.0 | | | onap/multicloud-openstack-starlingx:1.5.7 | | | onap/multicloud-openstack-windriver:1.5.7 | | | onap/multicloud-openstack-fcaps:1.5.7 | | | onap/multicloud-openstack-pike:1.5.7 | | | onap/multicloud-k8s:0.10.1 | +---------------------------+-------------------------------------------------+ -| **Release designation** | jakarta | +| **Release designation** | kohn | | | | +---------------------------+-------------------------------------------------+ @@ -49,21 +46,11 @@ Release Data New features ------------ -New features in k8s Plugin related with CNF support implemented by: - -- ``_ -- ``_ +N/A **Bug fixes** -- `MULTICLOUD-1468 `_ - MultiCloud k8s: Etcd connection is not validated on k8splugin start - -- `MULTICLOUD-1446 `_ - Multicloud k8s: Multicloud K8S Plugin does not delete namespace during the SO delete CNF instance macro flow - -- `MULTICLOUD-1443 `_ - Multicloud k8s: Fix log4j cve +N/A **Known Issues** @@ -161,7 +148,7 @@ N/A References ========== -For more information on the ONAP ``jakarta`` release, please see: +For more information on the ONAP ``kohn`` release, please see: #. `ONAP Home Page`_ #. `ONAP Documentation`_ -- 2.16.6 From 8e5db002fc77a540af715c1934c5b318129cb821 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Mon, 3 Jul 2023 14:25:13 +0200 Subject: [PATCH 14/16] Set Python and Ubuntu versions in .readthedocs.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It now follows the ONAP gate configurations. It also fixes the settings and formats it. Issue-ID: DOC-811 Signed-off-by: Cédric Ollivier Change-Id: I806f6204f0f44d6f79ef4c1552c5659f0f59faf7 --- .readthedocs.yaml | 12 +++++------- docs/tox.ini | 23 ++++++++++------------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 3797dc8..f56b3b7 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 diff --git a/docs/tox.ini b/docs/tox.ini index 4bbc640..9d0f3ee 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = docs, +envlist = docs,docs-linkcheck,docs-spellcheck skipsdist = true [testenv:docs] @@ -8,21 +8,18 @@ basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master commands = - sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html - echo "Generated docs available in {toxinidir}/_build/html" -whitelist_externals = - echo - git - sh + sphinx-build -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html [testenv:docs-linkcheck] basepython = python3.8 -#deps = -r{toxinidir}/requirements-docs.txt -commands = echo "Link Checking not enforced" -#commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck -whitelist_externals = echo +deps = + -r{toxinidir}/requirements-docs.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master +commands = + sphinx-build -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck [testenv:docs-spellcheck] basepython = python3.8 @@ -31,4 +28,4 @@ deps = -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -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 + sphinx-build -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck -- 2.16.6 From 8e8b2da28a996c4f33d60563fadbfdc4ab6b7fab Mon Sep 17 00:00:00 2001 From: thmsdt Date: Tue, 20 Feb 2024 14:08:27 +0100 Subject: [PATCH 15/16] add python compatibility module Issue-ID: DOC-823 Change-Id: If32f0c2b844280aeaa157ccb63dbc66ff82f14aa Signed-off-by: thmsdt --- docs/MultiCloud-Test-CSIT.rst | 2 ++ docs/Release Notes.rst | 2 ++ docs/conf.py | 6 ++++-- docs/multicloud-hpa-discovery-pluggable.rst | 2 ++ docs/release-notes.rst | 2 +- docs/requirements-docs.txt | 3 ++- docs/specs/README.rst | 3 +++ docs/specs/logging_enablement.rst | 8 ++++---- docs/specs/multicloud-container-plugin.rst | 12 ++++++------ docs/specs/multicloud-secured-communication.rst | 2 ++ docs/specs/multicloud4k8s-hpa-discovery.rst | 2 ++ docs/specs/parallelism_improvement.rst | 2 ++ 12 files changed, 32 insertions(+), 14 deletions(-) diff --git a/docs/MultiCloud-Test-CSIT.rst b/docs/MultiCloud-Test-CSIT.rst index 145148e..d0ecf65 100644 --- a/docs/MultiCloud-Test-CSIT.rst +++ b/docs/MultiCloud-Test-CSIT.rst @@ -2,6 +2,8 @@ This work is licensed under a Creative Commons Attribution 4.0 International License. +:orphan: + =============================== ONAP MultiCloud CSIT Test Guide =============================== diff --git a/docs/Release Notes.rst b/docs/Release Notes.rst index 1306c13..f08eb5c 100644 --- a/docs/Release Notes.rst +++ b/docs/Release Notes.rst @@ -4,6 +4,8 @@ This work is licensed under a Creative Commons Attribution 4.0 International License. +:orphan: + ============= Release Notes ============= diff --git a/docs/conf.py b/docs/conf.py index 667f168..2248321 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,5 +52,7 @@ def setup(app): app.add_css_file("css/ribbon.css") linkcheck_ignore = [ - r'http://localhost:\d+/' -] \ No newline at end of file + r'http:\.*', + r'https:\.*' + r'\.*' +] diff --git a/docs/multicloud-hpa-discovery-pluggable.rst b/docs/multicloud-hpa-discovery-pluggable.rst index ff330bb..8540bf3 100644 --- a/docs/multicloud-hpa-discovery-pluggable.rst +++ b/docs/multicloud-hpa-discovery-pluggable.rst @@ -2,6 +2,8 @@ .. http://creativecommons.org/licenses/by/4.0 .. Copyright (c) 2017-2018 VMware, Inc. +:orphan: + ================================== MultiCloud HPA Discovery Pluggable ================================== diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 927ca32..e0d3406 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -18,7 +18,7 @@ Summary Version: 11.0.0 --------------- +--------------- There are no updates to the Multicloud project for the Kohn release diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index ba3e0ec..097282b 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 diff --git a/docs/specs/README.rst b/docs/specs/README.rst index b39c8d3..28714fb 100644 --- a/docs/specs/README.rst +++ b/docs/specs/README.rst @@ -1,3 +1,6 @@ + +:orphan: + INTRO ===== diff --git a/docs/specs/logging_enablement.rst b/docs/specs/logging_enablement.rst index 9f89443..4f4ac16 100644 --- a/docs/specs/logging_enablement.rst +++ b/docs/specs/logging_enablement.rst @@ -19,12 +19,12 @@ Problem Description So far the logging of multi-vim is not able to support customer configuration, handler context specific logging like -MDC[MDC_Document]_, also it dose't propagate transaction-ID in REST headers +MDC `MDC_Document`_ , also it dose't propagate transaction-ID in REST headers which is critical to tracing request. There are 4 python containers in oom project need to configure filebeat container for shipping logs. -.. [MDC_Document] https://wiki.onap.org/display/DW/ONAP+Application+Logging+Guidelines+v1.1#ONAPApplicationLoggingGuidelinesv1.1-MDCs +.. _MDC_Document: https://wiki.onap.org/display/DW/ONAP+Application+Logging+Guidelines+v1.1#ONAPApplicationLoggingGuidelinesv1.1-MDCs In addition the current logging is very difficult to understand behavior and performance. @@ -38,13 +38,13 @@ The proposed change will include three parts. Filebeat container ------------------ -Logging architecture[Log_Architecture]_ use Filebeat collects logs from +Logging architecture `Log_Architecture`_ use Filebeat collects logs from multi-vim containers and ships them to the centralized logging stack. To enable this feature it need to add Filebeat container in multi-vim pod that was deployed by OOM, as well Yaml file will be used to configure Filebeat. -.. [Log_Architecture] https://wiki.onap.org/display/DW/Logging+Architecture +.. _Log_Architecture: https://wiki.onap.org/display/DW/Logging+Architecture Tracing ID ---------- diff --git a/docs/specs/multicloud-container-plugin.rst b/docs/specs/multicloud-container-plugin.rst index 0c68a89..d7182cb 100644 --- a/docs/specs/multicloud-container-plugin.rst +++ b/docs/specs/multicloud-container-plugin.rst @@ -294,7 +294,7 @@ Request Body: ================== ========== ======= ======================================== There are several constraints/assumptions on cloudOwner and -cloudRegionId. `cloud-region`_ . For k8s, cloudRegionId is (ab)used to +cloudRegionId. For k8s, cloudRegionId is (ab)used to specify k8s cluster instance. ONAP admin has to assign unique id for cloudRegionId as id for k8s cluster instance. @@ -571,9 +571,9 @@ Past presentations/proposals ONAP components --------------- -.. _ESR: Extenral System Register https://wiki.onap.org/pages/viewpage.action?pageId=11930343#A&AI:ExternalSystemOperationAPIDefinition-VIM +.. _"ESR: External System Register" https://wiki.onap.org/pages/viewpage.action?pageId=11930343#A&AI:ExternalSystemOperationAPIDefinition-VIM .. _AAI: Active and Available Inventory https://wiki.onap.org/display/DW/Active+and+Available+Inventory+Project -.. _OOM: ONAP Operations Manager https://wiki.onap.org/display/DW/ONAP+Operations+Manager+Project +.. _"OOM: ONAP Operations Manager" https://wiki.onap.org/display/DW/ONAP+Operations+Manager+Project .. _ONAPREST: RESTful API Design Specification https://wiki.onap.org/display/DW/RESTful+API+Design+Specification kubernetes @@ -582,9 +582,9 @@ kubernetes .. _issue23: https://github.com/kubernetes/kubeadm/issues/23 -misc ----- -.. _cloud-region: How to add a new cloud region and some thoughts https://wiki.onap.org/download/attachments/25429038/HowToAddNewCloudRegionAndThoughts.pdf +.. misc +.. ---- +.. .. _cloud-region: How to add a new cloud region and some thoughts https://wiki.onap.org/download/attachments/25429038/HowToAddNewCloudRegionAndThoughts.pdf Contributors diff --git a/docs/specs/multicloud-secured-communication.rst b/docs/specs/multicloud-secured-communication.rst index 722e86b..c12290f 100644 --- a/docs/specs/multicloud-secured-communication.rst +++ b/docs/specs/multicloud-secured-communication.rst @@ -2,6 +2,8 @@ This work is licensed under a Creative Commons Attribution 4.0 International License. +:orphan: + ====================================================== MultiCloud security enhancement: secured communication ====================================================== diff --git a/docs/specs/multicloud4k8s-hpa-discovery.rst b/docs/specs/multicloud4k8s-hpa-discovery.rst index 4d90a8c..fccf9b5 100644 --- a/docs/specs/multicloud4k8s-hpa-discovery.rst +++ b/docs/specs/multicloud4k8s-hpa-discovery.rst @@ -2,6 +2,8 @@ .. http://creativecommons.org/licenses/by/4.0 .. Copyright (c) 2019 Intel, Inc. +:orphan: + ================================================= MultiCloud for k8s HPA Discovery And Registration ================================================= diff --git a/docs/specs/parallelism_improvement.rst b/docs/specs/parallelism_improvement.rst index 69f0fb8..6ebece3 100644 --- a/docs/specs/parallelism_improvement.rst +++ b/docs/specs/parallelism_improvement.rst @@ -2,6 +2,8 @@ This work is licensed under a Creative Commons Attribution 4.0 International License. +:orphan: + =============================================== Parallelism improvement of Multi Cloud Services =============================================== -- 2.16.6 From 6e2a5ae4b75ae991eddbc1fb9868f44a27b6f379 Mon Sep 17 00:00:00 2001 From: thmsdt Date: Tue, 27 Feb 2024 11:06:56 +0100 Subject: [PATCH 16/16] update link to upper-constraints.txt Issue-ID: DOC-823 Change-Id: I892063aaa3e932d2cc75dc7daa3ebbf46d26db35 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 9d0f3ee..73e317e 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 -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html @@ -16,7 +16,7 @@ commands = 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 -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck @@ -25,7 +25,7 @@ commands = 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 -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck -- 2.16.6