You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2017/12/19 18:43:46 UTC
[cloudstack] 12/21: CLOUDSTACK-10181: Skip rVR test cases for
VMware until supported
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit bfc871ef2fd625b53a05440b09a8e6b7c3c803b5
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Sat Dec 9 00:43:25 2017 +0530
CLOUDSTACK-10181: Skip rVR test cases for VMware until supported
With this change, rVR related test cases will be skipped for VMware
where this feature is not properly supported.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
test/integration/smoke/test_internal_lb.py | 11 +++++++++++
test/integration/smoke/test_privategw_acl.py | 11 +++++++++++
test/integration/smoke/test_routers_network_ops.py | 13 ++++++++++++-
test/integration/smoke/test_vpc_redundant.py | 11 +++++++++++
test/integration/smoke/test_vpc_vpn.py | 10 ++++++++++
5 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py
index 5b4c663..379bbb0 100644
--- a/test/integration/smoke/test_internal_lb.py
+++ b/test/integration/smoke/test_internal_lb.py
@@ -50,6 +50,8 @@ from marvin.lib.common import (get_zone,
get_template,
list_network_offerings)
+from marvin.lib.decoratorGenerators import skipTestIf
+
from nose.plugins.attrib import attr
import logging
@@ -280,6 +282,7 @@ class TestInternalLb(cloudstackTestCase):
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
cls.domain = get_domain(cls.apiclient)
+
cls.logger.debug("Creating compute offering: %s" %cls.services["compute_offering"]["name"])
cls.compute_offering = ServiceOffering.create(
cls.apiclient,
@@ -302,6 +305,12 @@ class TestInternalLb(cloudstackTestCase):
%s" % (cls.account.name,
cls.account.id))
+ # Skip rVR related test cases for VMware, for details see
+ # https://issues.apache.org/jira/browse/CLOUDSTACK-10181
+ cls.rvrNotSupported = False
+ if cls.hypervisor.lower() in ['vmware']:
+ cls.rvrNotSupported = True
+
cls._cleanup = [cls.account, cls.compute_offering]
return
@@ -598,6 +607,7 @@ class TestInternalLb(cloudstackTestCase):
self.cleanup.insert(0, vpc_offering)
self.execute_internallb_roundrobin_tests(vpc_offering)
+ @skipTestIf("rvrNotSupported")
@attr(tags=["smoke", "advanced"], required_hardware="true")
def test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80(self):
"""
@@ -766,6 +776,7 @@ class TestInternalLb(cloudstackTestCase):
self.execute_internallb_haproxy_tests(vpc_offering)
+ @skipTestIf("rvrNotSupported")
@attr(tags=["smoke", "advanced"], required_hardware="true")
def test_04_rvpc_internallb_haproxy_stats_on_all_interfaces(self):
""" Test to verify access to loadbalancer haproxy admin stats page
diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py
index b86b96e..d48eb42 100644
--- a/test/integration/smoke/test_privategw_acl.py
+++ b/test/integration/smoke/test_privategw_acl.py
@@ -25,6 +25,7 @@ from marvin.lib.base import *
from marvin.lib.common import *
from nose.plugins.attrib import attr
from marvin.codes import PASS
+from marvin.lib.decoratorGenerators import skipTestIf
import time
import logging
@@ -182,6 +183,14 @@ class TestPrivateGwACL(cloudstackTestCase):
cls.services["service_offering"])
cls._cleanup = [cls.service_offering]
+ cls.hypervisor = cls.testClient.getHypervisorInfo()
+
+ # Skip rVR related test cases for VMware, for details see
+ # https://issues.apache.org/jira/browse/CLOUDSTACK-10181
+ cls.rvrNotSupported = False
+ if cls.hypervisor.lower() in ['vmware']:
+ cls.rvrNotSupported = True
+
cls.logger = logging.getLogger('TestPrivateGwACL')
cls.stream_handler = logging.StreamHandler()
cls.logger.setLevel(logging.DEBUG)
@@ -289,6 +298,7 @@ class TestPrivateGwACL(cloudstackTestCase):
self.performVPCTests(vpc_off, restart_with_cleanup = True)
+ @skipTestIf("rvrNotSupported")
@attr(tags=["advanced"], required_hardware="true")
def test_04_rvpc_privategw_static_routes(self):
self.logger.debug("Creating a Redundant VPC offering..")
@@ -301,6 +311,7 @@ class TestPrivateGwACL(cloudstackTestCase):
self.performVPCTests(vpc_off)
+ @skipTestIf("rvrNotSupported")
@attr(tags=["advanced"], required_hardware="true")
def _test_05_rvpc_privategw_check_interface(self):
self.logger.debug("Creating a Redundant VPC offering..")
diff --git a/test/integration/smoke/test_routers_network_ops.py b/test/integration/smoke/test_routers_network_ops.py
index 93563e2..09eb4f3 100644
--- a/test/integration/smoke/test_routers_network_ops.py
+++ b/test/integration/smoke/test_routers_network_ops.py
@@ -137,8 +137,16 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
- macchinina = Templates().templates["macchinina"]
cls.hypervisor = cls.testClient.getHypervisorInfo()
+
+ # Skip rVR related test cases for VMware, for details see
+ # https://issues.apache.org/jira/browse/CLOUDSTACK-10181
+ cls.rvrNotSupported = False
+ if cls.hypervisor.lower() in ['vmware']:
+ cls.rvrNotSupported = True
+ return
+
+ macchinina = Templates().templates["macchinina"]
cls.logger.debug("Downloading Template: %s from: %s" % (macchinina[cls.hypervisor.lower()],
macchinina[cls.hypervisor.lower()]["url"]))
cls.template = Template.register(cls.api_client, macchinina[cls.hypervisor.lower()],
@@ -200,6 +208,9 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
return
def setUp(self):
+ if self.rvrNotSupported:
+ self.skipTest("Redundant VRs are not supported for this hypervisor, skipping test")
+
self.apiclient = self.testClient.getApiClient()
self.cleanup = []
return
diff --git a/test/integration/smoke/test_vpc_redundant.py b/test/integration/smoke/test_vpc_redundant.py
index 372d847..915736d 100644
--- a/test/integration/smoke/test_vpc_redundant.py
+++ b/test/integration/smoke/test_vpc_redundant.py
@@ -255,6 +255,14 @@ class TestVPCRedundancy(cloudstackTestCase):
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.hypervisor = cls.testClient.getHypervisorInfo()
+
+ # Skip rVR related test cases for VMware, for details see
+ # https://issues.apache.org/jira/browse/CLOUDSTACK-10181
+ cls.rvrNotSupported = False
+ if cls.hypervisor.lower() in ['vmware']:
+ cls.rvrNotSupported = True
+ return
+
cls.template = Template.register(cls.api_client, cls.services["template"][cls.hypervisor.lower(
)], cls.zone.id, hypervisor=cls.hypervisor.lower(), domainid=cls.domain.id)
cls.template.download(cls.api_client)
@@ -285,6 +293,9 @@ class TestVPCRedundancy(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
def setUp(self):
+ if self.rvrNotSupported:
+ self.skipTest("RVR not supported on this hypervisor, skipping")
+
self.routers = []
self.networks = []
self.ips = []
diff --git a/test/integration/smoke/test_vpc_vpn.py b/test/integration/smoke/test_vpc_vpn.py
index b3dfab2..1c4d418 100644
--- a/test/integration/smoke/test_vpc_vpn.py
+++ b/test/integration/smoke/test_vpc_vpn.py
@@ -847,6 +847,13 @@ class TestRVPCSite2SiteVpn(cloudstackTestCase):
cls.hypervisor = testClient.getHypervisorInfo()
+ # Skip rVR related test cases for VMware, for details see
+ # https://issues.apache.org/jira/browse/CLOUDSTACK-10181
+ cls.rvrNotSupported = False
+ if cls.hypervisor.lower() in ['vmware']:
+ cls.rvrNotSupported = True
+ return
+
cls.logger.debug("Downloading Template: %s from: %s" % (cls.services["template"][
cls.hypervisor.lower()], cls.services["template"][cls.hypervisor.lower()]["url"]))
cls.template = Template.register(cls.apiclient, cls.services["template"][cls.hypervisor.lower(
@@ -952,6 +959,9 @@ class TestRVPCSite2SiteVpn(cloudstackTestCase):
"""Test Site 2 Site VPN Across redundant VPCs"""
self.logger.debug("Starting test: test_02_redundant_vpc_site2site_vpn")
+ if self.rvrNotSupported:
+ self.skipTest("Hypervisor not supported for rVR, skipping test")
+
# 0) Get the default network offering for VPC
networkOffering = NetworkOffering.list(
self.apiclient, name="DefaultIsolatedNetworkOfferingForVpcNetworks")
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.