diff --git a/api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java b/api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java index b13228b37c9..885405e64e0 100644 --- a/api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java +++ b/api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java @@ -33,6 +33,7 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.IpAddress; import com.cloud.network.rules.FirewallRule; +import com.cloud.network.rules.NetworkACL; import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.utils.net.NetUtils; @@ -117,13 +118,13 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal public void execute() throws ResourceUnavailableException { UserContext callerContext = UserContext.current(); boolean success = false; - FirewallRule rule = _entityMgr.findById(FirewallRule.class, getEntityId()); + FirewallRule rule = _entityMgr.findById(NetworkACL.class, getEntityId()); try { UserContext.current().setEventDetails("Rule Id: " + getEntityId()); success = _firewallService.applyFirewallRules(rule.getSourceIpAddressId(), callerContext.getCaller()); // State is different after the rule is applied, so get new object here - rule = _entityMgr.findById(FirewallRule.class, getEntityId()); + rule = _entityMgr.findById(NetworkACL.class, getEntityId()); FirewallResponse fwResponse = new FirewallResponse(); if (rule != null) { fwResponse = _responseGenerator.createFirewallResponse(rule); diff --git a/api/src/com/cloud/api/commands/DeleteFirewallRuleCmd.java b/api/src/com/cloud/api/commands/DeleteFirewallRuleCmd.java index 7d8f0e71174..0640be4f274 100644 --- a/api/src/com/cloud/api/commands/DeleteFirewallRuleCmd.java +++ b/api/src/com/cloud/api/commands/DeleteFirewallRuleCmd.java @@ -27,6 +27,7 @@ import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.rules.FirewallRule; +import com.cloud.network.rules.NetworkACL; import com.cloud.user.UserContext; @Implementation(description="Deletes a firewall rule", responseObject=SuccessResponse.class) @@ -75,11 +76,11 @@ public class DeleteFirewallRuleCmd extends BaseAsyncCmd { @Override public long getEntityOwnerId() { if (ownerId == null) { - FirewallRule rule = _entityMgr.findById(FirewallRule.class, id); + FirewallRule rule = _entityMgr.findById(NetworkACL.class, id); if (rule == null) { throw new InvalidParameterValueException("Unable to find firewall rule by id=" + id); } else { - ownerId = _entityMgr.findById(FirewallRule.class, id).getAccountId(); + ownerId = _entityMgr.findById(NetworkACL.class, id).getAccountId(); } } return ownerId; diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py index 19f6914229f..05c56798577 100644 --- a/test/integration/component/test_accounts.py +++ b/test/integration/component/test_accounts.py @@ -137,6 +137,8 @@ class TestAccounts(cloudstackTestCase): def test_01_create_account(self): """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. @@ -270,6 +272,8 @@ class TestRemoveUserFromAccount(cloudstackTestCase): def test_01_user_remove_VM_running(self): """Test Remove one user from the account """ + + tags = ["advanced", "basic", "eip", "advancedns", "sg"] # Validate the following # 1. Create an account with 2 users. @@ -369,6 +373,8 @@ class TestRemoveUserFromAccount(cloudstackTestCase): def test_02_remove_all_users(self): """Test Remove both users from the account """ + + tags = ["advanced", "basic", "eip", "advancedns", "sg"] # Validate the following # 1. Remove both the users from the account. @@ -525,6 +531,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 @@ -642,6 +650,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 @@ -755,6 +765,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 @@ -884,6 +896,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 @@ -1043,6 +1057,8 @@ class TestAddVmToSubDomain(cloudstackTestCase): def test_01_add_vm_to_subdomain(self): """ 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 diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py index 4155a41aa13..fc6f2b4ec09 100644 --- a/test/integration/component/test_blocker_bugs.py +++ b/test/integration/component/test_blocker_bugs.py @@ -182,6 +182,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 @@ -451,6 +453,8 @@ class TestTemplate(cloudstackTestCase): def test_01_create_template(self): """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 @@ -593,6 +597,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 @@ -793,6 +799,8 @@ class TestRouters(cloudstackTestCase): def test_01_list_routers_admin(self): """TS_BUG_007-Check listRouters() using Admin User """ + + tags = ["advanced", "advancedns"] # Validate the following # 1. PreReq: have rounters that are owned by other account @@ -902,6 +910,8 @@ class TestRouterRestart(cloudstackTestCase): def test_01_restart_network_cleanup(self): """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 @@ -1061,6 +1071,8 @@ class TestTemplates(cloudstackTestCase): def test_01_check_template_size(self): """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 @@ -1086,6 +1098,8 @@ class TestTemplates(cloudstackTestCase): def test_02_check_size_snapshotTemplate(self): """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 @@ -1164,6 +1178,8 @@ class TestTemplates(cloudstackTestCase): def test_03_resuse_template_name(self): """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 diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py index aa301dad3cb..f2154586d41 100644 --- a/test/integration/component/test_egress_rules.py +++ b/test/integration/component/test_egress_rules.py @@ -194,6 +194,8 @@ class TestDefaultSecurityGroupEgress(cloudstackTestCase): def test_deployVM_InDefaultSecurityGroup(self): """Test deploy VM in default security group with no egress rules """ + + tags = ["sg", "eip"] # Validate the following: # 1. Deploy a VM. @@ -349,6 +351,8 @@ class TestAuthorizeIngressRule(cloudstackTestCase): def test_authorizeIngressRule(self): """Test authorize ingress rule """ + + tags = ["sg", "eip"] # Validate the following: # 1. createaccount of type user @@ -505,6 +509,8 @@ class TestDefaultGroupEgress(cloudstackTestCase): def test_01_default_group_with_egress(self): """Test default group with egress rule before VM deploy and ping, ssh """ + + tags = ["sg", "eip"] # Validate the following: # 1. createaccount of type user @@ -705,6 +711,8 @@ class TestDefaultGroupEgressAfterDeploy(cloudstackTestCase): """ Test default group with egress rule added after vm deploy and ping, ssh test """ + + tags = ["sg", "eip"] # Validate the following: # 1. createaccount of type user @@ -885,6 +893,8 @@ class TestRevokeEgressRule(cloudstackTestCase): def test_revoke_egress_rule(self): """Test revoke security group egress rule """ + + tags = ["sg", "eip"] # Validate the following: # 1. createaccount of type user @@ -1145,6 +1155,8 @@ class TestInvalidAccountAuthroize(cloudstackTestCase): def test_invalid_account_authroize(self): """Test invalid account authroize """ + + tags = ["sg", "eip"] # Validate the following: # 1. createaccount of type user @@ -1271,6 +1283,8 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase): def test_multiple_account_egress_rule_negative(self): """Test multiple account egress rules negative case """ + + tags = ["sg", "eip"] # Validate the following: # 1. createaccount of type user A @@ -1517,6 +1531,8 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase): def test_multiple_account_egress_rule_positive(self): """Test multiple account egress rules positive case """ + + tags = ["sg", "eip"] # Validate the following: # 1. createaccount of type user A @@ -1806,6 +1822,8 @@ class TestStartStopVMWithEgressRule(cloudstackTestCase): def test_start_stop_vm_egress(self): """ Test stop start Vm with egress rules """ + + tags = ["sg", "eip"] # Validate the following: # 1. createaccount of type user @@ -2015,6 +2033,8 @@ class TestInvalidParametersForEgress(cloudstackTestCase): def test_invalid_parameters(self): """ Test invalid parameters for egress rules """ + + tags = ["sg", "eip"] # Validate the following: # 1. createUserAccount @@ -2200,6 +2220,8 @@ class TestEgressAfterHostMaintainance(cloudstackTestCase): def test_egress_after_host_maintainance(self): """Test maintenance case for egress """ + + tags = ["sg", "eip"] # Validate the following: # 1. createaccount of type user diff --git a/test/integration/component/test_eip_elb.py b/test/integration/component/test_eip_elb.py index ac11d6dab54..771c7c15ae1 100644 --- a/test/integration/component/test_eip_elb.py +++ b/test/integration/component/test_eip_elb.py @@ -180,6 +180,8 @@ class TestEIP(cloudstackTestCase): def test_01_eip_by_deploying_instance(self): """Test EIP by deploying an instance """ + + tags = ["eip"] # Validate the following # 1. Instance gets an IP from GUEST IP range. @@ -345,6 +347,8 @@ class TestEIP(cloudstackTestCase): def test_02_acquire_ip_enable_static_nat(self): """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 @@ -487,6 +491,8 @@ class TestEIP(cloudstackTestCase): def test_03_disable_static_nat(self): """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 @@ -684,6 +690,8 @@ class TestEIP(cloudstackTestCase): def test_04_disable_static_nat_system(self): """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 @@ -751,6 +759,8 @@ class TestEIP(cloudstackTestCase): def test_05_destroy_instance(self): """Test EIO after destroying instance """ + + tags = ["eip"] # Validate the following # 1. Destroy instance. Destroy should result in is_system=0 for EIP @@ -987,6 +997,8 @@ class TestELB(cloudstackTestCase): def test_01_elb_create(self): """Test ELB by creating a LB rule """ + + tags = ["eip"] # Validate the following # 1. Deploy 2 instances @@ -1158,6 +1170,8 @@ class TestELB(cloudstackTestCase): def test_02_elb_acquire_and_create(self): """Test ELB by acquiring IP and then creating a LB rule """ + + tags = ["eip"] # Validate the following # 1. Deploy 2 instances @@ -1304,6 +1318,8 @@ class TestELB(cloudstackTestCase): def test_03_elb_delete_lb_system(self): """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 @@ -1406,6 +1422,8 @@ class TestELB(cloudstackTestCase): def test_04_delete_lb_on_eip(self): """Test delete LB rule generated on EIP """ + + tags = ["eip"] # Validate the following # 1. Deleting LB rule won't release EIP where is_system=0 diff --git a/test/integration/component/test_high_availability.py b/test/integration/component/test_high_availability.py index 02463f0e0b8..21e04c5a4d5 100644 --- a/test/integration/component/test_high_availability.py +++ b/test/integration/component/test_high_availability.py @@ -172,6 +172,8 @@ class TestHighAvailability(cloudstackTestCase): def test_01_host_maintenance_mode(self): """Test host maintenance mode """ + + tags = ["advanced", "advancedns"] # Validate the following # 1. Create Vms. Acquire IP. Create port forwarding & load balancing @@ -561,6 +563,8 @@ class TestHighAvailability(cloudstackTestCase): def test_02_host_maintenance_mode_with_activities(self): """Test host maintenance mode with activities """ + + tags = ["advanced", "advancedns"] # Validate the following # 1. Create Vms. Acquire IP. Create port forwarding & load balancing diff --git a/test/integration/component/test_netscaler_configs.py b/test/integration/component/test_netscaler_configs.py index 99f356a8ee9..ed4c654842b 100644 --- a/test/integration/component/test_netscaler_configs.py +++ b/test/integration/component/test_netscaler_configs.py @@ -191,7 +191,7 @@ class TestAddNetScaler(cloudstackTestCase): def test_add_netscaler_device(self): """Test add netscaler device """ - + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device into a Zone by providing valid log in # credentials , public , private interface and enabling Load @@ -317,6 +317,7 @@ class TestInvalidParametersNetscaler(cloudstackTestCase): def test_invalid_cred(self): """Test add netscaler device with invalid credential """ + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device into a Zone by providing invalid log in @@ -385,6 +386,7 @@ class TestInvalidParametersNetscaler(cloudstackTestCase): def test_invalid_public_interface(self): """Test add netscaler device with invalid public interface """ + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device into a Zone by providing valid log in @@ -451,6 +453,7 @@ class TestInvalidParametersNetscaler(cloudstackTestCase): def test_invalid_private_interface(self): """Test add netscaler device with invalid private interface """ + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device into a Zone by providing valid log in @@ -635,6 +638,7 @@ class TestNetScalerDedicated(cloudstackTestCase): def test_netscaler_dedicated_mode(self): """Test netscaler device in dedicated mode """ + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device in dedicated mode. @@ -853,6 +857,7 @@ class TestNetScalerShared(cloudstackTestCase): def test_netscaler_shared_mode(self): """Test netscaler device in shared mode """ + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device in shared mode. @@ -1101,6 +1106,7 @@ class TestNetScalerCustomCapacity(cloudstackTestCase): def test_netscaler_custom_capacity(self): """Test netscaler device with custom capacity """ + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device in shared mode with capacity 3 @@ -1373,6 +1379,7 @@ class TestNetScalerNoCapacity(cloudstackTestCase): def test_netscaler_no_capacity(self): """Test netscaler device with no capacity remaining """ + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device in shared mode with capacity 2 @@ -1640,6 +1647,7 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase): def test_01_guest_network(self): """Implementing Guest Network when first VM gets deployed using the network having Netscaler as LB """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -1759,6 +1767,7 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase): def test_02_guest_network_multiple(self): """Implementing Guest Network when multiple VMs gets deployed using the network having Netscaler as LB """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -1924,6 +1933,7 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase): def test_03_delete_account(self): """Delete an account that has LB rules """ + tags = ["advancedns"] # Validate the following # 1. Acquire an ipaddress. Create multiple Lb rules on this ip address @@ -2203,6 +2213,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase): def test_01_stop_all_vms(self): """Test Stopping all the Vms for any account that has LB rules. """ + tags = ["advancedns"] # Validate the following # 1. Acquire IP address and create a load balancer rule @@ -2283,6 +2294,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase): def test_02_start_one_vm(self): """Test LB rules on Netscaler after starting one Vm in account """ + tags = ["advancedns"] # Validate the following # 1. Acquire IP address and create a load balancer rule @@ -2367,6 +2379,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase): def test_03_network_restart_without_cleanup(self): """Test LB rules on Netscaler after network restart without cleanup """ + tags = ["advancedns"] # Validate the following # 1. Acquire IP address and create a load balancer rule @@ -2428,6 +2441,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase): def test_04_network_restart_with_cleanup(self): """Test LB rules on Netscaler after network restart with cleanup """ + tags = ["advancedns"] # Validate the following # 1. Acquire IP address and create a load balancer rule @@ -2603,6 +2617,7 @@ class TestServiceProvider(cloudstackTestCase): def test_01_create_nw_off_disabled(self): """Test create network with network offering disabled """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -2648,6 +2663,7 @@ class TestServiceProvider(cloudstackTestCase): def test_02_create_nw_sp_disabled(self): """Test create network when service provider is disabled """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -2680,6 +2696,7 @@ class TestServiceProvider(cloudstackTestCase): def test_03_create_lb_sp_disabled(self): """Test create LB rules when service provider is disabled """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -2916,6 +2933,7 @@ class TestDeleteNetscaler(cloudstackTestCase): def test_delete_netscaler_with_lb(self): """Test delete Netscaler when active LB rules are present """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py index 59ac84f3f69..8d625c29b7e 100644 --- a/test/integration/component/test_netscaler_lb.py +++ b/test/integration/component/test_netscaler_lb.py @@ -224,6 +224,8 @@ class TestLbSourceNat(cloudstackTestCase): def test_add_lb_on_source_nat(self): """Test Create LB rule for sourceNat IP address """ + + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -431,6 +433,8 @@ class TestLbOnIpWithPf(cloudstackTestCase): def test_lb_on_ip_with_pf(self): """Test Create LB rule for sourceNat IP address """ + + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -640,6 +644,8 @@ class TestPfOnIpWithLb(cloudstackTestCase): def test_pf_on_ip_with_lb(self): """Test Create a port forwarding rule on an Ip address that already has a LB rule. """ + + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -850,6 +856,8 @@ class TestLbOnNonSourceNat(cloudstackTestCase): def test_lb_on_non_source_nat(self): """Test Create LB rule for non-sourceNat IP address """ + + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -1063,6 +1071,8 @@ class TestAddMultipleVmsLb(cloudstackTestCase): def test_add_multiple_vms_lb(self): """Test Add multiple Vms to an existing LB rule. """ + + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -1339,6 +1349,8 @@ class TestMultipleLbRules(cloudstackTestCase): def test_multiple_lb_publicip(self): """Test Create multiple LB rules using different public Ips acquired """ + + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -1653,6 +1665,8 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase): def test_multiple_lb_same_publicip(self): """Test Create multiple LB rules using same public Ips on diff ports """ + + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -2008,6 +2022,8 @@ class TestLoadBalancingRule(cloudstackTestCase): def test_01_edit_name_lb_rule(self): """Test edit name of LB rule """ + + tags = ["advancedns"] # Validate the following # 1. Create an Lb rule for couple of Vms . @@ -2040,6 +2056,8 @@ class TestLoadBalancingRule(cloudstackTestCase): def test_02_edit_lb_ports(self): """Test edit public port of LB rule """ + + tags = ["advancedns"] # Validate the following # 1. Create an Lb rule for couple of Vms . @@ -2060,6 +2078,8 @@ class TestLoadBalancingRule(cloudstackTestCase): def test_03_delete_lb_rule(self): """Test delete LB rule """ + + tags = ["advancedns"] # Validate the following # 1. Delete existing load balancing rule @@ -2224,6 +2244,8 @@ class TestDeleteCreateLBRule(cloudstackTestCase): def test_01_create_with_same_public_port(self): """Test create LB rule with same public port after deleting rule""" + + tags = ["advancedns"] # Validate the following # 1. Delete existing rule and create exactly same rule with different @@ -2383,6 +2405,8 @@ class TestVmWithLb(cloudstackTestCase): def test_01_delete_public_ip(self): """Test delete one public Ip with LB rules""" + + tags = ["advancedns"] # Validate the following # 1. Associate 2 public Ips and create load balancing rules in it @@ -2450,6 +2474,8 @@ class TestVmWithLb(cloudstackTestCase): def test_02_stop_user_vm(self): """Test stop user VM with LB""" + + tags = ["advancedns"] # Validate the following # 1. Create 2 instances and add these two for load balancing @@ -2528,6 +2554,8 @@ class TestVmWithLb(cloudstackTestCase): def test_03_start_user_vm(self): """Test start user VM with LB""" + + tags = ["advancedns"] # Validate the following # 1. Create 2 instances and add these two for load balancing @@ -2597,6 +2625,8 @@ class TestVmWithLb(cloudstackTestCase): def test_04_migrate_user_vm(self): """Test migrate user VM with LB""" + + tags = ["advancedns"] # Validate the following # 1. Create 2 instances and add these two for load balancing @@ -2708,6 +2738,8 @@ class TestVmWithLb(cloudstackTestCase): def test_05_reboot_user_vm(self): """Test reboot user VM with LB""" + + tags = ["advancedns"] # Validate the following # 1. Create 2 instances and add these two for load balancing @@ -2776,6 +2808,8 @@ class TestVmWithLb(cloudstackTestCase): def test_06_destroy_user_vm(self): """Test destroy user VM with LB""" + + tags = ["advancedns"] # Validate the following # 1. Create 2 instances and add these two for load balancing @@ -2857,6 +2891,8 @@ class TestVmWithLb(cloudstackTestCase): def test_07_delete_all_public_ip(self): """Test delete all public Ip with LB rules""" + + tags = ["advancedns"] # Validate the following # 1. Associate 2 public Ips and create load balancing rules in it diff --git a/test/integration/component/test_netscaler_lb_algo.py b/test/integration/component/test_netscaler_lb_algo.py index bcff75fb4a9..4b079c890ac 100644 --- a/test/integration/component/test_netscaler_lb_algo.py +++ b/test/integration/component/test_netscaler_lb_algo.py @@ -191,6 +191,7 @@ class TestLbWithRoundRobin(cloudstackTestCase): def test_lb_with_round_robin(self): """Test Create LB rule with round robin algorithm """ + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -403,6 +404,7 @@ class TestLbWithLeastConn(cloudstackTestCase): def test_lb_with_least_conn(self): """Test Create LB rule with least connection algorithm """ + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -622,6 +624,7 @@ class TestLbWithSourceIp(cloudstackTestCase): def test_lb_with_source_ip(self): """Test Create LB rule with source Ip algorithm """ + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -859,6 +862,7 @@ class TestLbAlgoRrLc(cloudstackTestCase): def test_lb_round_robin_to_least_conn(self): """Test edit LB rule from round robin to least connection algo """ + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -1071,6 +1075,7 @@ class TestLbAlgoLcRr(cloudstackTestCase): def test_lb_least_conn_to_round_robin(self): """Test edit LB rule from least conn to round robin algo """ + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -1281,6 +1286,7 @@ class TestLbAlgoRrSb(cloudstackTestCase): def test_lb_round_robin_to_source(self): """Test edit LB rule from round robin to source algo """ + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -1493,6 +1499,7 @@ class TestLbAlgoSbRr(cloudstackTestCase): def test_lb_source_to_round_robin(self): """Test edit LB rule from source to round robin algo """ + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -1708,6 +1715,7 @@ class TestLbAlgoSbLc(cloudstackTestCase): def test_lb_source_to_least_conn(self): """Test edit LB rule from source to least conn algo """ + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created @@ -1921,6 +1929,7 @@ class TestLbAlgoLcSb(cloudstackTestCase): def test_lb_leastconn_to_source(self): """Test edit LB rule from round robin to source algo """ + tags = ["advancedns"] # Validate the following # 1. Deploy the first VM using a network from the above created diff --git a/test/integration/component/test_netscaler_lb_sticky.py b/test/integration/component/test_netscaler_lb_sticky.py index 47f5cd1743d..8a420ae838e 100644 --- a/test/integration/component/test_netscaler_lb_sticky.py +++ b/test/integration/component/test_netscaler_lb_sticky.py @@ -218,6 +218,7 @@ class TestLbStickyPolicy(cloudstackTestCase): def test_01_source_based_roundrobin(self): """Test Create a "SourceBased" stick policy for a Lb rule with "RoundRobin" algorithm """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -305,6 +306,7 @@ class TestLbStickyPolicy(cloudstackTestCase): def test_02_source_based_source_algo(self): """Test Create a "SourceBased" stick policy for a Lb rule with "Source" algorithm """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -393,6 +395,7 @@ class TestLbStickyPolicy(cloudstackTestCase): def test_03_source_based_leastconn(self): """Test Create a "SourceBased" stick policy for a Lb rule with leastconn algo """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -481,6 +484,7 @@ class TestLbStickyPolicy(cloudstackTestCase): def test_04_lbcookie_based_roundrobin(self): """Test Create a "LBCookie" stick policy for a Lb rule with roundrobin algo """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -571,6 +575,7 @@ class TestLbStickyPolicy(cloudstackTestCase): def test_05_lbcookie_source_algo(self): """Test Create a "LBCookie" stick policy for a Lb rule with "Source" algorithm """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -661,6 +666,7 @@ class TestLbStickyPolicy(cloudstackTestCase): def test_06_lbcookie_leastconn(self): """Test Create a "LBCookie" stick policy for a Lb rule with leastconn algo """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -751,6 +757,7 @@ class TestLbStickyPolicy(cloudstackTestCase): def test_07_appcookie_based_roundrobin(self): """Test Create a "AppCookie" stick policy for a Lb rule with roundrobin algo """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -841,6 +848,7 @@ class TestLbStickyPolicy(cloudstackTestCase): def test_08_appcookie_source_algo(self): """Test Create a "AppCookie" stick policy for a Lb rule with "Source" """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. @@ -931,6 +939,7 @@ class TestLbStickyPolicy(cloudstackTestCase): def test_09_appcookie_leastconn(self): """Test Create a "AppCookie" stick policy for a Lb rule with leastconn """ + tags = ["advancedns"] # Validate the following # 1. Configure Netscaler for load balancing. diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py index d130ed540fa..c19a8267852 100644 --- a/test/integration/component/test_netscaler_nw_off.py +++ b/test/integration/component/test_netscaler_nw_off.py @@ -205,6 +205,8 @@ class TestAddMultipleNetScaler(cloudstackTestCase): def test_add_netscaler_device(self): """Test add netscaler device """ + + tags = ["advancedns"] # Validate the following # 1. Add multiple instances of netscaler @@ -361,6 +363,8 @@ class TestAddMultipleNSDiffZone(cloudstackTestCase): def test_add_mul_netscaler_diff_zone(self): """Test add netscaler devices in different zones """ + + tags = ["advancedns"] # Validate the following # 1. Add multiple instances of Netscaler in different zones @@ -647,6 +651,8 @@ class TestNetScalerSharedMode(cloudstackTestCase): def test_01_netscaler_shared_mode(self): """Test netscaler device in shared mode """ + + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device in shared mode with capacity 3 @@ -800,6 +806,8 @@ class TestNetScalerSharedMode(cloudstackTestCase): def test_02_multiple_netscaler_capacilty(self): """Test multiple netscaler devices with limited capacity """ + + tags = ["advancedns"] # Validate the following # 1. Add another netscaler device and spawn a new VM again @@ -900,6 +908,8 @@ class TestNetScalerSharedMode(cloudstackTestCase): def test_03_multiple_netscaler_full_capacilty(self): """Test netscaler device with full capacity """ + + tags = ["advancedns"] # Validate the following # 1. Spawn multiple instances for utilizing full capacity of Netscaler @@ -983,6 +993,8 @@ class TestNetScalerSharedMode(cloudstackTestCase): def test_04_delete_account_after_capacity_full(self): """Test delete and add resouces after netscaler device capacity is full """ + + tags = ["advancedns"] # Validate the following # 1. Delete one of the account. Wait till Network.gc.wait & @@ -1166,6 +1178,8 @@ class TestNwOffDedicatedNetscaler(cloudstackTestCase): def test_nw_off_dedicated_mode(self): """Test network offering in dedicated mode device """ + + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device in shared mode @@ -1358,6 +1372,8 @@ class TestNwOffNetscaler(cloudstackTestCase): def test_ns_shared_nw_dedicated(self): """Test netscaler device in shared mode with network offering in dedicated mode """ + + tags = ["advancedns"] # Validate the following # 1. Add Netscaler device in shared mode @@ -1666,6 +1682,8 @@ class TestNwOffSToDUpgrade(cloudstackTestCase): def test_shared_to_dedicated_upgrade(self): """Test upgrade from shared LB isolation to dedicated LB isolation""" + + tags = ["advancedns"] # Validate the following # 1. Create a dedicated and shared network offering @@ -2081,6 +2099,8 @@ class TestNwOffDToSUpgrade(cloudstackTestCase): def test_shared_to_dedicated_upgrade(self): """Test upgrade from shared LB isolation to dedicated LB isolation""" + + tags = ["advancedns"] # Validate the following # 1. Create a dedicated and shared network offering diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py index 50f17577871..8d37b335550 100644 --- a/test/integration/component/test_network_offering.py +++ b/test/integration/component/test_network_offering.py @@ -209,6 +209,8 @@ class TestNOVirtualRouter(cloudstackTestCase): def test_01_network_off_without_conserve_mode(self): """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. @@ -452,6 +454,8 @@ class TestNOVirtualRouter(cloudstackTestCase): def test_02_network_off_with_conserve_mode(self): """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. @@ -783,6 +787,8 @@ class TestNOWithNetscaler(cloudstackTestCase): def test_01_network_off_without_conserve_mode(self): """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. @@ -1051,6 +1057,8 @@ class TestNOWithNetscaler(cloudstackTestCase): def test_02_network_off_with_conserve_mode_netscaler(self): """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. @@ -1425,6 +1433,8 @@ class TestNetworkUpgrade(cloudstackTestCase): def test_01_nwupgrade_netscaler_conserve_on(self): """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 @@ -1622,6 +1632,8 @@ class TestNetworkUpgrade(cloudstackTestCase): def test_02_nwupgrade_netscaler_conserve_off(self): """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 diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py index 20e2f8af1ed..7888b000e91 100644 --- a/test/integration/component/test_project_configs.py +++ b/test/integration/component/test_project_configs.py @@ -170,13 +170,12 @@ class TestUserProjectCreation(cloudstackTestCase): def test_01_admin_project_creation(self): """Test create project as a domain admin and domain user """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Check if 'allow.user.create.projects' configuration is true # 2. Create a Project as domain admin # 3. Create a Project as domain user # 4. In both 2 and 3 project creation should be successful - configs = Configurations.list( self.apiclient, name='allow.user.create.projects' @@ -264,13 +263,12 @@ class TestUserProjectCreation(cloudstackTestCase): def test_02_user_project_creation(self): """Test create project as a domain admin and domain user """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Check if 'allow.user.create.projects' configuration is false # 2. Create a Project as domain admin. Project creation should be # successful. # 3. Create a Project as domain user. Project creation should fail - configs = Configurations.list( self.apiclient, name='allow.user.create.projects' @@ -390,7 +388,7 @@ class TestProjectInviteRequired(cloudstackTestCase): def test_03_add_user_to_project(self): """Add user to project when 'project.invite.required' is false""" - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following: # 1. Create a Project # 2. Add users to the project. Verify user is added to project @@ -490,12 +488,12 @@ class TestProjectInviteRequired(cloudstackTestCase): def test_04_add_user_to_project(self): """Add user to project when 'project.invite.required' is true""" - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following: # 1. Create a Project # 2. Add users to the project. verify user is shown in pending state - # Verify 'project.invite.required' is set to false + # Verify 'project.invite.required' is set to false configs = Configurations.list( self.apiclient, name='project.invite.required' @@ -589,7 +587,7 @@ class TestProjectInviteRequired(cloudstackTestCase): def test_05_invitation_timeout(self): """Test global config project invitation timeout""" - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following: # 1. Set configuration to 5 mins # 2. Create a Project @@ -730,7 +728,7 @@ class TestProjectInviteRequired(cloudstackTestCase): def test_06_invitation_timeout_after_expiry(self): """Test global config project invitation timeout""" - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following: # 1. Set configuration to 5 mins # 2. Create a Project @@ -876,7 +874,7 @@ class TestProjectInviteRequired(cloudstackTestCase): def test_07_invite_after_expiry(self): """Test global config project invitation timeout""" - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following: # 1. Set configuration to 5 mins # 2. Create a Project @@ -1021,7 +1019,7 @@ class TestProjectInviteRequired(cloudstackTestCase): def test_08_decline_invitation(self): """Test decline invitation""" - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following: # 1. Set configuration to 5 mins # 2. Create a Project @@ -1148,7 +1146,7 @@ class TestProjectInviteRequired(cloudstackTestCase): @unittest.skip("Requires SMPT configs") def test_09_invite_to_project_by_email(self): """Test invite user to project by email""" - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following: # 1. Set configuration to 5 mins # 2. Create a Project @@ -1157,7 +1155,7 @@ class TestProjectInviteRequired(cloudstackTestCase): # 5. Verify invitation is rejected and user doesn't become regular # user. - # Verify 'project.invite.required' is set to false + # Verify 'project.invite.required' is set to false configs = Configurations.list( self.apiclient, name='project.invite.timeout' diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py index c69cc3238fc..d1735fdfc4b 100644 --- a/test/integration/component/test_project_limits.py +++ b/test/integration/component/test_project_limits.py @@ -154,7 +154,7 @@ class TestProjectLimits(cloudstackTestCase): def test_01_project_limits(self): """ Test project limits """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a Project. Verify once projects are created, they inherit # a default set of resource limits as configured by the Cloud Stack @@ -169,7 +169,7 @@ class TestProjectLimits(cloudstackTestCase): # 4. Create Resource more than its set limit for a project. Verify # resource allocation should fail giving proper message - # Create project as a domain admin + # Create project as a domain admin project = Project.create( self.apiclient, self.services["project"], @@ -301,7 +301,7 @@ class TestProjectLimits(cloudstackTestCase): def test_02_project_limits_normal_user(self): """ Test project limits """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a Project # 2. Reduce the projects limits as a domain admin. Verify resource @@ -524,7 +524,7 @@ class TestResourceLimitsProject(cloudstackTestCase): def test_03_vm_per_project(self): """Test VM limit per project """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Set max VM per project to 2 # 2. Create account and start 2 VMs. Verify VM state is Up and Running @@ -586,7 +586,7 @@ class TestResourceLimitsProject(cloudstackTestCase): def test_04_publicip_per_project(self): """Test Public IP limit per project """ - + tags = ["advanced","eip","advancedns"] # Validate the following # 1. set max no of IPs per project to 2. # 2. Create an account in this domain @@ -671,7 +671,7 @@ class TestResourceLimitsProject(cloudstackTestCase): def test_05_snapshots_per_project(self): """Test Snapshot limit per project """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. set max no of snapshots per project to 1. # 2. Create one snapshot in the project. Snapshot should be @@ -748,7 +748,7 @@ class TestResourceLimitsProject(cloudstackTestCase): def test_06_volumes_per_project(self): """Test Volumes limit per project """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. set max no of volume per project to 1. # 2. Create 1 VM in this project @@ -797,7 +797,7 @@ class TestResourceLimitsProject(cloudstackTestCase): def test_07_templates_per_project(self): """Test Templates limit per project """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. set max no of templates per project to 1. # 2. Create a template in this project. Both template should be in diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py index a98f860a67b..131508679e6 100644 --- a/test/integration/component/test_project_resources.py +++ b/test/integration/component/test_project_resources.py @@ -205,7 +205,7 @@ class TestOfferings(cloudstackTestCase): def test_01_service_offerings(self): """ Test service offerings in a project """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project. # 2. List service offerings for the project. All SO available in the @@ -247,7 +247,7 @@ class TestOfferings(cloudstackTestCase): def test_02_project_disk_offerings(self): """ Test project disk offerings """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project. # 2. List service offerings for the project. All disk offerings @@ -379,7 +379,7 @@ class TestNetwork(cloudstackTestCase): def test_03_network_create(self): """ Test create network in project """ - + tags = ["advanced", "advancedns"] # Validate the following # 1. Create a project. # 2. Add virtual/direct network resource to the project. User shared @@ -583,7 +583,7 @@ class TestTemplates(cloudstackTestCase): def test_04_public_template_use_in_project(self): """Test Templates creation in projects """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project # 2. Verify Public templates can be used without any restriction @@ -642,7 +642,7 @@ class TestTemplates(cloudstackTestCase): def test_05_use_private_template_in_project(self): """Test use of private template in a project """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project # 2. Verify that in order to use somebody’s Private template for vm @@ -808,7 +808,7 @@ class TestSnapshots(cloudstackTestCase): def test_06_create_snapshots_in_project(self): """Test create snapshots in project """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project # 2. Add some snapshots to the project @@ -961,7 +961,7 @@ class TestPublicIpAddress(cloudstackTestCase): def test_07_associate_public_ip(self): """Test associate public IP within the project """ - + tags = ["advanced", "eip", "advancedns"] # Validate the following # 1. Create a project # 2. Add some public Ips to the project @@ -1237,7 +1237,7 @@ class TestSecurityGroup(cloudstackTestCase): def test_08_security_group(self): """Test security groups in project """ - + tags = ["sg", "eip"] # Validate the following: # 1. Create a project # 2. Assign some security groups to that project diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py index bbf6205c3a2..177287dbd1e 100644 --- a/test/integration/component/test_project_usage.py +++ b/test/integration/component/test_project_usage.py @@ -190,7 +190,7 @@ class TestVmUsage(cloudstackTestCase): def test_01_vm_usage(self): """Test Create/Destroy VM and verify usage calculation """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a VM. Verify usage_events table contains VM .create, # VM.start , Network.offering.assign , Volume.create events @@ -401,7 +401,7 @@ class TestPublicIPUsage(cloudstackTestCase): def test_01_public_ip_usage(self): """Test Assign new IP and verify usage calculation """ - + tags = ["advanced", "eip", "advancedns"] # Validate the following # 1. Acquire a IP for the network of this account. Verify usage_event # table has Acquire IP event for the IP for this account @@ -559,7 +559,7 @@ class TestVolumeUsage(cloudstackTestCase): def test_01_volume_usage(self): """Test Create/delete a volume and verify correct usage is recorded """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Volume.create event for both root and data disk is there for the # created account in cloud.usage_event table @@ -751,7 +751,7 @@ class TestTemplateUsage(cloudstackTestCase): """Test Upload/ delete a template and verify correct usage is generated for the template uploaded """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a account # 2. Upload a template from this account. template.create event is @@ -902,7 +902,7 @@ class TestISOUsage(cloudstackTestCase): def test_01_ISO_usage(self): """Test Create/Delete a ISO and verify its usage is generated correctly """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a account # 2. Upload a ISO from this account. ISO.create event is recorded in @@ -1074,7 +1074,7 @@ class TestLBRuleUsage(cloudstackTestCase): def test_01_lb_usage(self): """Test Create/Delete a LB rule and verify correct usage is recorded """ - + tags = ["advanced", "eip", "advancedns"] # Validate the following # 1. Acquire a IP for this account. lb.rule.create event is registered # for this account in cloud.usage_event table @@ -1241,7 +1241,7 @@ class TestSnapshotUsage(cloudstackTestCase): """Test Create/Delete a manual snap shot and verify correct usage is recorded """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create snapshot of the root disk for this account.Snapshot.create # event is there for the created account in cloud.usage_event table @@ -1432,7 +1432,7 @@ class TestNatRuleUsage(cloudstackTestCase): def test_01_nat_usage(self): """Test Create/Delete a PF rule and verify correct usage is recorded """ - + tags = ["advanced", "advancedns"] # Validate the following # 1. Acquire a IP for this account # 2. Create a PF rule on the IP associated with this account. @@ -1615,7 +1615,7 @@ class TestVpnUsage(cloudstackTestCase): def test_01_vpn_usage(self): """Test Create/Delete a VPN and verify correct usage is recorded """ - + tags = ["advanced", "advancedns"] # Validate the following # 1. Enable VPN for this IP. vpn.add.user event is registered for this # account in cloud.usage_event table diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py index fd195436905..c1d00d90e9f 100644 --- a/test/integration/component/test_projects.py +++ b/test/integration/component/test_projects.py @@ -158,7 +158,7 @@ class TestMultipleProjectCreation(cloudstackTestCase): """ Verify an account can own multiple projects and can belong to multiple projects """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create multiple project. Verify at step 1 An account is allowed # to create multiple projects @@ -380,7 +380,7 @@ class TestCrossDomainAccountAdd(cloudstackTestCase): def test_02_cross_domain_account_add(self): """ Verify No cross domain projects """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project in a domain. # 2. Add different domain account to the project. Add account should @@ -507,7 +507,7 @@ class TestDeleteAccountWithProject(cloudstackTestCase): def test_03_delete_account_with_project(self): """ Test As long as the project exists, its owner can't be removed """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project. # 2. Delete account who is owner of the project. Delete account should @@ -627,7 +627,7 @@ class TestDeleteDomainWithProject(cloudstackTestCase): """ Test Verify delete domain with cleanup=true should delete projects belonging to the domain """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project in a domain # 2. Delete domain forcefully. Verify that project is also deleted as @@ -779,7 +779,7 @@ class TestProjectOwners(cloudstackTestCase): """ Test Verify a project user can be later promoted to become a owner """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project. # 2. Add account to the project. Edit account to make it a project @@ -937,7 +937,7 @@ class TestProjectOwners(cloudstackTestCase): def test_06_max_one_project_owner(self): """ Test Verify there can only be one owner of a project at a time """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project. # 2. Add account to the project. Edit account to make it a project @@ -1235,7 +1235,7 @@ class TestProjectResources(cloudstackTestCase): """ Test Verify after an account is removed from the project, all his resources stay with the project. """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project. # 2. Add some accounts to project. Add resources to the project @@ -1367,7 +1367,7 @@ class TestProjectResources(cloudstackTestCase): def test_08_cleanup_after_project_delete(self): """ Test accounts are unassigned from project after project deletion """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project. # 2. Add some accounts to project. Add resources to the project @@ -1589,7 +1589,7 @@ class TestProjectSuspendActivate(cloudstackTestCase): """ Test Verify after an account is removed from the project, all his resources stay with the project. """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a project. # 2. Add some accounts to project. Add resources to the project @@ -1742,7 +1742,7 @@ class TestProjectSuspendActivate(cloudstackTestCase): def test_10_project_activation(self): """ Test project activation after suspension """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Activate the project # 2. Verify project is activated and we are able to add resources diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py index c7a0c6c8c5b..61a91c8b153 100644 --- a/test/integration/component/test_resource_limits.py +++ b/test/integration/component/test_resource_limits.py @@ -150,6 +150,7 @@ class TestResourceLimitsAccount(cloudstackTestCase): def test_01_vm_per_account(self): """Test VM limit per account """ + tags = ["advanced","advancedns"] # Validate the following # 1. Set user_vm=1 limit for account 1. @@ -242,6 +243,7 @@ class TestResourceLimitsAccount(cloudstackTestCase): def test_02_publicip_per_account(self): """Test Public IP limit per account """ + tags = ["advanced","advancedns"] # Validate the following # 1. Set Public_IP= 2 limit for account 1. @@ -384,6 +386,7 @@ class TestResourceLimitsAccount(cloudstackTestCase): def test_03_snapshots_per_account(self): """Test Snapshot limit per account """ + tags = ["advanced","advancedns"] # Validate the following # 1. Set snapshot= 2 limit for account 1. @@ -539,6 +542,7 @@ class TestResourceLimitsAccount(cloudstackTestCase): def test_04_volumes_per_account(self): """Test Volumes limit per account """ + tags = ["advanced","advancedns"] # Validate the following # 1. Set volumes=2 limit for account 1. @@ -680,6 +684,7 @@ class TestResourceLimitsAccount(cloudstackTestCase): def test_05_templates_per_account(self): """Test Templates limit per account """ + tags = ["advanced","advancedns"] # Validate the following # 1. Set templates=1 limit for account 1. @@ -909,6 +914,7 @@ class TestResourceLimitsDomain(cloudstackTestCase): def test_01_vm_per_domain(self): """Test VM limit per domain """ + tags = ["advanced","advancedns"] # Validate the following # 1. Set max VM per domain to 2 @@ -974,6 +980,7 @@ class TestResourceLimitsDomain(cloudstackTestCase): def test_01_publicip_per_domain(self): """Test Public IP limit per domain """ + tags = ["advanced","advancedns"] # Validate the following # 1. set max no of IPs per domain to 2. @@ -1043,6 +1050,7 @@ class TestResourceLimitsDomain(cloudstackTestCase): def test_03_snapshots_per_domain(self): """Test Snapshot limit per domain """ + tags = ["advanced","advancedns"] # Validate the following # 1. set max no of snapshots per domain to 1. @@ -1125,6 +1133,7 @@ class TestResourceLimitsDomain(cloudstackTestCase): def test_04_volumes_per_domain(self): """Test Volumes limit per domain """ + tags = ["advanced","advancedns"] # Validate the following # 1. set max no of volume per domain to 1. @@ -1177,6 +1186,7 @@ class TestResourceLimitsDomain(cloudstackTestCase): def test_05_templates_per_domain(self): """Test Templates limit per domain """ + tags = ["advanced","advancedns"] # Validate the following # 1. set max no of templates per domain to 2. @@ -1322,6 +1332,7 @@ class TestResources(cloudstackTestCase): def test_01_zones(self): """Check the status of zones""" + tags = ["advanced","advancedns"] # Validate the following # 1. List zones @@ -1347,6 +1358,7 @@ class TestResources(cloudstackTestCase): def test_02_pods(self): """Check the status of pods""" + tags = ["advanced","advancedns"] # Validate the following # 1. List pods @@ -1372,6 +1384,7 @@ class TestResources(cloudstackTestCase): def test_03_clusters(self): """Check the status of clusters""" + tags = ["advanced","advancedns"] # Validate the following # 1. List clusters @@ -1397,6 +1410,7 @@ class TestResources(cloudstackTestCase): def test_04_hosts(self): """Check the status of hosts""" + tags = ["advanced","advancedns"] # Validate the following # 1. List hosts with type=Routing @@ -1423,6 +1437,7 @@ class TestResources(cloudstackTestCase): def test_05_storage_pools(self): """Check the status of Storage pools""" + tags = ["advanced","advancedns"] # Validate the following # 1. List storage pools for the zone @@ -1448,6 +1463,7 @@ class TestResources(cloudstackTestCase): def test_06_secondary_storage(self): """Check the status of secondary storage""" + tags = ["advanced","advancedns"] # Validate the following # 1. List secondary storage diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py index 2b0ca7309e6..a6692dc9ae5 100644 --- a/test/integration/component/test_routers.py +++ b/test/integration/component/test_routers.py @@ -167,7 +167,7 @@ class TestRouterServices(cloudstackTestCase): def test_01_AdvancedZoneRouterServices(self): """Test advanced zone router services """ - + tags = ["advanced"] # Validate the following: # 1. Verify that list of services provided by this network are running # a. DNS @@ -313,7 +313,7 @@ class TestRouterServices(cloudstackTestCase): def test_02_NetworkGarbageCollection(self): """Test network garbage collection """ - + tags = ["advanced"] # Validate the following # 1. wait for router to start and guest network to be created # a.listRouters account=user, domainid=1 (router state=Running) @@ -471,6 +471,7 @@ class TestRouterServices(cloudstackTestCase): def test_03_RouterStartOnVmDeploy(self): """Test router start on VM deploy """ + tags = ["advanced"] # Validate the following # 1. deployVirtualMachine in the account # 2. listVirtualMachines account=user, domainid=1 @@ -646,7 +647,7 @@ class TestRouterStopCreatePF(cloudstackTestCase): def test_01_RouterStopCreatePF(self): """Test router stop create port forwarding """ - + tags = ["advanced"] # validate the following # 1. wait for router to start, guest network to be implemented and # VM to report Running @@ -855,7 +856,7 @@ class TestRouterStopCreateLB(cloudstackTestCase): def test_01_RouterStopCreateLB(self): """Test router stop create Load balancing """ - + tags = ["advanced"] # validate the following # 1. listLoadBalancerRules (publicipid=ipaddressid of source NAT) # 2. rule should be for port 2222 as applied and @@ -1065,7 +1066,7 @@ class TestRouterStopCreateFW(cloudstackTestCase): def test_01_RouterStopCreateFW(self): """Test router stop create Firewall rule """ - + tags = ["advanced"] # validate the following # 1. 1. listFirewallRules (filter by ipaddressid of sourcenat) # 2. rule should be for ports 1-600 and in state=Active diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py index 68074536f9e..86cdee4e778 100644 --- a/test/integration/component/test_security_groups.py +++ b/test/integration/component/test_security_groups.py @@ -165,6 +165,8 @@ class TestDefaultSecurityGroup(cloudstackTestCase): def test_01_deployVM_InDefaultSecurityGroup(self): """Test deploy VM in default security group """ + + tags = ["sg", "eip"] # Validate the following: # 1. deploy Virtual machine using admin user @@ -242,6 +244,8 @@ class TestDefaultSecurityGroup(cloudstackTestCase): def test_02_listSecurityGroups(self): """Test list security groups for admin account """ + + tags = ["sg", "eip"] # Validate the following: # 1. listSecurityGroups in admin account @@ -275,6 +279,8 @@ class TestDefaultSecurityGroup(cloudstackTestCase): def test_03_accessInDefaultSecurityGroup(self): """Test access in default security group """ + + tags = ["sg", "eip"] # Validate the following: # 1. deploy Virtual machine using admin user @@ -430,6 +436,8 @@ class TestAuthorizeIngressRule(cloudstackTestCase): def test_01_authorizeIngressRule(self): """Test authorize ingress rule """ + + tags = ["sg", "eip"] # Validate the following: #1. Create Security group for the account. @@ -564,6 +572,8 @@ class TestRevokeIngressRule(cloudstackTestCase): def test_01_revokeIngressRule(self): """Test revoke ingress rule """ + + tags = ["sg", "eip"] # Validate the following: #1. Create Security group for the account. @@ -729,6 +739,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 @@ -856,6 +869,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 @@ -1030,6 +1045,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 @@ -1112,6 +1129,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 @@ -1272,6 +1291,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 @@ -1382,6 +1403,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 @@ -1534,6 +1557,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 diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py index 05585b5ae68..a609602e2cd 100644 --- a/test/integration/component/test_snapshots.py +++ b/test/integration/component/test_snapshots.py @@ -162,7 +162,7 @@ class TestCreateVMsnapshotTemplate(cloudstackTestCase): def test_01_createVM_snapshotTemplate(self): """Test create VM, Snapshot and Template """ - + tags = ["advanced","advancedns"] # Validate the following # 1. Deploy VM using default template, small service offering # and small data disk offering. @@ -470,7 +470,7 @@ class TestAccountSnapshotClean(cloudstackTestCase): def test_02_accountSnapshotClean(self): """Test snapshot cleanup after account deletion """ - + tags = ["advanced","advancedns"] # Validate the following # 1. listAccounts API should list out the newly created account # 2. listVirtualMachines() command should return the deployed VM. @@ -801,7 +801,7 @@ class TestSnapshotDetachedDisk(cloudstackTestCase): def test_03_snapshot_detachedDisk(self): """Test snapshot from detached disk """ - + tags = ["advanced","advancedns"] # Validate the following # 1. login in VM and write some data on data disk(use fdisk to # partition datadisk,fdisk /dev/sdb, and make filesystem using @@ -1073,7 +1073,7 @@ class TestSnapshotLimit(cloudstackTestCase): def test_04_snapshot_limit(self): """Test snapshot limit in snapshot policies """ - + tags = ["advanced","advancedns"] # Validate the following # 1. Perform hourly recurring snapshot on the root disk of VM and keep # the maxsnapshots as 1 @@ -1325,7 +1325,7 @@ class TestSnapshotEvents(cloudstackTestCase): def test_05_snapshot_events(self): """Test snapshot events """ - + tags = ["advanced","advancedns"] # Validate the following # 1. Perform snapshot on the root disk of this VM and check the events/alerts. # 2. delete the snapshots and check the events/alerts diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py index 2ff2f811148..ba20f5f2927 100644 --- a/test/integration/component/test_stopped_vm.py +++ b/test/integration/component/test_stopped_vm.py @@ -169,6 +169,7 @@ class TestDeployVM(cloudstackTestCase): def test_01_deploy_vm_no_startvm(self): """Test Deploy Virtual Machine with no startVM parameter """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deploy Vm without specifying the startvm parameter @@ -222,6 +223,7 @@ class TestDeployVM(cloudstackTestCase): def test_02_deploy_vm_startvm_true(self): """Test Deploy Virtual Machine with startVM=true parameter """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deploy Vm with the startvm=true @@ -276,6 +278,7 @@ class TestDeployVM(cloudstackTestCase): def test_03_deploy_vm_startvm_false(self): """Test Deploy Virtual Machine with startVM=false parameter """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deploy Vm with the startvm=false @@ -367,6 +370,7 @@ class TestDeployVM(cloudstackTestCase): def test_04_deploy_startvm_false_attach_volume(self): """Test Deploy Virtual Machine with startVM=false and attach volume """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deploy Vm with the startvm=false. Attach volume to the instance @@ -433,6 +437,7 @@ class TestDeployVM(cloudstackTestCase): """Test Deploy Virtual Machine with startVM=false and change service offering """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deploy Vm with the startvm=false. Attach volume to the instance @@ -545,6 +550,7 @@ class TestDeployVM(cloudstackTestCase): """Test Deploy Virtual Machine with startVM=false and attach detach volumes """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deploy Vm with the startvm=false. Attach volume to the instance @@ -628,6 +634,7 @@ class TestDeployVM(cloudstackTestCase): def test_07_deploy_startvm_attach_iso(self): """Test Deploy Virtual Machine with startVM=false and attach ISO """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deploy Vm with the startvm=false. Attach volume to the instance @@ -719,6 +726,7 @@ class TestDeployVM(cloudstackTestCase): """Test Deploy Virtual Machine with startVM=false and attach volume already attached to different machine """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deploy Vm with the startvm=false. Attach volume to the instance @@ -918,6 +926,7 @@ class TestDeployHaEnabledVM(cloudstackTestCase): def test_01_deploy_ha_vm_startvm_false(self): """Test Deploy HA enabled Virtual Machine with startvm=false """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deployHA enabled Vm with the startvm parameter = false @@ -966,6 +975,7 @@ class TestDeployHaEnabledVM(cloudstackTestCase): def test_02_deploy_ha_vm_from_iso(self): """Test Deploy HA enabled Virtual Machine from ISO """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deployHA enabled Vm using ISO with the startvm parameter=true @@ -1030,6 +1040,7 @@ class TestDeployHaEnabledVM(cloudstackTestCase): def test_03_deploy_ha_vm_iso_startvm_false(self): """Test Deploy HA enabled Virtual Machine from ISO with startvm=false """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deployHA enabled Vm using ISO with the startvm parameter=false @@ -1146,6 +1157,7 @@ class TestRouterStateAfterDeploy(cloudstackTestCase): def test_01_deploy_vm_no_startvm(self): """Test Deploy Virtual Machine with no startVM parameter """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. deploy Vm without specifying the startvm parameter @@ -1360,6 +1372,7 @@ class TestDeployVMBasicZone(cloudstackTestCase): def test_01_deploy_vm_startvm_true(self): """Test Deploy Virtual Machine with startVM=true parameter """ + tags = ["eip","basic","sg"] # Validate the following: # 1. deploy Vm with the startvm=true @@ -1418,6 +1431,7 @@ class TestDeployVMBasicZone(cloudstackTestCase): def test_02_deploy_vm_startvm_false(self): """Test Deploy Virtual Machine with startVM=true parameter """ + tags = ["eip","basic","sg"] # Validate the following: # 1. deploy Vm with the startvm=true @@ -1576,6 +1590,7 @@ class TestDeployVMFromTemplate(cloudstackTestCase): """Test Deploy Virtual Machine with startVM=false & enabledpassword in template """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following: # 1. Create the password enabled template @@ -1712,6 +1727,7 @@ class TestVMAccountLimit(cloudstackTestCase): def test_vm_per_account(self): """Test VM limit per account """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following # 1. Set the resource limit for VM per account. @@ -1827,6 +1843,7 @@ class TestUploadAttachVolume(cloudstackTestCase): def test_upload_attach_volume(self): """Test Upload volume and attach to VM in stopped state """ + tags = ["advanced","eip","advancedns","basic","sg"] # Validate the following # 1. Upload the volume using uploadVolume API call diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py index afad16c04b7..f18cb08531d 100644 --- a/test/integration/component/test_templates.py +++ b/test/integration/component/test_templates.py @@ -159,7 +159,7 @@ class TestCreateTemplate(cloudstackTestCase): def test_01_create_template(self): """Test create public & private template """ - + tags = ["advanced","advancedns"] # Validate the following: # 1. Upload a templates in raw img format. Create a Vm instances from # raw img template. @@ -375,6 +375,7 @@ class TestTemplates(cloudstackTestCase): def test_01_create_template_volume(self): """Test Create template from volume """ + tags = ["advanced","advancedns"] # Validate the following: # 1. Deploy new VM using the template created from Volume @@ -413,6 +414,7 @@ class TestTemplates(cloudstackTestCase): def test_02_copy_template(self): """Test for copy template from one zone to another""" + tags = ["advanced","advancedns"] # Validate the following # 1. copy template should be successful and @@ -471,6 +473,7 @@ class TestTemplates(cloudstackTestCase): def test_03_delete_template(self): """Test Delete template """ + tags = ["advanced","advancedns"] # Validate the following: # 1. Create a template and verify it is shown in list templates response @@ -525,6 +528,7 @@ class TestTemplates(cloudstackTestCase): def test_04_template_from_snapshot(self): """Create Template from snapshot """ + tags = ["advanced","advancedns"] # Validate the following # 2. Snapshot the Root disk diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py index 1e37abda194..4f61d6ba1d9 100644 --- a/test/integration/component/test_usage.py +++ b/test/integration/component/test_usage.py @@ -176,7 +176,7 @@ class TestVmUsage(cloudstackTestCase): def test_01_vm_usage(self): """Test Create/Destroy VM and verify usage calculation """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a VM. Verify usage_events table contains VM .create, # VM.start , Network.offering.assign , Volume.create events @@ -367,7 +367,7 @@ class TestPublicIPUsage(cloudstackTestCase): def test_01_public_ip_usage(self): """Test Assign new IP and verify usage calculation """ - + tags = ["advanced", "eip", "advancedns"] # Validate the following # 1. Aquire a IP for the network of this account. Verify usage_event # table has Acquire IP event for the IP for this account @@ -514,7 +514,7 @@ class TestVolumeUsage(cloudstackTestCase): def test_01_volume_usage(self): """Test Create/delete a volume and verify correct usage is recorded """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Volume.create event for both root and data disk is there for the # created account in cloud.usage_event table @@ -696,7 +696,7 @@ class TestTemplateUsage(cloudstackTestCase): """Test Upload/ delete a template and verify correct usage is generated for the template uploaded """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a account # 2. Upload a template from this account. template.create event is @@ -838,7 +838,7 @@ class TestISOUsage(cloudstackTestCase): def test_01_ISO_usage(self): """Test Create/Delete a ISO and verify its usage is generated correctly """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create a account # 2. Upload a ISO from this account. ISO.create event is recorded in @@ -989,7 +989,7 @@ class TestLBRuleUsage(cloudstackTestCase): def test_01_lb_usage(self): """Test Create/Delete a LB rule and verify correct usage is recorded """ - + tags = ["advanced", "eip", "advancedns"] # Validate the following # 1. Acquire a IP for this account. lb.rule.create event is registered # for this account in cloud.usage_event table @@ -1145,7 +1145,7 @@ class TestSnapshotUsage(cloudstackTestCase): """Test Create/Delete a manual snap shot and verify correct usage is recorded """ - + tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. Create snapshot of the root disk for this account.Snapshot.create # event is there for the created account in cloud.usage_event table @@ -1315,7 +1315,7 @@ class TestNatRuleUsage(cloudstackTestCase): def test_01_nat_usage(self): """Test Create/Delete a PF rule and verify correct usage is recorded """ - + tags = ["advanced", "advancedns"] # Validate the following # 1. Acquire a IP for this account # 2. Create a PF rule on the IP associated with this account. @@ -1477,7 +1477,7 @@ class TestVpnUsage(cloudstackTestCase): def test_01_vpn_usage(self): """Test Create/Delete a VPN and verify correct usage is recorded """ - + tags = ["advanced", "advancedns"] # Validate the following # 1. Enable VPN for this IP. vpn.add.user event is registered for this # account in cloud.usage_event table diff --git a/test/integration/component/test_vmware_drs.py b/test/integration/component/test_vmware_drs.py index ec0228bf62f..e00ca70f934 100644 --- a/test/integration/component/test_vmware_drs.py +++ b/test/integration/component/test_vmware_drs.py @@ -162,7 +162,7 @@ class TestVMPlacement(cloudstackTestCase): - Another host should have some capacity remaining - DRS Cluster is configured in "Fully automated" mode """ - + tags = ["advanced","vmware","eip","advancedns","basic","sg"] # Validate the following # 1. Create a new VM in a host which is almost fully utilized # 2 Automatically places VM on the other host @@ -290,6 +290,7 @@ class TestAntiAffinityRules(cloudstackTestCase): - Add host names to host_1,host_2 and IDs of VM 1,2 in the settings class "anti_affinity" above. """ + tags = ["advanced","vmware","eip","advancedns","basic","sg"] # Validate the following # 1. Deploy VMs on host 1 and 2 @@ -490,6 +491,7 @@ class TestAffinityRules(cloudstackTestCase): - Add host names to host_1,host_2 and IDs of VM 1,2 in the settings class "affinity" above. """ + tags = ["advanced","vmware","eip","advancedns","basic","sg"] # Validate the following # 1. Deploy VMs 2 VMs on same hosts diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py index 4caee7d170f..1b905d4d813 100644 --- a/test/integration/component/test_volumes.py +++ b/test/integration/component/test_volumes.py @@ -140,7 +140,7 @@ class TestAttachVolume(cloudstackTestCase): def test_01_volume_attach(self): """Test Attach volumes (max capacity) """ - + tags = ["advanced","advancedns"] # Validate the following # 1. Deploy a vm and create 5 data disk # 2. Attach all the created Volume to the vm. @@ -292,6 +292,7 @@ class TestAttachVolume(cloudstackTestCase): def test_02_volume_attach_max(self): """Test attach volumes (more than max) to an instance """ + tags = ["advanced","advancedns"] # Validate the following # 1. Attach one more data volume to VM (Already 5 attached) @@ -422,6 +423,7 @@ class TestAttachDetachVolume(cloudstackTestCase): def test_01_volume_attach_detach(self): """Test Volume attach/detach to VM (5 data volumes) """ + tags = ["advanced","advancedns"] # Validate the following # 1. Deploy a vm and create 5 data disk @@ -669,6 +671,7 @@ class TestAttachVolumeISO(cloudstackTestCase): def test_01_volume_iso_attach(self): """Test Volumes and ISO attach """ + tags = ["advanced","advancedns"] # Validate the following # 1. Create and attach 5 data volumes to VM @@ -864,6 +867,7 @@ class TestVolumes(cloudstackTestCase): def test_01_attach_volume(self): """Attach a created Volume to a Running VM """ + tags = ["advanced","advancedns"] # Validate the following # 1. Create a data volume. # 2. List Volumes should not have vmname and virtualmachineid fields in @@ -947,6 +951,7 @@ class TestVolumes(cloudstackTestCase): def test_02_detach_volume(self): """Detach a Volume attached to a VM """ + tags = ["advanced","advancedns"] # Validate the following # 1. Data disk should be detached from instance @@ -994,6 +999,7 @@ class TestVolumes(cloudstackTestCase): def test_03_delete_detached_volume(self): """Delete a Volume unattached to an VM """ + tags = ["advanced","advancedns"] # Validate the following # 1. volume should be deleted successfully and listVolume should not # contain the deleted volume details.