Adding tags that identify deployment configurations against test cases

* advanced - Advanced Zone only
* basic  - basic zone without SecurityGroups
* sg - basic zone with security groups
* eip - basic zone with EIP/ELB
* advancedns - Advanced Zone with NetScalers

test/integration/component/test_accounts.py

@@ -141,6 +141,8 @@ class TestAccounts(cloudstackTestCase):
         """Test Create Account and user for that account 
         """
         
+        tags = ["advanced", "basic", "eip", "advancedns", "sg"]
+
         # Validate the following
         # 1. Create an Account. Verify the account is created.
         # 2. Create User associated with that account. Verify the created user
@@ -274,6 +276,8 @@ class TestRemoveUserFromAccount(cloudstackTestCase):
         """Test Remove one user from the account 
         """
         
+        tags = ["advanced", "basic", "eip", "advancedns", "sg"]
+
         # Validate the following
         # 1. Create an account with 2 users.
         # 2. Start 2 VMs; one for each user of the account
@@ -373,6 +377,8 @@ class TestRemoveUserFromAccount(cloudstackTestCase):
         """Test Remove both users from the account 
         """
         
+        tags = ["advanced", "basic", "eip", "advancedns", "sg"]
+
         # Validate the following
         # 1. Remove both the users from the account.
         # 2. Verify account is removed
@@ -529,6 +535,8 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
     def test_01_non_root_admin_Privileges(self):
         """Test to verify Non Root admin previleges"""
         
+        tags = ["advanced", "basic", "eip", "advancedns", "sg"]
+
         # Validate the following
         # 1. Create few accounts/users in ROOT domain
         # 2. Verify listAccounts API gives only accounts associated with new
@@ -646,6 +654,8 @@ class TestServiceOfferingSiblings(cloudstackTestCase):
     def test_01_service_offering_siblings(self):
         """Test to verify service offerings at same level in hierarchy"""
         
+        tags = ["advanced", "basic", "eip", "advancedns", "sg"]
+
         # Validate the following
         # 1. Verify service offering is visible for domain_1
         # 2. Verify service offering is not visible for domain_2
@@ -759,6 +769,8 @@ class TestServiceOfferingHierarchy(cloudstackTestCase):
     def test_01_service_offering_hierarchy(self):
         """Test to verify service offerings at same level in hierarchy"""
         
+        tags = ["advanced", "basic", "eip", "advancedns", "sg"]
+
         # Validate the following
         # 1. Verify service offering is visible for domain_1
         # 2. Verify service offering is also visible for domain_2
@@ -888,6 +900,8 @@ class TesttemplateHierarchy(cloudstackTestCase):
     def test_01_template_hierarchy(self):
         """Test to verify template at same level in hierarchy"""
         
+        tags = ["advanced", "basic", "eip", "advancedns", "sg"]
+
         # Validate the following
         # 1. Verify template is visible for domain_1
         # 2. Verify template is also visible for domain_2
@@ -1047,6 +1061,8 @@ class TestAddVmToSubDomain(cloudstackTestCase):
         """ Test Sub domain allowed to launch VM  when a Domain level zone is
             created"""
             
+        tags = ["advanced", "basic", "eip", "advancedns", "sg"]
+
         # Validate the following
         # 1. Verify VM created by Account_1 is in Running state
         # 2. Verify VM created by Account_2 is in Running state

test/integration/component/test_blocker_bugs.py

@@ -185,6 +185,8 @@ class TestSnapshots(cloudstackTestCase):
         """TS_BUG_001-Test Creating snapshot from volume having spaces in name(KVM)
         """
         
+        tags = ["advanced", "advancedns"]
+        
         # Validate the following
         #1. Create a virtual machine and data volume
         #2. Attach data volume to VM
@@ -455,6 +457,8 @@ class TestTemplate(cloudstackTestCase):
         """TS_BUG_002-Test to create and deploy VM using password enabled template
         """
         
+        tags = ["advanced", "advancedns", "basic", "sg"]
+
         # Validate the following:
         #1. Create a password enabled template
         #2. Deploy VM using this template
@@ -597,6 +601,8 @@ class TestNATRules(cloudstackTestCase):
     def test_01_firewall_rules_port_fw(self):
         """"Checking firewall rules deletion after static NAT disable"""
         
+        tags = ["advanced"]
+
         # Validate the following:
         #1. Enable static NAT for a VM
         #2. Open up some ports. At this point there will be new rows in the
@@ -797,6 +803,8 @@ class TestRouters(cloudstackTestCase):
         """TS_BUG_007-Check listRouters() using Admin User
         """
         
+        tags = ["advanced", "advancedns"]
+
         # Validate the following
         # 1. PreReq: have rounters that are owned by other account
         # 2. Create domain and create accounts in that domain 
@@ -906,6 +914,8 @@ class TestRouterRestart(cloudstackTestCase):
         """TS_BUG_008-Test restart network
         """
         
+        tags = ["advanced", "basic", "sg", "advancedns", "eip"]
+
         # Validate the following
         # 1. When cleanup = true, router is destroyed and a new one created
         # 2. New router will have new publicIp and linkLocalIp and
@@ -1065,6 +1075,8 @@ class TestTemplates(cloudstackTestCase):
         """TS_BUG_009-Test the size of template created from root disk
         """
         
+        tags = ["advanced", "advancedns", "basic", "sg", "eip"]
+
         # Validate the following:
         # 1. Deploy new VM using the template created from Volume
         # 2. VM should be in Up and Running state
@@ -1090,6 +1102,8 @@ class TestTemplates(cloudstackTestCase):
         """TS_BUG_010-Test check size of snapshot and template
         """
         
+        tags = ["advanced", "advancedns", "basic", "sg", "eip"]
+
         # Validate the following
         # 1. Deploy VM using default template, small service offering
         #    and small data disk offering.
@@ -1168,6 +1182,8 @@ class TestTemplates(cloudstackTestCase):
         """TS_BUG_011-Test Reusing deleted template name
         """
         
+        tags = ["advanced", "advancedns", "basic", "sg", "eip"]
+
         # Validate the following
         # 1. Deploy VM using default template, small service offering
         #    and small data disk offering.

test/integration/component/test_egress_rules.py

@@ -198,6 +198,8 @@ class TestDefaultSecurityGroupEgress(cloudstackTestCase):
         """Test deploy VM in default security group with no egress rules
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. Deploy a VM.
         # 2. Deployed VM should be running, verify with listVirtualMachiens
@@ -353,6 +355,8 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
         """Test authorize ingress rule
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. createaccount of type user
         # 2. createsecuritygroup (ssh) for this account
@@ -509,6 +513,8 @@ class TestDefaultGroupEgress(cloudstackTestCase):
         """Test default group with egress rule before VM deploy and ping, ssh
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. createaccount of type user
         # 2. createsecuritygroup (ssh) for this account
@@ -709,6 +715,8 @@ class TestDefaultGroupEgressAfterDeploy(cloudstackTestCase):
             ssh test
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. createaccount of type user
         # 2. createsecuritygroup (ssh) for this account
@@ -889,6 +897,8 @@ class TestRevokeEgressRule(cloudstackTestCase):
         """Test revoke security group egress rule
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. createaccount of type user
         # 2. createsecuritygroup (ssh) for this account
@@ -1149,6 +1159,8 @@ class TestInvalidAccountAuthroize(cloudstackTestCase):
         """Test invalid account authroize
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. createaccount of type user
         # 2. createsecuritygroup (ssh) for this account
@@ -1275,6 +1287,8 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
         """Test multiple account egress rules negative case
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. createaccount of type user A
         # 2. createaccount of type user B
@@ -1521,6 +1535,8 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase):
         """Test multiple account egress rules positive case
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. createaccount of type user A
         # 2. createaccount of type user B
@@ -1810,6 +1826,8 @@ class TestStartStopVMWithEgressRule(cloudstackTestCase):
         """ Test stop start Vm with egress rules
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. createaccount of type user
         # 2. createsecuritygroup (ssh) for this account
@@ -2019,6 +2037,8 @@ class TestInvalidParametersForEgress(cloudstackTestCase):
         """ Test invalid parameters for egress rules
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. createUserAccount
         # 2. createSecurityGroup (test)
@@ -2204,6 +2224,8 @@ class TestEgressAfterHostMaintainance(cloudstackTestCase):
         """Test maintenance case for egress
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. createaccount of type user
         # 2. createsecuritygroup (ssh) for this account

test/integration/component/test_eip_elb.py

@@ -184,6 +184,8 @@ class TestEIP(cloudstackTestCase):
         """Test EIP by deploying an instance
         """
         
+        tags = ["eip"]
+
         # Validate the following
         # 1. Instance gets an IP from GUEST IP range.
         # 2. One IP from EIP pool is taken and configured on NS
@@ -349,6 +351,8 @@ class TestEIP(cloudstackTestCase):
         """Test associate new IP and enable static NAT for new IP and the VM
         """
         
+        tags = ["eip"]
+
         # Validate the following
         # 1. user_ip_address.is_system = 0 & user_ip_address.one_to_one_nat=1
         # 2. releases default EIP whose user_ip_address.is_system=1
@@ -491,6 +495,8 @@ class TestEIP(cloudstackTestCase):
         """Test disable static NAT and release EIP acquired
         """
         
+        tags = ["eip"]
+
         # Validate the following
         # 1. Disable static NAT. Disables one-to-one NAT and releases EIP
         #    whose user_ip_address.is_system=0
@@ -688,6 +694,8 @@ class TestEIP(cloudstackTestCase):
         """Test disable static NAT with system = True
         """
         
+        tags = ["eip"]
+
         # Validate the following
         # 1. Try to disassociate/disable static NAT on EIP where is_system=1
         # 2. This operation should fail with proper error message.
@@ -755,6 +763,8 @@ class TestEIP(cloudstackTestCase):
         """Test EIO after destroying instance
         """
         
+        tags = ["eip"]
+
         # Validate the following
         # 1. Destroy instance. Destroy should result in is_system=0 for EIP
         #    and EIP should also be marked as free.
@@ -991,6 +1001,8 @@ class TestELB(cloudstackTestCase):
         """Test ELB by creating a LB rule
         """
         
+        tags = ["eip"]
+
         # Validate the following
         # 1. Deploy 2 instances
         # 2. Create LB rule to port 22 for the VMs and try to access VMs with
@@ -1162,6 +1174,8 @@ class TestELB(cloudstackTestCase):
         """Test ELB by acquiring IP and then creating a LB rule
         """
         
+        tags = ["eip"]
+
         # Validate the following
         # 1. Deploy 2 instances
         # 2. Create LB rule to port 22 for the VMs and try to access VMs with
@@ -1308,6 +1322,8 @@ class TestELB(cloudstackTestCase):
         """Test delete LB rule generated with public IP with is_system = 1
         """
         
+        tags = ["eip"]
+
         # Validate the following
         # 1. Deleting LB rule should release EIP where is_system=1
         # 2. check configuration changes for EIP reflects on NS
@@ -1410,6 +1426,8 @@ class TestELB(cloudstackTestCase):
         """Test delete LB rule generated on EIP
         """
         
+        tags = ["eip"]
+
         # Validate the following
         # 1. Deleting LB rule won't release EIP where is_system=0
         # 2. disassociateIP must release the above IP

test/integration/component/test_high_availability.py

@@ -176,6 +176,8 @@ class TestHighAvailability(cloudstackTestCase):
         """Test host maintenance mode
         """
         
+        tags = ["advanced", "advancedns"]
+
         # Validate the following
         # 1. Create Vms. Acquire IP. Create port forwarding & load balancing
         #    rules for Vms.
@@ -574,6 +576,8 @@ class TestHighAvailability(cloudstackTestCase):
         """Test host maintenance mode with activities
         """
         
+        tags = ["advanced", "advancedns"]
+
         # Validate the following
         # 1. Create Vms. Acquire IP. Create port forwarding & load balancing
         #    rules for Vms.

test/integration/component/test_network_offering.py

@@ -213,6 +213,8 @@ class TestNOVirtualRouter(cloudstackTestCase):
         """Test Network offering with Conserve mode off and VR - All services
         """
         
+        tags = ["advanced"]
+
         # Validate the following
         # 1. Create a Network from the above network offering and deploy a VM.
         # 2. On source NAT ipaddress, we should NOT be allowed to add a
@@ -456,6 +458,8 @@ class TestNOVirtualRouter(cloudstackTestCase):
         """Test Network offering with Conserve mode ON and VR - All services
         """
         
+        tags = ["advanced"]
+
         # Validate the following
         # 1. Create a Network from the above network offering and deploy a VM.
         # 2. On source NAT ipaddress, we should be allowed to add a LB rules
@@ -787,6 +791,8 @@ class TestNOWithNetscaler(cloudstackTestCase):
         """Test Nw off with Conserve mode off, VR-All services, LB-netscaler
         """
         
+        tags = ["advancedns"]
+
         # Validate the following
         # 1. Create a Network from the above network offering and deploy a VM.
         # 2. On source NAT ipaddress, we should NOT be allowed to add LB rule
@@ -1055,6 +1061,8 @@ class TestNOWithNetscaler(cloudstackTestCase):
         """Test NW off with Conserve mode ON, LB-Netscaler and VR-All services
         """
         
+        tags = ["advancedns"]
+
         # Validate the following
         # 1. Create a Network from the above network offering and deploy a VM.
         # 2. On source NAT ipaddress, we should NOT be allowed to add LB rule
@@ -1429,6 +1437,8 @@ class TestNetworkUpgrade(cloudstackTestCase):
         """Test Nw upgrade to netscaler lb service and conserve mode ON
         """
         
+        tags = ["advancedns"]
+
         # Validate the following
         # 1. Upgrade a network with VR and conserve mode ON TO
         #    A network that has Lb provided by "Netscaler" and all other
@@ -1626,6 +1636,8 @@ class TestNetworkUpgrade(cloudstackTestCase):
         """Test Nw upgrade to netscaler lb service and conserve mode OFF
         """
         
+        tags = ["advancedns"]
+
         # Validate the following
         # 1. Upgrade a network with VR and conserve mode ON TO
         #    A network that has Lb provided by "Netscaler" and all other

test/integration/component/test_security_groups.py

@@ -169,6 +169,8 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
         """Test deploy VM in default security group
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. deploy Virtual machine using admin user
         # 2. listVM should show a VM in Running state 
@@ -246,6 +248,8 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
         """Test list security groups for admin account
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. listSecurityGroups in admin account
         # 2. There should be one security group (default) listed for the admin account
@@ -279,6 +283,8 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
         """Test access in default security group
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         # 1. deploy Virtual machine using admin user
         # 2. listVM should show a VM in Running state 
@@ -434,6 +440,8 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
         """Test authorize ingress rule
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         #1. Create Security group for the account.
         #2. Createsecuritygroup (ssh-incoming) for this account
@@ -568,6 +576,8 @@ class TestRevokeIngressRule(cloudstackTestCase):
         """Test revoke ingress rule
         """
         
+        tags = ["sg", "eip"]
+
         # Validate the following:
         #1. Create Security group for the account.
         #2. Createsecuritygroup (ssh-incoming) for this account
@@ -732,6 +742,9 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
     def test_01_dhcpOnlyRouter(self):
         """Test router services for user account
         """
+        
+        tags = ["sg", "eip", "basic"]
+        
         # Validate the following
         #1. List routers for any user account
         #2. The only service supported by this router should be dhcp
@@ -859,6 +872,8 @@ class TestdeployVMWithUserData(cloudstackTestCase):
     def test_01_deployVMWithUserData(self):
         """Test Deploy VM with User data"""
         
+        tags = ["sg", "eip"]
+        
         # Validate the following
         # 1. CreateAccount of type user
         # 2. CreateSecurityGroup ssh-incoming
@@ -1033,6 +1048,8 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
     def test_01_delete_security_grp_running_vm(self):
         """Test delete security group with running VM"""
         
+        tags = ["sg", "eip"]
+        
         # Validate the following
         # 1. createsecuritygroup (ssh-incoming) for this account
         # 2. authorizeSecurityGroupIngress to allow ssh access to the VM
@@ -1115,6 +1132,8 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
     def test_02_delete_security_grp_withoout_running_vm(self):
         """Test delete security group without running VM"""
         
+        tags = ["sg", "eip"]
+        
         # Validate the following
         # 1. createsecuritygroup (ssh-incoming) for this account
         # 2. authorizeSecurityGroupIngress to allow ssh access to the VM
@@ -1275,6 +1294,8 @@ class TestIngressRule(cloudstackTestCase):
     def test_01_authorizeIngressRule_AfterDeployVM(self):
         """Test delete security group with running VM"""
         
+        tags = ["sg", "eip"]
+        
         # Validate the following
         # 1. createsecuritygroup (ssh-incoming, 22via22) for this account
         # 2. authorizeSecurityGroupIngress to allow ssh access to the VM
@@ -1385,6 +1406,8 @@ class TestIngressRule(cloudstackTestCase):
     def test_02_revokeIngressRule_AfterDeployVM(self):
         """Test Revoke ingress rule after deploy VM"""
         
+        tags = ["sg", "eip"]
+        
         # Validate the following
         # 1. createsecuritygroup (ssh-incoming, 22via22) for this account
         # 2. authorizeSecurityGroupIngress to allow ssh access to the VM
@@ -1537,6 +1560,8 @@ class TestIngressRule(cloudstackTestCase):
     def test_03_stopStartVM_verifyIngressAccess(self):
         """Test Start/Stop VM and Verify ingress rule"""
         
+        tags = ["sg", "eip"]
+        
         # Validate the following
         # 1. createsecuritygroup (ssh-incoming, 22via22) for this account
         # 2. authorizeSecurityGroupIngress to allow ssh access to the VM