Merge "NSX|P: Do not update backend port vif id after creation" into stable/victoria

This commit is contained in:
Zuul 2021-03-16 15:52:01 +00:00 committed by Gerrit Code Review
commit 96778bd695
1 changed files with 2 additions and 2 deletions

View File

@ -1743,8 +1743,8 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
device_owner.startswith('compute:') and port_data.get('vif_id')): device_owner.startswith('compute:') and port_data.get('vif_id')):
# During api-replay, migrated vm port should have this vif-id # During api-replay, migrated vm port should have this vif-id
vif_id = port_data['vif_id'] vif_id = port_data['vif_id']
elif (not device_owner or elif (is_create and (not device_owner or
device_owner != l3_db.DEVICE_OWNER_ROUTER_INTF): device_owner != l3_db.DEVICE_OWNER_ROUTER_INTF)):
# Set vif_id even if no device owner so that auto-generated # Set vif_id even if no device owner so that auto-generated
# MP ports won't be created for VMs before neutron sets the vif-id # MP ports won't be created for VMs before neutron sets the vif-id
vif_id = port_data['id'] vif_id = port_data['id']