From 798f7292513d08e0120e52775f0a4952adc7cef3 Mon Sep 17 00:00:00 2001 From: Ilia Abashin Date: Tue, 15 Aug 2017 17:58:28 +0300 Subject: Fixed api_access unit tests Fixed issues caused by migration to 'requests' library Change-Id: I4b77c9b5be8149639ae287c18055382f3892fff4 Signed-off-by: Ilia Abashin --- app/discover/fetchers/api/api_access.py | 2 +- app/test/fetch/api_fetch/test_api_access.py | 53 +++++++++++++++--------- app/test/fetch/api_fetch/test_data/api_access.py | 30 ++++---------- 3 files changed, 43 insertions(+), 42 deletions(-) diff --git a/app/discover/fetchers/api/api_access.py b/app/discover/fetchers/api/api_access.py index 3250378..84c4de3 100644 --- a/app/discover/fetchers/api/api_access.py +++ b/app/discover/fetchers/api/api_access.py @@ -161,7 +161,7 @@ class ApiAccess(Fetcher): else: msg = ", response: {}".format(response.text) self.log.error("req_url: {} {}".format(req_url, msg)) - return response + return None ret = response.json() return ret diff --git a/app/test/fetch/api_fetch/test_api_access.py b/app/test/fetch/api_fetch/test_api_access.py index e4767b7..f51c07b 100644 --- a/app/test/fetch/api_fetch/test_api_access.py +++ b/app/test/fetch/api_fetch/test_api_access.py @@ -7,7 +7,10 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from unittest.mock import patch, MagicMock +from unittest.mock import patch, MagicMock, Mock + +import requests + from discover.fetchers.api.api_access import ApiAccess from test.fetch.api_fetch.test_data.api_access import * from test.fetch.test_fetch import TestFetch @@ -20,6 +23,8 @@ class TestApiAccess(TestFetch): self.configure_environment() self.api_access = ApiAccess() self.set_regions_for_fetcher(self.api_access) + self.response = MagicMock() + self.response.status_code = requests.codes.ok def test_parse_time_without_dot_in_time(self): time = self.api_access.parse_time(TIME_WITHOUT_DOT) @@ -44,33 +49,38 @@ class TestApiAccess(TestFetch): self.assertEqual(token, None, "Can't get None when the token doesn't " + "exist in tokens") - @patch("httplib2.Http.request") + @patch("requests.post") def test_v2_auth(self, mock_request): self.api_access.get_existing_token = MagicMock(return_value=None) + self.response.json = Mock(return_value=CORRECT_AUTH_CONTENT) # mock authentication info from OpenStack Api - mock_request.return_value = (RESPONSE, CORRECT_AUTH_CONTENT) + mock_request.return_value = self.response token_details = self.api_access.v2_auth(TEST_PROJECT, TEST_HEADER, TEST_BODY) self.assertNotEqual(token_details, None, "Can't get the token details") - @patch("httplib2.Http.request") + @patch("requests.post") def test_v2_auth_with_error_content(self, mock_request): self.api_access.get_existing_token = MagicMock(return_value=None) + self.response.json = Mock(return_value=ERROR_AUTH_CONTENT) # authentication content from OpenStack Api will be incorrect - mock_request.return_value = (RESPONSE, ERROR_AUTH_CONTENT) + mock_request.return_value = self.response token_details = self.api_access.v2_auth(TEST_PROJECT, TEST_HEADER, TEST_BODY) self.assertIs(token_details, None, "Can't get None when the content is wrong") - @patch("httplib2.Http.request") + @patch("requests.post") def test_v2_auth_with_error_token(self, mock_request): + self.response.status_code = requests.codes.bad_request + self.response.json = Mock(return_value=ERROR_TOKEN_CONTENT) # authentication info from OpenStack Api will not contain token info - mock_request.return_value = (RESPONSE, ERROR_TOKEN_CONTENT) + mock_request.return_value = self.response token_details = self.api_access.v2_auth(TEST_PROJECT, TEST_HEADER, TEST_BODY) self.assertIs(token_details, None, "Can't get None when the content " + "doesn't contain any token info") - @patch("httplib2.Http.request") + @patch("requests.post") def test_v2_auth_with_error_expiry_time(self, mock_request): - mock_request.return_value = (RESPONSE, CORRECT_AUTH_CONTENT) + self.response.json = Mock(return_value=CORRECT_AUTH_CONTENT) + mock_request.return_value = self.response # store original parse_time method original_method = self.api_access.parse_time @@ -84,28 +94,33 @@ class TestApiAccess(TestFetch): self.assertIs(token_details, None, "Can't get None when the time in token " + "can't be parsed") - @patch("httplib2.Http.request") + @patch("requests.post") def test_v2_auth_pwd(self, mock_request): + self.response.json = Mock(return_value=CORRECT_AUTH_CONTENT) # mock the authentication info from OpenStack Api - mock_request.return_value = (RESPONSE, CORRECT_AUTH_CONTENT) + mock_request.return_value = self.response token = self.api_access.v2_auth_pwd(PROJECT) self.assertNotEqual(token, None, "Can't get token") - @patch("httplib2.Http.request") + @patch("requests.get") def test_get_url(self, mock_request): - mock_request.return_value = (RESPONSE, GET_CONTENT) + self.response.json = Mock(return_value=GET_CONTENT) + mock_request.return_value = self.response result = self.api_access.get_url(TEST_URL, TEST_HEADER) # check whether it returns content message when the response is correct - self.assertNotIn("status", result, "Can't get content when the " + - "response is correct") + self.assertNotEqual(result, None, "Can't get content when the " + "response is correct") - @patch("httplib2.Http.request") + @patch("requests.get") def test_get_url_with_error_response(self, mock_request): + self.response.status_code = requests.codes.bad_request + self.response.json = Mock(return_value=None) + self.response.text = "Bad request" # the response will be wrong - mock_request.return_value = (ERROR_RESPONSE, None) + mock_request.return_value = self.response result = self.api_access.get_url(TEST_URL, TEST_HEADER) - self.assertNotEqual(result, None, "Can't get response message " + - "when the response status is not 200") + self.assertEqual(result, None, "Result returned" + + "when the response status is not 200") def test_get_region_url(self): region_url = self.api_access.get_region_url(REGION_NAME, SERVICE_NAME) diff --git a/app/test/fetch/api_fetch/test_data/api_access.py b/app/test/fetch/api_fetch/test_data/api_access.py index 2181c48..5bedee6 100644 --- a/app/test/fetch/api_fetch/test_data/api_access.py +++ b/app/test/fetch/api_fetch/test_data/api_access.py @@ -7,36 +7,22 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### +import json from datetime import datetime, timedelta - TIME_WITH_DOT = "2016-10-19T23:21:09.418406Z" TIME_WITHOUT_DOT = "2016-10-19T23:21:09Z" ILLEGAL_TIME = "23243423" TEST_PROJECT = "test" PROJECT = "admin" -TEST_URL = "test_url" -TEST_HEADER = "test_headers" -TEST_BODY = "test_body" +TEST_URL = "http://test_url" +TEST_HEADER = {"test-header-name": "test-header-value"} +TEST_BODY = {"test_key": "test_value"} -RESPONSE = { - 'server': 'Apache', - 'vary': 'X-Auth-Token', - 'content-type': 'application/json', - 'date': 'Wed, 19 Oct 2016 23:15:36 GMT', - 'content-length': '4876', - 'x-openstack-request-id': 'req-01cda259-7f60-4440-99a0-508fed90f815', - 'connection': 'close', - 'status': '200' -} -ERROR_RESPONSE = { - 'connection': 'close', - 'status': '400' -} -GET_CONTENT = b'{"text":"test"}' -CORRECT_AUTH_CONTENT = b'{"access": {"token": {"issued_at": "2016-10-21T23:49:50.000000Z", "expires": "2016-10-22T00:49:50.445603Z", "id": "gAAAAABYCqme1l0qCm6mi3jON4ElweTkhZjGXZ_bYuxLHZGGXgO3T_JLnxKJ7KbK4xA8KjQ-DQe2trDncKQA0M-yeX167wT0xO_rjqqcCA19JV-EeXFfx7QOukkt8eC4pfK1r8Dc_kvBc-bwAemjZ1IvPGu5Nd2f0ktGWre0Qqzbg9QGtCEJUe8", "tenant": {"is_domain": false, "description": "admin tenant", "enabled": true, "id": "8c1751e0ce714736a63fee3c776164da", "parent_id": null, "name": "admin"}, "audit_ids": ["8BvzDPpyRBmeJho-FzKuGA"]}, "serviceCatalog": [{"endpoints": [{"adminURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da", "region": "RegionOne", "internalURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da", "id": "274cbbd9fd6d4311b78e78dd3a1df51f", "publicURL": "http://172.16.0.3:8774/v2/8c1751e0ce714736a63fee3c776164da"}], "endpoints_links": [], "type": "compute", "name": "nova"}, {"endpoints": [{"adminURL": "http://192.168.0.2:9696", "region": "RegionOne", "internalURL": "http://192.168.0.2:9696", "id": "8dc28584da224c4b9671171ead3c982a", "publicURL": "http://172.16.0.3:9696"}], "endpoints_links": [], "type": "network", "name": "neutron"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8776/v2/8c1751e0ce714736a63fee3c776164da", "region": "RegionOne", "internalURL": "http://192.168.0.2:8776/v2/8c1751e0ce714736a63fee3c776164da", "id": "2c30937688e944889db4a64fab6816e6", "publicURL": "http://172.16.0.3:8776/v2/8c1751e0ce714736a63fee3c776164da"}], "endpoints_links": [], "type": "volumev2", "name": "cinderv2"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8774/v3", "region": "RegionOne", "internalURL": "http://192.168.0.2:8774/v3", "id": "1df917160dfb4ce5b469764fde22b3ab", "publicURL": "http://172.16.0.3:8774/v3"}], "endpoints_links": [], "type": "computev3", "name": "novav3"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8080", "region": "RegionOne", "internalURL": "http://192.168.0.2:8080", "id": "4f655c8f2bef46a0a7ba4a20bba53666", "publicURL": "http://172.16.0.3:8080"}], "endpoints_links": [], "type": "s3", "name": "swift_s3"}, {"endpoints": [{"adminURL": "http://192.168.0.2:9292", "region": "RegionOne", "internalURL": "http://192.168.0.2:9292", "id": "475c6c77a94e4e63a5a0f0e767f697a8", "publicURL": "http://172.16.0.3:9292"}], "endpoints_links": [], "type": "image", "name": "glance"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8777", "region": "RegionOne", "internalURL": "http://192.168.0.2:8777", "id": "617177a3dcb64560a5a79ab0a91a7225", "publicURL": "http://172.16.0.3:8777"}], "endpoints_links": [], "type": "metering", "name": "ceilometer"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8000/v1", "region": "RegionOne", "internalURL": "http://192.168.0.2:8000/v1", "id": "0f04ec6ed49f4940822161bf677bdfb2", "publicURL": "http://172.16.0.3:8000/v1"}], "endpoints_links": [], "type": "cloudformation", "name": "heat-cfn"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8776/v1/8c1751e0ce714736a63fee3c776164da", "region": "RegionOne", "internalURL": "http://192.168.0.2:8776/v1/8c1751e0ce714736a63fee3c776164da", "id": "05643f2cf9094265b432376571851841", "publicURL": "http://172.16.0.3:8776/v1/8c1751e0ce714736a63fee3c776164da"}], "endpoints_links": [], "type": "volume", "name": "cinder"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8773/services/Admin", "region": "RegionOne", "internalURL": "http://192.168.0.2:8773/services/Cloud", "id": "390dddc753cc4d378b489129d06c4b7d", "publicURL": "http://172.16.0.3:8773/services/Cloud"}], "endpoints_links": [], "type": "ec2", "name": "nova_ec2"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8004/v1/8c1751e0ce714736a63fee3c776164da", "region": "RegionOne", "internalURL": "http://192.168.0.2:8004/v1/8c1751e0ce714736a63fee3c776164da", "id": "9e60268a5aaf422d9e42f0caab0a19b4", "publicURL": "http://172.16.0.3:8004/v1/8c1751e0ce714736a63fee3c776164da"}], "endpoints_links": [], "type": "orchestration", "name": "heat"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8080/v1/AUTH_8c1751e0ce714736a63fee3c776164da", "region": "RegionOne", "internalURL": "http://192.168.0.2:8080/v1/AUTH_8c1751e0ce714736a63fee3c776164da", "id": "12e78e06595f48339baebdb5d4309c70", "publicURL": "http://172.16.0.3:8080/v1/AUTH_8c1751e0ce714736a63fee3c776164da"}], "endpoints_links": [], "type": "object-store", "name": "swift"}, {"endpoints": [{"adminURL": "http://192.168.0.2:35357/v2.0", "region": "RegionOne", "internalURL": "http://192.168.0.2:5000/v2.0", "id": "404cceb349614eb39857742970408301", "publicURL": "http://172.16.0.3:5000/v2.0"}], "endpoints_links": [], "type": "identity", "name": "keystone"}], "user": {"username": "admin", "roles_links": [], "name": "admin", "roles": [{"id": "888bdf92213a477ba9f10554bc382e57", "name": "admin"}], "enabled": true, "email": "admin@localhost", "id": "13baa553aae44adca6615e711fd2f6d9"}, "metadata": {"is_admin": 0, "roles": []}}}' -ERROR_AUTH_CONTENT = b'{"access": {}}' -ERROR_TOKEN_CONTENT = b'{"error":{"code":"code","title":"title","message":"message",", URL":"URL"},"access": {}}' +GET_CONTENT = json.loads(b'{"text":"test"}') +CORRECT_AUTH_CONTENT = json.loads(b'{"access": {"token": {"issued_at": "2016-10-21T23:49:50.000000Z", "expires": "2016-10-22T00:49:50.445603Z", "id": "gAAAAABYCqme1l0qCm6mi3jON4ElweTkhZjGXZ_bYuxLHZGGXgO3T_JLnxKJ7KbK4xA8KjQ-DQe2trDncKQA0M-yeX167wT0xO_rjqqcCA19JV-EeXFfx7QOukkt8eC4pfK1r8Dc_kvBc-bwAemjZ1IvPGu5Nd2f0ktGWre0Qqzbg9QGtCEJUe8", "tenant": {"is_domain": false, "description": "admin tenant", "enabled": true, "id": "8c1751e0ce714736a63fee3c776164da", "parent_id": null, "name": "admin"}, "audit_ids": ["8BvzDPpyRBmeJho-FzKuGA"]}, "serviceCatalog": [{"endpoints": [{"adminURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da", "region": "RegionOne", "internalURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da", "id": "274cbbd9fd6d4311b78e78dd3a1df51f", "publicURL": "http://172.16.0.3:8774/v2/8c1751e0ce714736a63fee3c776164da"}], "endpoints_links": [], "type": "compute", "name": "nova"}, {"endpoints": [{"adminURL": "http://192.168.0.2:9696", "region": "RegionOne", "internalURL": "http://192.168.0.2:9696", "id": "8dc28584da224c4b9671171ead3c982a", "publicURL": "http://172.16.0.3:9696"}], "endpoints_links": [], "type": "network", "name": "neutron"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8776/v2/8c1751e0ce714736a63fee3c776164da", "region": "RegionOne", "internalURL": "http://192.168.0.2:8776/v2/8c1751e0ce714736a63fee3c776164da", "id": "2c30937688e944889db4a64fab6816e6", "publicURL": "http://172.16.0.3:8776/v2/8c1751e0ce714736a63fee3c776164da"}], "endpoints_links": [], "type": "volumev2", "name": "cinderv2"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8774/v3", "region": "RegionOne", "internalURL": "http://192.168.0.2:8774/v3", "id": "1df917160dfb4ce5b469764fde22b3ab", "publicURL": "http://172.16.0.3:8774/v3"}], "endpoints_links": [], "type": "computev3", "name": "novav3"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8080", "region": "RegionOne", "internalURL": "http://192.168.0.2:8080", "id": "4f655c8f2bef46a0a7ba4a20bba53666", "publicURL": "http://172.16.0.3:8080"}], "endpoints_links": [], "type": "s3", "name": "swift_s3"}, {"endpoints": [{"adminURL": "http://192.168.0.2:9292", "region": "RegionOne", "internalURL": "http://192.168.0.2:9292", "id": "475c6c77a94e4e63a5a0f0e767f697a8", "publicURL": "http://172.16.0.3:9292"}], "endpoints_links": [], "type": "image", "name": "glance"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8777", "region": "RegionOne", "internalURL": "http://192.168.0.2:8777", "id": "617177a3dcb64560a5a79ab0a91a7225", "publicURL": "http://172.16.0.3:8777"}], "endpoints_links": [], "type": "metering", "name": "ceilometer"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8000/v1", "region": "RegionOne", "internalURL": "http://192.168.0.2:8000/v1", "id": "0f04ec6ed49f4940822161bf677bdfb2", "publicURL": "http://172.16.0.3:8000/v1"}], "endpoints_links": [], "type": "cloudformation", "name": "heat-cfn"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8776/v1/8c1751e0ce714736a63fee3c776164da", "region": "RegionOne", "internalURL": "http://192.168.0.2:8776/v1/8c1751e0ce714736a63fee3c776164da", "id": "05643f2cf9094265b432376571851841", "publicURL": "http://172.16.0.3:8776/v1/8c1751e0ce714736a63fee3c776164da"}], "endpoints_links": [], "type": "volume", "name": "cinder"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8773/services/Admin", "region": "RegionOne", "internalURL": "http://192.168.0.2:8773/services/Cloud", "id": "390dddc753cc4d378b489129d06c4b7d", "publicURL": "http://172.16.0.3:8773/services/Cloud"}], "endpoints_links": [], "type": "ec2", "name": "nova_ec2"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8004/v1/8c1751e0ce714736a63fee3c776164da", "region": "RegionOne", "internalURL": "http://192.168.0.2:8004/v1/8c1751e0ce714736a63fee3c776164da", "id": "9e60268a5aaf422d9e42f0caab0a19b4", "publicURL": "http://172.16.0.3:8004/v1/8c1751e0ce714736a63fee3c776164da"}], "endpoints_links": [], "type": "orchestration", "name": "heat"}, {"endpoints": [{"adminURL": "http://192.168.0.2:8080/v1/AUTH_8c1751e0ce714736a63fee3c776164da", "region": "RegionOne", "internalURL": "http://192.168.0.2:8080/v1/AUTH_8c1751e0ce714736a63fee3c776164da", "id": "12e78e06595f48339baebdb5d4309c70", "publicURL": "http://172.16.0.3:8080/v1/AUTH_8c1751e0ce714736a63fee3c776164da"}], "endpoints_links": [], "type": "object-store", "name": "swift"}, {"endpoints": [{"adminURL": "http://192.168.0.2:35357/v2.0", "region": "RegionOne", "internalURL": "http://192.168.0.2:5000/v2.0", "id": "404cceb349614eb39857742970408301", "publicURL": "http://172.16.0.3:5000/v2.0"}], "endpoints_links": [], "type": "identity", "name": "keystone"}], "user": {"username": "admin", "roles_links": [], "name": "admin", "roles": [{"id": "888bdf92213a477ba9f10554bc382e57", "name": "admin"}], "enabled": true, "email": "admin@localhost", "id": "13baa553aae44adca6615e711fd2f6d9"}, "metadata": {"is_admin": 0, "roles": []}}}') +ERROR_AUTH_CONTENT = json.loads(b'{"access": {}}') +ERROR_TOKEN_CONTENT = json.loads(b'{"error":{"code":"code","title":"title","message":"message",", URL":"URL"},"access": {}}') VALID_TOKENS = { PROJECT: { -- cgit 1.2.3-korg