[MP2P] Do not assume Tier0 uplink ports are attached to LS
Attempt to collect uplink LS only if there is a linked logical port switch id for the uplink port Change-Id: I0774f7173d698039c80da85336a57cfd31c2add0
This commit is contained in:
parent
3a740ba1d2
commit
302cdd51a2
|
@ -503,9 +503,19 @@ def migrate_tier0s(nsxlib, nsxpolicy, plugin):
|
||||||
uplink_port = nsxlib.logical_router_port.get_tier0_uplink_port(tier0)
|
uplink_port = nsxlib.logical_router_port.get_tier0_uplink_port(tier0)
|
||||||
if uplink_port:
|
if uplink_port:
|
||||||
# Get the external LS id from the uplink port
|
# Get the external LS id from the uplink port
|
||||||
port_id = uplink_port['linked_logical_switch_port_id']['target_id']
|
linked_ls_id = uplink_port.get('linked_logical_switch_port_id')
|
||||||
port = nsxlib.logical_port.get(port_id)
|
if linked_ls_id:
|
||||||
public_switches.append(port['logical_switch_id'])
|
try:
|
||||||
|
port_id = linked_ls_id['target_id']
|
||||||
|
port = nsxlib.logical_port.get(port_id)
|
||||||
|
public_switches.append(port['logical_switch_id'])
|
||||||
|
except KeyError as e:
|
||||||
|
LOG.info("Required attribute missing: %s. Cannot "
|
||||||
|
"add public switch to objects to migrate", e)
|
||||||
|
else:
|
||||||
|
LOG.info("Uplink port %s for Tier0 router %s is not "
|
||||||
|
"connected to a logical switch",
|
||||||
|
tier0, uplink_port['id'])
|
||||||
|
|
||||||
return public_switches, migrated_tier0s
|
return public_switches, migrated_tier0s
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue