Ad function to get uris when a prefix is being used

This commit is contained in:
Liam Young 2016-01-14 15:25:37 +00:00
parent ac3d716713
commit 8bfd5c8b13

View File

@ -78,7 +78,7 @@ class RabbitMQRelationAdapter(OpenStackRelationAdapter):
class DatabaseRelationAdapter(OpenStackRelationAdapter): class DatabaseRelationAdapter(OpenStackRelationAdapter):
""" """
Adapter for the RabbitMQRequires relation interface. Adapter for the Database relation interface.
""" """
interface_type = "database" interface_type = "database"
@ -98,14 +98,21 @@ class DatabaseRelationAdapter(OpenStackRelationAdapter):
def type(self): def type(self):
return 'mysql' return 'mysql'
@property def get_uri(self, prefix=None):
def uri(self): if prefix:
uri = 'mysql://{}:{}@{}/{}'.format( uri = 'mysql://{}:{}@{}/{}'.format(
self.username, self.relation.username(prefix=prefix),
self.password, self.relation.password(prefix=prefix),
self.host, self.host,
self.database, self.relation.database(prefix=prefix),
) )
else:
uri = 'mysql://{}:{}@{}/{}'.format(
self.username,
self.password,
self.host,
self.database,
)
if self.ssl_ca: if self.ssl_ca:
uri = '{}?ssl_ca={}'.format(uri, self.ssl_ca) uri = '{}?ssl_ca={}'.format(uri, self.ssl_ca)
if self.ssl_cert: if self.ssl_cert:
@ -114,6 +121,12 @@ class DatabaseRelationAdapter(OpenStackRelationAdapter):
return uri return uri
@property
def uri(self):
return self.get_uri()
class ConfigurationAdapter(object): class ConfigurationAdapter(object):
""" """
Configuration Adapter which provides python based access Configuration Adapter which provides python based access