Merge "Use service_type and service_name of nova_catalog_admin_info"

This commit is contained in:
Zuul 2017-11-14 07:28:50 +00:00 committed by Gerrit Code Review
commit bcb7a6b5fe
2 changed files with 14 additions and 8 deletions

View File

@ -124,6 +124,8 @@ def novaclient(context, timeout=None):
global_request_id=context.global_id,
region_name=CONF.os_region_name,
endpoint_type=endpoint_type,
service_type=service_type,
service_name=service_name,
cacert=CONF.nova_ca_certificates_file,
extensions=nova_extensions)

View File

@ -57,8 +57,9 @@ class NovaClientTestCase(test.TestCase):
p_client.assert_called_once_with(
p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name=None,
insecure=False, endpoint_type='publicURL', cacert=None,
timeout=None, global_request_id=self.ctx.global_id,
insecure=False, endpoint_type='publicURL',
service_type='compute', service_name='Compute Service',
cacert=None, timeout=None, global_request_id=self.ctx.global_id,
extensions=nova.nova_extensions)
@mock.patch('novaclient.api_versions.APIVersion')
@ -76,8 +77,9 @@ class NovaClientTestCase(test.TestCase):
p_client.assert_called_once_with(
p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name=None,
insecure=False, endpoint_type='publicURL', cacert=None,
timeout=None, global_request_id=self.ctx.global_id,
insecure=False, endpoint_type='publicURL',
service_type='compute', service_name='Compute Service',
cacert=None, timeout=None, global_request_id=self.ctx.global_id,
extensions=nova.nova_extensions)
@mock.patch('novaclient.api_versions.APIVersion')
@ -97,8 +99,9 @@ class NovaClientTestCase(test.TestCase):
p_client.assert_called_once_with(
p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name=None,
insecure=False, endpoint_type='publicURL', cacert=None,
timeout=None, global_request_id=self.ctx.global_id,
insecure=False, endpoint_type='publicURL',
service_type='compute', service_name='Compute Service',
cacert=None, timeout=None, global_request_id=self.ctx.global_id,
extensions=nova.nova_extensions)
@mock.patch('novaclient.api_versions.APIVersion')
@ -117,8 +120,9 @@ class NovaClientTestCase(test.TestCase):
p_client.assert_called_once_with(
p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name='farfaraway',
insecure=False, endpoint_type='publicURL', cacert=None,
timeout=None, global_request_id=self.ctx.global_id,
insecure=False, endpoint_type='publicURL',
service_type='compute', service_name='Compute Service',
cacert=None, timeout=None, global_request_id=self.ctx.global_id,
extensions=nova.nova_extensions)