netcmd: models: enums and constants also brought forward

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/auth/policy.py b/python/samba/netcmd/domain/auth/policy.py
index de9ce4b004f0b49acd6ed5fc1de3af34b82d4d30..f65cff2738114e71fe26b922eae9d70e7bb66f43 100644 (file)
--- a/python/samba/netcmd/domain/auth/policy.py
+++ b/python/samba/netcmd/domain/auth/policy.py
@@ -22,10 +22,10 @@
 
 import samba.getopt as options
 from samba.netcmd import Command, CommandError, Option, SuperCommand
-from samba.netcmd.domain.models import AuthenticationPolicy,\
-    AuthenticationSilo, Group
-from samba.netcmd.domain.models.auth_policy import MIN_TGT_LIFETIME,\
-    MAX_TGT_LIFETIME, StrongNTLMPolicy
+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.netcmd.validators import Range
 

diff --git a/python/samba/netcmd/domain/models/__init__.py b/python/samba/netcmd/domain/models/__init__.py
index 8a6b254c70ae81c2388071e48505c57625bae2ea..b25b6348817d0e92363b2c201638069a7466a4f2 100644 (file)
--- a/python/samba/netcmd/domain/models/__init__.py
+++ b/python/samba/netcmd/domain/models/__init__.py
@@ -20,7 +20,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from .auth_policy import AuthenticationPolicy
+from .auth_policy import (AuthenticationPolicy, StrongNTLMPolicy,
+                          MIN_TGT_LIFETIME, MAX_TGT_LIFETIME)
 from .auth_silo import AuthenticationSilo
 from .claim_type import ClaimType
 from .group import Group

diff --git a/python/samba/tests/samba_tool/domain_models.py b/python/samba/tests/samba_tool/domain_models.py
index e0f21fe22bb9aeec4fc4f72b876f5a80aa43fa89..d58f47bfd9afc2eb3626c550f7977e3d7d578191 100644 (file)
--- a/python/samba/tests/samba_tool/domain_models.py
+++ b/python/samba/tests/samba_tool/domain_models.py
@@ -27,8 +27,8 @@ 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 Group, User, fields
-from samba.netcmd.domain.models.auth_policy import StrongNTLMPolicy
+from samba.netcmd.domain.models import (Group, Site, User, StrongNTLMPolicy,
+                                        fields)
 from samba.ndr import ndr_pack, ndr_unpack
 
 from .base import SambaToolCmdTest