diff options
| author |   yayogev <yaronyogev@gmail.com> | 2017-08-14 13:19:03 +0300 |
|---|---|---|
| committer | yayogev <yaronyogev@gmail.com> | 2017-08-14 13:19:03 +0300 |
| commit | 472b870cd5fb1eda282af648ef1b0b92d12d8c5e (patch) | |
| tree | 58798ddf7571ec81d3d1657bc0b6f10c33999cfb /app/test/fetch/api_fetch | |
| parent | 39e971ab1209c817ed2fcf8f060e87fd402a72a4 (diff) | |
DE811 fix fail on 2nd scan in scan manager
- keep auth_response per project
- also deleted unused ApiFetchEndPoints
Change-Id: I7e349431239a4710992eb2824881dc0f1be1704a
Signed-off-by: yayogev <yaronyogev@gmail.com>
Diffstat (limited to 'app/test/fetch/api_fetch')
| -rw-r--r-- | app/test/fetch/api_fetch/test_api_fetch_regions.py | 82 | ||||
| -rw-r--r-- | app/test/fetch/api_fetch/test_data/api_fetch_regions.py | 102 |
2 files changed, 93 insertions, 91 deletions
diff --git a/app/test/fetch/api_fetch/test_api_fetch_regions.py b/app/test/fetch/api_fetch/test_api_fetch_regions.py index 1ff7999..fba8acf 100644 --- a/app/test/fetch/api_fetch/test_api_fetch_regions.py +++ b/app/test/fetch/api_fetch/test_api_fetch_regions.py @@ -1,41 +1,41 @@ -############################################################################### -# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) # -# and others # -# # -# All rights reserved. This program and the accompanying materials # -# are made available under the terms of the Apache License, Version 2.0 # -# which accompanies this distribution, and is available at # -# http://www.apache.org/licenses/LICENSE-2.0 # -############################################################################### -from discover.fetchers.api.api_access import ApiAccess -from discover.fetchers.api.api_fetch_regions import ApiFetchRegions -from test.fetch.test_fetch import TestFetch -from test.fetch.api_fetch.test_data.api_fetch_regions import * -from test.fetch.api_fetch.test_data.token import TOKEN -from unittest.mock import MagicMock - - -class TestApiFetchRegions(TestFetch): - - def setUp(self): - ApiFetchRegions.v2_auth_pwd = MagicMock(return_value=TOKEN) - self.configure_environment() - - def test_get(self): - fetcher = ApiFetchRegions() - fetcher.set_env(ENV) - - ApiAccess.auth_response = AUTH_RESPONSE - ret = fetcher.get("test_id") - self.assertEqual(ret, REGIONS_RESULT, - "Can't get correct regions information") - - def test_get_without_token(self): - fetcher = ApiFetchRegions() - fetcher.v2_auth_pwd = MagicMock(return_value=[]) - fetcher.set_env(ENV) - - ret = fetcher.get("test_id") - - ApiFetchRegions.v2_auth_pwd = MagicMock(return_value=TOKEN) - self.assertEqual(ret, [], "Can't get [] when the token is invalid") +###############################################################################
+# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
+# and others #
+# #
+# All rights reserved. This program and the accompanying materials #
+# are made available under the terms of the Apache License, Version 2.0 #
+# which accompanies this distribution, and is available at #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+###############################################################################
+from discover.fetchers.api.api_access import ApiAccess
+from discover.fetchers.api.api_fetch_regions import ApiFetchRegions
+from test.fetch.test_fetch import TestFetch
+from test.fetch.api_fetch.test_data.api_fetch_regions import *
+from test.fetch.api_fetch.test_data.token import TOKEN
+from unittest.mock import MagicMock
+
+
+class TestApiFetchRegions(TestFetch):
+
+ def setUp(self):
+ ApiFetchRegions.v2_auth_pwd = MagicMock(return_value=TOKEN)
+ self.configure_environment()
+
+ def test_get(self):
+ fetcher = ApiFetchRegions()
+ fetcher.set_env(ENV)
+
+ ApiAccess.auth_response["admin"] = AUTH_RESPONSE
+ ret = fetcher.get("test_id")
+ self.assertEqual(ret, REGIONS_RESULT,
+ "Can't get correct regions information")
+
+ def test_get_without_token(self):
+ fetcher = ApiFetchRegions()
+ fetcher.v2_auth_pwd = MagicMock(return_value=[])
+ fetcher.set_env(ENV)
+
+ ret = fetcher.get("test_id")
+
+ ApiFetchRegions.v2_auth_pwd = MagicMock(return_value=TOKEN)
+ self.assertEqual(ret, [], "Can't get [] when the token is invalid")
diff --git a/app/test/fetch/api_fetch/test_data/api_fetch_regions.py b/app/test/fetch/api_fetch/test_data/api_fetch_regions.py index bd7be78..f8bffd1 100644 --- a/app/test/fetch/api_fetch/test_data/api_fetch_regions.py +++ b/app/test/fetch/api_fetch/test_data/api_fetch_regions.py @@ -1,50 +1,52 @@ -############################################################################### -# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) # -# and others # -# # -# All rights reserved. This program and the accompanying materials # -# are made available under the terms of the Apache License, Version 2.0 # -# which accompanies this distribution, and is available at # -# http://www.apache.org/licenses/LICENSE-2.0 # -############################################################################### -REGION = "RegionOne" -ENV = "Mirantis-Liberty" - -AUTH_RESPONSE = { - "access": { - "serviceCatalog": [ - { - "endpoints": [ - { - "adminURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da", - "id": "274cbbd9fd6d4311b78e78dd3a1df51f", - "internalURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da", - "publicURL": "http://172.16.0.3:8774/v2/8c1751e0ce714736a63fee3c776164da", - "region": "RegionOne" - } - ], - "endpoints_links": [], - "name": "nova", - "type": "compute" - } - ] - } -} - -REGIONS_RESULT = [ - { - "id": "RegionOne", - "endpoints": { - "nova": { - "adminURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da", - "id": "274cbbd9fd6d4311b78e78dd3a1df51f", - "internalURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da", - "publicURL": "http://172.16.0.3:8774/v2/8c1751e0ce714736a63fee3c776164da", - "service_type": "compute" - } - }, - "name": "RegionOne", - "parent_type": "regions_folder", - "parent_id": ENV + "-regions", - } -] +###############################################################################
+# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
+# and others #
+# #
+# All rights reserved. This program and the accompanying materials #
+# are made available under the terms of the Apache License, Version 2.0 #
+# which accompanies this distribution, and is available at #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+###############################################################################
+REGION = "RegionOne"
+ENV = "Mirantis-Liberty"
+
+AUTH_RESPONSE = {
+ "admin": {
+ "access": {
+ "serviceCatalog": [
+ {
+ "endpoints": [
+ {
+ "adminURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da",
+ "id": "274cbbd9fd6d4311b78e78dd3a1df51f",
+ "internalURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da",
+ "publicURL": "http://172.16.0.3:8774/v2/8c1751e0ce714736a63fee3c776164da",
+ "region": "RegionOne"
+ }
+ ],
+ "endpoints_links": [],
+ "name": "nova",
+ "type": "compute"
+ }
+ ]
+ }
+ }
+}
+
+REGIONS_RESULT = [
+ {
+ "id": "RegionOne",
+ "endpoints": {
+ "nova": {
+ "adminURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da",
+ "id": "274cbbd9fd6d4311b78e78dd3a1df51f",
+ "internalURL": "http://192.168.0.2:8774/v2/8c1751e0ce714736a63fee3c776164da",
+ "publicURL": "http://172.16.0.3:8774/v2/8c1751e0ce714736a63fee3c776164da",
+ "service_type": "compute"
+ }
+ },
+ "name": "RegionOne",
+ "parent_type": "regions_folder",
+ "parent_id": ENV + "-regions",
+ }
+]
|