Correct VLAN order logic
This commit is contained in:
parent
cb81bb484c
commit
9aca0a0548
1 changed files with 3 additions and 7 deletions
|
|
@ -198,13 +198,6 @@ class Network(object):
|
||||||
def get_or_create_vlan(self, vlan_id):
|
def get_or_create_vlan(self, vlan_id):
|
||||||
# FIXME: we may need to specify the datacenter
|
# FIXME: we may need to specify the datacenter
|
||||||
# since users may have same vlan id in multiple dc
|
# since users may have same vlan id in multiple dc
|
||||||
<<<<<<< HEAD
|
|
||||||
logging.debug(f"VLAN ID is: {vlan_id}")
|
|
||||||
vlan = nb.ipam.vlans.get(
|
|
||||||
vid=vlan_id,
|
|
||||||
)
|
|
||||||
=======
|
|
||||||
>>>>>>> 4b0b3997f5fa5ef8ef871ed60a060ab05e2cd7ee
|
|
||||||
#/var/tmp/netbox-agent# lldpctl
|
#/var/tmp/netbox-agent# lldpctl
|
||||||
# -------------------------------------------------------------------------------
|
# -------------------------------------------------------------------------------
|
||||||
# LLDP neighbors:
|
# LLDP neighbors:
|
||||||
|
|
@ -224,6 +217,9 @@ class Network(object):
|
||||||
vlan = nb.ipam.vlans.get(
|
vlan = nb.ipam.vlans.get(
|
||||||
vid=vlan_id,
|
vid=vlan_id,
|
||||||
)
|
)
|
||||||
|
vlan = nb.ipam.vlans.get(
|
||||||
|
vid=vlan_id,
|
||||||
|
)
|
||||||
if vlan is None:
|
if vlan is None:
|
||||||
vlan = nb.ipam.vlans.create(
|
vlan = nb.ipam.vlans.create(
|
||||||
name='VLAN {}'.format(vlan_id),
|
name='VLAN {}'.format(vlan_id),
|
||||||
|
|
|
||||||
Loading…
Add table
editor.link_modal.header
Reference in a new issue