x/vmware-nsx
Code Issues Proposed changes

Merge "fix update_port to get tenant_id from db rather than request"

Browse Source
This commit is contained in:
Jenkins 2013-03-02 05:12:07 +00:00 committed by Gerrit Code Review
commit 3427424a6a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
View File

@ -1358,7 +1358,6 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
if attr.is_attr_set(port['port'].get(psec.PORTSECURITY)): if attr.is_attr_set(port['port'].get(psec.PORTSECURITY)):
self._enforce_set_auth(context, port, self._enforce_set_auth(context, port,
self.port_security_enabled_update) self.port_security_enabled_update)
tenant_id = self._get_tenant_id_for_create(context, port['port'])
delete_security_groups = self._check_update_deletes_security_groups( delete_security_groups = self._check_update_deletes_security_groups(
port) port)
has_security_groups = self._check_update_has_security_groups(port) has_security_groups = self._check_update_has_security_groups(port)
@ -1368,7 +1367,7 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
context, id, port) context, id, port)
# copy values over # copy values over
ret_port.update(port['port']) ret_port.update(port['port'])
tenant_id = self._get_tenant_id_for_create(context, ret_port)
# populate port_security setting # populate port_security setting
if psec.PORTSECURITY not in port['port']: if psec.PORTSECURITY not in port['port']:
ret_port[psec.PORTSECURITY] = self._get_port_security_binding( ret_port[psec.PORTSECURITY] = self._get_port_security_binding(