apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

PEP8 of integration/smoke/test_vpc_vpn

Browse Source
This commit is contained in:
Michael Andersen 2015-12-22 12:29:44 +01:00
parent a42b04695f
commit ecc8cc0bc9
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
test/integration/smoke/test_vpc_vpn.py
View File

@ -19,7 +19,8 @@
# Import Local Modules # Import Local Modules
from marvin.codes import PASS, FAILED from marvin.codes import PASS, FAILED
from marvin.cloudstackTestCase import cloudstackTestCase from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.utils import (cleanup_resources, from marvin.lib.utils import (validateList,
cleanup_resources,
get_process_status) get_process_status)
from marvin.lib.base import (Domain, from marvin.lib.base import (Domain,
@ -259,7 +260,6 @@ class Services:
} }
class TestVpcRemoteAccessVpn(cloudstackTestCase): class TestVpcRemoteAccessVpn(cloudstackTestCase):
@classmethod @classmethod
@ -286,8 +286,10 @@ class TestVpcRemoteAccessVpn(cloudstackTestCase):
cls.hypervisor = testClient.getHypervisorInfo() cls.hypervisor = testClient.getHypervisorInfo()
cls.logger.debug("Downloading Template: %s from: %s" %(cls.services["template"][cls.hypervisor.lower()], cls.services["template"][cls.hypervisor.lower()]["url"])) cls.logger.debug("Downloading Template: %s from: %s" % (cls.services["template"][
cls.template = Template.register(cls.apiclient, cls.services["template"][cls.hypervisor.lower()], cls.zone.id, hypervisor=cls.hypervisor.lower(), account=cls.account.name, domainid=cls.domain.id) cls.hypervisor.lower()], cls.services["template"][cls.hypervisor.lower()]["url"]))
cls.template = Template.register(cls.apiclient, cls.services["template"][cls.hypervisor.lower(
)], cls.zone.id, hypervisor=cls.hypervisor.lower(), account=cls.account.name, domainid=cls.domain.id)
cls.template.download(cls.apiclient) cls.template.download(cls.apiclient)
if cls.template == FAILED: if cls.template == FAILED:
@ -463,8 +465,10 @@ class TestVpcSite2SiteVpn(cloudstackTestCase):
cls.hypervisor = testClient.getHypervisorInfo() cls.hypervisor = testClient.getHypervisorInfo()
cls.logger.debug("Downloading Template: %s from: %s" %(cls.services["template"][cls.hypervisor.lower()], cls.services["template"][cls.hypervisor.lower()]["url"])) cls.logger.debug("Downloading Template: %s from: %s" % (cls.services["template"][
cls.template = Template.register(cls.apiclient, cls.services["template"][cls.hypervisor.lower()], cls.zone.id, hypervisor=cls.hypervisor.lower(), account=cls.account.name, domainid=cls.domain.id) cls.hypervisor.lower()], cls.services["template"][cls.hypervisor.lower()]["url"]))
cls.template = Template.register(cls.apiclient, cls.services["template"][cls.hypervisor.lower(
)], cls.zone.id, hypervisor=cls.hypervisor.lower(), account=cls.account.name, domainid=cls.domain.id)
cls.template.download(cls.apiclient) cls.template.download(cls.apiclient)
if cls.template == FAILED: if cls.template == FAILED:
@ -530,11 +534,11 @@ class TestVpcSite2SiteVpn(cloudstackTestCase):
self.apiclient, self.apiclient,
id=vpc_offering.id id=vpc_offering.id
) )
self.assertEqual( offering_list = validateList(vpc_offs)
isinstance(vpc_offs, list), self.assertEqual(offering_list[0],
True, PASS,
"List VPC offerings should return a valid list" "List VPC offerings should return a valid list"
) )
self.assertEqual( self.assertEqual(
vpc_offering.name, vpc_offering.name,
vpc_offs[0].name, vpc_offs[0].name,
@ -824,8 +828,10 @@ class TestRVPCSite2SiteVpn(cloudstackTestCase):
cls.hypervisor = testClient.getHypervisorInfo() cls.hypervisor = testClient.getHypervisorInfo()
cls.logger.debug("Downloading Template: %s from: %s" %(cls.services["template"][cls.hypervisor.lower()], cls.services["template"][cls.hypervisor.lower()]["url"])) cls.logger.debug("Downloading Template: %s from: %s" % (cls.services["template"][
cls.template = Template.register(cls.apiclient, cls.services["template"][cls.hypervisor.lower()], cls.zone.id, hypervisor=cls.hypervisor.lower(), account=cls.account.name, domainid=cls.domain.id) cls.hypervisor.lower()], cls.services["template"][cls.hypervisor.lower()]["url"]))
cls.template = Template.register(cls.apiclient, cls.services["template"][cls.hypervisor.lower(
)], cls.zone.id, hypervisor=cls.hypervisor.lower(), account=cls.account.name, domainid=cls.domain.id)
cls.template.download(cls.apiclient) cls.template.download(cls.apiclient)
if cls.template == FAILED: if cls.template == FAILED:
@ -845,11 +851,11 @@ class TestRVPCSite2SiteVpn(cloudstackTestCase):
self.apiclient, self.apiclient,
id=vpc_offering.id id=vpc_offering.id
) )
self.assertEqual( offering_list = validateList(vpc_offs)
isinstance(vpc_offs, list), self.assertEqual(offering_list[0],
True, PASS,
"List VPC offerings should return a valid list" "List VPC offerings should return a valid list"
) )
self.assertEqual( self.assertEqual(
vpc_offering.name, vpc_offering.name,
vpc_offs[0].name, vpc_offs[0].name,
@ -876,7 +882,6 @@ class TestRVPCSite2SiteVpn(cloudstackTestCase):
return vpc_off return vpc_off
def _get_ssh_client(self, virtual_machine, services, retries): def _get_ssh_client(self, virtual_machine, services, retries):
""" Setup ssh client connection and return connection """ Setup ssh client connection and return connection
vm requires attributes public_ip, public_port, username, password """ vm requires attributes public_ip, public_port, username, password """
@ -923,7 +928,6 @@ class TestRVPCSite2SiteVpn(cloudstackTestCase):
vm.public_port = int(public_port) vm.public_port = int(public_port)
return nat_rule return nat_rule
@attr(tags=["advanced"], required_hardware="true") @attr(tags=["advanced"], required_hardware="true")
def test_01_redundant_vpc_site2site_vpn(self): def test_01_redundant_vpc_site2site_vpn(self):
"""Test Site 2 Site VPN Across redundant VPCs""" """Test Site 2 Site VPN Across redundant VPCs"""
@ -936,8 +940,10 @@ class TestRVPCSite2SiteVpn(cloudstackTestCase):
networkOffering) > 0, "No VPC based network offering") networkOffering) > 0, "No VPC based network offering")
# Create and enable redundant VPC offering # Create and enable redundant VPC offering
redundant_vpc_offering = self._create_vpc_offering('redundant_vpc_offering') redundant_vpc_offering = self._create_vpc_offering(
self.assert_(redundant_vpc_offering is not None, "Failed to create redundant VPC Offering") 'redundant_vpc_offering')
self.assert_(redundant_vpc_offering is not None,
"Failed to create redundant VPC Offering")
redundant_vpc_offering.update(self.apiclient, state='Enabled') redundant_vpc_offering.update(self.apiclient, state='Enabled')