x/vmware-nsx
Code Issues Proposed changes

NSX|V3: Rename tag in logical port with router attachment

Browse Source 
Rename tag os-neutron-port-id to os-neutron-rport-id
for logical port with router attachment.

Change-Id: I0247d9a6abbc11a98a65f1ae458ddb48fa323749
This commit is contained in:
Shih-Hao Li 2015-12-23 15:01:53 -08:00
parent 037a8963d9
commit e9d3d40956
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -575,8 +575,13 @@ class NsxV3Plugin(addr_pair_db.AllowedAddressPairsMixin,
def _create_port_at_the_backend(self, context, neutron_db,
port_data, l2gw_port_check,
psec_is_on):
device_owner = port_data.get('device_owner')
if device_owner == l3_db.DEVICE_OWNER_ROUTER_INTF:
resource_type = 'os-neutron-rport-id'
else:
resource_type = 'os-neutron-port-id'
tags = utils.build_v3_tags_payload(
port_data, resource_type='os-neutron-port-id',
port_data, resource_type=resource_type,
project_name=context.tenant_name)
parent_name, tag = self._get_data_from_binding_profile(
context, port_data)
@ -585,8 +590,7 @@ class NsxV3Plugin(addr_pair_db.AllowedAddressPairsMixin,
# transaction here later.
vif_uuid = port_data['id']
attachment_type = nsx_constants.ATTACHMENT_VIF
if (not port_data.get('device_owner') or
port_data.get('device_owner') == l3_db.DEVICE_OWNER_ROUTER_INTF):
if not device_owner or device_owner == l3_db.DEVICE_OWNER_ROUTER_INTF:
attachment_type = None
vif_uuid = None
# Change the attachment type for L2 gateway owned ports.
@ -594,12 +598,12 @@ class NsxV3Plugin(addr_pair_db.AllowedAddressPairsMixin,
# NSX backend requires the vif id be set to bridge endpoint id
# for ports plugged into a Bridge Endpoint.
vif_uuid = port_data.get('device_id')
attachment_type = port_data.get('device_owner')
attachment_type = device_owner
profiles = []
if psec_is_on and address_bindings:
profiles = [self._get_port_security_profile_id()]
if port_data.get('device_owner') == const.DEVICE_OWNER_DHCP:
if device_owner == const.DEVICE_OWNER_DHCP:
if self._dhcp_profile:
profiles.append(self._dhcp_profile)
else: