x/vmware-nsx
Code Issues Proposed changes

Merge "ML2 Cisco Nexus MD: Remove workaround for bug 1276395"

Browse Source
This commit is contained in:
Jenkins 2014-03-25 20:03:31 +00:00 committed by Gerrit Code Review
commit 49abacdf62
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/plugins/ml2/drivers/cisco/nexus/mech_cisco_nexus.py
View File

@ -151,12 +151,6 @@ class CiscoNexusMechanismDriver(api.MechanismDriver):
"""Verify configuration and then process event.""" """Verify configuration and then process event."""
device_id = port.get('device_id') device_id = port.get('device_id')
host_id = port.get(portbindings.HOST_ID) host_id = port.get(portbindings.HOST_ID)
# Workaround until vlan can be retrieved during delete_port_postcommit
# event.
if func == self._delete_switch_entry:
vlan_id = self._delete_port_postcommit_vlan
else:
vlan_id = self._get_vlanid(segment) vlan_id = self._get_vlanid(segment)
if vlan_id and device_id and host_id: if vlan_id and device_id and host_id:
@ -167,13 +161,6 @@ class CiscoNexusMechanismDriver(api.MechanismDriver):
fields += "host_id" if not host_id else "" fields += "host_id" if not host_id else ""
raise excep.NexusMissingRequiredFields(fields=fields) raise excep.NexusMissingRequiredFields(fields=fields)
# Workaround until vlan can be retrieved during delete_port_postcommit
# event.
if func == self._delete_nxos_db:
self._delete_port_postcommit_vlan = vlan_id
else:
self._delete_port_postcommit_vlan = 0
def update_port_precommit(self, context): def update_port_precommit(self, context):
"""Update port pre-database transaction commit event.""" """Update port pre-database transaction commit event."""