Set up and tear down test environment properly

Two issues were detected during testing deployment locally:
- incomplete provisioning if set up from scratch [1],
- leaving DevStack in unknown state if test failed.

[1] https://www.vagrantup.com/docs/cli/up#provision-with-x-y-z

Issue-ID: INT-1601
Change-Id: Ie553ba71a2b56789736ab822f1f1a2e4043f4935
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>

8 files changed, 44 insertions, 16 deletions

diff --git a/deployment/noheat/infra-openstack/vagrant/test/create_host.test b/deployment/noheat/infra-openstack/vagrant/test/create_host.test
index d36e288e9..f2a1ab909 100755
--- a/deployment/noheat/infra-openstack/vagrant/test/create_host.test
+++ b/deployment/noheat/infra-openstack/vagrant/test/create_host.test
@@ -5,8 +5,13 @@ export HOST_NAME='operator0'
 export VAGRANT_CWD='..'
 
 set_up() {
-    vagrant up --provision-with=run_playbook_destroy
-    vagrant up --provision-with=run_playbook_create
+    vagrant up
+    vagrant provision --provision-with=run_playbook_destroy
+    vagrant provision --provision-with=run_playbook_create
+}
+
+tear_down() {
+    vagrant provision --provision-with=run_playbook_destroy
 }
 
 check() {
@@ -19,3 +24,4 @@ check() {
 
 set_up >/dev/null # drop provisioning output
 check "$HOST_NAME"
+tear_down >/dev/null # drop provisioning output
diff --git a/deployment/noheat/infra-openstack/vagrant/test/create_keypair.test b/deployment/noheat/infra-openstack/vagrant/test/create_keypair.test
index 3e1dbfe2b..e402fa69a 100755
--- a/deployment/noheat/infra-openstack/vagrant/test/create_keypair.test
+++ b/deployment/noheat/infra-openstack/vagrant/test/create_keypair.test
@@ -5,8 +5,13 @@ export KEYPAIR_NAME='onap_ci_lab'
 export VAGRANT_CWD='..'
 
 set_up() {
-    vagrant up --provision-with=run_playbook_destroy
-    vagrant up --provision-with=run_playbook_create
+    vagrant up
+    vagrant provision --provision-with=run_playbook_destroy
+    vagrant provision --provision-with=run_playbook_create
+}
+
+tear_down() {
+    vagrant provision --provision-with=run_playbook_destroy
 }
 
 check() {
@@ -19,3 +24,4 @@ check() {
 
 set_up >/dev/null # drop provisioning output
 check "$KEYPAIR_NAME"
+tear_down >/dev/null # drop provisioning output
diff --git a/deployment/noheat/infra-openstack/vagrant/test/create_network.test b/deployment/noheat/infra-openstack/vagrant/test/create_network.test
index 7124f707e..d81a12fa6 100755
--- a/deployment/noheat/infra-openstack/vagrant/test/create_network.test
+++ b/deployment/noheat/infra-openstack/vagrant/test/create_network.test
@@ -5,8 +5,13 @@ export NETWORK_NAME='onap_ci_lab'
 export VAGRANT_CWD='..'
 
 set_up() {
-    vagrant up --provision-with=run_playbook_destroy
-    vagrant up --provision-with=run_playbook_create
+    vagrant up
+    vagrant provision --provision-with=run_playbook_destroy
+    vagrant provision --provision-with=run_playbook_create
+}
+
+tear_down() {
+    vagrant provision --provision-with=run_playbook_destroy
 }
 
 check() {
@@ -19,3 +24,4 @@ check() {
 
 set_up >/dev/null # drop provisioning output
 check "$NETWORK_NAME"
+tear_down >/dev/null # drop provisioning output
diff --git a/deployment/noheat/infra-openstack/vagrant/test/create_securitygroup.test b/deployment/noheat/infra-openstack/vagrant/test/create_securitygroup.test
index 6378776b8..6ac7fdc85 100755
--- a/deployment/noheat/infra-openstack/vagrant/test/create_securitygroup.test
+++ b/deployment/noheat/infra-openstack/vagrant/test/create_securitygroup.test
@@ -5,8 +5,13 @@ export SECURITYGROUP_NAME='onap_ci_lab'
 export VAGRANT_CWD='..'
 
 set_up() {
-    vagrant up --provision-with=run_playbook_destroy
-    vagrant up --provision-with=run_playbook_create
+    vagrant up
+    vagrant provision --provision-with=run_playbook_destroy
+    vagrant provision --provision-with=run_playbook_create
+}
+
+tear_down() {
+    vagrant provision --provision-with=run_playbook_destroy
 }
 
 check() {
@@ -19,3 +24,4 @@ check() {
 
 set_up >/dev/null # drop provisioning output
 check "$SECURITYGROUP_NAME"
+tear_down >/dev/null # drop provisioning output
diff --git a/deployment/noheat/infra-openstack/vagrant/test/destroy_host.test b/deployment/noheat/infra-openstack/vagrant/test/destroy_host.test
index 9db374e7b..8217081b1 100755
--- a/deployment/noheat/infra-openstack/vagrant/test/destroy_host.test
+++ b/deployment/noheat/infra-openstack/vagrant/test/destroy_host.test
@@ -5,8 +5,9 @@ export HOST_NAME='operator0'
 export VAGRANT_CWD='..'
 
 set_up() {
-    vagrant up --provision-with=run_playbook_create
-    vagrant up --provision-with=run_playbook_destroy
+    vagrant up
+    vagrant provision --provision-with=run_playbook_create
+    vagrant provision --provision-with=run_playbook_destroy
 }
 
 check() {
diff --git a/deployment/noheat/infra-openstack/vagrant/test/destroy_keypair.test b/deployment/noheat/infra-openstack/vagrant/test/destroy_keypair.test
index e80989320..42132b347 100755
--- a/deployment/noheat/infra-openstack/vagrant/test/destroy_keypair.test
+++ b/deployment/noheat/infra-openstack/vagrant/test/destroy_keypair.test
@@ -5,8 +5,9 @@ export KEYPAIR_NAME='onap_ci_lab'
 export VAGRANT_CWD='..'
 
 set_up() {
-    vagrant up --provision-with=run_playbook_create
-    vagrant up --provision-with=run_playbook_destroy
+    vagrant up
+    vagrant provision --provision-with=run_playbook_create
+    vagrant provision --provision-with=run_playbook_destroy
 }
 
 check() {
diff --git a/deployment/noheat/infra-openstack/vagrant/test/destroy_network.test b/deployment/noheat/infra-openstack/vagrant/test/destroy_network.test
index 173b3ecca..182d7dcaf 100755
--- a/deployment/noheat/infra-openstack/vagrant/test/destroy_network.test
+++ b/deployment/noheat/infra-openstack/vagrant/test/destroy_network.test
@@ -5,8 +5,9 @@ export NETWORK_NAME='onap_ci_lab'
 export VAGRANT_CWD='..'
 
 set_up() {
-    vagrant up --provision-with=run_playbook_create
-    vagrant up --provision-with=run_playbook_destroy
+    vagrant up
+    vagrant provision --provision-with=run_playbook_create
+    vagrant provision --provision-with=run_playbook_destroy
 }
 
 check() {
diff --git a/deployment/noheat/infra-openstack/vagrant/test/destroy_securitygroup.test b/deployment/noheat/infra-openstack/vagrant/test/destroy_securitygroup.test
index 0d8042d6a..ce65f1f08 100755
--- a/deployment/noheat/infra-openstack/vagrant/test/destroy_securitygroup.test
+++ b/deployment/noheat/infra-openstack/vagrant/test/destroy_securitygroup.test
@@ -5,8 +5,9 @@ export SECURITYGROUP_NAME='onap_ci_lab'
 export VAGRANT_CWD='..'
 
 set_up() {
-    vagrant up --provision-with=run_playbook_create
-    vagrant up --provision-with=run_playbook_destroy
+    vagrant up
+    vagrant provision --provision-with=run_playbook_create
+    vagrant provision --provision-with=run_playbook_destroy
 }
 
 check() {