Migrate to phosphorus

Update to phosphorus version of parent poms

Issue-ID: SDNC-1681
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: If84bf1b6cf061886d2df303a5614dfcaa9d517c9
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Signed-off-by: demskeq8 <alexander.dehn@highstreet-technologies.com>
Former-commit-id: 6e7661adfeb903ad85f6f02fe57ef3990b55ed7e

diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index 4bbf2b4..7ad774e 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.3.2</version>
+        <version>2.3.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/admportal/pom.xml b/admportal/pom.xml
index ac38474..f46e437 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.3.2</version>
+        <version>2.3.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml
index 57f288c..42dc34f 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.3.2</version>
+        <version>2.3.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam.vnfbackup</groupId>

diff --git a/csit/plans/sdnr/setup.sh b/csit/plans/sdnr/setup.sh
index a447cf5..5fa5f7b 100755 (executable)
--- a/csit/plans/sdnr/setup.sh
+++ b/csit/plans/sdnr/setup.sh
@@ -38,5 +38,5 @@ sdnr_launch
 
 #Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="--variablefile=${WORKSPACE}/plans/sdnr/testdata/localhost.py"
-ROBOT_IMAGE="hightec/sdnc-test-lib:v0.9.1"
+ROBOT_IMAGE="hightec/sdnc-test-lib:v0.10.0"
 

diff --git a/csit/run-csit.sh b/csit/run-csit.sh
index e1b831a..32b0fa5 100755 (executable)
--- a/csit/run-csit.sh
+++ b/csit/run-csit.sh
@@ -164,7 +164,10 @@ source_safely "${ROBOT_VENV}/bin/activate"
 fi
 
 WORKDIR=$(mktemp -d --suffix=-robot-workdir)
-cd "${WORKDIR}"
+chmod a+rwx "${WORKDIR}"
+echo "Additional info"
+ls -lsa "${WORKDIR}"
+id
 
 # Add csit scripts to PATH
 export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT_VENV}/bin"
@@ -205,8 +208,9 @@ if [[ -z $ROBOT_IMAGE ]]; then
     python -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
 else
     echo "*** TRACE **** python is running in a container"
-    docker run --net="host" -v ${WORKSPACE}:${WORKSPACE} -v ${WORKDIR}:${WORKDIR} $ROBOT_IMAGE  \
-    python -B -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp --outputdir ${WORKDIR} ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
+    docker run --net="host" \
+    -v ${WORKSPACE}:${WORKSPACE} -v ${WORKDIR}:${WORKDIR} $ROBOT_IMAGE  \
+    python3 -B -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp --outputdir ${WORKDIR} ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
 fi
 RESULT=$?
 load_set

diff --git a/csit/tests/sdnr/healthcheck/20_healthcheckSUT.robot b/csit/tests/sdnr/healthcheck/20_healthcheckSUT.robot
index dd3364c..e11fbf0 100644 (file)
--- a/csit/tests/sdnr/healthcheck/20_healthcheckSUT.robot
+++ b/csit/tests/sdnr/healthcheck/20_healthcheckSUT.robot
@@ -1,39 +1,44 @@
-*** Settings ***
-Documentation  healthcheck of system under test: sdnc server, sdnrdb are available
-Library  ConnectLibrary
-Library  SDNCBaseLibrary
-Library  Collections
-Library  ElasticSearchLibrary
-Library  ConnectApp
-Library  RequestsLibrary
-
-Suite Setup  global suite setup    &{GLOBAL_SUITE_SETUP_CONFIG}
-Suite Teardown  global suite teardown
-
-*** Variables ***
-&{headers}  Content-Type=application/json  Authorization=Basic
-
-*** Test Cases ***
-Test Is SDNR Node Available
-    ${server_status}=    server is ready    ${SDNR_PROTOCOL}${SDNR_HOST}    ${SDNR_PORT}
-    should be true    ${server_status}
-
-Test Is SDNRDB Available
-    ${es_version_info}=    get elastic search version info as dict
-    ${length_of_response}=    get length    ${es_version_info}
-    should be true    ${length_of_response}>${0}
-
-Test Is SDNRDB Initialized
-    ${res}=  check aliases
-    Log  ${res}  level=INFO  html=False  console=False  repr=False
-    Run Keyword If  not ${res}  Fatal Error
-
-Test Is VES Collector available
-    # curl -k -u sample1:sample1 https://172.40.0.1:8443
-    ${auth}=  Create List  ${VESCOLLECTOR}[USERNAME]  ${VESCOLLECTOR}[PASSWORD]
-    RequestsLibrary.Create Session  alias=ves  url=${VESCOLLECTOR}[SCHEME]://${VESCOLLECTOR}[IP]:${VESCOLLECTOR}[PORT]  headers=${headers}  auth=${auth}
-    ${resp}=  RequestsLibrary.GET On Session  ves  /
-    Should Be Equal As Strings  ${resp.text}  Welcome to VESCollector
-    Should Be Equal As Strings  ${resp.status_code}  200
-    RequestsLibrary.Delete All Sessions
-
+*** Settings ***\r
+Documentation  healthcheck of system under test: sdnc server, sdnrdb are available\r
+Library  ConnectLibrary\r
+Library  SDNCBaseLibrary\r
+Library  Collections\r
+Library  ElasticSearchLibrary\r
+Library  ConnectApp\r
+Library  RequestsLibrary\r
+\r
+Suite Setup  global suite setup    &{GLOBAL_SUITE_SETUP_CONFIG}\r
+Suite Teardown  global suite teardown\r
+\r
+*** Variables ***\r
+&{headers}  Content-Type=application/json  Authorization=Basic\r
+\r
+*** Test Cases ***\r
+Test Is SDNR Node Available\r
+    ${server_status}=    Server Is Ready\r
+    should be true    ${server_status}\r
+\r
+Test Is SDNRDB Available\r
+    ${es_version_info}=    Get Sdnrdb Version Info As Dict\r
+    ${length_of_response}=    Get Length    ${es_version_info}\r
+    should be true    ${length_of_response}>${0}\r
+\r
+Test Is SDNRDB Initialized\r
+    ${res}=  Check Aliases\r
+    Log  ${res}  level=INFO  html=False  console=False  repr=False\r
+\r
+Test Is VES Collector available\r
+    # curl -k -u sample1:sample1 https://172.40.0.1:8443\r
+    ${auth}=  Create List  ${VESCOLLECTOR}[USERNAME]  ${VESCOLLECTOR}[PASSWORD]\r
+    ${IPV6_ENABLED}=  Get Variable Value    ${ENABLE_IPV6}  ${False}\r
+    Log To Console    ${VESCOLLECTOR}[SCHEME]://[${VESCOLLECTOR}[IP]]:${VESCOLLECTOR}[PORT]\r
+    IF    ${IPV6_ENABLED} != ${True}\r
+        RequestsLibrary.Create Session  alias=ves  url=${VESCOLLECTOR}[SCHEME]://${VESCOLLECTOR}[IP]:${VESCOLLECTOR}[PORT]  headers=${headers}  auth=${auth}\r
+    ELSE\r
+        RequestsLibrary.Create Session  alias=ves  url=${VESCOLLECTOR}[SCHEME]://[${VESCOLLECTOR}[IP]]:${VESCOLLECTOR}[PORT]  headers=${headers}  auth=${auth}\r
+    END\r
+    ${resp}=  RequestsLibrary.GET On Session  ves  /\r
+    Should Be Equal As Strings  ${resp.text}  Welcome to VESCollector\r
+    Should Be Equal As Strings  ${resp.status_code}  200\r
+    RequestsLibrary.Delete All Sessions\r
+\r

diff --git a/pom.xml b/pom.xml
index b22b5f8..c68e1c2 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.3.2</version>
+        <version>2.3.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite -->
         <ccsdk.oran.a1adapter.version>1.3.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
         <sdnc.northbound.version>2.3.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc -->
-        <ccsdk.distribution.version>1.3.0-SNAPSHOT</ccsdk.distribution.version> 
+        <ccsdk.distribution.version>1.3.1-SNAPSHOT</ccsdk.distribution.version> 
         <ccsdk.sli.version>1.4.1-SNAPSHOT</ccsdk.sli.version>
         <ccsdk.features.version>1.3.0-SNAPSHOT</ccsdk.features.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>