Ver Fonte

HUE-8530 [organization] Rename imports to not confict with models2

Romain há 6 anos atrás
pai
commit
9a3d6994a0
91 ficheiros alterados com 91 adições e 91 exclusões
  1. 1 1
      apps/about/src/about/tests.py
  2. 1 1
      apps/beeswax/src/beeswax/api.py
  3. 1 1
      apps/beeswax/src/beeswax/management/commands/beeswax_install_examples.py
  4. 1 1
      apps/beeswax/src/beeswax/models.py
  5. 1 1
      apps/beeswax/src/beeswax/test_base.py
  6. 1 1
      apps/beeswax/src/beeswax/tests.py
  7. 1 1
      apps/beeswax/src/beeswax/views.py
  8. 1 1
      apps/filebrowser/src/filebrowser/forms.py
  9. 1 1
      apps/filebrowser/src/filebrowser/views.py
  10. 1 1
      apps/filebrowser/src/filebrowser/views_test.py
  11. 1 1
      apps/hbase/src/hbase/management/commands/hbase_setup.py
  12. 1 1
      apps/hbase/src/hbase/tests.py
  13. 1 1
      apps/impala/src/impala/tests.py
  14. 1 1
      apps/jobbrowser/src/jobbrowser/tests.py
  15. 1 1
      apps/jobsub/src/jobsub/models.py
  16. 1 1
      apps/jobsub/src/jobsub/tests.py
  17. 1 1
      apps/metastore/src/metastore/tests.py
  18. 1 1
      apps/oozie/src/oozie/models.py
  19. 1 1
      apps/oozie/src/oozie/models2_tests.py
  20. 1 1
      apps/oozie/src/oozie/tests.py
  21. 1 1
      apps/pig/src/pig/models.py
  22. 1 1
      apps/pig/src/pig/tests.py
  23. 1 1
      apps/search/src/search/models.py
  24. 1 1
      apps/search/src/search/tests.py
  25. 1 1
      apps/security/src/security/tests.py
  26. 1 1
      apps/sqoop/src/sqoop/tests.py
  27. 1 1
      apps/useradmin/src/useradmin/api.py
  28. 1 1
      apps/useradmin/src/useradmin/forms.py
  29. 1 1
      apps/useradmin/src/useradmin/ldap_access.py
  30. 1 1
      apps/useradmin/src/useradmin/middleware.py
  31. 1 1
      apps/useradmin/src/useradmin/models.py
  32. 1 1
      apps/useradmin/src/useradmin/templates/list_permissions.mako
  33. 1 1
      apps/useradmin/src/useradmin/test_ldap.py
  34. 1 1
      apps/useradmin/src/useradmin/test_ldap_deprecated.py
  35. 1 1
      apps/useradmin/src/useradmin/tests.py
  36. 1 1
      apps/useradmin/src/useradmin/tests_api.py
  37. 1 1
      apps/useradmin/src/useradmin/views.py
  38. 1 1
      desktop/core/src/desktop/api2_tests.py
  39. 1 1
      desktop/core/src/desktop/api_tests.py
  40. 1 1
      desktop/core/src/desktop/auth/backend.py
  41. 1 1
      desktop/core/src/desktop/auth/forms.py
  42. 1 1
      desktop/core/src/desktop/auth/views.py
  43. 1 1
      desktop/core/src/desktop/auth/views_test.py
  44. 1 1
      desktop/core/src/desktop/configuration/tests.py
  45. 1 1
      desktop/core/src/desktop/converter_tests.py
  46. 1 1
      desktop/core/src/desktop/lib/django_test_util.py
  47. 1 1
      desktop/core/src/desktop/lib/fs/proxyfs.py
  48. 1 1
      desktop/core/src/desktop/lib/fs/proxyfs_test.py
  49. 1 1
      desktop/core/src/desktop/management/commands/convert_documents.py
  50. 1 1
      desktop/core/src/desktop/management/commands/create_user_directories.py
  51. 1 1
      desktop/core/src/desktop/metrics.py
  52. 1 1
      desktop/core/src/desktop/middleware.py
  53. 1 1
      desktop/core/src/desktop/models.py
  54. 1 1
      desktop/core/src/desktop/monkey_patches.py
  55. 1 1
      desktop/core/src/desktop/tests.py
  56. 1 1
      desktop/core/src/desktop/tests_doc2.py
  57. 1 1
      desktop/libs/aws/src/aws/s3/s3fs_test.py
  58. 1 1
      desktop/libs/dashboard/src/dashboard/tests.py
  59. 1 1
      desktop/libs/indexer/src/indexer/indexers/envelope.py
  60. 1 1
      desktop/libs/indexer/src/indexer/indexers/envelope_tests.py
  61. 1 1
      desktop/libs/indexer/src/indexer/indexers/flume.py
  62. 1 1
      desktop/libs/indexer/src/indexer/indexers/flume_tests.py
  63. 1 1
      desktop/libs/indexer/src/indexer/indexers/morphline.py
  64. 1 1
      desktop/libs/indexer/src/indexer/indexers/morphline_tests.py
  65. 1 1
      desktop/libs/indexer/src/indexer/indexers/rdbms.py
  66. 1 1
      desktop/libs/indexer/src/indexer/indexers/sql.py
  67. 1 1
      desktop/libs/indexer/src/indexer/indexers/sql_tests.py
  68. 1 1
      desktop/libs/indexer/src/indexer/rdbms_indexer_tests.py
  69. 1 1
      desktop/libs/indexer/src/indexer/solr_client_tests.py
  70. 1 1
      desktop/libs/indexer/src/indexer/tests.py
  71. 1 1
      desktop/libs/liboauth/src/liboauth/backend.py
  72. 1 1
      desktop/libs/liboauth/src/liboauth/views.py
  73. 1 1
      desktop/libs/liboozie/src/liboozie/submittion2_tests.py
  74. 1 1
      desktop/libs/liboozie/src/liboozie/submittion_tests.py
  75. 1 1
      desktop/libs/liboozie/src/liboozie/tests.py
  76. 1 1
      desktop/libs/libopenid/src/libopenid/backend.py
  77. 1 1
      desktop/libs/libsaml/src/libsaml/backend.py
  78. 1 1
      desktop/libs/libsentry/src/libsentry/test_privilege_checker.py
  79. 1 1
      desktop/libs/libsentry/src/libsentry/tests.py
  80. 1 1
      desktop/libs/libsolr/src/libsolr/tests.py
  81. 1 1
      desktop/libs/libzookeeper/src/libzookeeper/tests.py
  82. 1 1
      desktop/libs/metadata/src/metadata/catalog/navigator_client_tests.py
  83. 1 1
      desktop/libs/metadata/src/metadata/catalog_tests.py
  84. 1 1
      desktop/libs/metadata/src/metadata/optimizer_api_tests.py
  85. 1 1
      desktop/libs/metadata/src/metadata/optimizer_client_tests.py
  86. 1 1
      desktop/libs/notebook/src/notebook/connectors/hiveserver2_tests.py
  87. 1 1
      desktop/libs/notebook/src/notebook/connectors/sql_alchemy_tests.py
  88. 1 1
      desktop/libs/notebook/src/notebook/management/commands/notebook_setup.py
  89. 1 1
      desktop/libs/notebook/src/notebook/models.py
  90. 1 1
      desktop/libs/notebook/src/notebook/tasks.py
  91. 1 1
      desktop/libs/notebook/src/notebook/tests.py

+ 1 - 1
apps/about/src/about/tests.py

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

+ 1 - 1
apps/beeswax/src/beeswax/api.py

@@ -52,7 +52,7 @@ from metastore.conf import FORCE_HS2_METADATA
 from metastore.views import _get_db, _get_servername
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/beeswax/src/beeswax/management/commands/beeswax_install_examples.py

@@ -40,7 +40,7 @@ from beeswax.server import dbms
 from beeswax.server.dbms import get_query_server_config, QueryServerException
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/beeswax/src/beeswax/models.py

@@ -39,7 +39,7 @@ from librdbms.server import dbms as librdbms_dbms
 from beeswax.design import HQLdesign
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/beeswax/src/beeswax/test_base.py

@@ -47,7 +47,7 @@ from beeswax.server.dbms import get_query_server_config
 from beeswax.server import dbms
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/beeswax/src/beeswax/tests.py

@@ -98,7 +98,7 @@ else:
   from cStringIO import StringIO as string_io
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/beeswax/src/beeswax/views.py

@@ -58,7 +58,7 @@ from beeswax.server.dbms import expand_exception, get_query_server_config, Query
 from desktop.auth.backend import is_admin
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/filebrowser/src/filebrowser/forms.py

@@ -38,7 +38,7 @@ from filebrowser.lib import rwx
 
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, default_organization
+  from useradmin.models import User, Group, default_organization
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/filebrowser/src/filebrowser/views.py

@@ -79,7 +79,7 @@ from filebrowser.forms import RenameForm, UploadFileForm, UploadArchiveForm, MkD
 
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/filebrowser/src/filebrowser/views_test.py

@@ -67,7 +67,7 @@ else:
   from urllib import unquote as urllib_unquote
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, default_organization
+  from useradmin.models import User, Group, default_organization
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/hbase/src/hbase/management/commands/hbase_setup.py

@@ -32,7 +32,7 @@ from hbased.ttypes import AlreadyExists
 from hbase.api import HbaseApi
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/hbase/src/hbase/tests.py

@@ -35,7 +35,7 @@ from nose.plugins.skip import SkipTest
 from django.urls import reverse
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/impala/src/impala/tests.py

@@ -46,7 +46,7 @@ from impala import conf
 from impala.dbms import ImpalaDbms
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/jobbrowser/src/jobbrowser/tests.py

@@ -49,7 +49,7 @@ from jobbrowser.models import can_view_job, can_modify_job, LinkJobLogs
 from jobbrowser.yarn_models import SparkJob
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/jobsub/src/jobsub/models.py

@@ -26,7 +26,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.lib.parameterization import find_parameters, bind_parameters
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/jobsub/src/jobsub/tests.py

@@ -34,7 +34,7 @@ from liboozie.oozie_api_tests import OozieServerProvider
 from oozie.models import Workflow, Node, Start, Kill, End, Link
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/metastore/src/metastore/tests.py

@@ -45,7 +45,7 @@ from beeswax.server import dbms
 from beeswax.test_base import BeeswaxSampleProvider
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/oozie/src/oozie/models.py

@@ -65,7 +65,7 @@ else:
   from cStringIO import StringIO as string_io
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/oozie/src/oozie/models2_tests.py

@@ -42,7 +42,7 @@ from oozie.models2 import Node, Workflow, WorkflowConfiguration, find_dollar_var
 from oozie.tests import OozieMockBase, save_temp_workflow, MockOozieApi
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/oozie/src/oozie/tests.py

@@ -69,7 +69,7 @@ else:
   from cStringIO import StringIO as string_io
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/pig/src/pig/models.py

@@ -32,7 +32,7 @@ from desktop.models import Document as Doc, SAMPLE_USER_ID
 from hadoop.fs.hadoopfs import Hdfs
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/pig/src/pig/tests.py

@@ -40,7 +40,7 @@ from pig.models import create_or_update_script, PigScript
 from pig.api import OozieApi, get
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/search/src/search/models.py

@@ -31,7 +31,7 @@ from libsolr.api import SolrApi
 from search.conf import SOLR_URL
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/search/src/search/tests.py

@@ -34,7 +34,7 @@ from dashboard.models import Collection2
 from dashboard.controller import DashboardController
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/security/src/security/tests.py

@@ -30,7 +30,7 @@ from useradmin.models import HuePermission, GroupPermission
 from security.api.hive import _to_sentry_privilege
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/sqoop/src/sqoop/tests.py

@@ -30,7 +30,7 @@ from sqoop.client.job import Job
 from sqoop.test_base import SqoopServerProvider
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/useradmin/src/useradmin/api.py

@@ -23,7 +23,7 @@ from desktop.lib.django_util import JsonResponse
 from desktop.lib.i18n import smart_unicode
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/useradmin/src/useradmin/forms.py

@@ -34,7 +34,7 @@ from useradmin.hue_password_policy import hue_get_password_validators
 from useradmin.models import GroupPermission, HuePermission, get_default_user_group
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, default_organization, Organization
+  from useradmin.models import User, Group, default_organization, Organization
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/useradmin/src/useradmin/ldap_access.py

@@ -30,7 +30,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.lib.python_util import CaseInsensitiveDict
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/useradmin/src/useradmin/middleware.py

@@ -38,7 +38,7 @@ from useradmin.views import import_ldap_users
 from useradmin import ldap_access
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
apps/useradmin/src/useradmin/models.py

@@ -59,7 +59,7 @@ from hadoop import cluster
 import useradmin.conf
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, default_organization
+  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, Organization, default_organization
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/useradmin/src/useradmin/templates/list_permissions.mako

@@ -23,7 +23,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.views import commonheader, commonfooter
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationGroup as Group
+  from useradmin.models import Group
 else:
   from django.contrib.auth.models import Group
 %>

+ 1 - 1
apps/useradmin/src/useradmin/test_ldap.py

@@ -42,7 +42,7 @@ from useradmin import ldap_access
 from useradmin.tests import BaseUserAdminTests, LdapTestConnection, reset_all_groups, reset_all_users
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/useradmin/src/useradmin/test_ldap_deprecated.py

@@ -41,7 +41,7 @@ from useradmin import ldap_access
 from useradmin.tests import BaseUserAdminTests, LdapTestConnection, reset_all_groups, reset_all_users
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/useradmin/src/useradmin/tests.py

@@ -56,7 +56,7 @@ from useradmin.models import get_profile, get_default_user_group
 from useradmin.hue_password_policy import reset_password_policy
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/useradmin/src/useradmin/tests_api.py

@@ -25,7 +25,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.lib.django_test_util import make_logged_in_client
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
apps/useradmin/src/useradmin/views.py

@@ -59,7 +59,7 @@ if sys.version_info[0] > 2:
   unicode = str
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
desktop/core/src/desktop/api2_tests.py

@@ -28,7 +28,7 @@ from desktop.lib.test_utils import grant_access
 from desktop.models import Document2
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/api_tests.py

@@ -32,7 +32,7 @@ from pig.models import PigScript
 from useradmin.models import get_default_user_group
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/auth/backend.py

@@ -55,7 +55,7 @@ from useradmin import ldap_access
 from useradmin.models import get_profile, get_default_user_group, UserProfile
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, Organization
+  from useradmin.models import User, Organization
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/auth/forms.py

@@ -32,7 +32,7 @@ from useradmin.hue_password_policy import hue_get_password_validators
 from desktop.auth.backend import is_admin
 
 if conf.ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/auth/views.py

@@ -52,7 +52,7 @@ from desktop.log.access import access_log, access_warn, last_access_map
 from desktop.settings import LOAD_BALANCER_COOKIE
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
desktop/core/src/desktop/auth/views_test.py

@@ -37,7 +37,7 @@ from desktop.lib.django_test_util import make_logged_in_client
 from desktop.lib.test_utils import add_to_group
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
desktop/core/src/desktop/configuration/tests.py

@@ -29,7 +29,7 @@ from desktop.models import DefaultConfiguration
 from useradmin.models import get_default_user_group
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/converter_tests.py

@@ -37,7 +37,7 @@ from desktop.lib.test_utils import grant_access
 from desktop.models import Directory, Document, Document2, DocumentPermission, DocumentTag
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/lib/django_test_util.py

@@ -28,7 +28,7 @@ import nose.tools
 from desktop.conf import ENABLE_ORGANIZATIONS
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, default_organization
+  from useradmin.models import User, Group, default_organization
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
desktop/core/src/desktop/lib/fs/proxyfs.py

@@ -28,7 +28,7 @@ from desktop.auth.backend import is_admin
 from desktop.conf import DEFAULT_USER, ENABLE_ORGANIZATIONS
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/lib/fs/proxyfs_test.py

@@ -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
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/management/commands/convert_documents.py

@@ -27,7 +27,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.converters import DocumentConverter
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/management/commands/create_user_directories.py

@@ -25,7 +25,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.models import Document2
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/metrics.py

@@ -28,7 +28,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.lib.metrics import global_registry
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/middleware.py

@@ -61,7 +61,7 @@ from desktop import appmanager
 from desktop import metrics
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/models.py

@@ -63,7 +63,7 @@ else:
   from urllib import quote as urllib_quote
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group
+  from useradmin.models import User, Group
 else:
   from django.contrib.auth.models import User, Group
 

+ 1 - 1
desktop/core/src/desktop/monkey_patches.py

@@ -23,7 +23,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
 from desktop.lib.django_util import get_username_re_rule
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/tests.py

@@ -81,7 +81,7 @@ else:
   from cStringIO import StringIO as string_io
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/core/src/desktop/tests_doc2.py

@@ -40,7 +40,7 @@ from useradmin.models import get_default_user_group
 from oozie.models2 import Workflow
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/aws/src/aws/s3/s3fs_test.py

@@ -33,7 +33,7 @@ from aws.s3.s3test_utils import S3TestBase, generate_id
 from aws.s3.upload import DEFAULT_WRITE_SIZE
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/dashboard/src/dashboard/tests.py

@@ -34,7 +34,7 @@ from dashboard.models import Collection2, augment_response
 from dashboard.controller import DashboardController
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/indexers/envelope.py

@@ -30,7 +30,7 @@ from indexer.conf import CONFIG_JARS_LIBS_PATH, config_morphline_path
 from libzookeeper.conf import zkensemble
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/indexers/envelope_tests.py

@@ -26,7 +26,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
 from indexer.indexers.envelope import EnvelopeIndexer
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/indexers/flume.py

@@ -29,7 +29,7 @@ from metadata.manager_client import ManagerApi
 from indexer.conf import config_morphline_path
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/indexers/flume_tests.py

@@ -24,7 +24,7 @@ from desktop.conf import ENABLE_ORGANIZATIONS
 from indexer.indexers.flume import FlumeIndexer
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/indexers/morphline.py

@@ -36,7 +36,7 @@ from indexer.indexers.morphline_operations import get_checked_args
 from indexer.solr_client import SolrClient
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/indexers/morphline_tests.py

@@ -48,7 +48,7 @@ else:
   from StringIO import StringIO as string_io
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/indexers/rdbms.py

@@ -33,7 +33,7 @@ from notebook.connectors.base import get_api
 from notebook.models import make_notebook
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/indexers/sql.py

@@ -39,7 +39,7 @@ else:
   from urlparse import urlparse
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/indexers/sql_tests.py

@@ -28,7 +28,7 @@ from desktop.lib.django_test_util import make_logged_in_client
 from indexer.indexers.sql import SQLIndexer
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/rdbms_indexer_tests.py

@@ -31,7 +31,7 @@ from indexer.indexers.rdbms import _get_api
 from librdbms.server import dbms as rdbms
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/solr_client_tests.py

@@ -27,7 +27,7 @@ from desktop.lib.test_utils import add_to_group, grant_access
 from indexer.solr_client import SolrClient
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/indexer/src/indexer/tests.py

@@ -34,7 +34,7 @@ from indexer.conf import get_solr_ensemble
 from indexer.controller import CollectionManagerController
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/liboauth/src/liboauth/backend.py

@@ -36,7 +36,7 @@ import liboauth.conf
 import liboauth.metrics
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/liboauth/src/liboauth/views.py

@@ -47,7 +47,7 @@ import liboauth.conf
 from liboauth.backend import OAuthBackend
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/liboozie/src/liboozie/submittion2_tests.py

@@ -41,7 +41,7 @@ from liboozie.credentials_tests import TestCredentials
 from liboozie.submission2 import Submission
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/liboozie/src/liboozie/submittion_tests.py

@@ -33,7 +33,7 @@ from useradmin.views import ensure_home_directory
 from liboozie.submittion import Submission
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/liboozie/src/liboozie/tests.py

@@ -29,7 +29,7 @@ from liboozie.utils import config_gen
 from oozie.tests import MockOozieApi
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/libopenid/src/libopenid/backend.py

@@ -32,7 +32,7 @@ from useradmin.models import get_profile, get_default_user_group, UserProfile
 from libopenid import metrics
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/libsaml/src/libsaml/backend.py

@@ -35,7 +35,7 @@ from libsaml import metrics
 from useradmin.models import get_profile, get_default_user_group, UserProfile
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/libsentry/src/libsentry/test_privilege_checker.py

@@ -28,7 +28,7 @@ from desktop.lib.test_utils import grant_access
 from libsentry.privilege_checker import PrivilegeChecker
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/libsentry/src/libsentry/tests.py

@@ -41,7 +41,7 @@ from libsentry.sentry_ha import get_next_available_server
 from libsentry.sentry_site import get_sentry_server
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/libsolr/src/libsolr/tests.py

@@ -33,7 +33,7 @@ from hadoop.pseudo_hdfs4 import is_live_cluster
 from libsolr.api import SolrApi
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/libzookeeper/src/libzookeeper/tests.py

@@ -32,7 +32,7 @@ from libzookeeper.models import ZookeeperClient
 from libzookeeper.conf import zkensemble, ENSEMBLE
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/metadata/src/metadata/catalog/navigator_client_tests.py

@@ -34,7 +34,7 @@ from metadata.metadata_sites import get_navigator_hue_server_name
 from metadata.catalog.navigator_client import NavigatorApi
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/metadata/src/metadata/catalog_tests.py

@@ -37,7 +37,7 @@ from metadata.catalog.navigator_client import NavigatorApi
 from metadata.catalog.atlas_client import AtlasApi
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/metadata/src/metadata/optimizer_api_tests.py

@@ -27,7 +27,7 @@ from desktop.lib.test_utils import add_to_group, grant_access
 from metadata.optimizer_api import _convert_queries
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/metadata/src/metadata/optimizer_client_tests.py

@@ -31,7 +31,7 @@ from metadata.conf import OPTIMIZER, has_optimizer
 from desktop.models import uuid_default
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/hiveserver2_tests.py

@@ -45,7 +45,7 @@ from beeswax.server import dbms
 from beeswax.test_base import BeeswaxSampleProvider, get_query_server_config, is_hive_on_spark
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/sql_alchemy_tests.py

@@ -30,7 +30,7 @@ from desktop.lib.test_utils import add_to_group, grant_access
 from notebook.connectors.sql_alchemy import SqlAlchemyApi
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/notebook/src/notebook/management/commands/notebook_setup.py

@@ -28,7 +28,7 @@ from desktop.models import Directory, Document, Document2, Document2Permission,
 from useradmin.models import get_default_user_group, install_sample_user
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/notebook/src/notebook/models.py

@@ -49,7 +49,7 @@ else:
   from urllib import quote as urllib_quote
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/notebook/src/notebook/tasks.py

@@ -53,7 +53,7 @@ else:
   from StringIO import StringIO as string_io
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User
 

+ 1 - 1
desktop/libs/notebook/src/notebook/tests.py

@@ -43,7 +43,7 @@ from notebook.conf import get_ordered_interpreters, INTERPRETERS_SHOWN_ON_WHEEL,
 from notebook.models import Analytics
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User
+  from useradmin.models import User
 else:
   from django.contrib.auth.models import User