openstack
/
heat
Code Issues Proposed changes

Merge "Remove unused url_for method from heat_keystoneclient"

This commit is contained in:
Jenkins 2017-02-10 04:31:16 +00:00 committed by Gerrit Code Review
parent b2e436aa67 9703437348
commit a23a9bbfea
2 changed files with 0 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/clients/os/keystone/heat_keystoneclient.py
View File

@ -540,12 +540,6 @@ class KsClientWrapper(object):
self._check_stack_domain_user(user_id, project_id, 'enable')
self.domain_admin_client.users.update(user=user_id, enabled=True)
def url_for(self, **kwargs):
default_region_name = (self.context.region_name or
cfg.CONF.region_name_for_services)
kwargs.setdefault('region_name', default_region_name)
return self.context.auth_plugin.get_endpoint(self.session, **kwargs)
@property
def auth_token(self):
return self.context.auth_plugin.get_token(self.session)

77
heat/tests/clients/test_heat_client.py
View File

@ -1419,83 +1419,6 @@ class KeystoneClientTest(common.HeatTestCase):
self.assertIsNone(heat_ks_client.delete_stack_domain_project(
project_id='aprojectid'))
def _test_url_for(self, service_url, expected_kwargs, ctx=None, **kwargs):
"""Testing url_for depending on different ways to pass region name."""
mock_ks_auth, mock_auth_ref = self._stubs_auth(client=False)
mock_ks_auth.get_endpoint(mox.IsA(ks_session.Session),
**expected_kwargs).AndReturn(service_url)
self.m.ReplayAll()
ctx = ctx or utils.dummy_context()
heat_ks_client = heat_keystoneclient.KeystoneClient(ctx)
self.assertEqual(service_url, heat_ks_client.url_for(**kwargs))
self.m.VerifyAll()
def test_url_for(self):
"""Test that None value is passed as region name.
Test that None value is passed as region name if region name is not
specified in the config file or as one of the arguments.
"""
cfg.CONF.set_override('region_name_for_services', None,
enforce_type=True)
service_url = 'http://example.com:1234/v1'
kwargs = {
'region_name': None
}
self._test_url_for(service_url, kwargs)
def test_url_for_with_region(self):
"""Test that region name passed as argument.
Test that region name passed as argument is not override by region name
specified in the config file.
"""
cfg.CONF.set_override('region_name_for_services', 'RegionOne',
enforce_type=True)
service_url = 'http://regiontwo.example.com:1234/v1'
kwargs = {
'region_name': 'RegionTwo'
}
self._test_url_for(service_url, kwargs, None, **kwargs)
def test_url_for_with_region_name_from_config(self):
"""Test default region name for services from config file is passed.
Test that default region name for services from config file is passed
if region name is not specified in arguments.
"""
region_name_for_services = 'RegionOne'
cfg.CONF.set_override('region_name_for_services',
region_name_for_services, enforce_type=True)
kwargs = {
'region_name': region_name_for_services
}
service_url = 'http://regionone.example.com:1234/v1'
self._test_url_for(service_url, kwargs)
def test_url_for_with_region_name_from_context(self):
"""Test that default region name for services from context is passed.
Test that default region name for services from context is passed
if region name is not specified in arguments.
"""
cfg.CONF.set_override('region_name_for_services', 'RegionOne',
enforce_type=True)
service_url = 'http://regiontwo.example.com:1234/v1'
region_name_for_services = 'RegionTwo'
expected_kwargs = {
'region_name': region_name_for_services
}
ctx = utils.dummy_context('test_username',
'test_tenant_id',
'password',
None,
None,
None,
region_name_for_services)
self._test_url_for(service_url, expected_kwargs, ctx)
class KeystoneClientTestDomainName(KeystoneClientTest):
def setUp(self):