openstack
/
rally
Code Issues Proposed changes

Replacing application_catalog with application-catalog 

Murano has changed its type, due to the bug that prevented correct
keystone communication in certain cases.

Change-Id: I81a6b70c0bc829a0ba2f3dd27654985279cac197
Closes-bug: #1514692
Depends-On: Id568c0a59b2e99dc946b1f2f55f6b233fd6a1b27
This commit is contained in:
liyingjun 2015-11-26 17:36:53 +08:00
parent 8b14eea91d
commit f37a5fe58d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rally/consts.py
View File

@ -138,7 +138,7 @@ class _ServiceType(utils.ImmutableMixin, utils.EnumMixin):
DATA_PROCESSING_MOS = "data_processing"
OBJECT_STORE = "object-store"
WORKFLOW_EXECUTION = "workflowv2"
APPLICATION_CATALOG = "application_catalog"
APPLICATION_CATALOG = "application-catalog"
BARE_METAL = "baremetal"
def __init__(self):

2
rally/osclients.py
View File

@ -477,7 +477,7 @@ class Zaqar(OSClient):
@configure("murano", default_version="1",
default_service_type="application_catalog",
default_service_type="application-catalog",
supported_versions=["1"])
class Murano(OSClient):
def create_client(self, version=None, service_type=None):

2
tests/unit/test_osclients.py
View File

@ -626,7 +626,7 @@ class OSClientsTestCase(test.TestCase):
client = self.clients.murano()
self.assertEqual(fake_murano, client)
self.service_catalog.url_for.assert_called_once_with(
service_type="application_catalog",
service_type="application-catalog",
endpoint_type=consts.EndpointType.PUBLIC,
region_name=self.endpoint.region_name
)