Merge "NSXV3: ensure that mac learning enabled has port sec disabled"
This commit is contained in:
commit
6f9664b1be
|
@ -2301,7 +2301,6 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
|
||||||
self._assert_on_router_port_with_qos(
|
self._assert_on_router_port_with_qos(
|
||||||
port['port'], device_owner)
|
port['port'], device_owner)
|
||||||
|
|
||||||
old_mac_learning_state = original_port.get(mac_ext.MAC_LEARNING)
|
|
||||||
updated_port = super(NsxV3Plugin, self).update_port(context,
|
updated_port = super(NsxV3Plugin, self).update_port(context,
|
||||||
id, port)
|
id, port)
|
||||||
self._extension_manager.process_update_port(context, port['port'],
|
self._extension_manager.process_update_port(context, port['port'],
|
||||||
|
@ -2329,16 +2328,15 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
|
||||||
self._process_portbindings_create_and_update(
|
self._process_portbindings_create_and_update(
|
||||||
context, port['port'], updated_port)
|
context, port['port'], updated_port)
|
||||||
self._extend_port_dict_binding(context, updated_port)
|
self._extend_port_dict_binding(context, updated_port)
|
||||||
new_mac_learning_state = updated_port.get(mac_ext.MAC_LEARNING)
|
mac_learning_state = updated_port.get(mac_ext.MAC_LEARNING)
|
||||||
if (new_mac_learning_state is not None and
|
if mac_learning_state is not None:
|
||||||
old_mac_learning_state != new_mac_learning_state):
|
if port_security and mac_learning_state:
|
||||||
if port_security and new_mac_learning_state:
|
|
||||||
msg = _('Mac learning requires that port security be '
|
msg = _('Mac learning requires that port security be '
|
||||||
'disabled')
|
'disabled')
|
||||||
LOG.error(msg)
|
LOG.error(msg)
|
||||||
raise n_exc.InvalidInput(error_message=msg)
|
raise n_exc.InvalidInput(error_message=msg)
|
||||||
self._update_mac_learning_state(context, id,
|
self._update_mac_learning_state(context, id,
|
||||||
new_mac_learning_state)
|
mac_learning_state)
|
||||||
|
|
||||||
address_bindings = self._build_address_bindings(updated_port)
|
address_bindings = self._build_address_bindings(updated_port)
|
||||||
if port_security and address_bindings:
|
if port_security and address_bindings:
|
||||||
|
|
Loading…
Reference in New Issue