Merge pull request #137 from kytos-ng/fix/match_id_cookie

fix: `cookie` is no longer a factor of a Flow `match_id`

CHANGELOG.rst

@@ -18,7 +18,7 @@ Fixed
 =====
 - Multipart replies clean up now happens before connection gets established to be safer
 - Set ``interface.speed`` on ``PortStatus`` reason ``OFPPR_ADD`` and ``OFPPR_MODIFY``
-
+- cookie is no longer a factor of a Flow match_id, just so equivalent matches but different cookies don't get different representations
 
 [2023.1.0] - 2023-06-05
 ***********************

flow.py

@@ -115,7 +115,6 @@ def match_id(self):
             'table_id': self.table_id,
             'match': self.match.as_dict(),
             'priority': self.priority,
-            'cookie': self.cookie,
         }
         flow_str = json.dumps(flow_match_fields, sort_keys=True)
         md5sum = md5()

tests/unit/test_flow.py

@@ -218,6 +218,10 @@ def test_match_id():
         flow_one = {"match": Match04(**{"in_port": 1, "dl_vlan": 2})}
         flow_two = {"match": Match04(**{"in_port": 1, "dl_vlan": 2})}
         flow_three = {"match": Match04(**{"in_port": 1, "dl_vlan": 3})}
+        flow_four = {"match": Match04(**{"in_port": 1, "dl_vlan": 2}),
+                     "cookie": 0x10}
+        flow_five = {"match": Match04(**{"in_port": 1, "dl_vlan": 2}),
+                     "cookie": 0x20}
 
         assert Flow04(mock_switch, **flow_one).match_id == Flow04(
             mock_switch, **flow_two
@@ -226,10 +230,14 @@ def test_match_id():
             mock_switch, **flow_three
         ).match_id
 
+        # cookie shouldn't matter for match_id
         flow_two["cookie"] = 0x10
-        assert Flow04(mock_switch, **flow_one).match_id != Flow04(
+        assert Flow04(mock_switch, **flow_one).match_id == Flow04(
             mock_switch, **flow_two
         ).match_id
+        assert Flow04(mock_switch, **flow_four).match_id == Flow04(
+            mock_switch, **flow_five
+        ).match_id
 
 
 class TestFlowBase: