sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

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

Browse Source 
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>
This commit is contained in:
Rob van der Linde 2024-03-22 11:02:50 +13:00 committed by Andrew Bartlett
parent bfd1f8cd46
commit 3c0833ead5
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/domain/models/__init__.py
View File

@ -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

4
python/samba/domain/models/constants.py
View File

@ -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)"

2
python/samba/domain/models/model.py
View File

@ -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):

2
python/samba/domain/models/query.py
View File

@ -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]|$))")

25
python/samba/domain/models/registry.py Normal file
View File

@ -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 = {}