Merge pull request #636 from hdiogenes/add-repr-to-group-mod

Add __repr__ to `GroupMod` (+4 other classes)

Author: hdiogenes

pyof/foundation/base.py

@@ -63,7 +63,7 @@ def __deepcopy__(self, memo):
         return type(self)(value=self._value, enum_ref=self.enum_ref)
 
     def __repr__(self):
-        return "{}({})".format(type(self).__name__, self._value)
+        return "{}({})".format(type(self).__name__, repr(self._value))
 
     def __str__(self):
         return '{}'.format(str(self._value))
@@ -517,6 +517,19 @@ def __eq__(self, other):
         """
         return self.pack() == other.pack()
 
+    # def __repr__(self):
+    #     """Generic fallback for __repr__ using the built-in introspection.
+    #
+    #     For debugging purposes. Disabled to avoid infinite recursion in
+    #     the case that objects reference each other.
+    #
+    #     """
+    #     # from pprint import pformat
+    #     # attributes = pformat(dict(self._get_instance_attributes()))
+    #     attributes = ', '.join(f'{k}={v!r}' for (k, v)
+    #                            in self._get_instance_attributes())
+    #     return f'{type(self).__name__}({attributes})'
+
     @staticmethod
     def _attr_fits_into_class(attr, cls):
         if not isinstance(attr, cls):

pyof/v0x04/common/action.py

@@ -328,6 +328,9 @@ def __init__(self, port=None,
         self.port = port
         self.max_length = max_length
 
+    def __repr__(self):
+        return f"{type(self).__name__}(port={self.port})"
+
 
 class ActionPopMPLS(ActionHeader):
     """Action structure for OFPAT_POP_MPLS."""
@@ -388,6 +391,10 @@ def __init__(self, field=None):
         super().__init__(action_type=ActionType.OFPAT_SET_FIELD)
         self.field = OxmTLV() if field is None else field
 
+    def __repr__(self):
+        return (f"{type(self).__name__}({self.field.oxm_field!s}, "
+                f"{self.field.oxm_value})")
+
     def pack(self, value=None):
         """Pack this structure updating the length and padding it."""
         self._update_length()

pyof/v0x04/common/header.py

@@ -102,3 +102,7 @@ def __init__(self, message_type=None, length=None, xid=None):
         self.message_type = message_type
         self.length = length
         self.xid = xid
+
+    def __repr__(self):
+        return (f"{type(self).__name__}(version={self.version}, "
+                f"xid={self.xid}, {self.message_type!s})")

pyof/v0x04/controller2switch/common.py

@@ -224,6 +224,9 @@ def __init__(self, length=None, weight=None, watch_port=None,
         self.watch_group = watch_group
         self.actions = actions
 
+    def __repr__(self):
+        return f"{type(self).__name__}(actions={self.actions!r})"
+
     def unpack(self, buff, offset=0):
         """Unpack bucket.
 

pyof/v0x04/controller2switch/group_mod.py

@@ -91,3 +91,8 @@ def __init__(self, xid=None, command=None, group_type=None, group_id=None,
         self.group_type = group_type
         self.group_id = group_id
         self.buckets = buckets
+
+    def __repr__(self):
+        return (f"{type(self).__name__}(xid={self.header.xid}, {self.command},"
+                f" group_type={self.group_type}, group_id={self.group_id},"
+                f" buckets={self.buckets!r})")