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

CLOUDSTACK-8276: Changes in Marvin to find free vlan in a setup when vlan is not returned for an existing network with listNetworks API

Browse Source 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
This commit is contained in:
Gaurav Aradhye 2015-02-22 23:44:33 -08:00 committed by SrikanteswaraRao Talluri
parent e1827fc696
commit 429abe2bd5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/marvin/marvin/lib/common.py
View File

@ -977,9 +977,9 @@ def get_free_vlan(apiclient, zoneid):
if isinstance(networks, list) and len(networks) > 0: if isinstance(networks, list) and len(networks) > 0:
usedVlanIds = [int(nw.vlan) usedVlanIds = [int(nw.vlan)
for nw in networks if nw.vlan != "untagged"] for nw in networks if (nw.vlan and str(nw.vlan).lower() != "untagged")]
if hasattr(physical_network, "vlan") is False: if not hasattr(physical_network, "vlan"):
while True: while True:
shared_ntwk_vlan = random.randrange(1, 4095) shared_ntwk_vlan = random.randrange(1, 4095)
if shared_ntwk_vlan in usedVlanIds: if shared_ntwk_vlan in usedVlanIds: