openstack-neutron: 2014.2-33.eayunstack.dev

Signed-off-by: Hunt Xu <[email protected]>

packaging/openstack-neutron/0105-es-metering-fix-port-selection-when-tcp_port-is-spec.patch

@@ -0,0 +1,38 @@
+From 3281feb860dde54befa07f0aacf99c2190a819fe Mon Sep 17 00:00:00 2001
+From: Hunt Xu <[email protected]>
+Date: Thu, 11 May 2017 11:46:20 +0800
+Subject: [PATCH] es-metering: fix port selection when tcp_port is specified
+
+Fixes: redmine #10055
+
+Signed-off-by: Hunt Xu <[email protected]>
+---
+ neutron/services/metering/drivers/iptables/es_iptables_driver.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/neutron/services/metering/drivers/iptables/es_iptables_driver.py b/neutron/services/metering/drivers/iptables/es_iptables_driver.py
+index 5854a13f7..9c2040053 100644
+--- a/neutron/services/metering/drivers/iptables/es_iptables_driver.py
++++ b/neutron/services/metering/drivers/iptables/es_iptables_driver.py
+@@ -109,15 +109,17 @@ class EsIptablesMeteringDriver(iptables_driver.IptablesMeteringDriver):
+         if label['direction'] == 'ingress':
+             rule_parts += ['-m mark --mark %s' % ES_METERING_MARK]
+             rule_dir = '-d'
++            port_selector = '--dport'
+         else:
+             rule_parts += ['-o %s+' % iptables_driver.EXTERNAL_DEV_PREFIX]
+             rule_dir = '-s'
++            port_selector = '--sport'
+
+         if label['internal_ip'] is not None:
+             rule_parts += ['%s %s' % (rule_dir, label['internal_ip'])]
+
+         if label['tcp_port'] is not None:
+-            rule_parts += ['-p tcp --dport %s' % label['tcp_port']]
++            rule_parts += ['-p tcp %s %s' % (port_selector, label['tcp_port'])]
+
+         rule_parts += ['-j %s' % label_chain]
+
+-- 
+2.13.0
+

packaging/openstack-neutron/0106-Optimize-haproxy-driver-port_to_pool_id-dict.patch

@@ -0,0 +1,40 @@
+From 50fba6053e3a90d75e39c9828c3e4ff08b388a64 Mon Sep 17 00:00:00 2001
+From: "cheng.tang" <[email protected]>
+Date: Thu, 11 May 2017 10:55:12 +0800
+Subject: [PATCH] Optimize haproxy driver port_to_pool_id dict
+
+Fixes: redmine #10056
+
+Signed-off-by: cheng.tang <[email protected]>
+Signed-off-by: Hunt Xu <[email protected]>
+---
+ neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py b/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
+index 7a5b315f6..1d72b3093 100644
+--- a/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
++++ b/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
+@@ -121,8 +121,8 @@ class HaproxyNSDriver(agent_device_driver.AgentDeviceDriver):
+         # remember the pool<>port mapping
+         self.pool_to_port_id[pool_id] = logical_config['vip']['port']['id']
+         if port_id not in self.port_to_pool_id:
+-            self.port_to_pool_id[port_id] = []
+-        self.port_to_pool_id[port_id].append(pool_id)
++            self.port_to_pool_id[port_id] = set()
++        self.port_to_pool_id[port_id].add(pool_id)
+
+     @n_utils.synchronized('haproxy-driver')
+     def undeploy_instance(self, pool_id, cleanup_namespace=False):
+@@ -138,7 +138,7 @@ class HaproxyNSDriver(agent_device_driver.AgentDeviceDriver):
+             namespace = get_ns_name(port_id)
+             ns = ip_lib.IPWrapper(self.root_helper, namespace)
+
+-            self.port_to_pool_id[port_id].remove(pool_id)
++            self.port_to_pool_id[port_id].discard(pool_id)
+             if not self.port_to_pool_id[port_id]:
+                 # last pool deteled
+                 self._unplug(namespace, port_id)
+-- 
+2.13.0
+

packaging/openstack-neutron/0107-OpenFlow-EW-DVR-be-more-torelant-when-syncing-dvr-po.patch

@@ -0,0 +1,35 @@
+From b6086598bba039777d503d28772b0184d6731004 Mon Sep 17 00:00:00 2001
+From: Hunt Xu <[email protected]>
+Date: Fri, 12 May 2017 11:06:30 +0800
+Subject: [PATCH] OpenFlow EW DVR: be more torelant when syncing dvr ports
+
+TrivialFix
+Related: redmine #9118
+
+Signed-off-by: Hunt Xu <[email protected]>
+---
+ neutron/plugins/openvswitch/agent/openflow_ew_dvr_agent.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/neutron/plugins/openvswitch/agent/openflow_ew_dvr_agent.py b/neutron/plugins/openvswitch/agent/openflow_ew_dvr_agent.py
+index c1cab1dfd..1dfce3c15 100644
+--- a/neutron/plugins/openvswitch/agent/openflow_ew_dvr_agent.py
++++ b/neutron/plugins/openvswitch/agent/openflow_ew_dvr_agent.py
+@@ -373,8 +373,12 @@ class OFEWDVRAgent(object):
+
+         LOG.debug("Started OpenFlow EW DVR sync_dvr_ports()")
+
+-        sync_dvrs = self.plugin_rpc.get_openflow_ew_dvrs(
+-            self.context, self.host)
++        try:
++            sync_dvrs = self.plugin_rpc.get_openflow_ew_dvrs(
++                self.context, self.host)
++        except Exception:
++            LOG.exception("Error syncing dvr ports")
++            return
+         LOG.debug("L2 Agent OF-EW DVR: Received response for "
+                   "get_openflow_ew_dvrs() from plugin: %r", sync_dvrs)
+
+-- 
+2.13.0
+

packaging/openstack-neutron/openstack-neutron.spec

@@ -4,7 +4,7 @@
 
 Name:		openstack-neutron
 Version:	2014.2
-Release:	32%{?dist_eayunstack}
+Release:	33%{?dist_eayunstack}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.4.b3
 Summary:	OpenStack Networking Service
@@ -147,6 +147,9 @@ Patch0101: 0101-l3_db-update-GatewayInUseByFloatingIp-check.patch
 Patch0102: 0102-Fix-fip-port-qos-namespace-selection-in-sync_qos.patch
 Patch0103: 0103-ES-fip-setup-ip-rule-for-floatingip-itself.patch
 Patch0104: 0104-Fix-error-when-update-l7policy-with-pool_id-None.patch
+Patch0105: 0105-es-metering-fix-port-selection-when-tcp_port-is-spec.patch
+Patch0106: 0106-Optimize-haproxy-driver-port_to_pool_id-dict.patch
+Patch0107: 0107-OpenFlow-EW-DVR-be-more-torelant-when-syncing-dvr-po.patch
 
 
 BuildArch:	noarch
@@ -729,6 +732,9 @@ IPSec.
 %patch0102 -p1
 %patch0103 -p1
 %patch0104 -p1
+%patch0105 -p1
+%patch0106 -p1
+%patch0107 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
@@ -1190,6 +1196,11 @@ exit 0
 
 
 %changelog
+* Thu May 18 2017 Xu Meihong <[email protected]> 2014.2-33.eayunstack.dev
+- add patch 0105 from github pull request #93 (redmine#10055)
+- add patch 0106 from github pull request #94 (redmine#10056)
+- add patch 0107 from github pull request #96 (redmine#9118)
+
 * Mon May 08 2017 Xu Meihong <[email protected]> 2014.2-32.eayunstack.dev
 - add patch 0098 from github pull request #86 (redmine#9968)
 - add patch 0099 from github pull request #87 (redmine#9970)