Merge "De-dup conntrack deletions before running them"

neutron/agent/linux/ip_conntrack.py

@@ -45,7 +45,7 @@ class IpConntrackManager(object):
         return cmd_ns
 
     def _get_conntrack_cmds(self, device_info_list, rule, remote_ip=None):
-        conntrack_cmds = []
+        conntrack_cmds = set()
         cmd = self._generate_conntrack_cmd_by_rule(rule, self.namespace)
         ethertype = rule.get('ethertype')
         for device_info in device_info_list:
@@ -59,7 +59,7 @@ class IpConntrackManager(object):
                 if remote_ip and str(
                         netaddr.IPNetwork(remote_ip).version) in ethertype:
                     ip_cmd.extend(['-s', str(remote_ip)])
-                conntrack_cmds.append(cmd + ip_cmd)
+                conntrack_cmds.add(tuple(cmd + ip_cmd))
         return conntrack_cmds
 
     def _delete_conntrack_state(self, device_info_list, rule, remote_ip=None):
@@ -67,7 +67,7 @@ class IpConntrackManager(object):
                                                   rule, remote_ip)
         for cmd in conntrack_cmds:
             try:
-                self.execute(cmd, run_as_root=True,
+                self.execute(list(cmd), run_as_root=True,
                              check_exit_code=True,
                              extra_ok_codes=[1])
             except RuntimeError:

neutron/tests/unit/agent/linux/test_ip_conntrack.py

@@ -0,0 +1,37 @@
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+import mock
+
+from neutron.agent.linux import ip_conntrack
+from neutron.tests import base
+
+
+class IPConntrackTestCase(base.BaseTestCase):
+
+    def setUp(self):
+        super(IPConntrackTestCase, self).setUp()
+        self.execute = mock.Mock()
+        self.mgr = ip_conntrack.IpConntrackManager(self._zone_lookup,
+                                                   self.execute)
+
+    def _zone_lookup(self, dev):
+        return 100
+
+    def test_delete_conntrack_state_dedupes(self):
+        rule = {'ethertype': 'IPv4', 'direction': 'ingress'}
+        dev_info = {'device': 'device', 'fixed_ips': ['1.2.3.4']}
+        dev_info_list = [dev_info for _ in range(10)]
+        self.mgr._delete_conntrack_state(dev_info_list, rule)
+        self.assertEqual(1, len(self.execute.mock_calls))