[Murano] Update service_type and auth strategy for murano

- Replace application_catalog to application-catalog
- Use http_client attribute to get auth_token from muranoclient

Change-Id: I64a11b4e1a12cd48109be625bbf4325d1d42686b
Closes-Bug: #1558189
This commit is contained in:
Victor Ryzhenkin 2016-03-31 16:47:48 +03:00
parent e5744909d9
commit 60c3b3c6b9
2 changed files with 7 additions and 4 deletions

View File

@ -57,11 +57,14 @@ class MuranoTest(fuel_health.nmanager.PlatformServicesBaseClass):
self.murano_available = True
self.endpoint = '{0}/v1/'.format(
self.identity_client.service_catalog.url_for(
service_type='application_catalog',
service_type='application-catalog',
endpoint_type='publicURL'))
self.headers = {'X-Auth-Token': self.murano_client.auth_token,
'content-type': 'application/json'}
self.headers = {
'X-Auth-Token': self.murano_client.http_client.auth_token,
'content-type': 'application/json'
}
try:
self.list_environments()
except exceptions.CommunicationError:

View File

@ -273,7 +273,7 @@ class OfficialClientManager(fuel_health.manager.Manager):
try:
endpoint = keystone.service_catalog.url_for(
service_type='application_catalog',
service_type='application-catalog',
endpoint_type='publicURL')
except keystoneclient.exceptions.EndpointNotFound:
LOG.warning('Endpoint for Murano service '