cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sangeet...@apache.org
Subject git commit: updated refs/heads/master to 172a0b7
Date Wed, 12 Nov 2014 23:40:36 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f416c82f0 -> 172a0b7ee


CLOUDSTACK-7811: Fixed the script 'test_persistent_networks.py' - Test Cases failing on Simulator
due to hardware resources requirement for test execution


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/172a0b7e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/172a0b7e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/172a0b7e

Branch: refs/heads/master
Commit: 172a0b7ee049b86407d513e7aaf2e74bc0a1a547
Parents: f416c82
Author: Chandan Purushothama <Chandan.Purushothama@citrix.com>
Authored: Tue Oct 28 13:47:50 2014 -0700
Committer: Sangeetha Hariharan <sangeetha.hariharan@citrix.com>
Committed: Wed Nov 12 18:26:56 2014 -0800

----------------------------------------------------------------------
 .../component/test_persistent_networks.py       | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/172a0b7e/test/integration/component/test_persistent_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py
index 65b109f..4cd0aa8 100644
--- a/test/integration/component/test_persistent_networks.py
+++ b/test/integration/component/test_persistent_networks.py
@@ -355,7 +355,7 @@ class TestPersistentNetworks(cloudstackTestCase):
         return
 
     @data("LB-VR", "LB-NS")
-    @attr(tags=["advanced", "advancedns"])
+    @attr(tags=["advanced", "advancedns"], required_hardware="true")
     def test_upgrade_to_persistent_services_VR(self, value):
 
         # This test is run against two networks (one with LB as virtual router
@@ -502,7 +502,7 @@ class TestPersistentNetworks(cloudstackTestCase):
             self.fail(exceptionMessage)
         return
 
-    @attr(tags=["advanced"])
+    @attr(tags=["advanced"], required_hardware="true")
     def test_upgrade_network_VR_to_PersistentRVR(self):
         # steps
         # 1. create isolated network with network offering which has
@@ -749,7 +749,7 @@ class TestPersistentNetworks(cloudstackTestCase):
         return
 
     @data("LB-VR", "LB-Netscaler")
-    @attr(tags=["advanced", "advancedns"])
+    @attr(tags=["advanced", "advancedns"], required_hardware="true")
     def test_pf_nat_rule_persistent_network(self, value):
 
         # This test shall run with two scenarios, one with LB services
@@ -867,7 +867,7 @@ class TestPersistentNetworks(cloudstackTestCase):
                 (virtual_machine.id, ipaddress.ipaddress.ipaddress))
         return
 
-    @attr(tags=["advanced"])
+    @attr(tags=["advanced"], required_hardware="true")
     def test_persistent_network_with_RVR(self):
         # steps
         # 1. create account and isolated network with network
@@ -977,7 +977,7 @@ class TestPersistentNetworks(cloudstackTestCase):
                 (virtual_machine.id, ipaddress.ipaddress.ipaddress))
         return
 
-    @attr(tags=["advanced"])
+    @attr(tags=["advanced"], required_hardware="true")
     def test_vm_deployment_two_persistent_networks(self):
         # steps
         # 1. Deploy VM in two persistent networks
@@ -1138,7 +1138,7 @@ class TestPersistentNetworks(cloudstackTestCase):
                 (virtual_machine.id, ipaddress_nw_2.ipaddress.ipaddress))
         return
 
-    @attr(tags=["advanced"])
+    @attr(tags=["advanced"], required_hardware="true")
     def test_vm_deployment_persistent_and_non_persistent_networks(self):
         # steps
         # 1. create account and create two networks in it
@@ -1259,7 +1259,7 @@ class TestPersistentNetworks(cloudstackTestCase):
                 (virtual_machine.id, ipaddress_nw_2.ipaddress.ipaddress))
         return
 
-    @attr(tags=["advanced"])
+    @attr(tags=["advanced"], required_hardware="true")
     def test_change_persistent_network_to_non_persistent(self):
         # steps
         # 1. Create a persistent network and deploy VM in it
@@ -1367,7 +1367,7 @@ class TestPersistentNetworks(cloudstackTestCase):
             self.fail(exceptionMessage)
         return
 
-    @attr(tags=["advanced"])
+    @attr(tags=["advanced"], required_hardware="true")
     def test_delete_account(self):
         # steps
         # 1. create persistent network and deploy VM in it
@@ -2052,7 +2052,7 @@ class TestRestartPersistentNetwork(cloudstackTestCase):
         return
 
     @data("true", "false")
-    @attr(tags=["advanced"])
+    @attr(tags=["advanced"], required_hardware="true")
     def test_cleanup_persistent_network(self, value):
         # steps
         # 1. Create account and create persistent network in it
@@ -2797,7 +2797,7 @@ class TestVPCNetworkOperations(cloudstackTestCase):
         self.VerifyNetworkCleanup(persistent_network_2.id)
         return
 
-    @attr(tags=["advanced"])
+    @attr(tags=["advanced"], required_hardware="true")
     def test_vpc_delete_account(self):
         # steps
         # 1. Create account and create VPC network in the account


Mime
View raw message