@@ -259,7 +259,6 @@ def __init__(self):
259259 }
260260
261261
262-
263262class TestVpcRemoteAccessVpn (cloudstackTestCase ):
264263
265264 @classmethod
@@ -286,8 +285,10 @@ def setUpClass(cls):
286285
287286 cls .hypervisor = testClient .getHypervisorInfo ()
288287
289- cls .logger .debug ("Downloading Template: %s from: %s" % (cls .services ["template" ][cls .hypervisor .lower ()], cls .services ["template" ][cls .hypervisor .lower ()]["url" ]))
290- 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 )
288+ cls .logger .debug ("Downloading Template: %s from: %s" % (cls .services ["template" ][
289+ cls .hypervisor .lower ()], cls .services ["template" ][cls .hypervisor .lower ()]["url" ]))
290+ cls .template = Template .register (cls .apiclient , cls .services ["template" ][cls .hypervisor .lower (
291+ )], cls .zone .id , hypervisor = cls .hypervisor .lower (), account = cls .account .name , domainid = cls .domain .id )
291292 cls .template .download (cls .apiclient )
292293
293294 if cls .template == FAILED :
@@ -463,8 +464,10 @@ def setUpClass(cls):
463464
464465 cls .hypervisor = testClient .getHypervisorInfo ()
465466
466- cls .logger .debug ("Downloading Template: %s from: %s" % (cls .services ["template" ][cls .hypervisor .lower ()], cls .services ["template" ][cls .hypervisor .lower ()]["url" ]))
467- 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 )
467+ cls .logger .debug ("Downloading Template: %s from: %s" % (cls .services ["template" ][
468+ cls .hypervisor .lower ()], cls .services ["template" ][cls .hypervisor .lower ()]["url" ]))
469+ cls .template = Template .register (cls .apiclient , cls .services ["template" ][cls .hypervisor .lower (
470+ )], cls .zone .id , hypervisor = cls .hypervisor .lower (), account = cls .account .name , domainid = cls .domain .id )
468471 cls .template .download (cls .apiclient )
469472
470473 if cls .template == FAILED :
@@ -824,8 +827,10 @@ def setUpClass(cls):
824827
825828 cls .hypervisor = testClient .getHypervisorInfo ()
826829
827- cls .logger .debug ("Downloading Template: %s from: %s" % (cls .services ["template" ][cls .hypervisor .lower ()], cls .services ["template" ][cls .hypervisor .lower ()]["url" ]))
828- 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 )
830+ cls .logger .debug ("Downloading Template: %s from: %s" % (cls .services ["template" ][
831+ cls .hypervisor .lower ()], cls .services ["template" ][cls .hypervisor .lower ()]["url" ]))
832+ cls .template = Template .register (cls .apiclient , cls .services ["template" ][cls .hypervisor .lower (
833+ )], cls .zone .id , hypervisor = cls .hypervisor .lower (), account = cls .account .name , domainid = cls .domain .id )
829834 cls .template .download (cls .apiclient )
830835
831836 if cls .template == FAILED :
@@ -876,7 +881,6 @@ def _create_vpc_offering(self, offering_name):
876881
877882 return vpc_off
878883
879-
880884 def _get_ssh_client (self , virtual_machine , services , retries ):
881885 """ Setup ssh client connection and return connection
882886 vm requires attributes public_ip, public_port, username, password """
@@ -923,7 +927,6 @@ def _create_natrule(self, vpc, vm, public_port, private_port, public_ip, network
923927 vm .public_port = int (public_port )
924928 return nat_rule
925929
926-
927930 @attr (tags = ["advanced" ], required_hardware = "true" )
928931 def test_01_redundant_vpc_site2site_vpn (self ):
929932 """Test Site 2 Site VPN Across redundant VPCs"""
@@ -936,8 +939,10 @@ def test_01_redundant_vpc_site2site_vpn(self):
936939 networkOffering ) > 0 , "No VPC based network offering" )
937940
938941 # Create and enable redundant VPC offering
939- redundant_vpc_offering = self ._create_vpc_offering ('redundant_vpc_offering' )
940- self .assert_ (redundant_vpc_offering is not None , "Failed to create redundant VPC Offering" )
942+ redundant_vpc_offering = self ._create_vpc_offering (
943+ 'redundant_vpc_offering' )
944+ self .assert_ (redundant_vpc_offering is not None ,
945+ "Failed to create redundant VPC Offering" )
941946
942947 redundant_vpc_offering .update (self .apiclient , state = 'Enabled' )
943948
0 commit comments