commit 664fbe8672b5818ce702a5294ce0331892e81628
author Andrea Campanella <andrea@opennetworking.org> Wed Mar 04 09:52:56 2020 +0100
committer Andrea Campanella <andrea@opennetworking.org> Wed Mar 04 10:16:36 2020 +0100
tree 11dfe55fab9b9666c47f74bc5720c3a0f7590543
parent 4461a58cd1f6943425440a31296c2ba8d1eb5acb

[VOL-2697] Avoid key error for vlan_vid_mask during flow stats reply

Change-Id: I9f55726fa70918bb1b00ff874531ac75ee571238

VERSION

diff --git a/VERSION b/VERSION
index 21bb5e1..bda8fbe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.5
+2.2.6

ofagent/converter.py

diff --git a/ofagent/converter.py b/ofagent/converter.py
index 38ceb03..7e26681 100755
--- a/ofagent/converter.py
+++ b/ofagent/converter.py
@@ -101,7 +101,7 @@
             of13.oxm.ip_proto(value=ofb_field['ip_proto']))
 
     elif field_type == pb2.OFPXMT_OFB_VLAN_VID:
-        if ofb_field.get('vlan_vid') == RESERVED_TRANSPARENT_VLAN and ofb_field['vlan_vid_mask'] == RESERVED_TRANSPARENT_VLAN:
+        if ofb_field.get('vlan_vid') == RESERVED_TRANSPARENT_VLAN and 'vlan_vid_mask' in ofb_field and ofb_field['vlan_vid_mask'] == RESERVED_TRANSPARENT_VLAN:
            return (
                of13.oxm.vlan_vid_masked(value=ofb_field['vlan_vid_mask'], value_mask=ofb_field['vlan_vid_mask']))
         else:

ofagent/of_connection.py

diff --git a/ofagent/of_connection.py b/ofagent/of_connection.py
index 8930472..a941111 100755
--- a/ofagent/of_connection.py
+++ b/ofagent/of_connection.py
@@ -98,7 +98,7 @@
         :return: None
         """
         assert self.connected
-        
+
         if msg.xid is None:
             msg.xid = self._gen_xid()
         buf = msg.pack()