Repository: cloudstack
Updated Branches:
refs/heads/4.4 b7b9cd0d2 -> bd8eaf86f
CLOUDSTACK-7393: Expunging VM immediately and removing unncessary wait in
test_vpc_vm_life_cycle.py
Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org>
(cherry picked from commit 402fc914cf4047b7faf1b1410972bb5a4ae5b29d)
Conflicts:
test/integration/component/test_vpc_vm_life_cycle.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bd8eaf86
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bd8eaf86
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bd8eaf86
Branch: refs/heads/4.4
Commit: bd8eaf86fe07c8c90f71da8ca430cfb489159655
Parents: b7b9cd0
Author: Gaurav Aradhye <gaurav.arad...@clogeny.com>
Authored: Mon Sep 8 18:59:17 2014 +0530
Committer: Daan Hoogland <d...@onecht.net>
Committed: Tue Sep 9 09:14:10 2014 +0200
----------------------------------------------------------------------
.../component/test_vpc_vm_life_cycle.py | 49 --------------------
1 file changed, 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd8eaf86/test/integration/component/test_vpc_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py
b/test/integration/component/test_vpc_vm_life_cycle.py
index fd995cd..bb26452 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -3488,60 +3488,11 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.account.name)
try:
self.vm_1.delete(self.apiclient)
-
- list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.vm_1.id
- )
-
- vm_response = list_vm_response[0]
-
- self.assertEqual(
- vm_response.state,
- 'Destroyed',
- "VM state should be destroyed"
- )
-
self.vm_2.delete(self.apiclient)
-
- list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.vm_2.id
- )
-
- vm_response = list_vm_response[0]
-
- self.assertEqual(
- vm_response.state,
- 'Destroyed',
- "VM state should be destroyed"
- )
-
self.vm_3.delete(self.apiclient)
-
- list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.vm_3.id
- )
-
- vm_response = list_vm_response[0]
-
- self.assertEqual(
- vm_response.state,
- 'Destroyed',
- "VM state should be destroyed"
- )
except Exception as e:
self.fail("Failed to destroy the virtual instances, %s" % e)
- self.debug(
- "Waiting for expunge interval to cleanup the network and VMs")
-
- wait_for_cleanup(
- self.apiclient,
- ["expunge.interval", "expunge.delay"]
- )
-
# Check if the network rules still exists after Vm stop
self.debug("Checking if NAT rules existed")
with self.assertRaises(Exception):
