etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8527: Skipping VPC tests on HyperV 

Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>

This closes #458
This commit is contained in:
Gaurav Aradhye 2015-06-15 16:46:13 +05:30 committed by Daan Hoogland
parent a5a1818d2a
commit 897ea3db76
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/integration/component/test_vpc_routers.py
View File

@ -193,7 +193,12 @@ class TestVPCRoutersBasic(cloudstackTestCase):
def setUpClass(cls):
cls.testClient = super(TestVPCRoutersBasic, cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
cls.hypervisor = cls.testClient.getHypervisorInfo()
cls.vpcSupported = True
cls._cleanup = []
if cls.hypervisor.lower() == 'hyperv':
cls.vpcSupported = False
return
cls.services = Services().services
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -252,7 +257,8 @@ class TestVPCRoutersBasic(cloudstackTestCase):
def setUp(self):
self.api_client = self.testClient.getApiClient()
if not self.vpcSupported:
self.skipTest("VPC is not supported on %s" % self.hypervisor)
return
def tearDown(self):
@ -627,7 +633,12 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls._cleanup = []
cls.testClient = super(TestVPCRouterOneNetwork, cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
cls.hypervisor = cls.testClient.getHypervisorInfo()
cls.vpcSupported = True
cls._cleanup = []
if cls.hypervisor.lower() == 'hyperv':
cls.vpcSupported = False
return
cls.services = Services().services
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -851,6 +862,8 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
def setUp(self):
self.api_client = self.testClient.getApiClient()
self.cleanup = []
if not self.vpcSupported:
self.skipTest("VPC is not supported on %s" % self.hypervisor)
return
def tearDown(self):