netcmd: models: model __json__ method should call as_dict instead

The comment about RelatedField is not really relevant so removed that part, RelatedField isn't used at this point.

The idea with RelatedField is that it fetches the object (vs DnField which just returns a Dn).

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/netcmd/domain/models/model.py b/python/samba/netcmd/domain/models/model.py
index 0e1f242ce9614533eb419cf70a5ed6c761201e62..b9b5b9c2a94e518885eb26b0837e19e12faad812 100644 (file)
--- a/python/samba/netcmd/domain/models/model.py
+++ b/python/samba/netcmd/domain/models/model.py
@@ -111,13 +111,8 @@ class Model(metaclass=ModelMeta):
             return self.dn == other.dn
 
     def __json__(self):
-        """Automatically called by custom JSONEncoder class.
-
-        When turning an object into json any fields of type RelatedField
-        will also end up calling this method.
-        """
-        if self.dn is not None:
-            return str(self.dn)
+        """Automatically called by custom JSONEncoder class."""
+        return self.as_dict()
 
     @staticmethod
     def get_base_dn(ldb):