diff --git a/muranoclient/osc/plugin.py b/muranoclient/osc/plugin.py index 963a5add..31fc4690 100644 --- a/muranoclient/osc/plugin.py +++ b/muranoclient/osc/plugin.py @@ -35,6 +35,7 @@ def make_client(instance): application_catalog_client)) client = application_catalog_client( + instance.get_configuration().get('murano_url'), region_name=instance._region_name, session=instance.session, service_type='application-catalog', @@ -53,4 +54,7 @@ def build_option_parser(parser): help=_("Application catalog API version, default={0}" "(Env:OS_APPLICATION_CATALOG_API_VERSION)").format( DEFAULT_APPLICATION_CATALOG_API_VERSION)) + parser.add_argument('--murano-url', + default=utils.env('MURANO_URL'), + help=_('Defaults to env[MURANO_URL].')) return parser diff --git a/muranoclient/tests/unit/osc/test_plugin.py b/muranoclient/tests/unit/osc/test_plugin.py index 56165acb..28d87b74 100644 --- a/muranoclient/tests/unit/osc/test_plugin.py +++ b/muranoclient/tests/unit/osc/test_plugin.py @@ -27,6 +27,8 @@ class TestApplicationCatalogPlugin(base.TestCaseShell): instance.session = 'murano_session' plugin.make_client(instance) - p_client.assert_called_with(region_name='murano_region', - session='murano_session', - service_type='application-catalog') + p_client.assert_called_with( + mock.ANY, + region_name='murano_region', + session='murano_session', + service_type='application-catalog') diff --git a/releasenotes/notes/osc-murano-url-507932234b49cf9f.yaml b/releasenotes/notes/osc-murano-url-507932234b49cf9f.yaml new file mode 100644 index 00000000..065a16c1 --- /dev/null +++ b/releasenotes/notes/osc-murano-url-507932234b49cf9f.yaml @@ -0,0 +1,3 @@ +--- +features: + - OSC plugin now honores ``--murano-url`` and ``MURANO_URL``, to allow using custom murano endpoint