Repository: cloudstack Updated Branches: refs/heads/master d8586462e -> 91a5e3bb6
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91a5e3bb/test/integration/component/test_vpc_network_pfrules.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py index c65da41..e5bb158 100644 --- a/test/integration/component/test_vpc_network_pfrules.py +++ b/test/integration/component/test_vpc_network_pfrules.py @@ -484,7 +484,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): return nwacl_internet_1 - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_01_network_services_VPC_StopCreatePF(self): """ Test : Create VPC PF rules on acquired public ip when VpcVirtualRouter is stopped """ @@ -515,7 +515,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_ssh_into_vm(vm_1, public_ip_1, testnegative=False) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_02_network_services_VPC_CreatePF(self): """ Test Create VPC PF rules on acquired public ip when VpcVirtualRouter is Running """ @@ -535,7 +535,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_ssh_into_vm(vm_1, public_ip_1, testnegative=False) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_03_network_services_VPC_StopCreateMultiplePF(self): """ Test Create multiple VPC PF rules on acquired public ip in diff't networks when VpcVirtualRouter is stopped """ @@ -571,7 +571,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_ssh_into_vm(vm_2, public_ip_2, testnegative=False) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_04_network_services_VPC_CreateMultiplePF(self): """ Test Create multiple VPC PF rules on acquired public ip in diff't networks when VpcVirtualRouter is running """ @@ -599,7 +599,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_ssh_into_vm(vm_2, public_ip_2, testnegative=False) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_05_network_services_VPC_StopDeletePF(self): """ Test delete a PF rule in VPC when VpcVirtualRouter is Stopped """ @@ -630,7 +630,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_wget_from_vm(vm_1, public_ip_1, testnegative=True) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_06_network_services_VPC_DeletePF(self): """ Test delete a PF rule in VPC when VpcVirtualRouter is Running """ @@ -657,7 +657,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_wget_from_vm(vm_1, public_ip_1, testnegative=True) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_07_network_services_VPC_StopDeleteAllPF(self): """ Test delete all PF rules in VPC when VpcVirtualRouter is Stopped """ @@ -691,7 +691,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_wget_from_vm(vm_1, public_ip_1, testnegative=True) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_08_network_services_VPC_DeleteAllPF(self): """ Test delete all PF rules in VPC when VpcVirtualRouter is Running """ @@ -721,7 +721,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_wget_from_vm(vm_1, public_ip_1, testnegative=True) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_09_network_services_VPC_StopDeleteAllMultiplePF(self): """ Test delete all PF rules in VPC across multiple networks when VpcVirtualRouter is Stopped """ @@ -788,7 +788,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_wget_from_vm(vm_4, public_ip_4, testnegative=True) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_10_network_services_VPC_DeleteAllMultiplePF(self): """ Test delete all PF rules in VPC across multiple networks when VpcVirtualRouter is Running """ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91a5e3bb/test/integration/component/test_vpc_network_staticnatrule.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py index 46e3479..ddc3c4c 100644 --- a/test/integration/component/test_vpc_network_staticnatrule.py +++ b/test/integration/component/test_vpc_network_staticnatrule.py @@ -495,7 +495,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): return nwacl_nat - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_01_VPC_StaticNatRuleCreateStoppedState(self): """ Test case no extra : """ @@ -523,7 +523,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_02_VPC_CreateStaticNatRule(self): """ Test case no 229 : Create Static NAT Rule for a single virtual network of a VPC using a new Public IP Address available with the VPC when the Virtual Router is in Running State @@ -546,7 +546,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_ssh_into_vm(vm_1, public_ip_1, testnegative=False) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_03_VPC_StopCreateMultipleStaticNatRuleStopppedState(self): """ Test case no extra : Create Static Nat Rule rules for a two/multiple virtual networks of a VPC using a new Public IP Address available with the VPC when Virtual Router is in Stopped State @@ -586,7 +586,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_ssh_into_vm(vm_2, public_ip_2, testnegative=False) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_04_VPC_CreateMultipleStaticNatRule(self): """ Test case no 230 : Create Static NAT Rules for a two/multiple virtual networks of a VPC using a new Public IP Address available with the VPC when the Virtual Router is in Running State @@ -619,7 +619,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_ssh_into_vm(vm_2, public_ip_2, testnegative=False) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_05_network_services_VPC_DeleteAllPF(self): """ Test case no 232: Delete all Static NAT Rules for a single virtual network of a VPC belonging to a single Public IP Address when the Virtual Router is in Running State @@ -651,7 +651,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase): self.check_wget_from_vm(vm_1, public_ip_1, testnegative=True) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_06_network_services_VPC_DeleteAllMultiplePF(self): """ Test case no 233: Delete all Static NAT rules for two/multiple virtual networks of a VPC. Observe the status of the Public IP Addresses of the rules when the Virtual Router is in Running State. http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91a5e3bb/test/integration/component/test_vpc_offerings.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py index 699cef9..9e3064b 100644 --- a/test/integration/component/test_vpc_offerings.py +++ b/test/integration/component/test_vpc_offerings.py @@ -235,7 +235,7 @@ class TestVPCOffering(cloudstackTestCase): self.debug("VPC network created successfully - %s" % network.name) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_01_create_vpc_offering(self): """ Test create VPC offering """ @@ -255,7 +255,7 @@ class TestVPCOffering(cloudstackTestCase): self.validate_vpc_offering(vpc_off) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_02_deploy_vms_in_vpc_nw(self): """Test deploy virtual machines in VPC networks""" @@ -457,7 +457,7 @@ class TestVPCOffering(cloudstackTestCase): # TODO: Remote Access VPN is not yet supported in VPC return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_03_vpc_off_without_lb(self): """Test VPC offering without load balancing service""" @@ -578,7 +578,7 @@ class TestVPCOffering(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_04_vpc_off_without_static_nat(self): """Test VPC offering without static NAT service""" @@ -697,7 +697,7 @@ class TestVPCOffering(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_05_vpc_off_without_pf(self): """Test VPC offering without port forwarding service""" @@ -815,7 +815,7 @@ class TestVPCOffering(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_06_vpc_off_invalid_services(self): """Test VPC offering with invalid services""" @@ -847,7 +847,7 @@ class TestVPCOffering(cloudstackTestCase): self.fail("Failed to create the VPC offering - %s" % e) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_07_update_vpc_off(self): """Test update VPC offering""" @@ -936,7 +936,7 @@ class TestVPCOffering(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_08_list_vpc_off(self): """Test list VPC offering""" http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91a5e3bb/test/integration/component/test_vpc_routers.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py index a836627..fb5aed5 100644 --- a/test/integration/component/test_vpc_routers.py +++ b/test/integration/component/test_vpc_routers.py @@ -343,7 +343,7 @@ class TestVPCRoutersBasic(cloudstackTestCase): " still %s" % (host.id, router.hostid)) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_01_stop_start_router_after_creating_vpc(self): """ Test to stop and start router after creation of VPC """ @@ -421,7 +421,7 @@ class TestVPCRoutersBasic(cloudstackTestCase): return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_02_reboot_router_after_creating_vpc(self): """ Test to reboot the router after creating a VPC """ @@ -470,7 +470,7 @@ class TestVPCRoutersBasic(cloudstackTestCase): return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_03_migrate_router_after_creating_vpc(self): """ Test migration of router to another host after creating VPC """ @@ -491,7 +491,7 @@ class TestVPCRoutersBasic(cloudstackTestCase): self.migrate_router(routers[0]) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_04_change_service_offerring_vpc(self): """ Tests to change service offering of the Router after creating a vpc @@ -552,7 +552,7 @@ class TestVPCRoutersBasic(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_05_destroy_router_after_creating_vpc(self): """ Test to destroy the router after creating a VPC """ @@ -980,7 +980,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase): return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioining"]) def test_01_start_stop_router_after_addition_of_one_guest_network(self): """ Test start/stop of router after addition of one guest network """ @@ -1075,7 +1075,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase): return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_02_reboot_router_after_addition_of_one_guest_network(self): """ Test reboot of router after addition of one guest network """ @@ -1142,7 +1142,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "provisioning"]) def test_03_migrate_router_after_addition_of_one_guest_network(self): """ Test migrate of router after addition of one guest network """ @@ -1185,7 +1185,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase): self.migrate_router(routers[0]) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_04_chg_srv_off_router_after_addition_of_one_guest_network(self): """ Test to change service offering of router after addition of one guest network """ @@ -1263,7 +1263,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_05_destroy_router_after_addition_of_one_guest_network(self): """ Test destroy of router after addition of one guest network """ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91a5e3bb/test/integration/component/test_vpc_vms_deployment.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py index 0a244ab..0ef51b4 100644 --- a/test/integration/component/test_vpc_vms_deployment.py +++ b/test/integration/component/test_vpc_vms_deployment.py @@ -276,7 +276,7 @@ class TestVMDeployVPC(cloudstackTestCase): self.debug("VPC network validated - %s" % network.name) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_01_deploy_vms_in_network(self): """ Test deploy VMs in VPC networks """ @@ -490,7 +490,7 @@ class TestVMDeployVPC(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_02_deploy_vms_delete_network(self): """ Test deploy VMs in VPC networks and delete one of the network """ @@ -742,7 +742,7 @@ class TestVMDeployVPC(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_03_deploy_vms_delete_add_network(self): """ Test deploy VMs, delete one of the network and add another one """ @@ -1011,7 +1011,7 @@ class TestVMDeployVPC(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_04_deploy_vms_delete_add_network_noLb(self): """ Test deploy VMs, delete one network without LB and add another one """ @@ -1305,7 +1305,7 @@ class TestVMDeployVPC(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_05_create_network_max_limit(self): """ Test create networks in VPC upto maximum limit for hypervisor """ @@ -1476,7 +1476,7 @@ class TestVMDeployVPC(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_06_delete_network_vm_running(self): """ Test delete network having running instances in VPC """ @@ -1718,7 +1718,7 @@ class TestVMDeployVPC(cloudstackTestCase): ) return - @attr(tags=["advanced", "intervlan"]) + @attr(tags=["advanced", "intervlan", "selfservice"]) def test_07_delete_network_with_rules(self): """ Test delete network that has PF/staticNat/LB rules/Network Acl """ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91a5e3bb/test/integration/component/test_vpn_users.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpn_users.py b/test/integration/component/test_vpn_users.py index 02dd026..710055a 100644 --- a/test/integration/component/test_vpn_users.py +++ b/test/integration/component/test_vpn_users.py @@ -258,7 +258,7 @@ class TestVPNUsers(cloudstackTestCase): self.debug("Limit exceeded exception raised!") return - @attr(tags=["advanced", "advancedns"]) + @attr(tags=["advanced", "advancedns", "selfservice"]) def test_02_use_vpn_port(self): """Test create VPN when L2TP port in use""" @@ -289,7 +289,7 @@ class TestVPNUsers(cloudstackTestCase): self.debug("Create VPN connection failed! Test successful!") return - @attr(tags=["advanced", "advancedns"]) + @attr(tags=["advanced", "advancedns", "selfservice"]) def test_03_enable_vpn_use_port(self): """Test create NAT rule when VPN when L2TP enabled""" @@ -315,7 +315,7 @@ class TestVPNUsers(cloudstackTestCase): self.debug("Create NAT rule failed! Test successful!") return - @attr(tags=["advanced", "advancedns"]) + @attr(tags=["advanced", "advancedns", "selfservice"]) def test_04_add_new_users(self): """Test add new users to existing VPN""" @@ -343,7 +343,7 @@ class TestVPNUsers(cloudstackTestCase): self.fail("Failed to create new VPN user: %s" % e) return - @attr(tags=["advanced", "advancedns"]) + @attr(tags=["advanced", "advancedns", "selfservice"]) def test_05_add_duplicate_user(self): """Test add duplicate user to existing VPN""" @@ -366,7 +366,7 @@ class TestVPNUsers(cloudstackTestCase): self.create_VPN_Users(rand_name=False) return - @attr(tags=["advanced", "advancedns"]) + @attr(tags=["advanced", "advancedns", "selfservice"]) def test_06_add_VPN_user_global_admin(self): """Test as global admin, add a new VPN user to an existing VPN entry that was created by another account.""" @@ -409,7 +409,7 @@ class TestVPNUsers(cloudstackTestCase): e) return - @attr(tags=["advanced", "advancedns"]) + @attr(tags=["advanced", "advancedns", "selfservice"]) def test_07_add_VPN_user_domain_admin(self): """Test as domain admin, add a new VPN user to an existing VPN entry that was created by another account."""
