You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/11/17 23:49:07 UTC
git commit: updated refs/heads/master to e712ac7
Repository: cloudstack
Updated Branches:
refs/heads/master eba7cc78d -> e712ac78d
CLOUDSTACK-7810 : Fixed the script '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/e712ac78
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e712ac78
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e712ac78
Branch: refs/heads/master
Commit: e712ac78d0814b973886ccdbd2c1edd88a0bfbb9
Parents: eba7cc7
Author: Chandan Purushothama <Ch...@citrix.com>
Authored: Sat Nov 15 15:03:03 2014 -0800
Committer: Sangeetha Hariharan <sa...@citrix.com>
Committed: Mon Nov 17 17:35:13 2014 -0800
----------------------------------------------------------------------
.../component/test_vpc_vm_life_cycle.py | 75 ++++++++++----------
1 file changed, 39 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e712ac78/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 84e27df..7a1fd8a 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -566,7 +566,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_03_start_instance_in_network(self):
""" Test start an instance in VPC networks
"""
@@ -591,7 +591,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_04_reboot_instance_in_network(self):
""" Test reboot an instance in VPC networks
"""
@@ -620,7 +620,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_05_destroy_instance_in_network(self):
""" Test destroy an instance in VPC networks
"""
@@ -719,6 +719,9 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
"VM state should be destroyed"
)
+
+
+
except Exception as e:
self.fail("Failed to stop the virtual instances, %s" % e)
@@ -784,7 +787,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_07_migrate_instance_in_network(self):
""" Test migrate an instance in VPC networks
"""
@@ -817,7 +820,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_08_user_data(self):
""" Test user data in virtual machines
"""
@@ -860,7 +863,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_09_meta_data(self):
""" Test meta data in virtual machines
"""
@@ -902,7 +905,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_10_expunge_instance_in_network(self):
""" Test expunge an instance in VPC networks
"""
@@ -954,7 +957,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls.testClient = super(TestVMLifeCycleSharedNwVPC, cls).getClsTestClient()
- cls.api_client = cls.testClient.getApiClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates
@@ -1283,7 +1286,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
(self.public_ip_1.ipaddress.ipaddress, e))
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_01_deploy_instance_in_network(self):
""" Test deploy an instance in VPC networks
"""
@@ -1318,7 +1321,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_02_stop_instance_in_network(self):
""" Test stop an instance in VPC networks
"""
@@ -1341,7 +1344,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_03_start_instance_in_network(self):
""" Test start an instance in VPC networks
"""
@@ -1382,7 +1385,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_04_reboot_instance_in_network(self):
""" Test reboot an instance in VPC networks
"""
@@ -1425,7 +1428,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_05_destroy_instance_in_network(self):
""" Test destroy an instance in VPC networks
"""
@@ -1460,7 +1463,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_06_recover_instance_in_network(self):
""" Test recover an instance in VPC networks
"""
@@ -1534,7 +1537,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_07_migrate_instance_in_network(self):
""" Test migrate an instance in VPC networks
"""
@@ -1567,7 +1570,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_08_user_data(self):
""" Test user data in virtual machines
"""
@@ -1610,7 +1613,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_09_meta_data(self):
""" Test meta data in virtual machines
"""
@@ -1652,7 +1655,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_10_expunge_instance_in_network(self):
""" Test expunge an instance in VPC networks
"""
@@ -1722,7 +1725,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls.testClient = super(TestVMLifeCycleBothIsolated, cls).getClsTestClient()
- cls.api_client = cls.testClient.getApiClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates
@@ -2056,7 +2059,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls.testClient = super(TestVMLifeCycleStoppedVPCVR, cls).getClsTestClient()
- cls.api_client = cls.testClient.getApiClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates
@@ -2442,7 +2445,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_03_start_instance_in_network(self):
""" Test start an instance in VPC networks
"""
@@ -2465,7 +2468,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_04_reboot_instance_in_network(self):
""" Test reboot an instance in VPC networks
"""
@@ -2492,7 +2495,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_05_destroy_instance_in_network(self):
""" Test destroy an instance in VPC networks
"""
@@ -2656,7 +2659,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_07_migrate_instance_in_network(self):
""" Test migrate an instance in VPC networks
"""
@@ -2690,7 +2693,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_08_user_data(self):
""" Test user data in virtual machines
"""
@@ -2733,7 +2736,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_09_meta_data(self):
""" Test meta data in virtual machines
"""
@@ -2775,7 +2778,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_10_expunge_instance_in_network(self):
""" Test expunge an instance in VPC networks
"""
@@ -3224,7 +3227,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_01_deploy_instance_in_network(self):
""" Test deploy an instance in VPC networks
"""
@@ -3258,7 +3261,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_02_stop_instance_in_network(self):
""" Test stop an instance in VPC networks
"""
@@ -3300,7 +3303,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_03_start_instance_in_network(self):
""" Test start an instance in VPC networks
"""
@@ -3351,7 +3354,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_04_reboot_instance_in_network(self):
""" Test reboot an instance in VPC networks
"""
@@ -3378,7 +3381,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_05_destroy_instance_in_network(self):
""" Test destroy an instance in VPC networks
"""
@@ -3541,7 +3544,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_06_migrate_instance_in_network(self):
""" Test migrate an instance in VPC networks
"""
@@ -3574,7 +3577,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_07_user_data(self):
""" Test user data in virtual machines
"""
@@ -3622,7 +3625,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_08_meta_data(self):
""" Test meta data in virtual machines
"""
@@ -3669,7 +3672,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"])
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_09_expunge_instance_in_network(self):
""" Test expunge an instance in VPC networks
"""