diff options
Diffstat (limited to 'newton')
| -rw-r--r-- | newton/newton/extensions/views/epacaps.py | 2 | ||||
| -rw-r--r-- | newton/newton/extensions/views/extensions.py | 2 | ||||
| -rw-r--r-- | newton/newton/proxy/tests/test_identity_proxy.py | 43 | ||||
| -rw-r--r-- | newton/newton/proxy/views/identityV3.py | 2 | ||||
| -rw-r--r-- | newton/newton/proxy/views/services.py | 2 | ||||
| -rw-r--r-- | newton/newton/registration/views/registration.py | 2 | ||||
| -rw-r--r-- | newton/newton/settings.py | 2 |
7 files changed, 49 insertions, 6 deletions
diff --git a/newton/newton/extensions/views/epacaps.py b/newton/newton/extensions/views/epacaps.py index 7efb71a6..025d55df 100644 --- a/newton/newton/extensions/views/epacaps.py +++ b/newton/newton/extensions/views/epacaps.py @@ -23,7 +23,7 @@ from newton_base.extensions import epacaps as newton_epacaps logger = logging.getLogger(__name__) -#DEBUG=True +# DEBUG=True class EpaCaps(newton_epacaps.EpaCaps): diff --git a/newton/newton/extensions/views/extensions.py b/newton/newton/extensions/views/extensions.py index a40ccdd3..bfff7104 100644 --- a/newton/newton/extensions/views/extensions.py +++ b/newton/newton/extensions/views/extensions.py @@ -19,7 +19,7 @@ from newton_base.extensions import extensions as newton_extensions logger = logging.getLogger(__name__) -#DEBUG=True +# DEBUG=True class Extensions(newton_extensions.Extensions): diff --git a/newton/newton/proxy/tests/test_identity_proxy.py b/newton/newton/proxy/tests/test_identity_proxy.py index f61ba699..adece80b 100644 --- a/newton/newton/proxy/tests/test_identity_proxy.py +++ b/newton/newton/proxy/tests/test_identity_proxy.py @@ -514,3 +514,46 @@ class TestIdentityService(unittest.TestCase): self.assertEqual(mock_info.MOCK_TOKEN_ID, response['X-Subject-Token']) self.assertIsNotNone(context['token']['catalog']) + + + @mock.patch.object(VimDriverUtils, 'get_vim_info') + @mock.patch.object(VimDriverUtils, 'get_session') + @mock.patch.object(VimDriverUtils, 'get_auth_state') + @mock.patch.object(VimDriverUtils, 'update_token_cache') + def test_tokensV2(self, mock_update_token_cache, mock_get_auth_state, + mock_get_session, mock_get_vim_info): + ''' + test API: get token + :param mock_update_token_cache: + :param mock_get_auth_state: + :param mock_get_session: + :param mock_get_vim_info: + :return: + ''' + + # mock VimDriverUtils APIs + mock_session_specs = ["get"] + mock_session_get_response = {'status': 200} + mock_session = mock.Mock(name='mock_session', + spec=mock_session_specs) + mock_session.get.return_value = mock_session_get_response + + mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO + mock_get_session.return_value = mock_session + mock_get_auth_state.return_value = json.dumps(mock_auth_state) + mock_update_token_cache.return_value = mock_info.MOCK_TOKEN_ID + + # simulate client to make the request + data = {} + response = self.client.post( + "/api/%s/v0/windriver-hudson-dc_RegionOne/identity/v2.0/" + "tokens" % test_base.MULTIVIM_VERSION, + data=data, format='json') + self.failUnlessEqual(status.HTTP_200_OK, + response.status_code) + context = response.json() + + self.assertIsNotNone(context['access']['token']) + self.assertEqual(mock_info.MOCK_TOKEN_ID, + context['access']['token']["id"]) + self.assertIsNotNone(context['access']['serviceCatalog'])
\ No newline at end of file diff --git a/newton/newton/proxy/views/identityV3.py b/newton/newton/proxy/views/identityV3.py index c831d017..eaeeca47 100644 --- a/newton/newton/proxy/views/identityV3.py +++ b/newton/newton/proxy/views/identityV3.py @@ -19,7 +19,7 @@ from newton_base.proxy import identityV3 as newton_identityV3 logger = logging.getLogger(__name__) -#DEBUG=True +# DEBUG=True class Tokens(newton_identityV3.Tokens): diff --git a/newton/newton/proxy/views/services.py b/newton/newton/proxy/views/services.py index c1d4f194..d7c1dc05 100644 --- a/newton/newton/proxy/views/services.py +++ b/newton/newton/proxy/views/services.py @@ -21,7 +21,7 @@ from newton_base.proxy import services as newton_services logger = logging.getLogger(__name__) -#DEBUG=True +# DEBUG=True class Services(newton_services.Services): diff --git a/newton/newton/registration/views/registration.py b/newton/newton/registration/views/registration.py index f07428a1..6b231a6d 100644 --- a/newton/newton/registration/views/registration.py +++ b/newton/newton/registration/views/registration.py @@ -26,7 +26,7 @@ from newton_base.openoapi.flavor import Flavors logger = logging.getLogger(__name__) -#DEBUG=True +# DEBUG=True class Registry(newton_registration.Registry): diff --git a/newton/newton/settings.py b/newton/newton/settings.py index 4a78f98b..bb7bd042 100644 --- a/newton/newton/settings.py +++ b/newton/newton/settings.py @@ -38,7 +38,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) SECRET_KEY = '3o-wney!99y)^h3v)0$j16l9=fdjxcb+a8g+q3tfbahcnu2b0o' # SECURITY WARNING: don't run with debug turned on in production! -#DEBUG = True +# DEBUG = True ALLOWED_HOSTS = ['*'] |