python: move models out of the netcmd package

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/netcmd/domain/models/__init__.py b/python/samba/domain/models/__init__.py
similarity index 100%
rename from python/samba/netcmd/domain/models/__init__.py
rename to python/samba/domain/models/__init__.py

diff --git a/python/samba/netcmd/domain/models/auth_policy.py b/python/samba/domain/models/auth_policy.py
similarity index 100%
rename from python/samba/netcmd/domain/models/auth_policy.py
rename to python/samba/domain/models/auth_policy.py

diff --git a/python/samba/netcmd/domain/models/auth_silo.py b/python/samba/domain/models/auth_silo.py
similarity index 100%
rename from python/samba/netcmd/domain/models/auth_silo.py
rename to python/samba/domain/models/auth_silo.py

diff --git a/python/samba/netcmd/domain/models/claim_type.py b/python/samba/domain/models/claim_type.py
similarity index 100%
rename from python/samba/netcmd/domain/models/claim_type.py
rename to python/samba/domain/models/claim_type.py

diff --git a/python/samba/netcmd/domain/models/computer.py b/python/samba/domain/models/computer.py
similarity index 100%
rename from python/samba/netcmd/domain/models/computer.py
rename to python/samba/domain/models/computer.py

diff --git a/python/samba/netcmd/domain/models/constants.py b/python/samba/domain/models/constants.py
similarity index 100%
rename from python/samba/netcmd/domain/models/constants.py
rename to python/samba/domain/models/constants.py

diff --git a/python/samba/netcmd/domain/models/exceptions.py b/python/samba/domain/models/exceptions.py
similarity index 100%
rename from python/samba/netcmd/domain/models/exceptions.py
rename to python/samba/domain/models/exceptions.py

diff --git a/python/samba/netcmd/domain/models/fields.py b/python/samba/domain/models/fields.py
similarity index 100%
rename from python/samba/netcmd/domain/models/fields.py
rename to python/samba/domain/models/fields.py

diff --git a/python/samba/netcmd/domain/models/gmsa.py b/python/samba/domain/models/gmsa.py
similarity index 100%
rename from python/samba/netcmd/domain/models/gmsa.py
rename to python/samba/domain/models/gmsa.py

diff --git a/python/samba/netcmd/domain/models/group.py b/python/samba/domain/models/group.py
similarity index 100%
rename from python/samba/netcmd/domain/models/group.py
rename to python/samba/domain/models/group.py

diff --git a/python/samba/netcmd/domain/models/model.py b/python/samba/domain/models/model.py
similarity index 100%
rename from python/samba/netcmd/domain/models/model.py
rename to python/samba/domain/models/model.py

diff --git a/python/samba/netcmd/domain/models/person.py b/python/samba/domain/models/person.py
similarity index 100%
rename from python/samba/netcmd/domain/models/person.py
rename to python/samba/domain/models/person.py

diff --git a/python/samba/netcmd/domain/models/query.py b/python/samba/domain/models/query.py
similarity index 100%
rename from python/samba/netcmd/domain/models/query.py
rename to python/samba/domain/models/query.py

diff --git a/python/samba/netcmd/domain/models/schema.py b/python/samba/domain/models/schema.py
similarity index 100%
rename from python/samba/netcmd/domain/models/schema.py
rename to python/samba/domain/models/schema.py

diff --git a/python/samba/netcmd/domain/models/site.py b/python/samba/domain/models/site.py
similarity index 100%
rename from python/samba/netcmd/domain/models/site.py
rename to python/samba/domain/models/site.py

diff --git a/python/samba/netcmd/domain/models/subnet.py b/python/samba/domain/models/subnet.py
similarity index 100%
rename from python/samba/netcmd/domain/models/subnet.py
rename to python/samba/domain/models/subnet.py

diff --git a/python/samba/netcmd/domain/models/types.py b/python/samba/domain/models/types.py
similarity index 100%
rename from python/samba/netcmd/domain/models/types.py
rename to python/samba/domain/models/types.py

diff --git a/python/samba/netcmd/domain/models/user.py b/python/samba/domain/models/user.py
similarity index 100%
rename from python/samba/netcmd/domain/models/user.py
rename to python/samba/domain/models/user.py

diff --git a/python/samba/netcmd/domain/models/value_type.py b/python/samba/domain/models/value_type.py
similarity index 100%
rename from python/samba/netcmd/domain/models/value_type.py
rename to python/samba/domain/models/value_type.py

diff --git a/python/samba/netcmd/domain/auth/policy.py b/python/samba/netcmd/domain/auth/policy.py
index d7156510a1c05acd950ecf87f69a1f59b5f1e051..8e45a3f08345ab73ce5314be6bac460a8a221aae 100644 (file)
--- a/python/samba/netcmd/domain/auth/policy.py
+++ b/python/samba/netcmd/domain/auth/policy.py
@@ -22,11 +22,11 @@
 
 import samba.getopt as options
 from samba.netcmd import Command, CommandError, Option, SuperCommand
-from samba.netcmd.domain.models import (AuthenticationPolicy,
-                                        AuthenticationSilo, Group,
-                                        MAX_TGT_LIFETIME, MIN_TGT_LIFETIME,
-                                        StrongNTLMPolicy)
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models import (AuthenticationPolicy,
+                                 AuthenticationSilo, Group,
+                                 MAX_TGT_LIFETIME, MIN_TGT_LIFETIME,
+                                 StrongNTLMPolicy)
+from samba.domain.models.exceptions import ModelError
 from samba.netcmd.validators import Range
 
 

diff --git a/python/samba/netcmd/domain/auth/silo.py b/python/samba/netcmd/domain/auth/silo.py
index f792e8a85420c3c1278c82da47813ea79ea2de82..cfa7b3827d5c65a11ee2c9c3d6cce946e65503cb 100644 (file)
--- a/python/samba/netcmd/domain/auth/silo.py
+++ b/python/samba/netcmd/domain/auth/silo.py
@@ -22,8 +22,8 @@
 
 import samba.getopt as options
 from samba.netcmd import Command, CommandError, Option, SuperCommand
-from samba.netcmd.domain.models import AuthenticationPolicy, AuthenticationSilo
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models import AuthenticationPolicy, AuthenticationSilo
+from samba.domain.models.exceptions import ModelError
 
 from .silo_member import cmd_domain_auth_silo_member
 

diff --git a/python/samba/netcmd/domain/auth/silo_member.py b/python/samba/netcmd/domain/auth/silo_member.py
index 9b414006e744ebdb5e90e1e6f83ffe3c188e2f36..e8777c45608da82fe8698b8d21e7c8ebc712dd1c 100644 (file)
--- a/python/samba/netcmd/domain/auth/silo_member.py
+++ b/python/samba/netcmd/domain/auth/silo_member.py
@@ -22,8 +22,8 @@
 
 import samba.getopt as options
 from samba.netcmd import Command, CommandError, Option, SuperCommand
-from samba.netcmd.domain.models import AuthenticationSilo, User
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models import AuthenticationSilo, User
+from samba.domain.models.exceptions import ModelError
 
 
 class cmd_domain_auth_silo_member_grant(Command):

diff --git a/python/samba/netcmd/domain/claim/claim_type.py b/python/samba/netcmd/domain/claim/claim_type.py
index 0801f0fd0dbfc26bd9db0d30ad6bedd62c5f8ecc..36e251d290af1c8e2b7c22f61209cac800412c49 100644 (file)
--- a/python/samba/netcmd/domain/claim/claim_type.py
+++ b/python/samba/netcmd/domain/claim/claim_type.py
@@ -22,9 +22,8 @@
 
 import samba.getopt as options
 from samba.netcmd import Command, CommandError, Option, SuperCommand
-from samba.netcmd.domain.models import AttributeSchema, ClassSchema,\
-    ClaimType, ValueType
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models import AttributeSchema, ClassSchema, ClaimType, ValueType
+from samba.domain.models.exceptions import ModelError
 
 
 class cmd_domain_claim_claim_type_create(Command):

diff --git a/python/samba/netcmd/domain/claim/value_type.py b/python/samba/netcmd/domain/claim/value_type.py
index ca30bd6890441b753c0ae590b74b08fec753307e..738cda57e7827fdbbcd35ef632c257b275a29ac9 100644 (file)
--- a/python/samba/netcmd/domain/claim/value_type.py
+++ b/python/samba/netcmd/domain/claim/value_type.py
@@ -22,8 +22,8 @@
 
 import samba.getopt as options
 from samba.netcmd import Command, CommandError, Option, SuperCommand
-from samba.netcmd.domain.models import ValueType
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models import ValueType
+from samba.domain.models.exceptions import ModelError
 
 
 class cmd_domain_claim_value_type_list(Command):

diff --git a/python/samba/netcmd/service_account/group_msa_membership.py b/python/samba/netcmd/service_account/group_msa_membership.py
index e27e333d9d2a6096764c5fe01726be09e0e9edf1..c285cd8624616af31d0f80a16c0474d989619f28 100644 (file)
--- a/python/samba/netcmd/service_account/group_msa_membership.py
+++ b/python/samba/netcmd/service_account/group_msa_membership.py
@@ -21,9 +21,8 @@
 
 from samba.getopt import CredentialsOptions, HostOptions, Option, SambaOptions
 from samba.netcmd import Command, CommandError, SuperCommand
-from samba.netcmd.domain.models import (Group, GroupManagedServiceAccount,
-                                        Model, User)
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models import Group, GroupManagedServiceAccount, Model, User
+from samba.domain.models.exceptions import ModelError
 
 
 class cmd_service_account_group_msa_membership_show(Command):

diff --git a/python/samba/netcmd/service_account/service_account.py b/python/samba/netcmd/service_account/service_account.py
index 4a3f78786d926c971646261fec21b15e83df65f9..0801b1d6aa912b14e70405751cd4dfab928f2aa8 100644 (file)
--- a/python/samba/netcmd/service_account/service_account.py
+++ b/python/samba/netcmd/service_account/service_account.py
@@ -22,10 +22,10 @@
 
 from samba.getopt import CredentialsOptions, HostOptions, Option, SambaOptions
 from samba.netcmd import Command, CommandError
-from samba.netcmd.domain.models import (AccountType, Computer, Group,
-                                        GroupManagedServiceAccount,
-                                        SupportedEncryptionTypes, User)
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models import (AccountType, Computer, Group,
+                                 GroupManagedServiceAccount,
+                                 SupportedEncryptionTypes, User)
+from samba.domain.models.exceptions import ModelError
 
 
 class cmd_service_account_list(Command):

diff --git a/python/samba/netcmd/shell.py b/python/samba/netcmd/shell.py
index 6f1b3e6ca75bf3fbc3fd878247e3479a72a5cf50..58bae299ba1b7e651fe896b7e44aa3db2bfea6fa 100644 (file)
--- a/python/samba/netcmd/shell.py
+++ b/python/samba/netcmd/shell.py
@@ -29,7 +29,7 @@ import ldb
 import samba.getopt as options
 from samba import version
 from samba.netcmd import Command
-from samba.netcmd.domain.models import MODELS
+from samba.domain.models import MODELS
 
 
 class cmd_shell(Command):

diff --git a/python/samba/netcmd/sites.py b/python/samba/netcmd/sites.py
index 52565d5e2b15970757eedd0349a21871baec06cc..c4fb1f7f5cdbd5553327d7246929ce5dafd62263 100644 (file)
--- a/python/samba/netcmd/sites.py
+++ b/python/samba/netcmd/sites.py
@@ -24,8 +24,8 @@ from samba.netcmd import (
     SuperCommand,
     Option,
 )
-from samba.netcmd.domain.models import Site, Subnet
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models import Site, Subnet
+from samba.domain.models.exceptions import ModelError
 
 
 class cmd_sites_list(Command):

diff --git a/python/samba/netcmd/user/auth/policy.py b/python/samba/netcmd/user/auth/policy.py
index 9c303705ac40d14e5caefa6c39616b3fd9cbafa7..36aa650ec6c22319d4054d5d40c10aa20ab859af 100644 (file)
--- a/python/samba/netcmd/user/auth/policy.py
+++ b/python/samba/netcmd/user/auth/policy.py
@@ -22,8 +22,8 @@
 
 import samba.getopt as options
 from samba.netcmd import Command, CommandError, Option, SuperCommand
-from samba.netcmd.domain.models import AuthenticationPolicy, User
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models import AuthenticationPolicy, User
+from samba.domain.models.exceptions import ModelError
 
 
 class cmd_user_auth_policy_assign(Command):

diff --git a/python/samba/netcmd/user/auth/silo.py b/python/samba/netcmd/user/auth/silo.py
index 992f63cde020ef85b5f4852af1da47cf65bd0e1a..cbde58aa00e90c6271d89540c35a40f856c03c86 100644 (file)
--- a/python/samba/netcmd/user/auth/silo.py
+++ b/python/samba/netcmd/user/auth/silo.py
@@ -22,8 +22,8 @@
 
 import samba.getopt as options
 from samba.netcmd import Command, CommandError, Option, SuperCommand
-from samba.netcmd.domain.models import AuthenticationSilo, User
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models import AuthenticationSilo, User
+from samba.domain.models.exceptions import ModelError
 
 
 class cmd_user_auth_silo_assign(Command):

diff --git a/python/samba/tests/krb5/authn_policy_tests.py b/python/samba/tests/krb5/authn_policy_tests.py
index 2f15f8b24171b0529cf19ff90196106b370e8299..9e441216268ebd3ae595f666480159dd444d91ed 100755 (executable)
--- a/python/samba/tests/krb5/authn_policy_tests.py
+++ b/python/samba/tests/krb5/authn_policy_tests.py
@@ -34,7 +34,7 @@ from samba import dsdb, ntstatus
 from samba.dcerpc import netlogon, security
 from samba.dcerpc import windows_event_ids as win_event
 from samba.ndr import ndr_pack
-from samba.netcmd.domain.models import AuthenticationPolicy, AuthenticationSilo
+from samba.domain.models import AuthenticationPolicy, AuthenticationSilo
 
 import samba.tests
 import samba.tests.krb5.kcrypto as kcrypto

diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
index 110a405f9cb734733fb8d7b2a2b14a49cd00d3ad..7ad2f19d17e891d968107b4c329076de4eca57ae 100644 (file)
--- a/python/samba/tests/krb5/kdc_base_test.py
+++ b/python/samba/tests/krb5/kdc_base_test.py
@@ -91,7 +91,7 @@ from samba.dcerpc.misc import (
 from samba.join import DCJoinContext
 from samba.ndr import ndr_pack, ndr_unpack
 from samba import net
-from samba.netcmd.domain.models import AuthenticationPolicy, AuthenticationSilo
+from samba.domain.models import AuthenticationPolicy, AuthenticationSilo
 from samba.param import LoadParm
 from samba.samdb import SamDB, dsdb_Dn
 

diff --git a/python/samba/tests/samba_tool/domain_auth_policy.py b/python/samba/tests/samba_tool/domain_auth_policy.py
index 1854037dd3a9df517651b5396c154043ff9e3150..e0a1956c6f37ad14e94da6f8319fee14df3a4f4e 100644 (file)
--- a/python/samba/tests/samba_tool/domain_auth_policy.py
+++ b/python/samba/tests/samba_tool/domain_auth_policy.py
@@ -26,7 +26,7 @@ from unittest.mock import patch
 
 from samba.dcerpc import security
 from samba.ndr import ndr_pack, ndr_unpack
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models.exceptions import ModelError
 from samba.samdb import SamDB
 from samba.sd_utils import SDUtils
 

diff --git a/python/samba/tests/samba_tool/domain_auth_silo.py b/python/samba/tests/samba_tool/domain_auth_silo.py
index a1cd85c8f057abb6a0c735ebc0cb1b84cde61f81..2659c15c9affc37b86de5bf38adc7b6b83029216 100644 (file)
--- a/python/samba/tests/samba_tool/domain_auth_silo.py
+++ b/python/samba/tests/samba_tool/domain_auth_silo.py
@@ -23,7 +23,7 @@
 import json
 from unittest.mock import patch
 
-from samba.netcmd.domain.models.exceptions import ModelError
+from samba.domain.models.exceptions import ModelError
 from samba.samdb import SamDB
 from samba.sd_utils import SDUtils
 

diff --git a/python/samba/tests/samba_tool/domain_models.py b/python/samba/tests/samba_tool/domain_models.py
index cd50c96de0944c701afa35671d6ad188c93cd579..52d58157f196ef3873de56d5013a3e98cdf6ea2e 100644 (file)
--- a/python/samba/tests/samba_tool/domain_models.py
+++ b/python/samba/tests/samba_tool/domain_models.py
@@ -27,7 +27,7 @@ from xml.etree import ElementTree
 from ldb import FLAG_MOD_ADD, MessageElement, SCOPE_ONELEVEL
 from samba.dcerpc import security
 from samba.dcerpc.misc import GUID
-from samba.netcmd.domain.models import (AccountType, Computer, Group, Site,
+from samba.domain.models import (AccountType, Computer, Group, Site,
                                         User, StrongNTLMPolicy, fields)
 from samba.ndr import ndr_pack, ndr_unpack
 

diff --git a/python/samba/tests/samba_tool/service_account.py b/python/samba/tests/samba_tool/service_account.py
index 3812c2fa808c7900e3c7f5ed3b545927d6123b1e..b2ba83d521e4b3987ccd4bfabd76d493d91d2fa6 100644 (file)
--- a/python/samba/tests/samba_tool/service_account.py
+++ b/python/samba/tests/samba_tool/service_account.py
@@ -23,8 +23,8 @@
 import json
 import os
 
-from samba.netcmd.domain.models import Group, GroupManagedServiceAccount, User
-from samba.netcmd.domain.models.constants import GROUP_MSA_MEMBERSHIP_DEFAULT
+from samba.domain.models import Group, GroupManagedServiceAccount, User
+from samba.domain.models.constants import GROUP_MSA_MEMBERSHIP_DEFAULT
 
 from .base import SambaToolCmdTest
 

diff --git a/python/samba/tests/samba_tool/silo_base.py b/python/samba/tests/samba_tool/silo_base.py
index 451d330850c0a3e27a5a4a14f5dc545950c4566a..7f1a8db03a32ac03958fda375fba14c6ea039c88 100644 (file)
--- a/python/samba/tests/samba_tool/silo_base.py
+++ b/python/samba/tests/samba_tool/silo_base.py
@@ -24,7 +24,7 @@ import os
 
 from ldb import SCOPE_ONELEVEL
 
-from samba.netcmd.domain.models import Group
+from samba.domain.models import Group
 
 from .base import SambaToolCmdTest
 

diff --git a/python/samba/tests/samba_tool/user_auth_policy.py b/python/samba/tests/samba_tool/user_auth_policy.py
index 9a2e1a03f3be659a98f35bd54a1a0db4b949a81a..035a1f2941f3231e3fcd6b92a05b01718533c60c 100644 (file)
--- a/python/samba/tests/samba_tool/user_auth_policy.py
+++ b/python/samba/tests/samba_tool/user_auth_policy.py
@@ -20,7 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from samba.netcmd.domain.models import AuthenticationPolicy, User
+from samba.domain.models import AuthenticationPolicy, User
 
 from .silo_base import SiloTest
 

diff --git a/python/samba/tests/samba_tool/user_auth_silo.py b/python/samba/tests/samba_tool/user_auth_silo.py
index 29d0f974fa007fc09f15137ffe4de2d50ddc824a..8ffc80cfcf4efc40e623c07b6c85c171e2ff50c1 100644 (file)
--- a/python/samba/tests/samba_tool/user_auth_silo.py
+++ b/python/samba/tests/samba_tool/user_auth_silo.py
@@ -20,7 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from samba.netcmd.domain.models import AuthenticationSilo, User
+from samba.domain.models import AuthenticationSilo, User
 
 from .silo_base import SiloTest
 

diff --git a/python/samba/tests/samba_tool/user_get_kerberos_ticket.py b/python/samba/tests/samba_tool/user_get_kerberos_ticket.py
index 52a06f3a1d30e16d3bd6be68008487f1b7c0d0bc..5e9535aef885bc8adc0b3a20b5008e043a55f868 100644 (file)
--- a/python/samba/tests/samba_tool/user_get_kerberos_ticket.py
+++ b/python/samba/tests/samba_tool/user_get_kerberos_ticket.py
@@ -33,7 +33,7 @@ from samba import credentials
 from samba.credentials import MUST_USE_KERBEROS
 from samba.dcerpc import security
 from samba.dsdb import UF_WORKSTATION_TRUST_ACCOUNT, UF_NORMAL_ACCOUNT
-from samba.netcmd.domain.models import User
+from samba.domain.models import User
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.tests import connect_samdb, delete_force
 

diff --git a/python/samba/tests/samba_tool/user_getpassword_gmsa.py b/python/samba/tests/samba_tool/user_getpassword_gmsa.py
index e14e2487d7ab7c6be1442d6bcb3ab8db672164dc..cde87707febc13dfdc874d6cb1c47cdb639611cf 100644 (file)
--- a/python/samba/tests/samba_tool/user_getpassword_gmsa.py
+++ b/python/samba/tests/samba_tool/user_getpassword_gmsa.py
@@ -33,7 +33,7 @@ from ldb import SCOPE_BASE
 from samba.credentials import MUST_USE_KERBEROS
 from samba.dcerpc import security, samr
 from samba.dsdb import UF_WORKSTATION_TRUST_ACCOUNT
-from samba.netcmd.domain.models import User
+from samba.domain.models import User
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.nt_time import nt_time_from_datetime
 from samba.tests import connect_samdb, connect_samdb_env, delete_force