remove vendoring of bitstring, fix SID parsing

CHANGELOG.rst

@@ -17,6 +17,7 @@ Version 5.0.0:
    patch: tomjshine
  * reported: the RIB code so withdraw message before any announce are sent
         this does change the RIB behaviour sending withdrawal when it was not previously
+ * Fix: parsing of SID in BGP-LS
 
 Version 4.2.6:
  * Fix: prevent the deletion of IP addresses not added by the healthchecker

lib/exabgp/bgp/message/update/attribute/bgpls/link/admingroup.py

@@ -6,7 +6,8 @@
 Copyright (c) 2014-2017 Exa Networks. All rights reserved.
 """
 
-from exabgp.vendoring.bitstring import BitArray
+from struct import unpack
+
 from exabgp.bgp.message.notification import Notify
 from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE
 
@@ -26,8 +27,7 @@ def unpack(cls, data, length):
         if length != 4:
             raise Notify(3, 5, "Unable to decode attribute. Incorrect Size")
         else:
-            b = BitArray(bytes=data)
-            colormask = b.unpack('uintbe:32')
+            colormask = unpack('!L', data[:4])[0]
             return cls(colormask=colormask)
 
     def json(self, compact=None):

lib/exabgp/bgp/message/update/attribute/bgpls/link/igpmetric.py

@@ -8,7 +8,6 @@
 
 from struct import unpack
 
-from exabgp.vendoring.bitstring import BitArray
 from exabgp.bgp.message.notification import Notify
 
 from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE
@@ -51,8 +50,7 @@ def unpack(cls, data, length):
             return cls(igpmetric=igpmetric)
         elif len(data) == 3:
             # ISIS wide metrics
-            b = BitArray(bytes=data)
-            igpmetric = b.unpack('uintbe:24')
+            igpmetric = unpack('!L', bytes([0]) + data)[0]
             return cls(igpmetric=igpmetric)
         else:
             raise Notify(3, 5, "Incorrect IGP Metric Size")

lib/exabgp/bgp/message/update/attribute/bgpls/link/sradj.py

@@ -10,7 +10,6 @@
 from struct import unpack
 from exabgp.util import hexstring
 
-from exabgp.vendoring.bitstring import BitArray
 from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE, LsGenericFlags
 
 #    draft-gredler-idr-bgp-ls-segment-routing-ext-03
@@ -62,12 +61,11 @@ def unpack(cls, data, length):
             # Range Size: 3 octet value indicating the number of labels in
             # the range.
             if int(flags.flags['V']) and int(flags.flags['L']):
-                b = BitArray(bytes=data[:3])
-                sid = b.unpack('uintbe:24')[0:1]
+                sid = unpack('!L', bytes([0]) + data[:3])[0]
                 data = data[3:]
                 sids.append(sid)
             elif (not flags.flags['V']) and (not flags.flags['L']):
-                sid = unpack('!I', data[:4])[0:1]
+                sid = unpack('!I', data[:4])[0]
                 data = data[4:]
                 sids.append(sid)
             else:

lib/exabgp/bgp/message/update/attribute/bgpls/link/sradjlan.py

@@ -10,7 +10,6 @@
 from struct import unpack
 from exabgp.util import hexstring
 
-from exabgp.vendoring.bitstring import BitArray
 from exabgp.protocol.iso import ISO
 from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE, LsGenericFlags
 
@@ -72,8 +71,7 @@ def unpack(cls, data, length):
             # Range Size: 3 octet value indicating the number of labels in
             # the range.
             if int(flags.flags['V']) and int(flags.flags['L']):
-                b = BitArray(bytes=data[:3])
-                sid = b.unpack('uintbe:24')[0]
+                sid = unpack('!L', bytes([0]) + data[:3])[0]
                 data = data[3:]
                 sids.append(sid)
             elif (not flags.flags['V']) and (not flags.flags['L']):

lib/exabgp/bgp/message/update/attribute/bgpls/linkstate.py

@@ -10,7 +10,6 @@
 import itertools
 from struct import unpack
 
-from exabgp.vendoring.bitstring import BitArray
 from exabgp.bgp.message.notification import Notify
 from exabgp.bgp.message.update.attribute.attribute import Attribute
 
@@ -128,17 +127,16 @@ def __init__(self, flags):
     def unpack(cls, data, pattern):
         pad = pattern.count('RSV')
         repeat = len(pattern) - pad
-        flag_array = binascii.b2a_hex(data)
-        hex_rep = hex(int(flag_array, 16))
-        bit_array = BitArray(hex_rep)
+        hex_rep = int(binascii.b2a_hex(data), 16)
+        bits = f'{hex_rep:08b}'
         valid_flags = [
             ''.join(''.join(item), ''.join(itertools.repeat('0', pad)))
             for item in itertools.product('01', repeat=repeat)
         ]
         valid_flags.append('0000')
-        if bit_array.bin in valid_flags:
+        if bits in valid_flags:
             flags = dict(zip(pattern, [0,] * len(pattern)))
-            flags.update(dict((k, int(v)) for k, v in zip(pattern, bit_array.bin)))
+            flags.update(dict((k, int(v)) for k, v in zip(pattern, bits)))
         else:
             raise Notify(3, 5, "Invalid SR flags mask")
         return cls(flags=flags)

lib/exabgp/bgp/message/update/attribute/bgpls/node/isisarea.py

@@ -6,10 +6,6 @@
 Copyright (c) 2014-2017 Exa Networks. All rights reserved.
 """
 
-from exabgp.vendoring.bitstring import BitArray
-
-from exabgp.bgp.message.notification import Notify
-
 from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE
 
 #      0                   1                   2                   3
@@ -34,9 +30,7 @@ def __repr__(self):
 
     @classmethod
     def unpack(cls, data, length):
-
-        b = BitArray(bytes=data)
-        return cls(areaid=b.hex)
+        return cls(areaid=int(data.hex(), 16))
 
     def json(self, compact=None):
         return '"area-id": "%s"' % str(self.areaid)

lib/exabgp/bgp/message/update/attribute/bgpls/node/srcap.py

@@ -9,7 +9,6 @@
 import json
 from struct import unpack
 
-from exabgp.vendoring.bitstring import BitArray
 from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE, LsGenericFlags
 from exabgp.bgp.message.notification import Notify
 
@@ -59,8 +58,8 @@ def unpack(cls, data, length):
         while data:
             # Range Size: 3 octet value indicating the number of labels in
             # the range.
-            b = BitArray(bytes=data[:3])
-            range_size = b.unpack('uintbe:24')[0]
+            range_size = unpack('!L', bytes([0]) + data[:3])[0]
+
             # SID/Label: If length is set to 3, then the 20 rightmost bits
             # represent a label.  If length is set to 4, then the value
             # represents a 32 bit SID.
@@ -69,8 +68,7 @@ def unpack(cls, data, length):
                 raise Notify(3, 5, "Invalid sub-TLV type: {}".format(t))
             v = data[7 : l + 7]
             if l == 3:
-                b = BitArray(bytes=v)
-                sid = b.unpack('uintbe:24')[0]
+                sid = unpack('!L', bytes([0]) + data[:3])[0]
             elif l == 4:
                 sid = unpack('!I', v)[0]
             sids.append((range_size, sid))

lib/exabgp/bgp/message/update/attribute/bgpls/prefix/prefixmetric.py

@@ -8,7 +8,6 @@
 
 from struct import unpack
 
-from exabgp.vendoring.bitstring import BitArray
 from exabgp.bgp.message.notification import Notify
 
 from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE

lib/exabgp/bgp/message/update/attribute/bgpls/prefix/srprefix.py

@@ -10,7 +10,6 @@
 from struct import unpack
 from exabgp.util import hexstring
 
-from exabgp.vendoring.bitstring import BitArray
 from exabgp.bgp.message.notification import Notify
 from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE, LsGenericFlags
 
@@ -61,8 +60,7 @@ def unpack(cls, data, length):
         raw = []
         while data:
             if flags.flags['V'] and flags.flags['L']:
-                b = BitArray(bytes=data[:3])
-                sid = b.unpack('uintbe:24')[0]
+                sid = unpack('!L', bytes([0]) + data[:3])[0]
                 data = data[3:]
                 sids.append(sid)
             elif (not flags.flags['V']) and (not flags.flags['L']):

lib/exabgp/bgp/message/update/attribute/sr/srgb.py

@@ -7,8 +7,8 @@
 """
 import json
 from struct import pack
+from struct import unpack
 
-from exabgp.vendoring.bitstring import BitArray
 from exabgp.bgp.message.update.attribute.sr.prefixsid import PrefixSid
 
 # 0                   1                   2                   3
@@ -67,10 +67,8 @@ def unpack(cls, data, length):
         # the SRGB field MAY appear multiple times.  If the SRGB field
         # appears multiple times, the SRGB consists of multiple ranges.
         while data:
-            b = BitArray(bytes=data[:3])
-            base = b.unpack('uintbe:24')[0]
-            b = BitArray(bytes=data[3:6])
-            srange = b.unpack('uintbe:24')[0]
+            base = unpack('!L', bytes([0]) + data[:3])[0]
+            srange = unpack('!L', bytes([0]) + data[3:6])[0]
             srgbs.append((base, srange))
             data = data[6:]
         return cls(srgbs=srgbs)

lib/exabgp/protocol/iso/__init__.py

@@ -10,8 +10,6 @@
 # =========================================================================== ISO
 #
 
-from exabgp.vendoring.bitstring import BitArray
-
 
 class ISO(object):
     def __init__(self, sysid, selector=None, area_id=None, afi=49):
@@ -23,8 +21,7 @@ def __init__(self, sysid, selector=None, area_id=None, afi=49):
 
     @classmethod
     def unpack_sysid(cls, data):
-        b = BitArray(bytes=data)
-        return b.hex
+        return data.hex()
 
     def json(self, compact=None):
         return self.sysid