openstack/neutron
Code Issues Proposed changes

Merge "Optimize OVS DVR CSNAT port code a little"

Browse Source
This commit is contained in:
Zuul
2018-10-04 16:52:33 +00:00
committed by Gerrit Code Review
parent 875c55a66a ed225d3f57
commit 8056f2b386
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
View File

@@ -483,25 +483,25 @@ class OVSDVRNeutronAgent(object):
def _bind_centralized_snat_port_on_dvr_subnet(self, port, lvm, def _bind_centralized_snat_port_on_dvr_subnet(self, port, lvm,
fixed_ips, device_owner): fixed_ips, device_owner):
# since centralized-SNAT (CSNAT) port must have only one fixed # We only pass the subnet uuid so the server code will correctly
# IP, directly use fixed_ips[0] # use the gateway_ip value from the subnet when looking up the
fixed_ip = fixed_ips[0] # centralized-SNAT (CSNAT) port, get it early from the first fixed_ip.
subnet_uuid = fixed_ips[0]['subnet_id']
if port.vif_id in self.local_ports: if port.vif_id in self.local_ports:
# throw an error if CSNAT port is already on a different # throw an error if CSNAT port is already on a different
# dvr routed subnet # dvr routed subnet
ovsport = self.local_ports[port.vif_id] ovsport = self.local_ports[port.vif_id]
subs = list(ovsport.get_subnets()) subs = list(ovsport.get_subnets())
if subs[0] == fixed_ip['subnet_id']: if subs[0] == subnet_uuid:
return return
LOG.error("Centralized-SNAT port %(port)s on subnet " LOG.error("Centralized-SNAT port %(port)s on subnet "
"%(port_subnet)s already seen on a different " "%(port_subnet)s already seen on a different "
"subnet %(orig_subnet)s", { "subnet %(orig_subnet)s", {
"port": port.vif_id, "port": port.vif_id,
"port_subnet": fixed_ip['subnet_id'], "port_subnet": subnet_uuid,
"orig_subnet": subs[0], "orig_subnet": subs[0],
}) })
return return
subnet_uuid = fixed_ip['subnet_id']
ldm = None ldm = None
subnet_info = None subnet_info = None
if subnet_uuid not in self.local_dvr_map: if subnet_uuid not in self.local_dvr_map: