netcmd: models: rename DoesNotExist exception to NotFound

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>

diff --git a/python/samba/netcmd/domain/models/exceptions.py b/python/samba/netcmd/domain/models/exceptions.py
index 14ebd774d097fd353851e53d39ed47c8bc1584f4..a1742237d02291e6c542af7d58fbd028b2177d81 100644 (file)
--- a/python/samba/netcmd/domain/models/exceptions.py
+++ b/python/samba/netcmd/domain/models/exceptions.py
@@ -40,7 +40,7 @@ class MultipleObjectsReturned(ModelError):
     pass
 
 
-class DoesNotExist(ModelError):
+class NotFound(ModelError):
     pass
 
 

diff --git a/python/samba/netcmd/domain/models/model.py b/python/samba/netcmd/domain/models/model.py
index 509aff5723b001e313b271ffda4e99ca08abab45..42de54fa5c7fb61e99a8144b33a54ce033771317 100644 (file)
--- a/python/samba/netcmd/domain/models/model.py
+++ b/python/samba/netcmd/domain/models/model.py
@@ -28,8 +28,8 @@ from ldb import (ERR_NO_SUCH_OBJECT, FLAG_MOD_ADD, FLAG_MOD_REPLACE,
                  SCOPE_SUBTREE)
 from samba.sd_utils import SDUtils
 
-from .exceptions import (DeleteError, DoesNotExist, FieldError,
-                         ProtectError, UnprotectError)
+from .exceptions import (DeleteError, FieldError, NotFound, ProtectError,
+                         UnprotectError)
 from .fields import (DateTimeField, DnField, Field, GUIDField, IntegerField,
                      StringField)
 from .query import Query
@@ -181,7 +181,7 @@ class Model(metaclass=ModelMeta):
             res = ldb.search(self.dn, scope=SCOPE_BASE, attrs=attrs)
         except LdbError as e:
             if e.args[0] == ERR_NO_SUCH_OBJECT:
-                raise DoesNotExist(f"Refresh failed, object gone: {self.dn}")
+                raise NotFound(f"Refresh failed, object gone: {self.dn}")
             raise
 
         self._apply(ldb, res[0])
@@ -244,7 +244,7 @@ class Model(metaclass=ModelMeta):
                                 expression=cls.build_expression(**kwargs))
         except LdbError as e:
             if e.args[0] == ERR_NO_SUCH_OBJECT:
-                raise DoesNotExist(f"Container does not exist: {base_dn}")
+                raise NotFound(f"Container does not exist: {base_dn}")
             raise
 
         return Query(cls, ldb, result)

diff --git a/python/samba/netcmd/domain/models/query.py b/python/samba/netcmd/domain/models/query.py
index 9cdb65099c13376c51a9736e37bac7a8febebbd5..0b7fb2dd9a87c1b1a430e209bce04e1c194cc8a3 100644 (file)
--- a/python/samba/netcmd/domain/models/query.py
+++ b/python/samba/netcmd/domain/models/query.py
@@ -22,7 +22,7 @@
 
 import re
 
-from .exceptions import DoesNotExist, MultipleObjectsReturned
+from .exceptions import NotFound, MultipleObjectsReturned
 
 RE_SPLIT_CAMELCASE = re.compile(r"[A-Z](?:[a-z]+|[A-Z]*(?=[A-Z]|$))")
 
@@ -68,11 +68,11 @@ class Query:
         """Must return EXACTLY one item or raise an exception.
 
         :returns: Model instance
-        :raises DoesNotExist: if no results were returned
+        :raises NotFound: if no results were returned
         :raises MultipleObjectsReturned: if more than one results were returned
         """
         if self.count < 1:
-            raise DoesNotExist(
+            raise NotFound(
                 f"{self.name.capitalize()} matching query not found")
         elif self.count > 1:
             raise MultipleObjectsReturned(