Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

CLOUDSTACK-9511: fix test_privategw_acl.py to handle multiple physical networks #1695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
murali-reddy wants to merge 1 commit into from
Closed

CLOUDSTACK-9511: fix test_privategw_acl.py to handle multiple physical networks #1695

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions 36 test/integration/smoke/test_privategw_acl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,13 @@ def test_01_vpc_privategw_acl(self):

self.cleanup = [vpc, vpc_off, self.account]

physical_networks = get_physical_networks(self.apiclient, self.zone.id)
if not physical_networks:
physical_network = self.get_guest_traffic_physical_network(self.apiclient, self.zone.id)
if not physical_network:
self.fail("No Physical Networks found!")

qresultset = self.dbclient.execute(
"select vnet from op_dc_vnet_alloc where physical_network_id=\
(select id from physical_network where uuid='%s' ) and taken is NULL;" % physical_networks[0].id
(select id from physical_network where uuid='%s' ) and taken is NULL;" % physical_network.id
)
self.assertEqual(validateList(qresultset)[0],
PASS,
Expand Down Expand Up @@ -312,13 +312,13 @@ def performVPCTests(self, vpc_off, restart_with_cleanup = False):

self.cleanup = [vpc_1, vpc_2, vpc_off, self.account]

physical_networks = get_physical_networks(self.apiclient, self.zone.id)
if not physical_networks:
physical_network = self.get_guest_traffic_physical_network(self.apiclient, self.zone.id)
if not physical_network:
self.fail("No Physical Networks found!")

qresultset = self.dbclient.execute(
"select vnet from op_dc_vnet_alloc where physical_network_id=\
(select id from physical_network where uuid='%s' ) and taken is NULL;" % physical_networks[0].id
(select id from physical_network where uuid='%s' ) and taken is NULL;" % physical_network.id
)
self.assertEqual(validateList(qresultset)[0],
PASS,
Expand Down Expand Up @@ -372,11 +372,11 @@ def performPrivateGWInterfaceTests(self, vpc_off):

self.cleanup = [vpc_1, vpc_off, self.account]

physical_networks = get_physical_networks(self.apiclient, self.zone.id)
if not physical_networks:
physical_network = self.get_guest_traffic_physical_network(self.apiclient, self.zone.id)
if not physical_network:
self.fail("No Physical Networks found!")

vlans = physical_networks[0].vlan.split('-')
vlans = physical_network.vlan.split('-')
vlan_1 = int(vlans[0])

net_offering_no_lb = "network_offering_no_lb"
Expand Down Expand Up @@ -408,7 +408,7 @@ def performPrivateGWInterfaceTests(self, vpc_off):

public_ip_1 = self.acquire_publicip(vpc_1, network_1)
nat_rule_1 = self.create_natrule(vpc_1, vm1, public_ip_1, network_1)

self.check_private_gateway_interfaces()

self.check_pvt_gw_connectivity(vm1, public_ip_1, [vm2.nic[0].ipaddress, vm3.nic[0].ipaddress, vm4.nic[0].ipaddress])
Expand Down Expand Up @@ -589,14 +589,14 @@ def createNetwork(self, vpc, net_offering = "network_offering", gateway = '10.1.
return obj_network

def createPvtGw(self, vpc, ip_address, gateway, aclId, vlan):
physical_networks = get_physical_networks(self.apiclient, self.zone.id)
if not physical_networks:
physical_network = self.get_guest_traffic_physical_network(self.apiclient, self.zone.id)
if not physical_network:
self.fail("No Physical Networks found!")

self.logger.debug('::: Physical Networks ::: ==> %s' % physical_networks)
self.logger.debug('::: Physical Network ::: ==> %s' % physical_network)

createPrivateGatewayCmd = createPrivateGateway.createPrivateGatewayCmd()
createPrivateGatewayCmd.physicalnetworkid = physical_networks[0].id
createPrivateGatewayCmd.physicalnetworkid = physical_network.id
createPrivateGatewayCmd.gateway = gateway
createPrivateGatewayCmd.netmask = "255.255.255.0"
createPrivateGatewayCmd.ipaddress = ip_address
Expand Down Expand Up @@ -847,3 +847,11 @@ def check_routers_state(self, status_to_check="MASTER", expected_count=1):

if cnts[vals.index(status_to_check)] != expected_count:
self.fail("Expected '%s' routers at state '%s', but found '%s'!" % (expected_count, status_to_check, cnts[vals.index(status_to_check)]))

def get_guest_traffic_physical_network(self, apiclient, zoneid):
physical_networks = get_physical_networks(apiclient, zoneid)
if not physical_networks:
return None
for physical_network in physical_networks:
if physical_network.vlan:
return physical_network
Morty Proxy This is a proxified and sanitized view of the page, visit original site.