Import changes

Author: pragatimodi

tests/test_tenant_mgt.py

@@ -26,10 +26,7 @@
 from firebase_admin import tenant_mgt
 from firebase_admin import _auth_providers
 from firebase_admin import _user_mgt
-from firebase_admin.multi_factor_config_mgt import MultiFactorConfig
-from firebase_admin.multi_factor_config_mgt import MultiFactorServerConfig
-from firebase_admin.multi_factor_config_mgt import ProviderConfig
-from firebase_admin.multi_factor_config_mgt import TOTPProviderConfig
+from firebase_admin import multi_factor_config_mgt
 from tests import testutils
 from tests import test_token_gen
 
@@ -258,11 +255,11 @@ def test_invalid_multi_factor_configs(self, multi_factor_config, tenant_mgt_app)
 
     def test_create_tenant(self, tenant_mgt_app):
         _, recorder = _instrument_tenant_mgt(tenant_mgt_app, 200, GET_TENANT_RESPONSE)
-        mfa_object = MultiFactorConfig(
+        mfa_object = multi_factor_config_mgt.MultiFactorConfig(
             provider_configs=[
-                ProviderConfig(
-                    state=ProviderConfig.State.ENABLED,
-                    totp_provider_config=TOTPProviderConfig(
+                multi_factor_config_mgt.ProviderConfig(
+                    state=multi_factor_config_mgt.ProviderConfig.State.ENABLED,
+                    totp_provider_config=multi_factor_config_mgt.TOTPProviderConfig(
                         adjacent_intervals=5
                     )
                 )
@@ -377,11 +374,11 @@ def test_update_tenant_no_args(self, tenant_mgt_app):
 
     def test_update_tenant(self, tenant_mgt_app):
         _, recorder = _instrument_tenant_mgt(tenant_mgt_app, 200, GET_TENANT_RESPONSE)
-        mfa_object = MultiFactorConfig(
+        mfa_object = multi_factor_config_mgt.MultiFactorConfig(
             provider_configs=[
-                ProviderConfig(
-                    state=ProviderConfig.State.ENABLED,
-                    totp_provider_config=TOTPProviderConfig(
+                multi_factor_config_mgt.ProviderConfig(
+                    state=multi_factor_config_mgt.ProviderConfig.State.ENABLED,
+                    totp_provider_config=multi_factor_config_mgt.TOTPProviderConfig(
                         adjacent_intervals=5
                     )
                 )
@@ -1066,14 +1063,15 @@ def test_custom_token_with_claims(self, tenant_aware_custom_token_app):
             custom_token, expected_claims=claims, tenant_id='test-tenant')
 
 def _assert_multi_factor_config(mfa_config):
-    assert isinstance(mfa_config, MultiFactorServerConfig)
+    assert isinstance(mfa_config, multi_factor_config_mgt.MultiFactorServerConfig)
     assert len(mfa_config.provider_configs) == 1
     assert isinstance(mfa_config.provider_configs, list)
     for provider_config in mfa_config.provider_configs:
-        assert isinstance(provider_config, MultiFactorServerConfig.ProviderConfigServerConfig)
+        assert isinstance(provider_config, multi_factor_config_mgt.MultiFactorServerConfig.\
+                          ProviderConfigServerConfig)
         assert provider_config.state == 'ENABLED'
         assert isinstance(provider_config.totp_provider_config,
-                          MultiFactorServerConfig.ProviderConfigServerConfig
+                          multi_factor_config_mgt.MultiFactorServerConfig.ProviderConfigServerConfig
                           .TOTPProviderServerConfig)
         assert provider_config.totp_provider_config.adjacent_intervals == 5