decoder: add console script, add basic tests

noxfile.py

@@ -238,6 +238,14 @@ def unit(session, config):
     session.run(*options('test_unit', config))
 
 
+@nox.session
+@add_session_config
+def decoder(session, config):
+    '''Run decoder tests.'''
+    setup_venv_dev(session)
+    session.run(*options('test_decoder', config))
+
+
 @nox.session
 @add_session_config
 def integration(session, config):

pyroute2/decoder/loader.py

@@ -56,17 +56,17 @@ def decode(self):
             self.exception = repr(e)
             self.msg = hexdump(self.data)
 
+    def dump(self):
+        return {
+            "pcap header": repr(self.packet_header),
+            "link layer header": repr(self.ll_header),
+            "message class": repr(self.cls),
+            "exception": self.exception,
+            "data": self.msg,
+        }
+
     def __repr__(self):
-        return json.dumps(
-            {
-                "pcap header": repr(self.packet_header),
-                "link layer header": repr(self.ll_header),
-                "message class": repr(self.cls),
-                "exception": self.exception,
-                "data": self.msg,
-            },
-            indent=4,
-        )
+        return json.dumps(self.dump(), indent=4)
 
 
 class MatchOps:
@@ -91,8 +91,9 @@ def f(packet_header, ll_header, raw, data_offset, stack):
 
     @staticmethod
     def ll_header(family):
-        if not isinstance(family, int) or family < 0 or family > 0xffff:
+        if not isinstance(family, int) or family < 0 or family > 0xFFFF:
             raise TypeError('family must be unsigned short integer')
+
         def f(packet_header, ll_header, raw, data_offset, stack):
             return ll_header.family == family
 
@@ -104,6 +105,7 @@ def data(fmt, offset, value):
             raise TypeError('format must be string')
         if not isinstance(offset, int) or not isinstance(value, int):
             raise TypeError('offset and value must be integers')
+
         def f(packet_header, ll_header, raw, data_offset, stack):
             o = data_offset + offset
             s = struct.calcsize(fmt)
@@ -193,7 +195,9 @@ def data(self):
             ll_header = self.decode_ll_header(self.raw, self.offset)
             self.offset += ll_header.header_len
             length = packet_header.incl_len - ll_header.header_len
-            if self.matcher.match(packet_header, ll_header, self.raw, self.offset):
+            if self.matcher.match(
+                packet_header, ll_header, self.raw, self.offset
+            ):
                 msg = Message(
                     packet_header,
                     ll_header,

pyroute2/decoder/main.py

@@ -2,14 +2,18 @@
 A cli tool to decode netlink buffers.
 '''
 
-from args import args
-from loader import get_loader
+import json
+
+from pyroute2.decoder.args import args
+from pyroute2.decoder.loader import get_loader
 
 
 def run():
     loader = get_loader(args)
+    ret = []
     for message in loader.data:
-        print(message)
+        ret.append(message.dump())
+    print(json.dumps(ret, indent=4))
 
 
 if __name__ == "__main__":

setup.cfg

@@ -39,5 +39,6 @@ packages = find:
 console_scripts =
     ss2 = pyroute2.netlink.diag.ss2:run [psutil]
     pyroute2-cli = pyroute2.ndb.cli:run
+    pyroute2-decoder = pyroute2.decoder.main:run
     pyroute2-dhcp-client = pyroute2.dhcp.client:run
     pyroute2-test-platform = pyroute2.config.test_platform:run