openstack/heat-translator
Code Issues Proposed changes

Rename TOSCA node property relationship to relationships

Browse Source 
TOSCA node template can have multiple relationships so property name
providing relationship should be plural.

Closes-Bug: #1404109

Change-Id: I12892b72f6b05b9b26ee1694c8d144e6beade524
This commit is contained in:
spzala 2014-12-20 20:02:35 -08:00
parent 2b3c3b0454
commit 2933ff038e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
translator/hot/translate_node_templates.py
View File

@ -130,7 +130,7 @@ class TranslateNodeTemplates():
def _get_attachment_node(self, node, suffix, volume_name): def _get_attachment_node(self, node, suffix, volume_name):
attach = False attach = False
ntpl = self.nodetemplates ntpl = self.nodetemplates
for key, value in node.relationship.items(): for key, value in node.relationships.items():
if key.type == 'tosca.relationships.AttachTo': if key.type == 'tosca.relationships.AttachTo':
if value.type == 'tosca.nodes.BlockStorage': if value.type == 'tosca.nodes.BlockStorage':
attach = True attach = True

2
translator/toscalib/nodetemplate.py
View File

@ -40,7 +40,7 @@ class NodeTemplate(EntityTemplate):
self._relationships = {} self._relationships = {}
@property @property
def relationship(self): def relationships(self):
if not self._relationships: if not self._relationships:
requires = self.requirements requires = self.requirements
if requires: if requires:

14
translator/toscalib/tests/test_toscatpl.py
View File

@ -91,10 +91,10 @@ class ToscaTemplateTest(TestCase):
'''Test relationship.''' '''Test relationship.'''
self.assertEqual( self.assertEqual(
expected_relationshp, expected_relationshp,
[x.type for x in tpl.relationship.keys()]) [x.type for x in tpl.relationships.keys()])
self.assertEqual( self.assertEqual(
expected_host, expected_host,
[y.name for y in tpl.relationship.values()]) [y.name for y in tpl.relationships.values()])
'''Test interfaces.''' '''Test interfaces.'''
self.assertEqual( self.assertEqual(
@ -173,7 +173,7 @@ class ToscaTemplateTest(TestCase):
for node_tpl in template.nodetemplates: for node_tpl in template.nodetemplates:
if node_tpl.name == 'nodejs': if node_tpl.name == 'nodejs':
config_interface = 'tosca.interfaces.relationship.Configure' config_interface = 'tosca.interfaces.relationship.Configure'
relation = node_tpl.relationship relation = node_tpl.relationships
for key in relation.keys(): for key in relation.keys():
rel_tpl = relation.get(key).get_relationship_template() rel_tpl = relation.get(key).get_relationship_template()
interfaces = rel_tpl[0].interfaces interfaces = rel_tpl[0].interfaces
@ -216,20 +216,20 @@ class ToscaTemplateTest(TestCase):
('tosca.relationships.HostedOn', 'my_webserver')] ('tosca.relationships.HostedOn', 'my_webserver')]
actual_relationship = sorted([ actual_relationship = sorted([
(relation.type, node.name) for (relation.type, node.name) for
relation, node in node_tpl.relationship.items()]) relation, node in node_tpl.relationships.items()])
self.assertEqual(expected_relationship, actual_relationship) self.assertEqual(expected_relationship, actual_relationship)
if node_tpl.name == 'mysql_database': if node_tpl.name == 'mysql_database':
self.assertEqual( self.assertEqual(
[('tosca.relationships.HostedOn', 'my_dbms')], [('tosca.relationships.HostedOn', 'my_dbms')],
[(relation.type, node.name) for [(relation.type, node.name) for
relation, relation,
node in node_tpl.relationship.items()]) node in node_tpl.relationships.items()])
if node_tpl.name == 'my_server': if node_tpl.name == 'my_server':
self.assertEqual( self.assertEqual(
[('tosca.relationships.AttachTo', 'my_storage')], [('tosca.relationships.AttachTo', 'my_storage')],
[(relation.type, node.name) for [(relation.type, node.name) for
relation, relation,
node in node_tpl.relationship.items()]) node in node_tpl.relationships.items()])
def test_template_requirements_not_implemented(self): def test_template_requirements_not_implemented(self):
#TODO(spzala) replace this test with new one once TOSCA types look up #TODO(spzala) replace this test with new one once TOSCA types look up
@ -295,4 +295,4 @@ class ToscaTemplateTest(TestCase):
simple_parse(tpl_snippet))['node_templates'] simple_parse(tpl_snippet))['node_templates']
self.assertRaises( self.assertRaises(
NotImplementedError, NotImplementedError,
lambda: NodeTemplate(tpl_name, nodetemplates).relationship) lambda: NodeTemplate(tpl_name, nodetemplates).relationships)

4
translator/toscalib/tpl_relationship_graph.py
View File

@ -36,8 +36,8 @@ class ToscaGraph(object):
def _create(self): def _create(self):
for node in self.nodetemplates: for node in self.nodetemplates:
if node.relationship: relation = node.relationships
relation = node.relationship if relation:
for relation, nodetpls in relation.items(): for relation, nodetpls in relation.items():
for tpl in self.nodetemplates: for tpl in self.nodetemplates:
if tpl.name == nodetpls.name: if tpl.name == nodetpls.name: