openstack/python-saharaclient
Code Issues Proposed changes

Merge "Adding sahara_url and endpoint_type to OpenstackClient CLI"

Browse Source
This commit is contained in:
Jenkins
2015-09-25 11:01:07 +00:00
committed by Gerrit Code Review
parent cc5a2f3cf7 248767ef63
commit 9300a22969
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
saharaclient/osc/plugin.py
View File

@@ -34,11 +34,15 @@ def make_client(instance):
LOG.debug('Instantiating data-processing client: %s',
data_processing_client)
kwargs = utils.build_kwargs_dict('endpoint_type', instance._interface)
client = data_processing_client(
session=instance.session,
region_name=instance._region_name,
cacert=instance._cacert,
insecure=instance._insecure
insecure=instance._insecure,
sahara_url=instance._cli_options.data_processing_url,
**kwargs
)
return client
@@ -54,4 +58,10 @@ def build_option_parser(parser):
help=("Data processing API version, default=" +
DEFAULT_DATA_PROCESSING_API_VERSION +
' (Env: OS_DATA_PROCESSING_API_VERSION)'))
parser.add_argument(
"--os-data-processing-url",
default=utils.env(
"OS_DATA_PROCESSING_URL"),
help=("Data processing API URL, "
"(Env: OS_DATA_PROCESSING_API_URL)"))
return parser

6
saharaclient/tests/unit/osc/test_plugin.py
View File

@@ -30,9 +30,13 @@ class TestDataProcessingPlugin(base.BaseTestCase):
instance._region_name = 'region_name'
instance._cacert = 'cacert'
instance._insecure = 'insecure'
instance._cli_options.data_processing_url = 'url'
instance._interface = 'public'
plugin.make_client(instance)
p_client.assert_called_with(session='session',
region_name='region_name',
cacert='cacert',
insecure='insecure')
insecure='insecure',
sahara_url='url',
endpoint_type='public')