python: domain: models: move MODELS to registry.py because it's not really a constant

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/__init__.py b/python/samba/domain/models/__init__.py
index fe05bac1482a0860c5004f260e8921ee40642073..f3cdad0c8fd033343f62d94ce9797040f42d185d 100644 (file)
--- a/python/samba/domain/models/__init__.py
+++ b/python/samba/domain/models/__init__.py
@@ -25,12 +25,12 @@ from .auth_policy import (AuthenticationPolicy, StrongNTLMPolicy,
 from .auth_silo import AuthenticationSilo
 from .claim_type import ClaimType
 from .computer import Computer
-from .constants import MODELS
 from .container import Container
 from .gmsa import GroupManagedServiceAccount
 from .group import Group
 from .model import Model
 from .person import OrganizationalPerson, Person
+from .registry import MODELS
 from .schema import AttributeSchema, ClassSchema
 from .site import Site
 from .subnet import Subnet

diff --git a/python/samba/domain/models/constants.py b/python/samba/domain/models/constants.py
index aa1b030744595bbbae464c97ce9a678e6c64dd9f..0afef5ce19f18ddd42bd09bc1c9da7c0d41673f7 100644 (file)
--- a/python/samba/domain/models/constants.py
+++ b/python/samba/domain/models/constants.py
@@ -20,9 +20,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# Keeps track of registered models.
-# This gets populated by the ModelMeta class.
-MODELS = {}
-
 # Default SDDL for GroupManagedServiceAccount msDS-GroupMSAMembership field.
 GROUP_MSA_MEMBERSHIP_DEFAULT = "O:BAD:(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;LA)"

diff --git a/python/samba/domain/models/model.py b/python/samba/domain/models/model.py
index 3671eaf367bb02883f372aa2777476aa9540c79b..268aa26dd3313e93649c042b18c92bd29be93f52 100644 (file)
--- a/python/samba/domain/models/model.py
+++ b/python/samba/domain/models/model.py
@@ -27,12 +27,12 @@ from ldb import (ERR_NO_SUCH_OBJECT, FLAG_MOD_ADD, FLAG_MOD_REPLACE,
                  SCOPE_ONELEVEL, SCOPE_SUBTREE)
 from samba.sd_utils import SDUtils
 
-from .constants import MODELS
 from .exceptions import (DeleteError, FieldError, NotFound, ProtectError,
                          UnprotectError)
 from .fields import (DateTimeField, DnField, Field, GUIDField, IntegerField,
                      SIDField, StringField)
 from .query import Query
+from .registry import MODELS
 
 
 class ModelMeta(type):

diff --git a/python/samba/domain/models/query.py b/python/samba/domain/models/query.py
index a3d280f46a1e98b7292a713f22af8d3c1916028d..777bad6c5ea105d7395c3a91ab79229d7d351dc6 100644 (file)
--- a/python/samba/domain/models/query.py
+++ b/python/samba/domain/models/query.py
@@ -22,8 +22,8 @@
 
 import re
 
-from .constants import MODELS
 from .exceptions import NotFound, MultipleObjectsReturned
+from .registry import MODELS
 
 RE_SPLIT_CAMELCASE = re.compile(r"[A-Z](?:[a-z]+|[A-Z]*(?=[A-Z]|$))")
 

diff --git a/python/samba/domain/models/registry.py b/python/samba/domain/models/registry.py
new file mode 100644 (file)
index 0000000..9968613
--- /dev/null
+++ b/python/samba/domain/models/registry.py
@@ -0,0 +1,25 @@
+# Unix SMB/CIFS implementation.
+#
+# Model registry.
+#
+# Copyright (C) Catalyst.Net Ltd. 2024
+#
+# Written by Rob van der Linde <rob@catalyst.net.nz>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Keeps track of registered models.
+# This gets populated by the ModelMeta class.
+MODELS = {}