x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V3+P: remove redundent code in get_port/s"

Browse Source
This commit is contained in:
Zuul 2019-04-02 08:50:17 +00:00 committed by Gerrit Code Review
commit 5774a61866
3 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vmware_nsx/plugins/nsx_p/plugin.py
View File

@ -1144,9 +1144,6 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
def get_port(self, context, port_id, fields=None):
port = super(NsxPolicyPlugin, self).get_port(
context, port_id, fields=None)
if 'id' in port:
port_model = self._get_port(context, port['id'])
resource_extend.apply_funcs('ports', port, port_model)
self._extend_nsx_port_dict_binding(context, port)
self._extend_qos_port_dict_binding(context, port)
self._remove_provider_security_groups_from_list(port)
@ -1164,16 +1161,6 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
limit, marker, page_reverse))
# Add port extensions
for port in ports[:]:
if 'id' in port:
try:
port_model = self._get_port(context, port['id'])
resource_extend.apply_funcs('ports', port, port_model)
except n_exc.PortNotFound:
# Port might have been deleted by now
LOG.debug("Port %s was deleted during the get_ports "
"process, and is being skipped", port['id'])
ports.remove(port)
continue
self._extend_nsx_port_dict_binding(context, port)
self._extend_qos_port_dict_binding(context, port)
self._remove_provider_security_groups_from_list(port)

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

@ -2028,9 +2028,6 @@ class NsxV3Plugin(nsx_plugin_common.NsxPluginV3Base,
def get_port(self, context, id, fields=None):
port = super(NsxV3Plugin, self).get_port(context, id, fields=None)
if 'id' in port:
port_model = self._get_port(context, port['id'])
resource_extend.apply_funcs('ports', port, port_model)
self._extend_get_port_dict_qos_and_binding(context, port)
self._remove_provider_security_groups_from_list(port)
return db_utils.resource_fields(port, fields)
@ -2047,16 +2044,6 @@ class NsxV3Plugin(nsx_plugin_common.NsxPluginV3Base,
limit, marker, page_reverse))
# Add port extensions
for port in ports[:]:
if 'id' in port:
try:
port_model = self._get_port(context, port['id'])
resource_extend.apply_funcs('ports', port, port_model)
except n_exc.PortNotFound:
# Port might have been deleted by now
LOG.debug("Port %s was deleted during the get_ports "
"process, and is being skipped", port['id'])
ports.remove(port)
continue
self._extend_get_port_dict_qos_and_binding(context, port)
self._remove_provider_security_groups_from_list(port)
return (ports if not fields else

22
vmware_nsx/tests/unit/nsx_v3/test_plugin.py
View File

@ -1456,28 +1456,6 @@ class TestPortsV2(test_plugin.TestPortsV2, NsxV3PluginTestCaseMixin,
self._get_ports_with_fields(tenid, 'mac_address', 4)
self._get_ports_with_fields(tenid, 'network_id', 4)
def test_list_ports_while_deleting(self):
self.plugin = directory.get_plugin()
orig_get_port = self.plugin._get_port
class local(object):
counter = 0
def mock_get_port(*args):
#global counter
local.counter += 1
if local.counter == 3:
raise n_exc.PortNotFound(port_id=args[1])
return orig_get_port(*args)
self.plugin = directory.get_plugin()
with self.port(), self.port(), self.port(), self.port() as p:
tenid = p['port']['tenant_id']
# get all ports, while "deleting" one of them:
with mock.patch.object(self.plugin, "_get_port",
side_effect=mock_get_port):
self._get_ports_with_fields(tenid, None, 3)
def test_list_ports_filtered_by_security_groups(self):
ctx = context.get_admin_context()
with self.port() as port1, self.port() as port2: