diff options
| author |   Murali <murali.p@huawei.com> | 2017-08-30 09:07:42 +0000 |
|---|---|---|
| committer | Murali <murali.p@huawei.com> | 2017-08-30 09:07:42 +0000 |
| commit | 6811ec2e8d1269d67e78873c203d1d435e99ff34 (patch) | |
| tree | 6a2dc8b27717f33b7c98d261c315fbd389bde2e9 | |
| parent | 9b890140774f555d4d71be2b8874875bb6944d4a (diff) | |
Fix the startup and teardown for vnfmarket
Change-Id: Ief9b851d161edf4bbb9b9744374e8f366be468a2
Jira:VNFSDK-34
Signed-off-by: Murali <murali.p@huawei.com>
| -rw-r--r-- | test/csit/plans/vnfsdk-marketplace/sanity-check/setup.sh | 26 | ||||
| -rw-r--r-- | test/csit/plans/vnfsdk-marketplace/sanity-check/teardown.sh | 7 |
2 files changed, 7 insertions, 26 deletions
diff --git a/test/csit/plans/vnfsdk-marketplace/sanity-check/setup.sh b/test/csit/plans/vnfsdk-marketplace/sanity-check/setup.sh index 86d7ce61b..85c6bc275 100644 --- a/test/csit/plans/vnfsdk-marketplace/sanity-check/setup.sh +++ b/test/csit/plans/vnfsdk-marketplace/sanity-check/setup.sh @@ -16,33 +16,15 @@ # # These scripts are sourced by run-csit.sh. -source ${SCRIPTS}/common_functions.sh - -# Start MSB -${SCRIPTS}/common-services-microservice-bus/startup.sh i-msb -MSB_IP=`get-instance-ip.sh i-msb` -curl_path='http://'${MSB_IP}'/openoui/microservices/index.html' -sleep_msg="Waiting_connection_for_url_for:i-msb" -wait_curl_driver CURL_COMMAND=$curl_path WAIT_MESSAGE='"$sleep_msg"' GREP_STRING="org_openo_msb_route_title" REPEAT_NUMBER="15" #Start market place -docker run -d -i -t --name=marketplace -e MSB_ADDR=$MSB_IP -p 8702:8702 openoint/vnf-sdk-marketplace - -# Start vnfsdk -docker run -d -i -t --name=functest -e MSB_ADDR=$MSB_IP -p 8701:8701 openoint/vnfsdk-function-test - -#Start catalogue, aria -docker run -d -i -t --name=catalog -e MSB_ADDR=$MSB_IP -p 8200:8200 -p 8201:8201 openoint/common-tosca-catalog +docker run -d -i -t --name=vnfmarket -p 8702:8702 onap/vnfmarket -docker run -d -i -t --name=aria -e MSB_ADDR=$MSB_IP -p 8204:8204 openoint/common-tosca-aria +REPO_IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' vnfmarket` - -echo SCRIPTS - # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v SCRIPTS:${SCRIPTS}" +ROBOT_VARIABLES="-v REPO_IP:${REPO_IP}" + -# Run Mock server -run_robottestlib
\ No newline at end of file diff --git a/test/csit/plans/vnfsdk-marketplace/sanity-check/teardown.sh b/test/csit/plans/vnfsdk-marketplace/sanity-check/teardown.sh index f74b59745..42d7b7fd4 100644 --- a/test/csit/plans/vnfsdk-marketplace/sanity-check/teardown.sh +++ b/test/csit/plans/vnfsdk-marketplace/sanity-check/teardown.sh @@ -16,7 +16,6 @@ # # This script is sourced by run-csit.sh after Robot test completion. -kill-instance.sh functest -kill-instance.sh marketplace -kill-instance.sh catalog -kill-instance.sh aria + +kill-instance.sh vnfmarket + |