You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2015/03/20 12:51:35 UTC
[1/4] git commit: updated refs/heads/master to 62a733e
Repository: cloudstack
Updated Branches:
refs/heads/master 7a2e27c3b -> 62a733e8c
CLOUDSTACK-8330: Tagging test cases which should be run with vmware dvs configuration
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/104ea2b5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/104ea2b5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/104ea2b5
Branch: refs/heads/master
Commit: 104ea2b5ef9db614cc28759347ec30e77b899c88
Parents: 3041166
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri Mar 20 10:28:08 2015 +0530
Committer: Gaurav Aradhye <ga...@clogeny.com>
Committed: Fri Mar 20 10:28:39 2015 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 2 +-
test/integration/component/test_blocker_bugs.py | 2 +-
.../component/test_multiple_ips_per_nic.py | 10 +++---
test/integration/component/test_vpc.py | 4 +--
test/integration/component/test_vpc_network.py | 2 +-
.../component/test_vpc_vm_life_cycle.py | 36 ++++++++++----------
test/integration/smoke/test_network.py | 14 ++++----
test/integration/smoke/test_routers.py | 6 ++--
8 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/104ea2b5/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index 254f1ce..cf4b0e3 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -1525,7 +1525,7 @@ class TestDomainForceRemove(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["domains", "advanced", "advancedns", "simulator"], required_hardware="false")
+ @attr(tags=["domains", "advanced", "advancedns", "simulator", "dvs"], required_hardware="false")
def test_forceDeleteDomain(self):
""" Test delete domain with force option"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/104ea2b5/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index 559b363..7123984 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -325,7 +325,7 @@ class TestNATRules(cloudstackTestCase):
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
- @attr(tags=["advanced"], required_hardware="false")
+ @attr(tags=["advanced", "dvs"], required_hardware="false")
def test_01_firewall_rules_port_fw(self):
""""Checking firewall rules deletion after static NAT disable"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/104ea2b5/test/integration/component/test_multiple_ips_per_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py
index 536c39d..1881ced 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -718,7 +718,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced"])
+ @attr(tags=["advanced", "dvs"])
def test_add_PF_rule(self, value):
""" Add secondary IP to NIC of a VM"""
@@ -806,7 +806,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced"])
+ @attr(tags=["advanced", "dvs"])
def test_delete_PF_nat_rule(self, value):
""" Add secondary IP to NIC of a VM"""
@@ -891,7 +891,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced"])
+ @attr(tags=["advanced, "dvs"])
def test_disassociate_ip_mapped_to_secondary_ip_through_PF_rule(
self,
value):
@@ -960,7 +960,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced"])
+ @attr(tags=["advanced", "dvs"])
def test_add_static_nat_rule(self, value):
""" Add secondary IP to NIC of a VM"""
@@ -1059,7 +1059,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced"])
+ @attr(tags=["advanced", "dvs"])
def test_disable_static_nat(self, value):
""" Add secondary IP to NIC of a VM"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/104ea2b5/test/integration/component/test_vpc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc.py b/test/integration/component/test_vpc.py
index 58960a9..bae89c5 100644
--- a/test/integration/component/test_vpc.py
+++ b/test/integration/component/test_vpc.py
@@ -482,7 +482,7 @@ class TestVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"], required_hardware="false")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="false")
def test_02_restart_vpc_no_networks(self):
""" Test restart VPC having no networks
"""
@@ -513,7 +513,7 @@ class TestVPC(cloudstackTestCase):
self.validate_vpc_network(vpc, state='Enabled')
return
- @attr(tags=["advanced", "intervlan"], required_hardware="false")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="false")
def test_03_restart_vpc_with_networks(self):
""" Test restart VPC having networks
"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/104ea2b5/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py
index f4c0a2f..e183054 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -2435,7 +2435,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_03_restart_vpcvr(self):
""" Test Stop all the Vms that are part of the a Network
(Wait for network GC).Restart VPCVR.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/104ea2b5/test/integration/component/test_vpc_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py
index 694c924..d146af1 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -491,7 +491,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan", "dvs"])
def test_01_deploy_instance_in_network(self):
""" Test deploy an instance in VPC networks
"""
@@ -524,7 +524,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan", "dvs"])
def test_02_stop_instance_in_network(self):
""" Test stop an instance in VPC networks
"""
@@ -566,7 +566,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_03_start_instance_in_network(self):
""" Test start an instance in VPC networks
"""
@@ -591,7 +591,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_04_reboot_instance_in_network(self):
""" Test reboot an instance in VPC networks
"""
@@ -620,7 +620,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_05_destroy_instance_in_network(self):
""" Test destroy an instance in VPC networks
"""
@@ -787,7 +787,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_07_migrate_instance_in_network(self):
""" Test migrate an instance in VPC networks
"""
@@ -823,7 +823,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_08_user_data(self):
""" Test user data in virtual machines
"""
@@ -866,7 +866,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_09_meta_data(self):
""" Test meta data in virtual machines
"""
@@ -908,7 +908,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_10_expunge_instance_in_network(self):
""" Test expunge an instance in VPC networks
"""
@@ -3066,7 +3066,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_01_deploy_instance_in_network(self):
""" Test deploy an instance in VPC networks
"""
@@ -3100,7 +3100,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_02_stop_instance_in_network(self):
""" Test stop an instance in VPC networks
"""
@@ -3142,7 +3142,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_03_start_instance_in_network(self):
""" Test start an instance in VPC networks
"""
@@ -3193,7 +3193,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_04_reboot_instance_in_network(self):
""" Test reboot an instance in VPC networks
"""
@@ -3220,7 +3220,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_05_destroy_instance_in_network(self):
""" Test destroy an instance in VPC networks
"""
@@ -3383,7 +3383,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_06_migrate_instance_in_network(self):
""" Test migrate an instance in VPC networks
"""
@@ -3419,7 +3419,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_07_user_data(self):
""" Test user data in virtual machines
"""
@@ -3467,7 +3467,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_08_meta_data(self):
""" Test meta data in virtual machines
"""
@@ -3514,7 +3514,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_09_expunge_instance_in_network(self):
""" Test expunge an instance in VPC networks
"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/104ea2b5/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 2844be3..b1c5805 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -134,7 +134,7 @@ class TestPublicIP(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
def test_public_ip_admin_account(self):
"""Test for Associate/Disassociate public IP address for admin account"""
@@ -188,7 +188,7 @@ class TestPublicIP(cloudstackTestCase):
self.fail("list public ip response is not empty")
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
def test_public_ip_user_account(self):
"""Test for Associate/Disassociate public IP address for user account"""
@@ -304,7 +304,7 @@ class TestPortForwarding(cloudstackTestCase):
cleanup_resources(self.apiclient, self.cleanup)
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
def test_01_port_fwd_on_src_nat(self):
"""Test for port forwarding on source NAT"""
@@ -433,7 +433,7 @@ class TestPortForwarding(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
def test_02_port_fwd_on_non_src_nat(self):
"""Test for port forwarding on non source NAT"""
@@ -646,7 +646,7 @@ class TestRebootRouter(cloudstackTestCase):
]
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
def test_reboot_router(self):
"""Test for reboot router"""
@@ -804,7 +804,7 @@ class TestReleaseIP(cloudstackTestCase):
def tearDown(self):
cleanup_resources(self.apiclient, self.cleanup)
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
def test_releaseIP(self):
"""Test for release public IP address"""
@@ -1173,7 +1173,7 @@ class TestRouterRules(cloudstackTestCase):
return
@data(STATIC_NAT_RULE, NAT_RULE, LB_RULE)
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
def test_network_rules_acquired_public_ip(self, value):
"""Test for Router rules for network rules on acquired public IP"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/104ea2b5/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index 7940d12..a901039 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -313,7 +313,7 @@ class TestRouterServices(cloudstackTestCase):
self.debug("Haproxy process status: %s" % res)
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
def test_03_restart_network_cleanup(self):
"""Test restart network
"""
@@ -390,7 +390,7 @@ class TestRouterServices(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
def test_04_restart_network_wo_cleanup(self):
"""Test restart network without cleanup
"""
@@ -752,7 +752,7 @@ class TestRouterServices(cloudstackTestCase):
return True
return False
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
def test_09_reboot_router(self):
"""Test reboot router
"""
[2/4] git commit: updated refs/heads/master to 62a733e
Posted by ta...@apache.org.
Merge branch '8330' of https://github.com/gauravaradhye/cloudstack
This closes #121
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4498c48
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4498c48
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4498c48
Branch: refs/heads/master
Commit: f4498c48e30b473b2388c012b2e745bcbf9261c4
Parents: 7a2e27c 104ea2b
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Fri Mar 20 16:14:25 2015 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri Mar 20 16:14:25 2015 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 2 +-
test/integration/component/test_blocker_bugs.py | 2 +-
.../component/test_multiple_ips_per_nic.py | 10 +++---
test/integration/component/test_vpc.py | 4 +--
test/integration/component/test_vpc_network.py | 2 +-
.../component/test_vpc_vm_life_cycle.py | 36 ++++++++++----------
test/integration/smoke/test_network.py | 14 ++++----
test/integration/smoke/test_routers.py | 6 ++--
8 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
[4/4] git commit: updated refs/heads/master to 62a733e
Posted by ta...@apache.org.
CLOUDSTACK-8330: Tagging test cases which should be run with vmware dvs configuration
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/62a733e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62a733e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62a733e8
Branch: refs/heads/master
Commit: 62a733e8cf7a2a29517d17c158a8271ce20a74cc
Parents: 5cea73d
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri Mar 20 10:28:08 2015 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri Mar 20 17:20:55 2015 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 2 +-
test/integration/component/test_blocker_bugs.py | 2 +-
.../component/test_multiple_ips_per_nic.py | 10 +++---
test/integration/component/test_vpc.py | 4 +--
test/integration/component/test_vpc_network.py | 2 +-
.../component/test_vpc_vm_life_cycle.py | 36 ++++++++++----------
test/integration/smoke/test_network.py | 14 ++++----
test/integration/smoke/test_routers.py | 6 ++--
8 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62a733e8/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index 254f1ce..cf4b0e3 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -1525,7 +1525,7 @@ class TestDomainForceRemove(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["domains", "advanced", "advancedns", "simulator"], required_hardware="false")
+ @attr(tags=["domains", "advanced", "advancedns", "simulator", "dvs"], required_hardware="false")
def test_forceDeleteDomain(self):
""" Test delete domain with force option"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62a733e8/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index 559b363..7123984 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -325,7 +325,7 @@ class TestNATRules(cloudstackTestCase):
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
- @attr(tags=["advanced"], required_hardware="false")
+ @attr(tags=["advanced", "dvs"], required_hardware="false")
def test_01_firewall_rules_port_fw(self):
""""Checking firewall rules deletion after static NAT disable"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62a733e8/test/integration/component/test_multiple_ips_per_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py
index 536c39d..1881ced 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -718,7 +718,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced"])
+ @attr(tags=["advanced", "dvs"])
def test_add_PF_rule(self, value):
""" Add secondary IP to NIC of a VM"""
@@ -806,7 +806,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced"])
+ @attr(tags=["advanced", "dvs"])
def test_delete_PF_nat_rule(self, value):
""" Add secondary IP to NIC of a VM"""
@@ -891,7 +891,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced"])
+ @attr(tags=["advanced, "dvs"])
def test_disassociate_ip_mapped_to_secondary_ip_through_PF_rule(
self,
value):
@@ -960,7 +960,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced"])
+ @attr(tags=["advanced", "dvs"])
def test_add_static_nat_rule(self, value):
""" Add secondary IP to NIC of a VM"""
@@ -1059,7 +1059,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced"])
+ @attr(tags=["advanced", "dvs"])
def test_disable_static_nat(self, value):
""" Add secondary IP to NIC of a VM"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62a733e8/test/integration/component/test_vpc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc.py b/test/integration/component/test_vpc.py
index 58960a9..bae89c5 100644
--- a/test/integration/component/test_vpc.py
+++ b/test/integration/component/test_vpc.py
@@ -482,7 +482,7 @@ class TestVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"], required_hardware="false")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="false")
def test_02_restart_vpc_no_networks(self):
""" Test restart VPC having no networks
"""
@@ -513,7 +513,7 @@ class TestVPC(cloudstackTestCase):
self.validate_vpc_network(vpc, state='Enabled')
return
- @attr(tags=["advanced", "intervlan"], required_hardware="false")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="false")
def test_03_restart_vpc_with_networks(self):
""" Test restart VPC having networks
"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62a733e8/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py
index f4c0a2f..e183054 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -2435,7 +2435,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_03_restart_vpcvr(self):
""" Test Stop all the Vms that are part of the a Network
(Wait for network GC).Restart VPCVR.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62a733e8/test/integration/component/test_vpc_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py
index 694c924..d146af1 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -491,7 +491,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan", "dvs"])
def test_01_deploy_instance_in_network(self):
""" Test deploy an instance in VPC networks
"""
@@ -524,7 +524,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"])
+ @attr(tags=["advanced", "intervlan", "dvs"])
def test_02_stop_instance_in_network(self):
""" Test stop an instance in VPC networks
"""
@@ -566,7 +566,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_03_start_instance_in_network(self):
""" Test start an instance in VPC networks
"""
@@ -591,7 +591,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_04_reboot_instance_in_network(self):
""" Test reboot an instance in VPC networks
"""
@@ -620,7 +620,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_05_destroy_instance_in_network(self):
""" Test destroy an instance in VPC networks
"""
@@ -787,7 +787,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_07_migrate_instance_in_network(self):
""" Test migrate an instance in VPC networks
"""
@@ -823,7 +823,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_08_user_data(self):
""" Test user data in virtual machines
"""
@@ -866,7 +866,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_09_meta_data(self):
""" Test meta data in virtual machines
"""
@@ -908,7 +908,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
def test_10_expunge_instance_in_network(self):
""" Test expunge an instance in VPC networks
"""
@@ -3066,7 +3066,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_01_deploy_instance_in_network(self):
""" Test deploy an instance in VPC networks
"""
@@ -3100,7 +3100,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_02_stop_instance_in_network(self):
""" Test stop an instance in VPC networks
"""
@@ -3142,7 +3142,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_03_start_instance_in_network(self):
""" Test start an instance in VPC networks
"""
@@ -3193,7 +3193,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_04_reboot_instance_in_network(self):
""" Test reboot an instance in VPC networks
"""
@@ -3220,7 +3220,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_05_destroy_instance_in_network(self):
""" Test destroy an instance in VPC networks
"""
@@ -3383,7 +3383,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_06_migrate_instance_in_network(self):
""" Test migrate an instance in VPC networks
"""
@@ -3419,7 +3419,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_07_user_data(self):
""" Test user data in virtual machines
"""
@@ -3467,7 +3467,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_08_meta_data(self):
""" Test meta data in virtual machines
"""
@@ -3514,7 +3514,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
def test_09_expunge_instance_in_network(self):
""" Test expunge an instance in VPC networks
"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62a733e8/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 2844be3..b1c5805 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -134,7 +134,7 @@ class TestPublicIP(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
def test_public_ip_admin_account(self):
"""Test for Associate/Disassociate public IP address for admin account"""
@@ -188,7 +188,7 @@ class TestPublicIP(cloudstackTestCase):
self.fail("list public ip response is not empty")
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
def test_public_ip_user_account(self):
"""Test for Associate/Disassociate public IP address for user account"""
@@ -304,7 +304,7 @@ class TestPortForwarding(cloudstackTestCase):
cleanup_resources(self.apiclient, self.cleanup)
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
def test_01_port_fwd_on_src_nat(self):
"""Test for port forwarding on source NAT"""
@@ -433,7 +433,7 @@ class TestPortForwarding(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
def test_02_port_fwd_on_non_src_nat(self):
"""Test for port forwarding on non source NAT"""
@@ -646,7 +646,7 @@ class TestRebootRouter(cloudstackTestCase):
]
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
def test_reboot_router(self):
"""Test for reboot router"""
@@ -804,7 +804,7 @@ class TestReleaseIP(cloudstackTestCase):
def tearDown(self):
cleanup_resources(self.apiclient, self.cleanup)
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
def test_releaseIP(self):
"""Test for release public IP address"""
@@ -1173,7 +1173,7 @@ class TestRouterRules(cloudstackTestCase):
return
@data(STATIC_NAT_RULE, NAT_RULE, LB_RULE)
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
def test_network_rules_acquired_public_ip(self, value):
"""Test for Router rules for network rules on acquired public IP"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62a733e8/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index 7940d12..a901039 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -313,7 +313,7 @@ class TestRouterServices(cloudstackTestCase):
self.debug("Haproxy process status: %s" % res)
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
def test_03_restart_network_cleanup(self):
"""Test restart network
"""
@@ -390,7 +390,7 @@ class TestRouterServices(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
def test_04_restart_network_wo_cleanup(self):
"""Test restart network without cleanup
"""
@@ -752,7 +752,7 @@ class TestRouterServices(cloudstackTestCase):
return True
return False
- @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
def test_09_reboot_router(self):
"""Test reboot router
"""
[3/4] git commit: updated refs/heads/master to 62a733e
Posted by ta...@apache.org.
Revert "Merge branch '8330' of https://github.com/gauravaradhye/cloudstack"
This reverts commit f4498c48e30b473b2388c012b2e745bcbf9261c4, reversing
changes made to 7a2e27c3b3b3a3fef887f2bdcaa47a4980d904e4.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5cea73d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5cea73d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5cea73d4
Branch: refs/heads/master
Commit: 5cea73d4130625698b98b158ff183b37799b8748
Parents: f4498c4
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Fri Mar 20 17:14:07 2015 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri Mar 20 17:14:07 2015 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 2 +-
test/integration/component/test_blocker_bugs.py | 2 +-
.../component/test_multiple_ips_per_nic.py | 10 +++---
test/integration/component/test_vpc.py | 4 +--
test/integration/component/test_vpc_network.py | 2 +-
.../component/test_vpc_vm_life_cycle.py | 36 ++++++++++----------
test/integration/smoke/test_network.py | 14 ++++----
test/integration/smoke/test_routers.py | 6 ++--
8 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cea73d4/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index cf4b0e3..254f1ce 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -1525,7 +1525,7 @@ class TestDomainForceRemove(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["domains", "advanced", "advancedns", "simulator", "dvs"], required_hardware="false")
+ @attr(tags=["domains", "advanced", "advancedns", "simulator"], required_hardware="false")
def test_forceDeleteDomain(self):
""" Test delete domain with force option"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cea73d4/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index 7123984..559b363 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -325,7 +325,7 @@ class TestNATRules(cloudstackTestCase):
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
- @attr(tags=["advanced", "dvs"], required_hardware="false")
+ @attr(tags=["advanced"], required_hardware="false")
def test_01_firewall_rules_port_fw(self):
""""Checking firewall rules deletion after static NAT disable"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cea73d4/test/integration/component/test_multiple_ips_per_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py
index 1881ced..536c39d 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -718,7 +718,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced", "dvs"])
+ @attr(tags=["advanced"])
def test_add_PF_rule(self, value):
""" Add secondary IP to NIC of a VM"""
@@ -806,7 +806,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced", "dvs"])
+ @attr(tags=["advanced"])
def test_delete_PF_nat_rule(self, value):
""" Add secondary IP to NIC of a VM"""
@@ -891,7 +891,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced, "dvs"])
+ @attr(tags=["advanced"])
def test_disassociate_ip_mapped_to_secondary_ip_through_PF_rule(
self,
value):
@@ -960,7 +960,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced", "dvs"])
+ @attr(tags=["advanced"])
def test_add_static_nat_rule(self, value):
""" Add secondary IP to NIC of a VM"""
@@ -1059,7 +1059,7 @@ class TestNetworkRules(cloudstackTestCase):
return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
- @attr(tags=["advanced", "dvs"])
+ @attr(tags=["advanced"])
def test_disable_static_nat(self, value):
""" Add secondary IP to NIC of a VM"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cea73d4/test/integration/component/test_vpc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc.py b/test/integration/component/test_vpc.py
index bae89c5..58960a9 100644
--- a/test/integration/component/test_vpc.py
+++ b/test/integration/component/test_vpc.py
@@ -482,7 +482,7 @@ class TestVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="false")
+ @attr(tags=["advanced", "intervlan"], required_hardware="false")
def test_02_restart_vpc_no_networks(self):
""" Test restart VPC having no networks
"""
@@ -513,7 +513,7 @@ class TestVPC(cloudstackTestCase):
self.validate_vpc_network(vpc, state='Enabled')
return
- @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="false")
+ @attr(tags=["advanced", "intervlan"], required_hardware="false")
def test_03_restart_vpc_with_networks(self):
""" Test restart VPC having networks
"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cea73d4/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py
index e183054..f4c0a2f 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -2435,7 +2435,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_03_restart_vpcvr(self):
""" Test Stop all the Vms that are part of the a Network
(Wait for network GC).Restart VPCVR.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cea73d4/test/integration/component/test_vpc_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py
index d146af1..694c924 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -491,7 +491,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan", "dvs"])
+ @attr(tags=["advanced", "intervlan"])
def test_01_deploy_instance_in_network(self):
""" Test deploy an instance in VPC networks
"""
@@ -524,7 +524,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan", "dvs"])
+ @attr(tags=["advanced", "intervlan"])
def test_02_stop_instance_in_network(self):
""" Test stop an instance in VPC networks
"""
@@ -566,7 +566,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_03_start_instance_in_network(self):
""" Test start an instance in VPC networks
"""
@@ -591,7 +591,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_04_reboot_instance_in_network(self):
""" Test reboot an instance in VPC networks
"""
@@ -620,7 +620,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_05_destroy_instance_in_network(self):
""" Test destroy an instance in VPC networks
"""
@@ -787,7 +787,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
return
- @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_07_migrate_instance_in_network(self):
""" Test migrate an instance in VPC networks
"""
@@ -823,7 +823,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_08_user_data(self):
""" Test user data in virtual machines
"""
@@ -866,7 +866,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_09_meta_data(self):
""" Test meta data in virtual machines
"""
@@ -908,7 +908,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_10_expunge_instance_in_network(self):
""" Test expunge an instance in VPC networks
"""
@@ -3066,7 +3066,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
return
- @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_01_deploy_instance_in_network(self):
""" Test deploy an instance in VPC networks
"""
@@ -3100,7 +3100,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_02_stop_instance_in_network(self):
""" Test stop an instance in VPC networks
"""
@@ -3142,7 +3142,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_03_start_instance_in_network(self):
""" Test start an instance in VPC networks
"""
@@ -3193,7 +3193,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_04_reboot_instance_in_network(self):
""" Test reboot an instance in VPC networks
"""
@@ -3220,7 +3220,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_05_destroy_instance_in_network(self):
""" Test destroy an instance in VPC networks
"""
@@ -3383,7 +3383,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
return
- @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_06_migrate_instance_in_network(self):
""" Test migrate an instance in VPC networks
"""
@@ -3419,7 +3419,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.validate_network_rules()
return
- @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_07_user_data(self):
""" Test user data in virtual machines
"""
@@ -3467,7 +3467,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_08_meta_data(self):
""" Test meta data in virtual machines
"""
@@ -3514,7 +3514,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
)
return
- @attr(tags=["advanced","multihost", "intervlan", "dvs"], required_hardware="true")
+ @attr(tags=["advanced","multihost", "intervlan"], required_hardware="true")
def test_09_expunge_instance_in_network(self):
""" Test expunge an instance in VPC networks
"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cea73d4/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index b1c5805..2844be3 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -134,7 +134,7 @@ class TestPublicIP(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
def test_public_ip_admin_account(self):
"""Test for Associate/Disassociate public IP address for admin account"""
@@ -188,7 +188,7 @@ class TestPublicIP(cloudstackTestCase):
self.fail("list public ip response is not empty")
return
- @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
def test_public_ip_user_account(self):
"""Test for Associate/Disassociate public IP address for user account"""
@@ -304,7 +304,7 @@ class TestPortForwarding(cloudstackTestCase):
cleanup_resources(self.apiclient, self.cleanup)
return
- @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
def test_01_port_fwd_on_src_nat(self):
"""Test for port forwarding on source NAT"""
@@ -433,7 +433,7 @@ class TestPortForwarding(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
def test_02_port_fwd_on_non_src_nat(self):
"""Test for port forwarding on non source NAT"""
@@ -646,7 +646,7 @@ class TestRebootRouter(cloudstackTestCase):
]
return
- @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
def test_reboot_router(self):
"""Test for reboot router"""
@@ -804,7 +804,7 @@ class TestReleaseIP(cloudstackTestCase):
def tearDown(self):
cleanup_resources(self.apiclient, self.cleanup)
- @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
def test_releaseIP(self):
"""Test for release public IP address"""
@@ -1173,7 +1173,7 @@ class TestRouterRules(cloudstackTestCase):
return
@data(STATIC_NAT_RULE, NAT_RULE, LB_RULE)
- @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
def test_network_rules_acquired_public_ip(self, value):
"""Test for Router rules for network rules on acquired public IP"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cea73d4/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index a901039..7940d12 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -313,7 +313,7 @@ class TestRouterServices(cloudstackTestCase):
self.debug("Haproxy process status: %s" % res)
return
- @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
def test_03_restart_network_cleanup(self):
"""Test restart network
"""
@@ -390,7 +390,7 @@ class TestRouterServices(cloudstackTestCase):
)
return
- @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="true")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
def test_04_restart_network_wo_cleanup(self):
"""Test restart network without cleanup
"""
@@ -752,7 +752,7 @@ class TestRouterServices(cloudstackTestCase):
return True
return False
- @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
+ @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false")
def test_09_reboot_router(self):
"""Test reboot router
"""