You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ga...@apache.org on 2015/04/17 17:38:47 UTC
git commit: updated refs/heads/master to 46c35e2
Repository: cloudstack
Updated Branches:
refs/heads/master 9593221b9 -> 46c35e240
CLOUDSTACK-8390: Skipping VPC tests on Hyperv
Signed-off-by: Gaurav Aradhye <ga...@clogeny.com>
This closes #179
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/46c35e24
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/46c35e24
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/46c35e24
Branch: refs/heads/master
Commit: 46c35e2401744aeb1308c91ee5f5e0e355287bbd
Parents: 9593221
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Thu Apr 16 20:29:09 2015 +0530
Committer: Gaurav Aradhye <ga...@clogeny.com>
Committed: Fri Apr 17 21:00:58 2015 +0530
----------------------------------------------------------------------
.../component/test_multiple_ips_per_nic.py | 42 ++++++++++++++++++++
1 file changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46c35e24/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..f3bc0c8 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -192,6 +192,7 @@ class TestBasicOperations(cloudstackTestCase):
def setUpClass(cls):
cls.testClient = super(TestBasicOperations, cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
+ cls.hypervisor = cls.testClient.getHypervisorInfo().lower()
# Fill services from the external config file
cls.services = cls.testClient.getParsedTestDataConfig()
@@ -376,6 +377,9 @@ class TestBasicOperations(cloudstackTestCase):
# 1. Step 4 should succeed
# 2. Step 5 should fail
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -456,6 +460,9 @@ class TestBasicOperations(cloudstackTestCase):
# 5. Step 8 should fail
# 6. Step 9 should fail
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -559,6 +566,9 @@ class TestBasicOperations(cloudstackTestCase):
# Validations:
# 1. All the operations should be successful
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
child_domain = Domain.create(
self.apiclient,
services=self.services["domain"],
@@ -625,6 +635,7 @@ class TestNetworkRules(cloudstackTestCase):
def setUpClass(cls):
cls.testClient = super(TestNetworkRules, cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
+ cls.hypervisor = cls.testClient.getHypervisorInfo().lower()
# Fill services from the external config file
cls.services = cls.testClient.getParsedTestDataConfig()
@@ -738,6 +749,9 @@ class TestNetworkRules(cloudstackTestCase):
# 3. Step 6 should succeed
# 4. Step 7 should fail
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -823,6 +837,9 @@ class TestNetworkRules(cloudstackTestCase):
# 1. Step 5 should fail
# 2. Step 6 should succeed
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -908,6 +925,9 @@ class TestNetworkRules(cloudstackTestCase):
# Validations:
# 1. Step 5 should succeed
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -982,6 +1002,9 @@ class TestNetworkRules(cloudstackTestCase):
# 4. Step 7 should fail
# 5. Step 8 should succeed
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -1075,6 +1098,9 @@ class TestNetworkRules(cloudstackTestCase):
# 1. Verify step 5 by listing seconday IP and checking the appropriate
# flag
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -1151,6 +1177,7 @@ class TestVmNetworkOperations(cloudstackTestCase):
def setUpClass(cls):
cls.testClient = super(TestVmNetworkOperations, cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
+ cls.hypervisor = cls.testClient.getHypervisorInfo().lower()
# Fill services from the external config file
cls.services = cls.testClient.getParsedTestDataConfig()
@@ -1257,6 +1284,9 @@ class TestVmNetworkOperations(cloudstackTestCase):
# 7. Verify that nat rule does not exist and static nat is not enabled for
# secondary IP
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -1362,6 +1392,9 @@ class TestVmNetworkOperations(cloudstackTestCase):
# 6. Destroy the virtual machine and recover it
# 7. Verify that nat and static nat rules exist
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -1469,6 +1502,9 @@ class TestVmNetworkOperations(cloudstackTestCase):
# 6. Restart the network with cleanup option True
# 7. Verify that nat and static nat rules exist after network restart
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -1560,6 +1596,9 @@ class TestVmNetworkOperations(cloudstackTestCase):
# 6. Restart the network with cleanup option False
# 7. Verify that nat and static nat rules exist after network restart
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],
@@ -1651,6 +1690,9 @@ class TestVmNetworkOperations(cloudstackTestCase):
# 6. Reboot router VM
# 7. Verify that nat and static nat rules exist after router restart
+ if value == VPC_NETWORK and self.hypervisor == 'hyperv':
+ self.skipTest("VPC is not supported on Hyper-V")
+
self.account = Account.create(
self.apiclient,
self.services["account"],