Fixes for montreal release

- updating the DOCKER REPO port to pull images from the read only repo
- update the csit dmi plugin image to 1.4.0
- add six as dependency for csit
- added legacy-ouput flag to the csit run-csit file
- commented cps-subscription csit test

Issue-ID: CPS-2075
Change-Id: I00dffdf305f634841208dade210cac499c61615d
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

diff --git a/csit/plans/cps/test.properties b/csit/plans/cps/test.properties
index f97ac1c..7280979 100644 (file)
--- a/csit/plans/cps/test.properties
+++ b/csit/plans/cps/test.properties
@@ -18,10 +18,10 @@ DMI_USERNAME=cpsuser
 DMI_PASSWORD=cpsr0cks!
 DMI_SERVICE_URL=http://$LOCAL_IP:$DMI_PORT
 
-DOCKER_REPO=nexus3.onap.org:10003
+DOCKER_REPO=nexus3.onap.org:10001
 
 CPS_VERSION=latest
-DMI_VERSION=1.4.0-SNAPSHOT-latest
+DMI_VERSION=1.4.0
 
 ADVISED_MODULES_SYNC_SLEEP_TIME_MS=2000
 CMHANDLE_DATA_SYNC_SLEEP_TIME_MS=2000

diff --git a/csit/plans/cps/testplan.txt b/csit/plans/cps/testplan.txt
index 1775ad3..d790ab8 100644 (file)
--- a/csit/plans/cps/testplan.txt
+++ b/csit/plans/cps/testplan.txt
@@ -21,7 +21,7 @@ cps-admin
 cps-data
 cps-model-sync
 cps-data-sync
-cps-subscriptions
+#cps-subscriptions
 ncmp-passthrough
 cm-handle-query
 cps-data-operations
\ No newline at end of file

diff --git a/csit/run-csit.sh b/csit/run-csit.sh
index 9a344c1..1210eb4 100755 (executable)
--- a/csit/run-csit.sh
+++ b/csit/run-csit.sh
@@ -213,7 +213,7 @@ python3 --version
 pip freeze
 python3 -m robot.run --version || :
 
-python3 -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
+python3 -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp --legacy-output ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
 RESULT=$?
 load_set
 echo "RESULT: $RESULT"

diff --git a/csit/tests/cps-data/cps-data.robot b/csit/tests/cps-data/cps-data.robot
index ce2033c..61ab3dc 100644 (file)
--- a/csit/tests/cps-data/cps-data.robot
+++ b/csit/tests/cps-data/cps-data.robot
@@ -57,7 +57,7 @@ Get Updated Data Node by XPath
     ${response}=        Get On Session      CPS_URL   ${uri}   params=${params}   headers=${headers}   expected_status=200
     ${responseJson}=    Set Variable        ${response.json()['tree:nest']}
     Should Be Equal As Strings              ${responseJson['name']}   Bigger
-    Should Be Equal As Strings              ${responseJson['birds']}   ['Falcon', 'Eagle', 'Pigeon']
+    Should Be Equal As Strings              ${responseJson['birds']}   ['Pigeon', 'Falcon', 'Eagle']
 
 Get Data Node by XPath
     ${uri}=             Set Variable        ${basePath}/v1/dataspaces/${dataspaceName}/anchors/${anchorName}/node

diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index ed96b42..b95c29f 100644 (file)
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -1,3 +1,4 @@
+six
 sphinx>=4.2.0  # BSD
 sphinx-rtd-theme>=1.0.0  # MIT
 sphinxcontrib-blockdiag  # BSD