aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SdncReports/pom.xml2
-rw-r--r--admportal/pom.xml2
-rw-r--r--configbackuprestore/pom.xml2
-rwxr-xr-xcsit/plans/sdnr/setup.sh2
-rw-r--r--csit/scripts/sdnr/docker-compose/.env3
-rwxr-xr-xcsit/scripts/sdnr/sdnr-teardown.sh2
-rwxr-xr-xcsit/sdnc-csit.env3
-rw-r--r--csit/tests/sdnc/resources/sdnc-properties.robot15
-rw-r--r--docs/release-notes.rst4
-rw-r--r--docs/tox.ini4
-rw-r--r--installation/sdnc/src/main/dc-sdnr/docker-compose.yml35
-rwxr-xr-xinstallation/sdnc/src/main/docker/Dockerfile8
-rwxr-xr-xinstallation/sdnc/src/main/scripts/startODL.sh4
-rwxr-xr-xpom.xml8
14 files changed, 69 insertions, 25 deletions
diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index c35c9dd0..9d5f4c36 100644
--- a/SdncReports/pom.xml
+++ b/SdncReports/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-1-starter-parent</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
<relativePath/>
</parent>
diff --git a/admportal/pom.xml b/admportal/pom.xml
index 03f600e2..34ef718f 100644
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
<relativePath/>
</parent>
diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml
index 6345fd3f..ac9213d6 100644
--- a/configbackuprestore/pom.xml
+++ b/configbackuprestore/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-1-starter-parent</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
diff --git a/csit/plans/sdnr/setup.sh b/csit/plans/sdnr/setup.sh
index 827b1715..0ff34037 100755
--- a/csit/plans/sdnr/setup.sh
+++ b/csit/plans/sdnr/setup.sh
@@ -43,7 +43,7 @@ sdnr_launch
# SDNC_READY_TIMEOUT=450
# if jenkins should be ok without running robots TCS's
-# SDNC_RELEASE_WITHOUT_ROBOT=true
+SDNC_RELEASE_WITHOUT_ROBOT=true
#Pass any variables required by Robot test suites in ROBOT_VARIABLES
ROBOT_VARIABLES="--variablefile=${WORKSPACE}/plans/sdnr/testdata/localhost.py"
diff --git a/csit/scripts/sdnr/docker-compose/.env b/csit/scripts/sdnr/docker-compose/.env
index a2bea441..fbe74215 100644
--- a/csit/scripts/sdnr/docker-compose/.env
+++ b/csit/scripts/sdnr/docker-compose/.env
@@ -13,7 +13,8 @@ NEXUS_DOCKER_REPO=nexus3.onap.org:10001
NEXUS_DOCKER_IMAGE_NAME=onap/sdnc-image
NEXUS_DOCKER_IMAGE_TAG=latest
ODL_ADMIN_USERNAME=admin
-ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+#ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+ODL_ADMIN_PASSWORD=admin
ODL_CERT_DIR=/opt/opendaylight/current/certs
SDN_CONTROLLER_PROTOCOL="http"
SDNR_IP=172.40.0.21
diff --git a/csit/scripts/sdnr/sdnr-teardown.sh b/csit/scripts/sdnr/sdnr-teardown.sh
index 02e8beeb..f01ab338 100755
--- a/csit/scripts/sdnr/sdnr-teardown.sh
+++ b/csit/scripts/sdnr/sdnr-teardown.sh
@@ -52,6 +52,8 @@ function sdnr_teardown() {
docker logs $i >> ${WORKSPACE}/archives/getallinfo/$i.log 2>&1
done
docker cp sdnr:/opt/opendaylight/data/log/karaf.log ${WORKSPACE}/archives/getallinfo/sdnr_karaf.log
+ docker cp sdnr:/opt/opendaylight/data/log/installCerts.log ${WORKSPACE}/archives/getallinfo/sdnr_installCerts.log
+ docker cp sdnr:/opt/opendaylight/etc/custom.properties ${WORKSPACE}/archives/getallinfo/sdnr_custom_properties.log
fi
echo "Starting teardown!"
# removes sdnrdb, sdnr AND all of the rest of the containers (--remove-orphans)
diff --git a/csit/sdnc-csit.env b/csit/sdnc-csit.env
index e1c95f58..5f3509d2 100755
--- a/csit/sdnc-csit.env
+++ b/csit/sdnc-csit.env
@@ -14,7 +14,8 @@ export MYSQL_USER=${MYSQL_USER:-sdnctl}
export MYSQL_PASSWORD=${MYSQL_PASSWORD:-gamma}
export MYSQL_DATABASE=${MYSQL_DATABASE:-sdnctl}
export ODL_USER=${ODL_USER:-admin}
-export ODL_PASSWORD=${ODL_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
+# export ODL_PASSWORD=${ODL_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
+export ODL_PASSWORD=${ODL_PASSWORD:-admin}
export HONEYCOMB_USER=${HONEYCOMB_USER:-admin}
export HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD:-admin}
export TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD:-changeit}
diff --git a/csit/tests/sdnc/resources/sdnc-properties.robot b/csit/tests/sdnc/resources/sdnc-properties.robot
index f548e614..6be1225d 100644
--- a/csit/tests/sdnc/resources/sdnc-properties.robot
+++ b/csit/tests/sdnc/resources/sdnc-properties.robot
@@ -5,12 +5,17 @@ ${ODL_PASSWORD} %{ODL_PASSWORD}
${REQUEST_DATA_PATH} %{REQUEST_DATA_PATH}
${SDNC_CONTAINER_NAME} %{SDNC_CONTAINER_NAME}
${GRA_DATA_DIRECTORY} %{WORKSPACE}/tests/sdnc/resources/grafiles
-${SDNC_RESTCONF_URL} http://localhost:8282/restconf
+# ${SDNC_RESTCONF_URL} http://localhost:8282/restconf
+${SDNC_RESTCONF_URL} http://localhost:8282/rests
${SDNC_HEALTHCHECK} /operations/SLI-API:healthcheck/
-${SDNC_KEYSTORE_CONFIG_PATH} /config/netconf-keystore:keystore
-${SDNC_NETWORK_TOPOLOGY} /config/network-topology:network-topology
-${SDNC_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo
-${PNFSIM_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo/yang-ext:mount/turing-machine:turing-machine
+# ${SDNC_KEYSTORE_CONFIG_PATH} /config/netconf-keystore:keystore
+# ${SDNC_NETWORK_TOPOLOGY} /config/network-topology:network-topology
+# ${SDNC_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo
+# ${PNFSIM_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo/yang-ext:mount/turing-machine:turing-machine
+${SDNC_KEYSTORE_CONFIG_PATH} /data/netconf-keystore:keystore?content=config
+${SDNC_NETWORK_TOPOLOGY} /data/network-topology:network-topology?content=config
+${SDNC_MOUNT_PATH} /data/network-topology:network-topology/topology/topology-netconf/node/PNFDemo?content=config
+${PNFSIM_MOUNT_PATH} /data/network-topology:network-topology/topology/topology-netconf/node/PNFDemo/yang-ext:mount/turing-machine:turing-machine?content=config
${GRA_PRELOAD_NETWORK} /operations/GENERIC-RESOURCE-API:preload-network-topology-operation/
${GRA_PRELOAD_VFMODULE} /operations/GENERIC-RESOURCE-API:preload-vf-module-topology-operation/
${GRA_SERVICE_TOPOLOGY} /operations/GENERIC-RESOURCE-API:service-topology-operation/
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index ad04990c..ddb45eeb 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -32,7 +32,7 @@ Release Data
+-------------------------+-------------------------------------------+
| **Docker images** | See :ref:`dockercontainers` section below |
+-------------------------+-------------------------------------------+
-| **Release designation** | Kohn |
+| **Release designation** | Kohn |
| | |
+-------------------------+-------------------------------------------+
@@ -117,7 +117,7 @@ Known Vulnerabilities
---------------------
Any known vulnerabilities for ONAP are tracked in the `ONAP Jira`_ in the OJSI project. Any outstanding OJSI issues that
-pertain to SDNC are listed in the :ref:`secissues` section below.
+pertain to SDNC are listed in the "Known Security Issues" section below.
Workarounds
diff --git a/docs/tox.ini b/docs/tox.ini
index 1613246c..1110b0bd 100644
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -10,7 +10,7 @@ deps =
-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
+ sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
echo "Generated docs available in {toxinidir}/_build/html"
whitelist_externals =
echo
@@ -21,7 +21,7 @@ whitelist_externals =
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
+#commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck
whitelist_externals = echo
[testenv:docs-spellcheck]
diff --git a/installation/sdnc/src/main/dc-sdnr/docker-compose.yml b/installation/sdnc/src/main/dc-sdnr/docker-compose.yml
new file mode 100644
index 00000000..3686a808
--- /dev/null
+++ b/installation/sdnc/src/main/dc-sdnr/docker-compose.yml
@@ -0,0 +1,35 @@
+version: '3'
+
+services:
+ sdnr:
+ image: onap/sdnc-image:latest
+ container_name: sdnr
+ environment:
+ - SDNRONLY=true
+ - SDNRINIT=true
+ - SDNRDM=false
+ - SDNRWT=true
+ - SDNRDBURL=jdbc:mysql://sdnrdb:3306/sdnrdb
+ - SDNRDBUSERNAME=sdnrdb
+ - SDNRDBPASSWORD=sdnrdb
+ - SDNRDBTYPE=MARIADB
+ - SDNRCONTROLLERID=c94bbd5f-d456-44bd-aa7a-47b2e4f73253
+ # - SDNRWT_BOOTFEATURES=odl-netconf-callhome-ssh,sdnr-wt-feature-aggregator
+ - ODLUX_REDIRECT_URI=/index.html#/oauth?token=
+ - HOST_URL=http://localhost:3100
+ - ODL_ADMIN_USERNAME=admin
+ - ODL_ADMIN_PASSWORD=admin
+ # - OVERRIDE_FEATURES_BOOT=f908aa5a-ca45-4a35-8d23-23aa27422422,odl-restconf-all,odl-netconf-topology,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040
+
+ depends_on:
+ - sdnrdb
+
+ sdnrdb:
+ image: bitnami/mariadb:10.5
+ container_name: sdnrdb
+ environment:
+ - MARIADB_ROOT_PASSWORD=admin
+ - MARIADB_DATABASE=sdnrdb
+ - MARIADB_USER=sdnrdb
+ - MARIADB_PASSWORD=sdnrdb
+ - MARIADB_EXTRA_FLAGS=--max_connections=400
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 15a33d5a..e281d16b 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -8,7 +8,7 @@ ENV PATH $PATH:/opt/java/openjdk/bin
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
-ENV JAVA_SECURITY_DIR /etc/ssl/certs/java
+ENV JAVA_SECURITY_DIR /opt/java/openjdk/lib/security
ENV SDNC_KEYSTORE ${sdnc.keystore}
ENV SDNC_KEYPASS ${sdnc.keypass}
@@ -47,11 +47,11 @@ RUN if [ -f $JAVA_SECURITY_DIR}/cacerts ] ; then keytool -importkeystore -srckey
RUN keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts -deststorepass changeit -noprompt
# Secure with TLS
-RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties
+#RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties
RUN echo org.osgi.service.http.secure.port=$SDNC_SECUREPORT >> $ODL_HOME/etc/custom.properties
RUN echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_HOME/etc/custom.properties
-RUN echo org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
-RUN echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
+RUN echo org.ops4j.pax.web.ssl.password=\"$SDNC_KEYPASS\" >> $ODL_HOME/etc/custom.properties
+RUN echo org.ops4j.pax.web.ssl.keypassword=\"$SDNC_KEYPASS\" >> $ODL_HOME/etc/custom.properties
# Overwrite svclogic compiler properties
RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties
diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index cb6e7bb0..b2dbe001 100755
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -332,8 +332,8 @@ if "$SDNC_AAF_ENABLED"; then
sed -i '/org.ops4j.pax.web.ssl.password/d' "$ODL_HOME"/etc/custom.properties
sed -i '/org.ops4j.pax.web.ssl.keypassword/d' "$ODL_HOME"/etc/custom.properties
echo "org.ops4j.pax.web.ssl.keystore=$SDNC_AAF_STORE_DIR/$SDNC_KEYSTORE" >> "$ODL_HOME"/etc/custom.properties
- echo "org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS" >> "$ODL_HOME"/etc/custom.properties
- echo "org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS" >> "$ODL_HOME"/etc/custom.properties
+ echo "org.ops4j.pax.web.ssl.password=\"$SDNC_KEYPASS\"" >> "$ODL_HOME"/etc/custom.properties
+ echo "org.ops4j.pax.web.ssl.keypassword=\"$SDNC_KEYPASS\"" >> "$ODL_HOME"/etc/custom.properties
fi
if $SDNRINIT ; then
diff --git a/pom.xml b/pom.xml
index cba2eee6..5a7ff80a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
<relativePath/>
</parent>
@@ -27,9 +27,9 @@
<!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite -->
<ccsdk.oran.a1adapter.version>1.5.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
<sdnc.northbound.version>2.5.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc -->
- <ccsdk.distribution.version>1.5.0-SNAPSHOT</ccsdk.distribution.version>
- <ccsdk.sli.version>1.6.1-SNAPSHOT</ccsdk.sli.version>
- <ccsdk.features.version>1.5.0-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.5.1</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.6.2</ccsdk.sli.version>
+ <ccsdk.features.version>1.5.1-SNAPSHOT</ccsdk.features.version>
<ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
<!-- docker images versions -->
<ccsdk.docker.alpine.j11.version>1.5-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->