netcmd: models: Add optional base_dn argument to Model.query method

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 b4f34ce75e44505e4c7a96388cbb9f7d9f22605d..a9b10a7b53ef6a30fdac2dca76e23dbef75a1ee5 100644 (file)
--- a/python/samba/netcmd/domain/models/model.py
+++ b/python/samba/netcmd/domain/models/model.py
@@ -225,7 +225,7 @@ class Model(metaclass=ModelMeta):
         return expression
 
     @classmethod
-    def query(cls, ldb, polymorphic=False, **kwargs):
+    def query(cls, ldb, polymorphic=False, base_dn=None, **kwargs):
         """Returns a search query for this model.
 
         NOTE: If polymorphic is enabled then querying will return instances
@@ -237,9 +237,11 @@ class Model(metaclass=ModelMeta):
 
         :param ldb: Ldb connection
         :param polymorphic: If true enables polymorphic querying (see note)
+        :param base_dn: Optional provide base dn for searching or use the model
         :param kwargs: Search criteria as keyword args
         """
-        base_dn = cls.get_search_dn(ldb)
+        if base_dn is None:
+            base_dn = cls.get_search_dn(ldb)
 
         # If the container does not exist produce a friendly error message.
         try: