aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2017-09-13 10:25:21 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2017-09-13 10:25:21 +0800
commit0f689f519dfb8c9b074aca3b34511826ff2d70c5 (patch)
tree5ab7393668bebca4c49825d54849b705a582279f
parent98a621d3186d9f98b68d7e9ce55cbcb00d2f2aeb (diff)
Remove extra debug code
Remove extra debug code in gvnfm driver and svnfm driver setup.sh Change-Id: I8680e6942f935dfd421d8f35d62dd8525db6141a Issue-ID: VFC-347 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
-rw-r--r--test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh18
-rw-r--r--test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh18
2 files changed, 1 insertions, 35 deletions
diff --git a/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh b/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
index c5c9f12cd..a4e2cf3e6 100644
--- a/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
+++ b/test/csit/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh
@@ -45,30 +45,12 @@ sleep 60
docker run -d --name vfc-gvnfmdriver -e MSB_ADDR=${MSB_DISCOVERY_IP}:10081 nexus3.onap.org:10001/onap/vfc/gvnfmdriver
GVNFMDRIVER_IP=`get-instance-ip.sh vfc-gvnfmdriver`
-docker logs -f vfc-gvnfmdriver > vfc-gvnfmdriver &
# Wait for initialization
for i in {1..10}; do
curl -sS ${GVNFMDRIVER_IP}:8484 && break
echo sleep $i
sleep $i
done
-cat vfc-gvnfmdriver.log
-
-echo "================================================"
-docker cp vfc-gvnfmdriver:/service/vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/docker/docker-entrypoint.sh ./
-cat docker-entrypoint.sh
-
-echo "================================================"
-docker cp vfc-gvnfmdriver:/service/vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/docker/instance_config.sh ./
-cat instance_config.sh
-
-echo "================================================"
-docker cp vfc-gvnfmdriver:/service/vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/docker/instance_init.sh ./
-cat instance_init.sh
-
-echo "================================================"
-docker cp vfc-gvnfmdriver:/service/vfc/nfvo/driver/vnfm/gvnfm/gvnfmadapter/docker/instance_run.sh ./
-cat instance_run.sh
# Pass any variables required by Robot test suites in ROBOT_VARIABLES
ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v GVNFMDRIVER_IP:${GVNFMDRIVER_IP}"
diff --git a/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh
index 3f79bb024..8eb205b0b 100644
--- a/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh
+++ b/test/csit/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/setup.sh
@@ -41,34 +41,18 @@ done
# wait for container initalization
echo sleep 60
sleep 60
+
# start vfc-ztevmanagerdriver
docker run -d --name vfc-ztevmanagerdriver -e MSB_ADDR=${MSB_DISCOVERY_IP}:10081 nexus3.onap.org:10001/onap/vfc/ztevmanagerdriver
ZTEVMANAGERDRIVER_IP=`get-instance-ip.sh vfc-ztevmanagerdriver`
-docker logs -f vfc-ztevmanagerdriver > vfc-ztevmanagerdriver &
# Wait for initialization
for i in {1..10}; do
curl -sS ${ZTEVMANAGERDRIVER_IP}:8410 && break
echo sleep $i
sleep $i
done
-cat vfc-ztevmanagerdriver.log
-
-echo "================================================"
-docker cp vfc-ztevmanagerdriver:/service/vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/docker-entrypoint.sh ./
-cat docker-entrypoint.sh
-
-echo "================================================"
-docker cp vfc-ztevmanagerdriver:/service/vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/instance_config.sh ./
-cat instance_config.sh
-
-echo "================================================"
-docker cp vfc-ztevmanagerdriver:/service/vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/instance_init.sh ./
-cat instance_init.sh
-echo "================================================"
-docker cp vfc-ztevmanagerdriver:/service/vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/docker/instance_run.sh ./
-cat instance_run.sh
# Start svnfm-huawei
docker run -d --name vfc-svnfm-huawei -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/vfc/nfvo/svnfm/huawei