python: domain: models: MODELS lookup does need to include base Model for shell command

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

diff --git a/python/samba/domain/models/model.py b/python/samba/domain/models/model.py
index d14a87f6a48615d581c4912d177d7e3337b73bb0..3671eaf367bb02883f372aa2777476aa9540c79b 100644 (file)
--- a/python/samba/domain/models/model.py
+++ b/python/samba/domain/models/model.py
@@ -42,10 +42,7 @@ class ModelMeta(type):
         cls.fields = dict(inspect.getmembers(cls, lambda f: isinstance(f, Field)))
         cls.meta = mcls
         object_class = cls.get_object_class()
-
-        if cls.__name__ != "Model":
-            MODELS[object_class] = cls
-
+        MODELS[object_class] = cls
         return cls
 
 

diff --git a/python/samba/netcmd/shell.py b/python/samba/netcmd/shell.py
index 54c4019df365c44634da2d2c9558f4b69d10a57c..5df3aa11336feaa4f0e72f95979ccaebc639c892 100644 (file)
--- a/python/samba/netcmd/shell.py
+++ b/python/samba/netcmd/shell.py
@@ -50,6 +50,7 @@ class cmd_shell(Command):
         context.update({
             "samdb": samdb,
             "ldb": ldb,
+            "Model": Model,
         })
         context.update({model.__name__: model for model in MODELS.values()})