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

python: domain: models: move OrganizationalPerson to org.py

There are other models like OrganizationalUnit which can go in org.py better if this is done first

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:33:17 +13:00 committed by Andrew Bartlett
parent 3c0833ead5
commit 5ac4b6969b
4 changed files with 38 additions and 13 deletions

View File

@ -29,7 +29,8 @@ from .container import Container
from .gmsa import GroupManagedServiceAccount
from .group import Group
from .model import Model
from .person import OrganizationalPerson, Person
from .org import OrganizationalPerson
from .person import Person
from .registry import MODELS
from .schema import AttributeSchema, ClassSchema
from .site import Site

View File

@ -0,0 +1,33 @@
# Unix SMB/CIFS implementation.
#
# Organizational models.
#
# 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/>.
#
from .fields import IntegerField, StringField
from .person import Person
class OrganizationalPerson(Person):
country_code = IntegerField("countryCode")
given_name = StringField("givenName")
@staticmethod
def get_object_class():
return "organizationalPerson"

View File

@ -1,6 +1,6 @@
# Unix SMB/CIFS implementation.
#
# Person and OrganisationalPerson models.
# Person model.
#
# Copyright (C) Catalyst.Net Ltd. 2024
#
@ -20,7 +20,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
from .fields import IntegerField, StringField
from .fields import StringField
from .model import Model
@ -30,12 +30,3 @@ class Person(Model):
@staticmethod
def get_object_class():
return "person"
class OrganizationalPerson(Person):
country_code = IntegerField("countryCode")
given_name = StringField("givenName")
@staticmethod
def get_object_class():
return "organizationalPerson"

View File

@ -27,7 +27,7 @@ from samba.dsdb import DS_GUID_USERS_CONTAINER
from .exceptions import NotFound
from .fields import DnField, EnumField, IntegerField, NtTimeField, StringField
from .person import OrganizationalPerson
from .org import OrganizationalPerson
from .types import AccountType, UserAccountControl