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>

4 files changed, 42 insertions, 4 deletions

diff --git a/csit/plans/sdnc/generate_certs.sh b/csit/plans/sdnc/generate_certs.sh
new file mode 100755
index 00000000..d5b80179
--- /dev/null
+++ b/csit/plans/sdnc/generate_certs.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Copyright (c) 2022 highstreet technologies GmbH Property
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# generates fresh certificates for netconfserver
+
+
+tls_dir=$1
+
+cd $tls_dir
+echo "generate all required certificates and store in $tls_dir"
+openssl version
+openssl req -newkey rsa:4096 -keyform PEM -keyout ca.key -x509 -days 3650 -outform PEM -out ca.crt -nodes \
+    -subj "/C=DE/ST=Berlin/L=Berlin/O=ONAP/OU=SDNC/CN=www.onap.org/emailAddress=dev@www.example.com"
+openssl genrsa -out client.key 4096
+openssl req -new -key client.key -out client.req -nodes \
+    -subj "/C=PL/ST=DS/L=Wroclaw/O=ONAP/OU=SDNC/CN=www.onap.org"
+openssl x509 -req -in client.req -CA ca.crt -CAkey ca.key -set_serial 101 -extensions client -days 365 -outform PEM -out client.crt
+openssl genrsa -out server_key.pem 4096
+openssl req -new -key server_key.pem -out server.req -sha256 -nodes \
+    -subj "/C=PL/ST=DS/L=Wroclaw/O=ONAP/OU=SDNC/CN=www.onap.org"
+openssl x509 -req -in server.req -CA ca.crt -CAkey ca.key -set_serial 100 -extensions server -days 1460 -outform PEM -out server_cert.crt -sha256
+
diff --git a/csit/plans/sdnc/setup.sh b/csit/plans/sdnc/setup.sh
index 3212f981..7c953a3c 100644
--- a/csit/plans/sdnc/setup.sh
+++ b/csit/plans/sdnc/setup.sh
@@ -49,6 +49,9 @@ mv ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netop
 cat ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netopeer.sh.orig | sed -e "s/\r$//g" > ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netopeer.sh
 chmod 755 ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/netconf/initialize_netopeer.sh
 
+# generate fresh certificates for netconfserver [INT-2269]
+
+./generate_certs.sh "${WORKSPACE}"/archives/pnf-simulator/netconfsimulator/tls
 
 # Start Netconf Simulator Container with docker-compose and configuration from docker-compose.yml
 docker-compose -f "${WORKSPACE}"/archives/pnf-simulator/netconfsimulator/docker-compose.yml up -d
diff --git a/csit/tests/sdnc/resources/sdnc-keywords.robot b/csit/tests/sdnc/resources/sdnc-keywords.robot
index 8c417bc3..4c4750db 100644
--- a/csit/tests/sdnc/resources/sdnc-keywords.robot
+++ b/csit/tests/sdnc/resources/sdnc-keywords.robot
@@ -45,7 +45,7 @@ Send Get Request And Validate TLS Connection Response
     ${mount}=    Get File    ${REQUEST_DATA_PATH}${/}mount.xml
     &{headers}=  Create Dictionary   Content-Type=application/xml    Accept=application/xml
     ${resp}=    PUT On Session    sdnc_restconf    ${url}    data=${mount}    headers=${headers}  expected_status=201
-    Sleep  30
+    Sleep  120
     &{headers1}=  Create Dictionary  Content-Type=application/json    Accept=application/json
     ${resp1}=    GET On Session    sdnc_restconf    ${PNFSIM_MOUNT_PATH}    headers=${headers1}  expected_status=${resp_code}
 
diff --git a/csit/tests/sdnc/sdnc_csit.robot b/csit/tests/sdnc/sdnc_csit.robot
index 6b49b0f7..bcd2f013 100644
--- a/csit/tests/sdnc/sdnc_csit.robot
+++ b/csit/tests/sdnc/sdnc_csit.robot
@@ -16,17 +16,17 @@ Check SDNC Keystore For PNF Simulator Certificates
     [Tags]      SDNC-PNFSIM-CERT-DEPLOYMENT
     [Documentation]    Checking Keystore after SDNC installation
     Send Get Request And Validate Response Sdnc  ${SDNC_KEYSTORE_CONFIG_PATH}  200
-
+ 
 
 Check SDNC NETCONF/TLS Connection to PNF Simulator
     [Tags]      SDNC-PNFSIM-TLS-CONNECTION-CHECK
-   [Documentation]    Checking NETCONF/TLS connection to PNF Simulator
+    [Documentation]    Checking NETCONF/TLS connection to PNF Simulator
     Send Get Request And Validate TLS Connection Response  ${SDNC_MOUNT_PATH}  200
 
 Check Dropping NETCONF/TLS Connection
     [Tags]      SDNC-PNFSIM-TLS-DISCONNECT-CHECK
     [Documentation]    Checking PNF Simulator Mount Delete from SDNC
-   Send Delete Request And Validate PNF Mount Deleted  ${SDNC_MOUNT_PATH}  204
+    Send Delete Request And Validate PNF Mount Deleted  ${SDNC_MOUNT_PATH}  204
 
 Load network preload data
     [Tags]     SDNC-GRA-PRELOAD-NETWORK