Merge "PM-Mapper CSIT image pulls enhancements"

8 files changed, 28 insertions, 3 deletions

diff --git a/csit/.gitignore b/csit/.gitignore
index c8865c2..3a900d8 100644
--- a/csit/.gitignore
+++ b/csit/.gitignore
@@ -1,2 +1,3 @@
 env.properties
 archives/
+*.pyc
diff --git a/csit/plans/filesprocessingconfigpmmapper/setup.sh b/csit/plans/filesprocessingconfigpmmapper/setup.sh
index 5f0b41b..0a86c0a 100644
--- a/csit/plans/filesprocessingconfigpmmapper/setup.sh
+++ b/csit/plans/filesprocessingconfigpmmapper/setup.sh
@@ -78,6 +78,18 @@ for i in {1..5}; do
 done
 [ "$containers_ok" = "false" ] && echo "Error: required container not running." && exit 1
 
+#Data Router healthcheck
+for i in $(seq 10); do
+  curl -sf 'http://localhost:8080/internal/prov' -o /dev/null
+  curl_status=$?
+  if [ curl_status -eq 0 ]; then
+      break
+    else
+      sleep 2
+  fi
+done
+
+
 # Data Router Configuration.
 docker exec -i datarouter-prov sh -c \
     "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$GATEWAY_IP"
diff --git a/csit/plans/pmmapper/docker-compose.yml b/csit/plans/pmmapper/docker-compose.yml
index d612de2..ad671d2 100644
--- a/csit/plans/pmmapper/docker-compose.yml
+++ b/csit/plans/pmmapper/docker-compose.yml
@@ -46,7 +46,7 @@ services:
       - "dcae-pm-mapper:$PMMAPPER_IP"
 
   node:
-    image: node:10-slim
+    image: nexus3.onap.org:10001/node:10-slim
     container_name: mr-simulator
     volumes:
       - /var/tmp/mrserver.js:/tmp/mrserver.js
@@ -57,7 +57,7 @@ services:
         ipv4_address: $NODE_IP
 
   mariadb:
-    image: mariadb:10.2.14
+    image: nexus3.onap.org:10001/mariadb:10.2.14
     container_name: mariadb
     ports:
       - "3306:3306"
diff --git a/csit/plans/pmmapper/setup.sh b/csit/plans/pmmapper/setup.sh
index 918b7f6..258b99e 100644
--- a/csit/plans/pmmapper/setup.sh
+++ b/csit/plans/pmmapper/setup.sh
@@ -71,6 +71,17 @@ for i in {1..5}; do
 done
 [ "$containers_ok" = "false" ] && echo "Error: required container not running." && exit 1
 
+#Data Router healthcheck
+for i in $(seq 10); do
+  curl -sf 'http://localhost:8080/internal/prov' -o /dev/null
+  curl_status=$?
+  if [ curl_status -eq 0 ]; then
+      break
+    else
+      sleep 2
+  fi
+done
+
 # Data Router Configuration.
 docker exec -i datarouter-prov sh -c \
     "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$GATEWAY_IP"
diff --git a/csit/tests/filesprocessingconfigpmmapper/filesprocessingconfigpmmapper.robot b/csit/tests/filesprocessingconfigpmmapper/filesprocessingconfigpmmapper.robot
index 9648ef8..5f026d1 100644
--- a/csit/tests/filesprocessingconfigpmmapper/filesprocessingconfigpmmapper.robot
+++ b/csit/tests/filesprocessingconfigpmmapper/filesprocessingconfigpmmapper.robot
@@ -15,7 +15,7 @@ ${NR_VALID_METADATA_PATH}                ${ASSETS_PATH}/valid_metadata.json
 ${CLI_EXEC_CLI_PM_LOG_CLEAR}             docker exec pmmapper /bin/sh -c "echo -n "" > /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log"
 ${PUBLISH_NODE_URL}                      https://${DR_NODE_IP}:8443/publish/1
 ${CLI_EXEC_LOGS_LIST}                    docker exec datarouter-node /bin/sh -c "ls /opt/app/datartr/logs"
-${DOCKER_CLIENT_IMAGE}                   nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:latest
+${DOCKER_CLIENT_IMAGE}                   onap/org.onap.dcaegen2.services.pm-mapper:latest
 ${CLIENT_CONTAINER_NAME}                 pmmapper
 ${FILE_PATH}                             ${ASSETS_PATH}/ABigFile.xml
 ${CONFIG_ENVS_1_1}                       ${ASSETS_PATH}/config_1_1.env
@@ -122,6 +122,7 @@ GetLogsOutput
                                       ${exec}=                         Catenate                                  docker exec datarouter-node /bin/sh -c      ${file_path}
                                       ${single_file}=                  Run Process                               ${exec}         shell=yes
                                       ${output}=                       Catenate                                  SEPARATOR=\n         ${output}                  ${single_file.stdout}
+                                      Log                              ${output}
     END
     [Return]                          ${output}
 
diff --git a/csit/tests/filesprocessingconfigpmmapper/libraries/DockerContainerManager.pyc b/csit/tests/filesprocessingconfigpmmapper/libraries/DockerContainerManager.pyc
deleted file mode 100644
index 2bf62c3..0000000
--- a/csit/tests/filesprocessingconfigpmmapper/libraries/DockerContainerManager.pyc
+++ /dev/null
diff --git a/csit/tests/filesprocessingconfigpmmapper/libraries/EnvsReader.pyc b/csit/tests/filesprocessingconfigpmmapper/libraries/EnvsReader.pyc
deleted file mode 100644
index 831aa34..0000000
--- a/csit/tests/filesprocessingconfigpmmapper/libraries/EnvsReader.pyc
+++ /dev/null
diff --git a/csit/tests/filesprocessingconfigpmmapper/libraries/LogReader.pyc b/csit/tests/filesprocessingconfigpmmapper/libraries/LogReader.pyc
deleted file mode 100644
index d8e936c..0000000
--- a/csit/tests/filesprocessingconfigpmmapper/libraries/LogReader.pyc
+++ /dev/null