Allow OpenStackRelationAdapter to work with Endpoint-based interfaces
Change-Id: I9d52243ab0ccc60eade6c8023d9c5831a1637338 Closes-Bug: #1798335
This commit is contained in:
parent
ad407c9912
commit
39fc35b68d
|
@ -130,7 +130,10 @@ class OpenStackRelationAdapter(object):
|
|||
Note that the accessor is dynamic as each access calls the underlying
|
||||
getattr() for each property access.
|
||||
"""
|
||||
self.accessors.extend(self.relation.auto_accessors)
|
||||
try:
|
||||
self.accessors.extend(self.relation.auto_accessors)
|
||||
except AttributeError:
|
||||
self.accessors = []
|
||||
for field in self.accessors:
|
||||
meth_name = field.replace('-', '_')
|
||||
# Get the relation property dynamically
|
||||
|
@ -1107,7 +1110,10 @@ class OpenStackRelationAdapters(object):
|
|||
:param relation: a RelationBase derived reactive relation
|
||||
:returns (string, OpenstackRelationAdapter-derived): see above.
|
||||
"""
|
||||
relation_name = relation.relation_name.replace('-', '_')
|
||||
try:
|
||||
relation_name = relation.endpoint_name.replace('-', '_')
|
||||
except AttributeError:
|
||||
relation_name = relation.relation_name.replace('-', '_')
|
||||
try:
|
||||
adapter = self._adapters[relation_name](relation)
|
||||
except KeyError:
|
||||
|
|
Loading…
Reference in New Issue