cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanj...@apache.org
Subject git commit: updated refs/heads/master to ba8449b
Date Mon, 14 Sep 2015 12:16:05 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master d091b9189 -> ba8449b1a


Tagging tests appropriately to pick them for running on basic zone
This closes #819


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

Branch: refs/heads/master
Commit: ba8449b1a05a12c83d58e4ba72d6644431fdbfe2
Parents: d091b91
Author: sanjeev <sanjeev@apache.org>
Authored: Mon Sep 14 16:52:13 2015 +0530
Committer: sanjeev <sanjeev@apache.org>
Committed: Mon Sep 14 17:45:05 2015 +0530

----------------------------------------------------------------------
 .../component/test_security_groups.py           | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba8449b1/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index f1ac0b6..b3620be 100755
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -115,7 +115,7 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
 
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_01_deployVM_InDefaultSecurityGroup(self):
         """Test deploy VM in default security group
         """
@@ -193,7 +193,7 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
         )
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_02_listSecurityGroups(self):
         """Test list security groups for admin account
         """
@@ -228,7 +228,7 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
         )
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_03_accessInDefaultSecurityGroup(self):
         """Test access in default security group
         """
@@ -389,7 +389,7 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
 
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_01_authorizeIngressRule(self):
         """Test authorize ingress rule
         """
@@ -535,7 +535,7 @@ class TestRevokeIngressRule(cloudstackTestCase):
         self.apiclient.revokeSecurityGroupIngress(cmd)
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_01_revokeIngressRule(self):
         """Test revoke ingress rule
         """
@@ -717,7 +717,7 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
 
         return
 
-    @attr(tags=["sg", "eip", "basic"], required_hardware="true")
+    @attr(tags=["sg", "basic", "eip", "basic"], required_hardware="true")
     def test_01_dhcpOnlyRouter(self):
         """Test router services for user account
         """
@@ -851,7 +851,7 @@ class TestdeployVMWithUserData(cloudstackTestCase):
 
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_01_deployVMWithUserData(self):
         """Test Deploy VM with User data"""
 
@@ -1029,7 +1029,7 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
 
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_01_delete_security_grp_running_vm(self):
         """Test delete security group with running VM"""
 
@@ -1113,7 +1113,7 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
         )
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_02_delete_security_grp_withoout_running_vm(self):
         """Test delete security group without running VM"""
 
@@ -1260,7 +1260,7 @@ class TestIngressRule(cloudstackTestCase):
 
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_01_authorizeIngressRule_AfterDeployVM(self):
         """Test delete security group with running VM"""
 
@@ -1377,7 +1377,7 @@ class TestIngressRule(cloudstackTestCase):
                       % (ingress_rule_2["id"], e))
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_02_revokeIngressRule_AfterDeployVM(self):
         """Test Revoke ingress rule after deploy VM"""
 
@@ -1549,7 +1549,7 @@ class TestIngressRule(cloudstackTestCase):
                           % (icmp_rule["ruleid"], e))
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_03_stopStartVM_verifyIngressAccess(self):
         """Test Start/Stop VM and Verify ingress rule"""
 
@@ -1791,7 +1791,7 @@ class TestIngressRuleSpecificIpSet(cloudstackTestCase):
         self.apiclient.revokeSecurityGroupIngress(cmd)
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_ingress_rules_specific_IP_set(self):
         """Test ingress rules for specific IP set
 
@@ -1983,7 +1983,7 @@ class TestIngressRuleSpecificIpSet(cloudstackTestCase):
                           self.mgtSvrDetails["mgtSvrIp"]))
         return
 
-    @attr(tags=["sg", "eip", "advancedsg"])
+    @attr(tags=["sg", "basic", "eip", "advancedsg"])
     def test_ingress_rules_specific_IP_set_non_def_sec_group(self):
         """Test ingress rules for specific IP set and non default security group
 


Mime
View raw message