@@ -29,7 +29,7 @@ from desktop.models import Settings
from oozie.tests import OozieBase
if ENABLE_ORGANIZATIONS.get():
- from useradmin.models2 import OrganizationUser as User
+ from useradmin.models import User
else:
from django.contrib.auth.models import User
@@ -52,7 +52,7 @@ from metastore.conf import FORCE_HS2_METADATA
from metastore.views import _get_db, _get_servername
@@ -40,7 +40,7 @@ from beeswax.server import dbms
from beeswax.server.dbms import get_query_server_config, QueryServerException
@@ -39,7 +39,7 @@ from librdbms.server import dbms as librdbms_dbms
from beeswax.design import HQLdesign
@@ -47,7 +47,7 @@ from beeswax.server.dbms import get_query_server_config
from beeswax.server import dbms
@@ -98,7 +98,7 @@ else:
from cStringIO import StringIO as string_io
@@ -58,7 +58,7 @@ from beeswax.server.dbms import expand_exception, get_query_server_config, Query
from desktop.auth.backend import is_admin
@@ -38,7 +38,7 @@ from filebrowser.lib import rwx
- from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, default_organization
+ from useradmin.models import User, Group, default_organization
from django.contrib.auth.models import User, Group
@@ -79,7 +79,7 @@ from filebrowser.forms import RenameForm, UploadFileForm, UploadArchiveForm, MkD
- from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+ from useradmin.models import User, Group
@@ -67,7 +67,7 @@ else:
from urllib import unquote as urllib_unquote
@@ -32,7 +32,7 @@ from hbased.ttypes import AlreadyExists
from hbase.api import HbaseApi
@@ -35,7 +35,7 @@ from nose.plugins.skip import SkipTest
from django.urls import reverse
@@ -46,7 +46,7 @@ from impala import conf
from impala.dbms import ImpalaDbms
@@ -49,7 +49,7 @@ from jobbrowser.models import can_view_job, can_modify_job, LinkJobLogs
from jobbrowser.yarn_models import SparkJob
@@ -26,7 +26,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
from desktop.lib.parameterization import find_parameters, bind_parameters
@@ -34,7 +34,7 @@ from liboozie.oozie_api_tests import OozieServerProvider
from oozie.models import Workflow, Node, Start, Kill, End, Link
@@ -45,7 +45,7 @@ from beeswax.server import dbms
from beeswax.test_base import BeeswaxSampleProvider
@@ -65,7 +65,7 @@ else:
@@ -42,7 +42,7 @@ from oozie.models2 import Node, Workflow, WorkflowConfiguration, find_dollar_var
from oozie.tests import OozieMockBase, save_temp_workflow, MockOozieApi
@@ -69,7 +69,7 @@ else:
@@ -32,7 +32,7 @@ from desktop.models import Document as Doc, SAMPLE_USER_ID
from hadoop.fs.hadoopfs import Hdfs
@@ -40,7 +40,7 @@ from pig.models import create_or_update_script, PigScript
from pig.api import OozieApi, get
@@ -31,7 +31,7 @@ from libsolr.api import SolrApi
from search.conf import SOLR_URL
@@ -34,7 +34,7 @@ from dashboard.models import Collection2
from dashboard.controller import DashboardController
@@ -30,7 +30,7 @@ from useradmin.models import HuePermission, GroupPermission
from security.api.hive import _to_sentry_privilege
@@ -30,7 +30,7 @@ from sqoop.client.job import Job
from sqoop.test_base import SqoopServerProvider
@@ -23,7 +23,7 @@ from desktop.lib.django_util import JsonResponse
from desktop.lib.i18n import smart_unicode
@@ -34,7 +34,7 @@ from useradmin.hue_password_policy import hue_get_password_validators
from useradmin.models import GroupPermission, HuePermission, get_default_user_group
- from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, default_organization, Organization
+ from useradmin.models import User, Group, default_organization, Organization
@@ -30,7 +30,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
from desktop.lib.python_util import CaseInsensitiveDict
@@ -38,7 +38,7 @@ from useradmin.views import import_ldap_users
from useradmin import ldap_access
@@ -59,7 +59,7 @@ from hadoop import cluster
import useradmin.conf
+ from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, Organization, default_organization
@@ -23,7 +23,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
from desktop.views import commonheader, commonfooter
- from useradmin.models2 import OrganizationGroup as Group
+ from useradmin.models import Group
from django.contrib.auth.models import Group
%>
@@ -42,7 +42,7 @@ from useradmin import ldap_access
from useradmin.tests import BaseUserAdminTests, LdapTestConnection, reset_all_groups, reset_all_users
@@ -41,7 +41,7 @@ from useradmin import ldap_access
@@ -56,7 +56,7 @@ from useradmin.models import get_profile, get_default_user_group
from useradmin.hue_password_policy import reset_password_policy
@@ -25,7 +25,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
from desktop.lib.django_test_util import make_logged_in_client
@@ -55,7 +55,7 @@ from useradmin.models import HuePermission, UserProfile, LdapGroup
from useradmin.models import get_profile, get_default_user_group
@@ -28,7 +28,7 @@ from desktop.lib.test_utils import grant_access
from desktop.models import Document2
@@ -32,7 +32,7 @@ from pig.models import PigScript
from useradmin.models import get_default_user_group
@@ -55,7 +55,7 @@ from useradmin import ldap_access
from useradmin.models import get_profile, get_default_user_group, UserProfile
- from useradmin.models2 import OrganizationUser as User, Organization
+ from useradmin.models import User, Organization
@@ -32,7 +32,7 @@ from useradmin.hue_password_policy import hue_get_password_validators
if conf.ENABLE_ORGANIZATIONS.get():
@@ -52,7 +52,7 @@ from desktop.log.access import access_log, access_warn, last_access_map
from desktop.settings import LOAD_BALANCER_COOKIE
@@ -37,7 +37,7 @@ from desktop.lib.django_test_util import make_logged_in_client
from desktop.lib.test_utils import add_to_group
@@ -29,7 +29,7 @@ from desktop.models import DefaultConfiguration
@@ -37,7 +37,7 @@ from desktop.lib.test_utils import grant_access
from desktop.models import Directory, Document, Document2, DocumentPermission, DocumentTag
@@ -28,7 +28,7 @@ import nose.tools
from desktop.conf import ENABLE_ORGANIZATIONS
@@ -28,7 +28,7 @@ from desktop.auth.backend import is_admin
from desktop.conf import DEFAULT_USER, ENABLE_ORGANIZATIONS
@@ -29,7 +29,7 @@ from desktop.lib.django_test_util import make_logged_in_client
from desktop.lib.test_utils import add_permission, remove_from_group
@@ -27,7 +27,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
from desktop.converters import DocumentConverter
@@ -28,7 +28,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
from desktop.lib.metrics import global_registry
@@ -61,7 +61,7 @@ from desktop import appmanager
from desktop import metrics
@@ -63,7 +63,7 @@ else:
from urllib import quote as urllib_quote
from desktop.lib.django_util import get_username_re_rule
@@ -81,7 +81,7 @@ else:
@@ -40,7 +40,7 @@ from useradmin.models import get_default_user_group
from oozie.models2 import Workflow
@@ -33,7 +33,7 @@ from aws.s3.s3test_utils import S3TestBase, generate_id
from aws.s3.upload import DEFAULT_WRITE_SIZE
@@ -34,7 +34,7 @@ from dashboard.models import Collection2, augment_response
@@ -30,7 +30,7 @@ from indexer.conf import CONFIG_JARS_LIBS_PATH, config_morphline_path
from libzookeeper.conf import zkensemble
from indexer.indexers.envelope import EnvelopeIndexer
@@ -29,7 +29,7 @@ from metadata.manager_client import ManagerApi
from indexer.conf import config_morphline_path
@@ -24,7 +24,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
from indexer.indexers.flume import FlumeIndexer
@@ -36,7 +36,7 @@ from indexer.indexers.morphline_operations import get_checked_args
from indexer.solr_client import SolrClient
@@ -48,7 +48,7 @@ else:
from StringIO import StringIO as string_io
@@ -33,7 +33,7 @@ from notebook.connectors.base import get_api
from notebook.models import make_notebook
@@ -39,7 +39,7 @@ else:
from urlparse import urlparse
@@ -28,7 +28,7 @@ from desktop.lib.django_test_util import make_logged_in_client
from indexer.indexers.sql import SQLIndexer
@@ -31,7 +31,7 @@ from indexer.indexers.rdbms import _get_api
from librdbms.server import dbms as rdbms
@@ -27,7 +27,7 @@ from desktop.lib.test_utils import add_to_group, grant_access
@@ -34,7 +34,7 @@ from indexer.conf import get_solr_ensemble
from indexer.controller import CollectionManagerController
@@ -36,7 +36,7 @@ import liboauth.conf
import liboauth.metrics
@@ -47,7 +47,7 @@ import liboauth.conf
from liboauth.backend import OAuthBackend
@@ -41,7 +41,7 @@ from liboozie.credentials_tests import TestCredentials
from liboozie.submission2 import Submission
@@ -33,7 +33,7 @@ from useradmin.views import ensure_home_directory
from liboozie.submittion import Submission
@@ -29,7 +29,7 @@ from liboozie.utils import config_gen
from oozie.tests import MockOozieApi
@@ -32,7 +32,7 @@ from useradmin.models import get_profile, get_default_user_group, UserProfile
from libopenid import metrics
@@ -35,7 +35,7 @@ from libsaml import metrics
from libsentry.privilege_checker import PrivilegeChecker
@@ -41,7 +41,7 @@ from libsentry.sentry_ha import get_next_available_server
from libsentry.sentry_site import get_sentry_server
@@ -33,7 +33,7 @@ from hadoop.pseudo_hdfs4 import is_live_cluster
from libsolr.api import SolrApi
@@ -32,7 +32,7 @@ from libzookeeper.models import ZookeeperClient
from libzookeeper.conf import zkensemble, ENSEMBLE
@@ -34,7 +34,7 @@ from metadata.metadata_sites import get_navigator_hue_server_name
from metadata.catalog.navigator_client import NavigatorApi
@@ -37,7 +37,7 @@ from metadata.catalog.navigator_client import NavigatorApi
from metadata.catalog.atlas_client import AtlasApi
from metadata.optimizer_api import _convert_queries
@@ -31,7 +31,7 @@ from metadata.conf import OPTIMIZER, has_optimizer
from desktop.models import uuid_default
from beeswax.test_base import BeeswaxSampleProvider, get_query_server_config, is_hive_on_spark
@@ -30,7 +30,7 @@ from desktop.lib.test_utils import add_to_group, grant_access
from notebook.connectors.sql_alchemy import SqlAlchemyApi
@@ -28,7 +28,7 @@ from desktop.models import Directory, Document, Document2, Document2Permission,
from useradmin.models import get_default_user_group, install_sample_user
@@ -49,7 +49,7 @@ else:
@@ -53,7 +53,7 @@ else:
@@ -43,7 +43,7 @@ from notebook.conf import get_ordered_interpreters, INTERPRETERS_SHOWN_ON_WHEEL,
from notebook.models import Analytics