apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

integration test: skip vlan of public ip range in get_free_vlan

Browse Source
This commit is contained in:
Wei Zhou 2020-11-27 07:12:26 +00:00 committed by dahn
parent 03e65a1266
commit 83ae6d7c01
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1054,6 +1054,11 @@ def get_free_vlan(apiclient, zoneid):
usedVlanIds = [int(nw.vlan)
for nw in networks if (nw.vlan and str(nw.vlan).lower() != "untagged")]
ipranges = list_vlan_ipranges(apiclient, zoneid=zoneid)
if isinstance(ipranges, list) and len(ipranges) > 0:
usedVlanIds += [int(iprange.vlan.split("/")[-1])
for iprange in ipranges if (iprange.vlan and iprange.vlan.split("/")[-1].lower() != "untagged")]
if not hasattr(physical_network, "vlan"):
while True:
shared_ntwk_vlan = random.randrange(1, 4095)