x
/
vmware-nsx
Code Issues Proposed changes

Merge "NSX|V3+P: Fix mdproxy handling for vlan transparent"

This commit is contained in:
Zuul 2019-09-09 11:07:18 +00:00 committed by Gerrit Code Review
parent cceaa376b9 84a09a82fc
commit 9cc310d98c
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -743,6 +743,11 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
super(NsxPolicyPlugin, self).delete_network( super(NsxPolicyPlugin, self).delete_network(
context, net_id) context, net_id)
# this extra lookup is necessary to get the
# latest db model for the extension functions
net_model = self._get_network(context, net_id)
resource_extend.apply_funcs('networks', created_net, net_model)
# MD Proxy is currently supported by the passthrough api only # MD Proxy is currently supported by the passthrough api only
if is_backend_network and cfg.CONF.nsx_p.allow_passthrough: if is_backend_network and cfg.CONF.nsx_p.allow_passthrough:
try: try:
@ -755,11 +760,6 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
LOG.error("Failed to create mdproxy port for network %s: %s", LOG.error("Failed to create mdproxy port for network %s: %s",
net_id, e) net_id, e)
# this extra lookup is necessary to get the
# latest db model for the extension functions
net_model = self._get_network(context, net_id)
resource_extend.apply_funcs('networks', created_net, net_model)
# Update the QoS policy (will affect only future compute ports) # Update the QoS policy (will affect only future compute ports)
qos_com_utils.set_qos_policy_on_new_net( qos_com_utils.set_qos_policy_on_new_net(
context, net_data, created_net) context, net_data, created_net)

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

@ -970,6 +970,12 @@ class NsxV3Plugin(nsx_plugin_common.NsxPluginV3Base,
{'network': {'vlan_transparent': vlt}}) {'network': {'vlan_transparent': vlt}})
rollback_network = True rollback_network = True
# this extra lookup is necessary to get the
# latest db model for the extension functions
net_model = self._get_network(context, created_net['id'])
resource_extend.apply_funcs('networks', created_net, net_model)
if is_backend_network: if is_backend_network:
self._create_net_mdproxy_port( self._create_net_mdproxy_port(
context, created_net, az, nsx_net_id) context, created_net, az, nsx_net_id)
@ -990,11 +996,6 @@ class NsxV3Plugin(nsx_plugin_common.NsxPluginV3Base,
super(NsxV3Plugin, self).delete_network( super(NsxV3Plugin, self).delete_network(
context, created_net['id']) context, created_net['id'])
# this extra lookup is necessary to get the
# latest db model for the extension functions
net_model = self._get_network(context, created_net['id'])
resource_extend.apply_funcs('networks', created_net, net_model)
# Update the QoS policy (will affect only future compute ports) # Update the QoS policy (will affect only future compute ports)
qos_com_utils.set_qos_policy_on_new_net( qos_com_utils.set_qos_policy_on_new_net(
context, net_data, created_net) context, net_data, created_net)