Merge "fix for CSIT config-over-netconf 5G-bulkpm"

7 files changed, 34 insertions, 45 deletions

diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml
new file mode 100644
index 00000000..f2d7a420
--- /dev/null
+++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml
@@ -0,0 +1,14 @@
+version: '2.1'
+services:
+  pmmapper:
+    container_name: pmmapper
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.1.3
+    ports:
+      - "8081:8081"
+    environment:
+      CONFIG_BINDING_SERVICE_SERVICE_HOST: CBSIP
+      CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
+      HOSTNAME: pmmapper
+    extra_hosts:
+      - "dmaap-dr-node:1.1.1.1"
+      - "message-router:4.4.4.4"
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh
index c2feb52d..00993b72 100644
--- a/plans/usecases/5G-bulkpm/setup.sh
+++ b/plans/usecases/5G-bulkpm/setup.sh
@@ -202,7 +202,7 @@ curl 'http://'$CONSUL_IP':8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: applica
 # PM Mapper startup and configuration
 mkdir /tmp/docker-compose
 cd /tmp/docker-compose
-cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml /tmp/docker-compose/docker-compose.yml
+cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml /tmp/docker-compose/docker-compose.yml
 CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' cbs)
 sed -i 's/CBSIP/'$CBS_IP'/g' docker-compose.yml
 sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml
diff --git a/plans/usecases/config-over-netconf/setup.sh b/plans/usecases/config-over-netconf/setup.sh
index 9e87b041..713d57d1 100644
--- a/plans/usecases/config-over-netconf/setup.sh
+++ b/plans/usecases/config-over-netconf/setup.sh
@@ -44,6 +44,8 @@ HOST_IP_ADDR=localhost
 cd $SDNC_DOCKER_PATH
 unset http_proxy https_proxy
 
+docker pull $NETOPEER_DOCKER_REPO:$NETOPEER_IMAGE_TAG
+docker tag  $NETOPEER_DOCKER_REPO:$NETOPEER_IMAGE_TAG $NETOPEER_DOCKER_REPO:latest
 #sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="AUTO"/g" diocker-compose.yml
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 
@@ -72,7 +74,8 @@ TIME_OUT=1000
 INTERVAL=30
 TIME=0
 while [ "$TIME" -lt "$TIME_OUT" ]; do
-  response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-sdnc" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8282/restconf/operations/SLI-API:healthcheck ); echo $response
+  response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-sdnc" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8282/restconf/operations/SLI-API:healthcheck );
+  echo $response
 
   if [ "$response" == "200" ]; then
     echo SDNC started in $TIME seconds
@@ -108,42 +111,6 @@ sed -i "s/reskey/$RES_KEY/g" $REQUEST_DATA_PATH/config-assign.json
 
 #########################check if server is up gracefully ######################################
 
-TIME_OUT=1500
-INTERVAL=60
-TIME=0
-while [ "$TIME" -lt "$TIME_OUT" ]; do
-docker exec sdnc_controller_container rm -f /opt/opendaylight/current/etc/host.key
-response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
-docker exec sdnc_controller_container rm -f /opt/opendaylight/current/etc/host.key
-
-  if [ "$response" == "Level 100" ] ; then
-    echo SDNC karaf started in $TIME seconds
-    break;
-  fi
-
-  echo Sleep: $INTERVAL seconds before testing if SDNC is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds
-  sleep $INTERVAL
-  TIME=$(($TIME+$INTERVAL))
-done
-
-if [ "$TIME" -ge "$TIME_OUT" ]; then
-   echo TIME OUT: karaf session not started in $TIME_OUT seconds... Could cause problems for testing activities...
-fi
-
-response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
-
-  if [ "$response" == "Level 100" ] ; then
-    num_failed_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure | wc -l)
-    failed_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure)
-    echo There is/are $num_failed_bundles failed bundles out of $num_bundles installed bundles.
-  fi
-
-if [ "$num_failed_bundles" -ge 1 ]; then
-  echo "The following bundle(s) are in a failed state: "
-  echo "  $failed_bundles"
-fi
-
-
 # Sleep additional 3 minutes (180 secs) to give application time to finish
 
 sleep 150
diff --git a/plans/usecases/config-over-netconf/teardown.sh b/plans/usecases/config-over-netconf/teardown.sh
index 5bf1b909..9613e3ee 100755
--- a/plans/usecases/config-over-netconf/teardown.sh
+++ b/plans/usecases/config-over-netconf/teardown.sh
@@ -4,6 +4,13 @@ SDNC_DOCKER_COMPOSE_PATH=$SDNC_DOCKER_PATH/docker-compose.yaml
 PNFSIM_DOCKER_COMPOSE_PATH=$INT_DOCKER_PATH/docker-compose.yml
 CDS_DOCKER_COMPOSE_PATH=$CDS_DOCKER_PATH/docker-compose.yaml
 
+echo "==========================blueprint-processor logs =================================="
+docker logs bp-rest
+
+echo "==========================sdnc-controller logs ======================================"
+docker logs sdnc_controller_container
+
+
 docker-compose -f $SDNC_DOCKER_COMPOSE_PATH down
 docker-compose -f $PNFSIM_DOCKER_COMPOSE_PATH down
 docker-compose -f $CDS_DOCKER_COMPOSE_PATH down
diff --git a/plans/usecases/config-over-netconf/test.properties b/plans/usecases/config-over-netconf/test.properties
index bdce15ab..ee002461 100644
--- a/plans/usecases/config-over-netconf/test.properties
+++ b/plans/usecases/config-over-netconf/test.properties
@@ -1,13 +1,14 @@
 NEXUS_DOCKER_REPO=nexus3.onap.org:10001
 NEXUS_USERNAME=docker
 NEXUS_PASSWD=docker
-SDNC_IMAGE_TAG=1.7.3
-ANSIBLE_IMAGE_TAG=1.7.3
-BP_IMAGE_TAG=0.6.3
+SDNC_IMAGE_TAG=1.7.6
+ANSIBLE_IMAGE_TAG=1.7.6
+BP_IMAGE_TAG=0.6.4
 REQUEST_DATA_PATH=$WORKSPACE/tests/$PARENT/$SUB_PARENT/data
 TC_PLANS_PATH=$WORKSPACE/plans/$PARENT/$SUB_PARENT
 CDS_DOCKER_PATH=$TC_PLANS_PATH/cds
 SDNC_DOCKER_PATH=$TC_PLANS_PATH/sdn
 INT_DOCKER_PATH=$WORKSPACE/temp/integration/test/mocks/pnfsimulator
 CERT_SUBPATH=$TC_PLANS_PATH/certs
-
+NETOPEER_DOCKER_REPO=sysrepo/sysrepo-netopeer2
+NETOPEER_IMAGE_TAG=v0.7.7
diff --git a/tests/usecases/config-over-netconf/config_over_netconf.robot b/tests/usecases/config-over-netconf/config_over_netconf.robot
index c6e06596..2ba64007 100644
--- a/tests/usecases/config-over-netconf/config_over_netconf.robot
+++ b/tests/usecases/config-over-netconf/config_over_netconf.robot
@@ -7,8 +7,8 @@ Library     String
 
 *** Variables ***
 ${SDNC_KEYSTORE_CONFIG_PATH}    /config/netconf-keystore:keystore
-${SDNC_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/netopeer2
-${PNFSIM_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/netopeer2/yang-ext:mount/mynetconf:netconflist
+${SDNC_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator
+${PNFSIM_MOUNT_PATH}    /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist
 ${BP_UPLOAD_URL}    /api/v1/execution-service/upload
 ${BP_PROCESS_URL}    /api/v1/execution-service/process
 ${BP_ARCHIVE_PATH}    ${CURDIR}/data/blueprint_archive.zip
diff --git a/tests/usecases/config-over-netconf/data/mount.xml b/tests/usecases/config-over-netconf/data/mount.xml
index 108369bc..22053e8a 100644
--- a/tests/usecases/config-over-netconf/data/mount.xml
+++ b/tests/usecases/config-over-netconf/data/mount.xml
@@ -1,5 +1,5 @@
 <node xmlns="urn:TBD:params:xml:ns:yang:network-topology">
-  <node-id>netopeer2</node-id>
+  <node-id>pnf-simulator</node-id>
     <key-based xmlns="urn:opendaylight:netconf-node-topology">
    <key-id xmlns="urn:opendaylight:netconf-node-topology">ODL_private_key_0</key-id>
    <username xmlns="urn:opendaylight:netconf-node-topology">netconf</username>