Update to version 2.6.1 of parent pom

Update to version 2.6.1 of parent pom to pick up Argon SR2 versions

Issue-ID: CCSDK-3944
Change-Id: Idba0a162fd079f35d420e62f3026f6c8dfc1d983
Signed-off-by: Dan Timoney <dtimoney@att.com>
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>

diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index 7dd49b0..ce15a0f 100644 (file)
--- 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.6.0</version>
+        <version>2.6.1</version>
         <relativePath/>
     </parent>
 

diff --git a/admportal/pom.xml b/admportal/pom.xml
index 3218f32..3218e49 100644 (file)
--- 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.6.0</version>
+        <version>2.6.1</version>
         <relativePath/>
     </parent>
 

diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml
index 8de3bed..43157f2 100644 (file)
--- 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.6.0</version>
+        <version>2.6.1</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam.vnfbackup</groupId>

diff --git a/csit/plans/sdnc/generate_certs.sh b/csit/plans/sdnc/generate_certs.sh
new file mode 100755 (executable)
index 0000000..d5b8017
--- /dev/null
+++ b/csit/plans/sdnc/generate_certs.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Copyright (c) 2022 highstreet technologies GmbH Property
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# generates fresh certificates for netconfserver
+
+
+tls_dir=$1
+
+cd $tls_dir
+echo "generate all required certificates and store in $tls_dir"
+openssl version
+openssl req -newkey rsa:4096 -keyform PEM -keyout ca.key -x509 -days 3650 -outform PEM -out ca.crt -nodes \
+    -subj "/C=DE/ST=Berlin/L=Berlin/O=ONAP/OU=SDNC/CN=www.onap.org/emailAddress=dev@www.example.com"
+openssl genrsa -out client.key 4096
+openssl req -new -key client.key -out client.req -nodes \
+    -subj "/C=PL/ST=DS/L=Wroclaw/O=ONAP/OU=SDNC/CN=www.onap.org"
+openssl x509 -req -in client.req -CA ca.crt -CAkey ca.key -set_serial 101 -extensions client -days 365 -outform PEM -out client.crt
+openssl genrsa -out server_key.pem 4096
+openssl req -new -key server_key.pem -out server.req -sha256 -nodes \
+    -subj "/C=PL/ST=DS/L=Wroclaw/O=ONAP/OU=SDNC/CN=www.onap.org"
+openssl x509 -req -in server.req -CA ca.crt -CAkey ca.key -set_serial 100 -extensions server -days 1460 -outform PEM -out server_cert.crt -sha256
+

diff --git a/csit/plans/sdnc/setup.sh b/csit/plans/sdnc/setup.sh
index 3212f98..7c953a3 100644 (file)
--- a/csit/plans/sdnc/setup.sh
+++ b/csit/plans/sdnc/setup.sh
@@ -49,6 +49,9 @@ mv ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netop
 cat ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netopeer.sh.orig | sed -e "s/\r$//g" > ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netopeer.sh
 chmod 755 ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netopeer.sh
 
+# generate fresh certificates for netconfserver [INT-2269]
+
+./generate_certs.sh "${WORKSPACE}"/archives/pnf-simulator/netconfsimulator/tls
 
 # Start Netconf Simulator Container with docker-compose and configuration from docker-compose.yml
 docker-compose -f "${WORKSPACE}"/archives/pnf-simulator/netconfsimulator/docker-compose.yml up -d

diff --git a/csit/tests/sdnc/resources/sdnc-keywords.robot b/csit/tests/sdnc/resources/sdnc-keywords.robot
index 8c417bc..4c4750d 100644 (file)
--- a/csit/tests/sdnc/resources/sdnc-keywords.robot
+++ b/csit/tests/sdnc/resources/sdnc-keywords.robot
@@ -45,7 +45,7 @@ Send Get Request And Validate TLS Connection Response
     ${mount}=    Get File    ${REQUEST_DATA_PATH}${/}mount.xml
     &{headers}=  Create Dictionary   Content-Type=application/xml    Accept=application/xml
     ${resp}=    PUT On Session    sdnc_restconf    ${url}    data=${mount}    headers=${headers}  expected_status=201
-    Sleep  30
+    Sleep  120
     &{headers1}=  Create Dictionary  Content-Type=application/json    Accept=application/json
     ${resp1}=    GET On Session    sdnc_restconf    ${PNFSIM_MOUNT_PATH}    headers=${headers1}  expected_status=${resp_code}
 

diff --git a/csit/tests/sdnc/sdnc_csit.robot b/csit/tests/sdnc/sdnc_csit.robot
index 6b49b0f..bcd2f01 100644 (file)
--- a/csit/tests/sdnc/sdnc_csit.robot
+++ b/csit/tests/sdnc/sdnc_csit.robot
@@ -16,17 +16,17 @@ Check SDNC Keystore For PNF Simulator Certificates
     [Tags]      SDNC-PNFSIM-CERT-DEPLOYMENT
     [Documentation]    Checking Keystore after SDNC installation
     Send Get Request And Validate Response Sdnc  ${SDNC_KEYSTORE_CONFIG_PATH}  200
-
+ 
 
 Check SDNC NETCONF/TLS Connection to PNF Simulator
     [Tags]      SDNC-PNFSIM-TLS-CONNECTION-CHECK
-   [Documentation]    Checking NETCONF/TLS connection to PNF Simulator
+    [Documentation]    Checking NETCONF/TLS connection to PNF Simulator
     Send Get Request And Validate TLS Connection Response  ${SDNC_MOUNT_PATH}  200
 
 Check Dropping NETCONF/TLS Connection
     [Tags]      SDNC-PNFSIM-TLS-DISCONNECT-CHECK
     [Documentation]    Checking PNF Simulator Mount Delete from SDNC
-   Send Delete Request And Validate PNF Mount Deleted  ${SDNC_MOUNT_PATH}  204
+    Send Delete Request And Validate PNF Mount Deleted  ${SDNC_MOUNT_PATH}  204
 
 Load network preload data
     [Tags]     SDNC-GRA-PRELOAD-NETWORK

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 06d4ac2..5d1fa8f 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -30,6 +30,7 @@
 
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
+        <odl.shiro.version>0.17.11</odl.shiro.version>
 
         <!-- SDNR Features Boot -->
         <sdnr.features.boot>ccsdk-features-all</sdnr.features.boot>
@@ -38,7 +39,6 @@
             mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features,\
             mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features,\
             mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features,\
-            mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-oauth/${ccsdk.features.version}/xml/features,\
             mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features,\
             mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/${ccsdk.features.version}/xml/features
         </sdnr.features.repo>
@@ -400,6 +400,28 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-with-alternalte-repo-2</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.highstreet-technologies.aaa</groupId>
+                                    <artifactId>aaa-authn-api</artifactId>
+                                    <version>0.17.8</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory>
+                                    <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/pom.xml b/pom.xml
index a1b7b05..60755ca 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
         <relativePath/>
     </parent>
 
@@ -25,18 +25,18 @@
         <sdnc.project.version>${project.version}</sdnc.project.version>
 
         <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite -->
-        <ccsdk.oran.a1adapter.version>1.6.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
-        <sdnc.northbound.version>2.6.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc -->
-        <ccsdk.distribution.version>1.6.0-SNAPSHOT</ccsdk.distribution.version> 
-        <ccsdk.sli.version>1.7.1-SNAPSHOT</ccsdk.sli.version>
-        <ccsdk.features.version>1.6.0-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>1.6.0</ccsdk.oran.a1adapter.version>
+        <sdnc.northbound.version>2.6.0</sdnc.northbound.version> <!-- Used by installation/sdnc -->
+        <ccsdk.distribution.version>1.6.1-SNAPSHOT</ccsdk.distribution.version> 
+        <ccsdk.sli.version>1.7.1</ccsdk.sli.version>
+        <ccsdk.features.version>1.6.1</ccsdk.features.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.bierman.api.version>1.0.0</ccsdk.bierman.api.version>
         <!-- docker images versions -->
-        <ccsdk.docker.alpine.j11.version>1.6.0-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
-        <ccsdk.docker.odlsli.alpine.version>1.6.0-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
-        <ccsdk.docker.ansible.server.version>1.6.0-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
-        <ccsdk.docker.ubuntu.version>1.6.0-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
+        <ccsdk.docker.alpine.j11.version>1.6.1-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
+        <ccsdk.docker.odlsli.alpine.version>1.6.1-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
+        <ccsdk.docker.ansible.server.version>1.6.1-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
+        <ccsdk.docker.ubuntu.version>1.6.1-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
     </properties>
 
     <modules>