diff options
| author |   Yang Xu <yang.xu3@huawei.com> | 2019-02-22 15:49:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-22 15:49:04 +0000 |
| commit | 50c89f9872d724ed9a03b3a10485bfd7090a817d (patch) | |
| tree | 81ea396d0873f36e94ba25a60fae93a4ab02ef2e /plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check | |
| parent | 2f837e687c8a432d8886585d8ad2d74543b077d2 (diff) | |
| parent | 6c2eae8d2ea2d595407a0204f7bbe7a43355868f (diff) | |
Merge "Remove dummy plans"
Diffstat (limited to 'plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check')
3 files changed, 2 insertions, 17 deletions
diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh index bdc66d0e..e7ac1f36 100644 --- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh +++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh @@ -52,16 +52,5 @@ for i in {1..10}; do sleep $i done -# start vfc-jujudriver -docker run -d --name vfc-jujudriver -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/vfc/jujudriver -JUJUDRIVER_IP=`get-instance-ip.sh vfc-jujudriver` - -# Wait for initialization -for i in {1..10}; do - curl -sS ${JUJUDRIVER_IP}:8483 && break - echo sleep $i - sleep $i -done - # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v GVNFMDRIVER_IP:${GVNFMDRIVER_IP} -v JUJUDRIVER_IP:${JUJUDRIVER_IP}" +ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v GVNFMDRIVER_IP:${GVNFMDRIVER_IP}" diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh index 78d7c5ad..d90aad27 100644 --- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh +++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh @@ -19,6 +19,4 @@ kill-instance.sh msb_internal_apigateway kill-instance.sh msb_discovery kill-instance.sh msb_consul -kill-instance.sh vfc-gvnfmdriver - -kill-instance.sh vfc-jujudriver +kill-instance.sh vfc-gvnfmdriver diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt index a54f095c..1295b2f8 100644 --- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt @@ -2,5 +2,3 @@ # Place the suites in run order. vfc/nfvo-driver-gvnfm/gvnfmdriver.robot - -vfc/nfvo-driver-gvnfm/jujudriver.robot |