From 1e911e7ea4c7d2b0ebe2184710ef119d51369664 Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Wed, 13 Sep 2017 17:30:30 +0800 Subject: Update vfc csit setup.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modify vnflcm、vnfres、gvnfm-driver、svnfm-driver csit setup.py Change-Id: Iaf0bd41650a02ad9b00fa367c46622a432231b47 Issue-ID: VFC-353 Signed-off-by: ying.yunlong --- .../plans/vfc-gvnfm-vnfres/sanity-check/setup.sh | 26 ++-------------------- 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'test/csit/plans/vfc-gvnfm-vnfres') diff --git a/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh b/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh index 78cc5e0cb..0139bcdcc 100755 --- a/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh +++ b/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh @@ -42,37 +42,15 @@ done echo sleep 60 sleep 60 # start vfc-vnfres -docker run -d --name vfc-vnfres -v /var/lib/mysql -e MSB_ADDR=${MSB_DISCOVERY_IP}:10081 nexus3.onap.org:10001/onap/vfc/vnfres +docker run -d --name vfc-vnfres -v /var/lib/mysql -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/vfc/vnfres VNFRES_IP=`get-instance-ip.sh vfc-vnfres` -docker logs -f vfc-vnfres > vfc-vnfres.log & # Wait for initialization for i in {1..10}; do curl -sS ${VNFRES_IP}:8802 && break echo sleep $i sleep $i done -cat vfc-vnfres.log - -echo "================================================" -docker cp vfc-vnfres:/service/vfc/gvnfm/vnfres/res/docker/docker-entrypoint.sh ./ -cat docker-entrypoint.sh - -echo "================================================" -docker cp vfc-vnfres:/service/vfc/gvnfm/vnfres/res/docker/instance_config.sh ./ -cat instance_config.sh - -echo "================================================" -docker cp vfc-vnfres:/service/vfc/gvnfm/vnfres/res/docker/instance_init.sh ./ -cat instance_init.sh - -echo "================================================" -docker cp vfc-vnfres:/service/vfc/gvnfm/vnfres/res/docker/instance_run.sh ./ -cat instance_run.sh - -#echo "================================================" -#docker cp vfc-vnfres:/service/vfc/gvnfm/vnfres/res/logs/runtime_res.log ./ -#cat instance_init.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 VNFRES_IP:${VNFRES_IP}" +ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v VNFRES_IP:${VNFRES_IP}" -- cgit 1.2.3-korg