From: Julien Fortin <julien@cumulusnetworks.com>
Date: Thu, 16 Aug 2018 10:31:36 +0000 (+0200)
Subject: addons: bridge: ports l2protocol tunnel: fix TypeError exception
X-Git-Tag: 1.2.2-1~56
X-Git-Url: https://git.proxmox.com/?p=mirror_ifupdown2.git;a=commitdiff_plain;h=6deeac331a23537d6267f71b3587dbf189e09e05

addons: bridge: ports l2protocol tunnel: fix TypeError exception

ifquery may fail on the following exception:

File "/usr/share/ifupdown2/addons/bridge.py", line 709, in _query_check_l2protocol_tunnel_lldp
     return ifla_brport_group_mask & 0x4000
 TypeError: unsupported operand type(s) for &: 'NoneType' and 'int'

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
---

diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
index f6fe5ee..afe2f48 100644
--- a/ifupdown2/addons/bridge.py
+++ b/ifupdown2/addons/bridge.py
@@ -664,27 +664,42 @@ class bridge(moduleBase):
 
     @staticmethod
     def _l2protocol_tunnel_set_pvst(ifla_brport_group_mask, ifla_brport_group_maskhi):
-        ifla_brport_group_maskhi |= 0x1
+        if not ifla_brport_group_maskhi:
+            ifla_brport_group_maskhi = 0x1
+        else:
+            ifla_brport_group_maskhi |= 0x1
         return ifla_brport_group_mask, ifla_brport_group_maskhi
 
     @staticmethod
     def _l2protocol_tunnel_set_cdp(ifla_brport_group_mask, ifla_brport_group_maskhi):
-        ifla_brport_group_maskhi |= 0x2
+        if not ifla_brport_group_maskhi:
+            ifla_brport_group_maskhi = 0x2
+        else:
+            ifla_brport_group_maskhi |= 0x2
         return ifla_brport_group_mask, ifla_brport_group_maskhi
 
     @staticmethod
     def _l2protocol_tunnel_set_stp(ifla_brport_group_mask, ifla_brport_group_maskhi):
-        ifla_brport_group_mask |= 0x1
+        if not ifla_brport_group_mask:
+            ifla_brport_group_mask = 0x1
+        else:
+            ifla_brport_group_mask |= 0x1
         return ifla_brport_group_mask, ifla_brport_group_maskhi
 
     @staticmethod
     def _l2protocol_tunnel_set_lacp(ifla_brport_group_mask, ifla_brport_group_maskhi):
-        ifla_brport_group_mask |= 0x4
+        if not ifla_brport_group_mask:
+            ifla_brport_group_mask = 0x4
+        else:
+            ifla_brport_group_mask |= 0x4
         return ifla_brport_group_mask, ifla_brport_group_maskhi
 
     @staticmethod
     def _l2protocol_tunnel_set_lldp(ifla_brport_group_mask, ifla_brport_group_maskhi):
-        ifla_brport_group_mask |= 0x4000
+        if not ifla_brport_group_mask:
+            ifla_brport_group_mask = 0x4000
+        else:
+            ifla_brport_group_mask |= 0x4000
         return ifla_brport_group_mask, ifla_brport_group_maskhi
 
     @staticmethod
@@ -694,23 +709,23 @@ class bridge(moduleBase):
 
     @staticmethod
     def _query_check_l2protocol_tunnel_stp(ifla_brport_group_mask, ifla_brport_group_maskhi):
-        return ifla_brport_group_mask & 0x1
+        return ifla_brport_group_mask and ifla_brport_group_mask & 0x1
 
     @staticmethod
     def _query_check_l2protocol_tunnel_cdp(ifla_brport_group_mask, ifla_brport_group_maskhi):
-        return ifla_brport_group_maskhi & 0x2
+        return ifla_brport_group_maskhi and ifla_brport_group_maskhi & 0x2
 
     @staticmethod
     def _query_check_l2protocol_tunnel_pvst(ifla_brport_group_mask, ifla_brport_group_maskhi):
-        return ifla_brport_group_maskhi & 0x1
+        return ifla_brport_group_maskhi and ifla_brport_group_maskhi & 0x1
 
     @staticmethod
     def _query_check_l2protocol_tunnel_lldp(ifla_brport_group_mask, ifla_brport_group_maskhi):
-        return ifla_brport_group_mask & 0x4000
+        return ifla_brport_group_mask and ifla_brport_group_mask & 0x4000
 
     @staticmethod
     def _query_check_l2protocol_tunnel_lacp(ifla_brport_group_mask, ifla_brport_group_maskhi):
-        return ifla_brport_group_mask & 0x4
+        return ifla_brport_group_mask and ifla_brport_group_mask & 0x4
 
     @staticmethod
     def _query_check_l2protocol_tunnel_all(ifla_brport_group_mask, ifla_brport_group_maskhi):