openstack
/
neutron
Code Issues Proposed changes

Merge "NSX: fix router ports port_security_enabled=False"

This commit is contained in:
Jenkins 2014-07-22 02:25:26 +00:00 committed by Gerrit Code Review
parent a1251e948e 25f1439ff3
commit 122c17c56b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/plugins/vmware/plugins/base.py
View File

@ -1674,10 +1674,11 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
if port_id:
port_data = self.get_port(context, port_id)
# If security groups are present we need to remove them as
# this is a router port.
# this is a router port and disable port security.
if port_data['security_groups']:
self.update_port(context, port_id,
{'port': {'security_groups': []}})
{'port': {'security_groups': [],
psec.PORTSECURITY: False}})
nsx_switch_id, nsx_port_id = nsx_utils.get_nsx_switch_and_port_id(
context.session, self.cluster, port_id)
# Unplug current attachment from lswitch port

1
neutron/tests/unit/vmware/test_nsx_plugin.py
View File

@ -1008,6 +1008,7 @@ class TestL3NatTestCase(L3NatTest,
# fetch port and confirm no security-group on it.
body = self._show('ports', p['port']['id'])
self.assertEqual(body['port']['security_groups'], [])
self.assertFalse(body['port']['port_security_enabled'])
# clean-up
self._router_interface_action('remove',
r['router']['id'],