openinfra/python-tempestconf
Code Issues Proposed changes

A service can have no endpoints

Browse Source 
If a service has no endpoints, python-tempestconf fails,
because it expects a url. This patch fixes this.

Change-Id: Iaadb7959b98ecb895f0f1cbd177cbb2f2f16e776
This commit is contained in:
Martin Kopec
2018-05-03 05:18:50 -04:00
parent 3fcafee74f
commit c757b5e073
2 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
config_tempest/tests/services/test_services.py
View File

@@ -83,6 +83,29 @@ class TestServices(BaseConfigTempestTest):
self.assertEqual(services.service_catalog, 'catalog')
self.assertEqual(services.public_url, 'url')
def test_parse_endpoints_empty(self):
services = self._create_services_instance()
services.public_url = "url"
ep = []
url = services.parse_endpoints(ep, "ServiceName")
self.assertEqual("", url)
def test_parse_endpoints(self):
services = self._create_services_instance()
services.public_url = "url"
ep = {
'url': 'http://10.0.0.107:8386/v1.1/96409a589d',
'interface': 'public',
'region': 'regioneOne',
}
url = services.parse_endpoints(ep, "ServiceName")
self.assertEqual('http://10.0.0.107:8386/v1.1/96409a589d', url)
ep['url'] = 'https://10.0.0.101/identity'
auth_url = 'https://10.0.0.101:13000/v2.0'
services._clients.auth_provider.auth_url = auth_url
url = services.parse_endpoints(ep, 'ServiceName')
self.assertEqual('https://10.0.0.101:13000/identity/v2', url)
def test_edit_identity_url(self):
services = self._create_services_instance()
url_port = 'https://10.0.0.101:13000/v2.0'