From: Ilya Shakhat <ishakhat@mirantis.com>
Date: Fri, 8 Aug 2014 12:48:22 +0000 (+0400)
Subject: Do not assume order of parameters in OVSBridge.add_flow call
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9ce1935d06b2822a34ffb1234bc994acf306ad32;p=openstack-build%2Fneutron-build.git

Do not assume order of parameters in OVSBridge.add_flow call

This fixes neutron.tests.unit.agent.linux.test_ovs_lib.OVS_Lib_Test.test_add_flow
unit test that breaks with a randomized PYTHONHASHSEED.

The test assumed that the parameters passed to add_flow had
elements in a particular order. Found with PYTHONHASHSEED=2455351445.
The fix refactors the test case to match parameters as set.

Partial-bug: #1348818

Note: There are several other unrelated unit tests that also break with a
randomized PYTHONHASHSEED, but they are not addressed here. They will be
addressed in separate patches.

Change-Id: Ibe2f4d929b8b42c8c909c2306d2554faf7109b49
---

diff --git a/neutron/tests/unit/agent/linux/test_ovs_lib.py b/neutron/tests/unit/agent/linux/test_ovs_lib.py
index 04afdaf19..622382abf 100644
--- a/neutron/tests/unit/agent/linux/test_ovs_lib.py
+++ b/neutron/tests/unit/agent/linux/test_ovs_lib.py
@@ -109,6 +109,24 @@ class TestBaseOVS(base.BaseTestCase):
         self._test_port_exists(None, False)
 
 
+class OFCTLParamListMatcher(object):
+
+    def _parse(self, params):
+        actions_pos = params.find('actions')
+        return set(params[:actions_pos].split(',')), params[actions_pos:]
+
+    def __init__(self, params):
+        self.expected = self._parse(params)
+
+    def __eq__(self, other):
+        return self.expected == self._parse(other)
+
+    def __str__(self):
+        return 'ovs-ofctl parameters: %s, "%s"' % self.expected
+
+    __repr__ = __str__
+
+
 class OVS_Lib_Test(base.BaseTestCase):
     """A test suite to exercise the OVS libraries shared by Neutron agents.
 
@@ -261,36 +279,43 @@ class OVS_Lib_Test(base.BaseTestCase):
         self.br.add_flow(**flow_dict_7)
         expected_calls = [
             mock.call(["ovs-ofctl", "add-flows", self.BR_NAME, '-'],
-                      process_input="hard_timeout=0,idle_timeout=0,"
-                                    "priority=2,dl_src=ca:fe:de:ad:be:ef"
-                                    ",actions=strip_vlan,output:0",
+                      process_input=OFCTLParamListMatcher(
+                          "hard_timeout=0,idle_timeout=0,"
+                          "priority=2,dl_src=ca:fe:de:ad:be:ef,"
+                          "actions=strip_vlan,output:0"),
                       root_helper=self.root_helper),
             mock.call(["ovs-ofctl", "add-flows", self.BR_NAME, '-'],
-                      process_input="hard_timeout=0,idle_timeout=0,"
-                                    "priority=1,actions=normal",
+                      process_input=OFCTLParamListMatcher(
+                          "hard_timeout=0,idle_timeout=0,"
+                          "priority=1,actions=normal"),
                       root_helper=self.root_helper),
             mock.call(["ovs-ofctl", "add-flows", self.BR_NAME, '-'],
-                      process_input="hard_timeout=0,idle_timeout=0,"
-                                    "priority=2,actions=drop",
+                      process_input=OFCTLParamListMatcher(
+                          "hard_timeout=0,idle_timeout=0,"
+                          "priority=2,actions=drop"),
                       root_helper=self.root_helper),
             mock.call(["ovs-ofctl", "add-flows", self.BR_NAME, '-'],
-                      process_input="hard_timeout=0,idle_timeout=0,priority=2,"
-                                    "in_port=%s,actions=drop" % ofport,
+                      process_input=OFCTLParamListMatcher(
+                          "hard_timeout=0,idle_timeout=0,priority=2,"
+                          "in_port=%s,actions=drop" % ofport),
                       root_helper=self.root_helper),
             mock.call(["ovs-ofctl", "add-flows", self.BR_NAME, '-'],
-                      process_input="hard_timeout=0,idle_timeout=0,"
-                                    "priority=4,dl_vlan=%s,in_port=%s,"
-                                    "actions=strip_vlan,set_tunnel:%s,normal"
-                                    % (vid, ofport, lsw_id),
+                      process_input=OFCTLParamListMatcher(
+                          "hard_timeout=0,idle_timeout=0,"
+                          "priority=4,dl_vlan=%s,in_port=%s,"
+                          "actions=strip_vlan,set_tunnel:%s,normal"
+                          % (vid, ofport, lsw_id)),
                       root_helper=self.root_helper),
             mock.call(["ovs-ofctl", "add-flows", self.BR_NAME, '-'],
-                      process_input="hard_timeout=0,idle_timeout=0,priority=3,"
-                                    "tun_id=%s,actions=mod_vlan_vid:%s,"
-                                    "output:%s" % (lsw_id, vid, ofport),
+                      process_input=OFCTLParamListMatcher(
+                          "hard_timeout=0,idle_timeout=0,priority=3,"
+                          "tun_id=%s,actions=mod_vlan_vid:%s,"
+                          "output:%s" % (lsw_id, vid, ofport)),
                       root_helper=self.root_helper),
             mock.call(["ovs-ofctl", "add-flows", self.BR_NAME, '-'],
-                      process_input="hard_timeout=0,idle_timeout=0,priority=4,"
-                                    "nw_src=%s,arp,actions=drop" % cidr,
+                      process_input=OFCTLParamListMatcher(
+                          "hard_timeout=0,idle_timeout=0,priority=4,"
+                          "nw_src=%s,arp,actions=drop" % cidr),
                       root_helper=self.root_helper),
         ]
         self.execute.assert_has_calls(expected_calls)