x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V3: Fix ENS check on update network with QoS"

Browse Source
This commit is contained in:
Zuul 2018-06-15 18:27:46 +00:00 committed by Gerrit Code Review
commit 1c0d8402fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1446,10 +1446,11 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
providernet._raise_if_updates_provider_attributes(net_data) providernet._raise_if_updates_provider_attributes(net_data)
extern_net = self._network_is_external(context, id) extern_net = self._network_is_external(context, id)
is_nsx_net = self._network_is_nsx_net(context, id) is_nsx_net = self._network_is_nsx_net(context, id)
is_ens_net = self._is_ens_tz_net(context, id)
if extern_net: if extern_net:
self._assert_on_external_net_with_qos(net_data) self._assert_on_external_net_with_qos(net_data)
else: else:
if self._get_net_tz(context, id): if is_ens_net:
self._assert_on_ens_with_qos(net_data) self._assert_on_ens_with_qos(net_data)
updated_net = super(NsxV3Plugin, self).update_network(context, id, updated_net = super(NsxV3Plugin, self).update_network(context, id,
network) network)
@ -1458,8 +1459,7 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
if psec.PORTSECURITY in net_data: if psec.PORTSECURITY in net_data:
# do not allow to enable port security on ENS networks # do not allow to enable port security on ENS networks
if (net_data[psec.PORTSECURITY] and if (net_data[psec.PORTSECURITY] and
not original_net[psec.PORTSECURITY] and not original_net[psec.PORTSECURITY] and is_ens_net):
self._is_ens_tz_net(context, id)):
raise nsx_exc.NsxENSPortSecurity() raise nsx_exc.NsxENSPortSecurity()
self._process_network_port_security_update( self._process_network_port_security_update(
context, net_data, updated_net) context, net_data, updated_net)