Add ability to override MURANO_URL for murano OSC plugin
Partially implements: blueprint openstack-client-plugin-support Change-Id: I47635ba27cf214b621bbd4756760efb9a3cca997
This commit is contained in:
parent
9a86110b6d
commit
3589256a00
|
@ -35,6 +35,7 @@ def make_client(instance):
|
||||||
application_catalog_client))
|
application_catalog_client))
|
||||||
|
|
||||||
client = application_catalog_client(
|
client = application_catalog_client(
|
||||||
|
instance.get_configuration().get('murano_url'),
|
||||||
region_name=instance._region_name,
|
region_name=instance._region_name,
|
||||||
session=instance.session,
|
session=instance.session,
|
||||||
service_type='application-catalog',
|
service_type='application-catalog',
|
||||||
|
@ -53,4 +54,7 @@ def build_option_parser(parser):
|
||||||
help=_("Application catalog API version, default={0}"
|
help=_("Application catalog API version, default={0}"
|
||||||
"(Env:OS_APPLICATION_CATALOG_API_VERSION)").format(
|
"(Env:OS_APPLICATION_CATALOG_API_VERSION)").format(
|
||||||
DEFAULT_APPLICATION_CATALOG_API_VERSION))
|
DEFAULT_APPLICATION_CATALOG_API_VERSION))
|
||||||
|
parser.add_argument('--murano-url',
|
||||||
|
default=utils.env('MURANO_URL'),
|
||||||
|
help=_('Defaults to env[MURANO_URL].'))
|
||||||
return parser
|
return parser
|
||||||
|
|
|
@ -27,6 +27,8 @@ class TestApplicationCatalogPlugin(base.TestCaseShell):
|
||||||
instance.session = 'murano_session'
|
instance.session = 'murano_session'
|
||||||
|
|
||||||
plugin.make_client(instance)
|
plugin.make_client(instance)
|
||||||
p_client.assert_called_with(region_name='murano_region',
|
p_client.assert_called_with(
|
||||||
session='murano_session',
|
mock.ANY,
|
||||||
service_type='application-catalog')
|
region_name='murano_region',
|
||||||
|
session='murano_session',
|
||||||
|
service_type='application-catalog')
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- OSC plugin now honores ``--murano-url`` and ``MURANO_URL``, to allow using custom murano endpoint
|
Loading…
Reference in New Issue