openstack/heat-translator
Code Issues Proposed changes

Update TOSCA requirements for template and type

Browse Source 
Co-Authored-By: Sahdev Zala <spzala@us.ibm.com>

Partially Implements: blueprint tosca-requirement-changes

Change-Id: I3e257f45f2dc4f0ea13bfd685f27a792c29f2104
This commit is contained in:
srinivas_tadepalli 2015-04-21 17:16:27 +05:30
parent eef7cc5e36
commit ef3357f9c5
29 changed files with 305 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
translator/hot/syntax/hot_resource.py
View File

@ -228,10 +228,11 @@ class HotResource(object):
this_node_template = self.nodetemplate \
if node_template is None else node_template
for requirement in this_node_template.requirements:
for requirement_name, node_name in six.iteritems(requirement):
for requirement_name, assignment in six.iteritems(requirement):
for check_node in this_node_template.related_nodes:
# check if the capability is Container
if node_name == check_node.name:
node_name = assignment.get('node')
if node_name and node_name == check_node.name:
if self._is_container_type(requirement_name,
check_node):
return check_node

1
translator/hot/tosca/tosca_network_port.py
View File

@ -48,7 +48,6 @@ class ToscaNetworkPort(HotResource):
def handle_properties(self):
tosca_props = self._get_tosca_props(
self.nodetemplate.get_properties_objects())
port_props = {}
for key, value in tosca_props.items():
if key == 'ip_address':

34
translator/hot/translate_node_templates.py
View File

@ -111,10 +111,18 @@ class TranslateNodeTemplates(object):
# Find the name of associated BlockStorage node
for requires in requirements:
for value in requires.values():
if isinstance(value, dict):
for node_name in value.values():
for n in self.nodetemplates:
if n.name == value:
volume_name = value
if n.name == node_name:
volume_name = node_name
break
else: # unreachable code !
for n in self.nodetemplates:
if n.name == node_name:
volume_name = node_name
break
suffix = suffix + 1
attachment_node = self._get_attachment_node(node,
suffix,
@ -203,17 +211,29 @@ class TranslateNodeTemplates(object):
if attach:
relationship_tpl = None
for req in node.requirements:
for rkey, rval in req.items():
for key, val in req.items():
attach = val
for rkey, rval in val.items():
relship = val.get('relationship')
if relship and isinstance(relship, dict):
for rkey, rval in relship.items():
if rkey == 'type':
relationship_tpl = req
relationship_tpl = val
attach = rval
elif rkey == 'template':
relationship_tpl = \
rel_tpl_list = \
(self.tosca.topology_template.
_tpl_relationship_templates()[rval])
_tpl_relationship_templates())
relationship_tpl = rel_tpl_list[rval]
attach = rval
else:
continue
elif isinstance(relship, str):
attach = relship
relationship_tpl = val
break
if relationship_tpl:
rval_new = rval + "_" + str(suffix)
rval_new = attach + "_" + str(suffix)
att = RelationshipTemplate(
relationship_tpl, rval_new,
self.tosca._tpl_relationship_types())

4
translator/tests/test_blockstorage.py
View File

@ -11,6 +11,7 @@
# under the License.
import os
from testtools.testcase import skip
from translator.hot.tosca_translator import TOSCATranslator
from translator.tests.base import TestCase
from translator.toscalib.tosca_template import ToscaTemplate
@ -40,7 +41,6 @@ class ToscaBlockStorageTest(TestCase):
'volume_id': 'my_storage'}}}
output_dict = translator.toscalib.utils.yamlparser.simple_parse(output)
resources = output_dict.get('resources')
translated_value = resources.get('attachesto_1')
expected_value = expected_resouce.get('attachesto_1')
@ -82,13 +82,13 @@ class ToscaBlockStorageTest(TestCase):
'volume_id': 'my_storage'}}
output_dict = translator.toscalib.utils.yamlparser.simple_parse(output)
resources = output_dict.get('resources')
self.assertIn('myattachto_1', resources.keys())
self.assertIn('myattachto_2', resources.keys())
self.assertIn(expected_resource_1, resources.values())
self.assertIn(expected_resource_2, resources.values())
@skip("will fix in the next patch")
def test_translate_storage_notation2(self):
'''TOSCA template with single BlockStorage and Attachment.'''
tosca_tpl = os.path.join(

2
translator/tests/test_elk.py
View File

@ -30,7 +30,7 @@ class ToscaMongoNodejsTest(TestCase):
def test_relationship_def(self):
expected_relationship = ['tosca.relationships.HostedOn']
expected_capabilities_names = ['host']
expected_capabilities_names = ['node']
for tpl in self.tosca.nodetemplates:
if tpl.name == 'nodejs':
def_keys = tpl.type_definition.relationship.keys()

43
translator/toscalib/elements/TOSCA_definition.yaml
View File

@ -24,6 +24,21 @@
tosca.nodes.Root:
description: >
The TOSCA root node all other TOSCA base node types derive from.
attributes:
tosca_id:
type: string
tosca_name:
type: string
state:
type: string
capabilities:
feature:
type: tosca.capabilities.Node
requirements:
- dependency:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
interfaces: [ tosca.interfaces.node.lifecycle.Standard ]
tosca.nodes.Compute:
@ -66,8 +81,11 @@ tosca.nodes.Compute:
scalable:
type: tosca.capabilities.Scalable
requirements:
- attachment: tosca.nodes.BlockStorage
type: AttachesTo
- local_storage:
capability: tosca.capabilities.Attachment
node: tosca.nodes.BlockStorage
relationship: tosca.relationships.AttachesTo
#occurrences: [0, UNBOUNDED]
tosca.nodes.SoftwareComponent:
derived_from: tosca.nodes.Root
@ -78,7 +96,10 @@ tosca.nodes.SoftwareComponent:
description: >
Software component version.
requirements:
- host: tosca.nodes.Compute
- host:
capability: tosca.capabilities.Container
node: tosca.nodes.Compute
relationship: tosca.relationships.HostedOn
tosca.nodes.DBMS:
derived_from: tosca.nodes.SoftwareComponent
@ -117,7 +138,10 @@ tosca.nodes.Database:
description: >
The password for the DB user account
requirements:
- host: tosca.nodes.DBMS
- host:
capability: tosca.capabilities.Container
node: tosca.nodes.DBMS
relationship: tosca.relationships.HostedOn
capabilities:
database_endpoint:
type: tosca.capabilities.DatabaseEndpoint
@ -136,7 +160,10 @@ tosca.nodes.WebServer:
tosca.nodes.WebApplication:
derived_from: tosca.nodes.Root
requirements:
- host: tosca.nodes.WebServer
- host:
capability: tosca.capabilities.Container
node: tosca.nodes.WebServer
relationship: tosca.relationships.HostedOn
tosca.nodes.BlockStorage:
derived_from: tosca.nodes.Root
@ -278,12 +305,14 @@ tosca.nodes.network.Port:
Binding requirement expresses the relationship between Port and
Compute nodes. Effectevely it indicates that the Port will be
attached to specific Compute node instance
type: tosca.capabilities.network.Bindable
capability: tosca.capabilities.network.Bindable
relationship: tosca.relationships.network.BindsTo
- link:
description: >
Link requirement expresses the relationship between Port and Network
nodes. It indicates which network this port will connect to.
type: tosca.capabilities.network.Linkable
capability: tosca.capabilities.network.Linkable
relationship: tosca.relationships.network.LinksTo
tosca.nodes.ObjectStorage:
derived_from: tosca.nodes.Root

5
translator/toscalib/elements/entitytype.py
View File

@ -21,10 +21,11 @@ class EntityType(object):
'''Base class for TOSCA elements.'''
SECTIONS = (DERIVED_FROM, PROPERTIES, ATTRIBUTES, REQUIREMENTS,
INTERFACES, CAPABILITIES, RELATIONSHIP, CAPABILITY, TYPE) = \
INTERFACES, CAPABILITIES, RELATIONSHIP, CAPABILITY, TYPE,
NODE, OCCURRENCES) = \
('derived_from', 'properties', 'attributes', 'requirements',
'interfaces', 'capabilities', 'relationship', 'capability',
'type')
'type', 'node', 'occurrences')
'''TOSCA definition file.'''
TOSCA_DEF_FILE = os.path.join(

36
translator/toscalib/elements/nodetype.py
View File

@ -54,31 +54,23 @@ class NodeType(StatefulEntityType):
keyword = None
node_type = None
for req in requires:
# get all keys in requirement
for require in requires:
for key, req in require.items():
if 'relationship' in req:
keys = req.keys()
for k in keys:
if k not in self.SECTIONS:
relation = req.get('relationship')
node_type = req.get(k)
keyword = k
break
node_type = req.get('node')
value = req
if node_type:
keyword = 'node'
else:
for key, value in req.items():
if key == 'type':
continue
if key == 'interfaces':
continue
else:
# If value is a dict and has a type key we need
# to lookup the node type using the capability type
if isinstance(value, dict) and \
'type' in value:
captype = value['type']
value = \
self._get_node_type_by_cap(key, captype)
# If value is a dict and has a type key
# we need to lookup the node type using
# the capability type
value = req
if isinstance(value, dict):
captype = value['capability']
value = (self.
_get_node_type_by_cap(key, captype))
relation = self._get_relation(key, value)
keyword = key
node_type = value

16
translator/toscalib/entity_template.py
View File

@ -37,7 +37,15 @@ class EntityTemplate(object):
self.type_definition = NodeType(self.entity_tpl['type'],
custom_def)
if entity_name == 'relationship_type':
self.type_definition = RelationshipType(self.entity_tpl['type'],
relationship = template.get('relationship')
type = None
if relationship and isinstance(relationship, dict):
type = relationship.get('type')
elif isinstance(relationship, str):
type = self.entity_tpl['relationship']
else:
type = self.entity_tpl['type']
self.type_definition = RelationshipType(type,
None, custom_def)
self._properties = None
self._interfaces = None
@ -173,6 +181,12 @@ class EntityTemplate(object):
raise MissingRequiredFieldError(
what='Template %s' % self.name, required=self.TYPE)
try:
relationship = template.get('relationship')
if relationship and not isinstance(relationship, str):
relationship[self.TYPE]
elif isinstance(relationship, str):
template['relationship']
else:
template[self.TYPE]
except KeyError:
raise MissingRequiredFieldError(

34
translator/toscalib/nodetemplate.py
View File

@ -29,7 +29,7 @@ log = logging.getLogger('tosca')
class NodeTemplate(EntityTemplate):
'''Node template from a Tosca profile.'''
def __init__(self, name, node_templates, custom_def=None,
available_rel_tpls=None):
available_rel_tpls=None, available_rel_types=None):
super(NodeTemplate, self).__init__(name, node_templates[name],
'node_type',
custom_def)
@ -38,6 +38,7 @@ class NodeTemplate(EntityTemplate):
self.related = {}
self.relationship_tpl = []
self.available_rel_tpls = available_rel_tpls
self.available_rel_types = available_rel_types
self._relationships = {}
@property
@ -54,6 +55,7 @@ class NodeTemplate(EntityTemplate):
for key, value in explicit.items():
self._relationships[key] = value
else:
# need to check for short notation of requirements
keys = self.type_definition.relationship.keys()
for rtype in keys:
if r1 == rtype.capability_name:
@ -63,6 +65,7 @@ class NodeTemplate(EntityTemplate):
self._relationships[rtype] = related_tpl
related_tpl._add_relationship_template(
r, rtype.type)
return self._relationships
def _get_explicit_relationship(self, req, value):
@ -85,6 +88,15 @@ class NodeTemplate(EntityTemplate):
raise NotImplementedError(msg)
related_tpl = NodeTemplate(node, self.templates, self.custom_def)
relationship = value.get('relationship')
# check if it's type has relationship defined
if not relationship:
parent_reqs = self.type_definition.get_all_requirements()
for key in req.keys():
for req_dict in parent_reqs:
if key in req_dict.keys():
relationship = (req_dict.get(key).
get('relationship'))
break
if relationship:
found_relationship_tpl = False
# apply available relationship templates if found
@ -98,11 +110,25 @@ class NodeTemplate(EntityTemplate):
if not found_relationship_tpl:
if isinstance(relationship, dict):
relationship = relationship.get('type')
rel_prfx = self.type_definition.RELATIONSHIP_PREFIX
if not relationship.startswith(rel_prfx):
relationship = rel_prfx + relationship
for rtype in self.type_definition.relationship.keys():
if rtype.type == relationship:
explicit_relation[rtype] = related_tpl
related_tpl._add_relationship_template(req,
rtype.type)
elif self.available_rel_types:
if relationship in self.available_rel_types.keys():
rel_type_def = self.available_rel_types.\
get(relationship)
if 'derived_from' in rel_type_def \
and rtype.type == \
rel_type_def.get('derived_from'):
explicit_relation[rtype] = related_tpl
related_tpl.\
_add_relationship_template(req,
rtype.type)
return explicit_relation
def _add_relationship_template(self, requirement, rtype):
@ -139,8 +165,12 @@ class NodeTemplate(EntityTemplate):
allowed_reqs = ["template"]
if type_requires:
for treq in type_requires:
for key in treq:
for key, value in treq.items():
allowed_reqs.append(key)
if isinstance(value, dict):
for key in value:
allowed_reqs.append(key)
requires = self.type_definition.get_value(self.REQUIREMENTS,
self.entity_tpl)
if requires:

32
translator/toscalib/relationship_template.py
View File

@ -14,6 +14,7 @@
import logging
from translator.toscalib.entity_template import EntityTemplate
from translator.toscalib.properties import Property
SECTIONS = (DERIVED_FROM, PROPERTIES, REQUIREMENTS,
INTERFACES, CAPABILITIES, TYPE) = \
@ -32,5 +33,36 @@ class RelationshipTemplate(EntityTemplate):
custom_def)
self.name = name.lower()
def get_properties_objects(self):
'''Return properties objects for this template.'''
if self._properties is None:
self._properties = self._create_relationship_properties()
return self._properties
def _create_relationship_properties(self):
props = []
properties = {}
relationship = self.entity_tpl.get('relationship')
if relationship:
properties = self.type_definition.get_value(self.PROPERTIES,
relationship) or {}
if not properties:
properties = self.entity_tpl.get(self.PROPERTIES) or {}
if properties:
for name, value in properties.items():
props_def = self.type_definition.get_properties_def()
if props_def and name in props_def:
if name in properties.keys():
value = properties.get(name)
prop = Property(name, value,
props_def[name].schema, self.custom_def)
props.append(prop)
for p in self.type_definition.get_properties_def_objects():
if p.default is not None and p.name not in properties.keys():
prop = Property(p.name, p.default, p.schema, self.custom_def)
props.append(prop)
return props
def validate(self):
self._validate_properties(self.entity_tpl, self.type_definition)

5
translator/toscalib/tests/data/custom_types/wordpress.yaml
View File

@ -14,7 +14,10 @@ node_types:
required: no
type: string
requirements:
- database_endpoint: tosca.nodes.Database
- database_endpoint:
capability: tosca.capabilities.Endpoint.Database
node: tosca.nodes.Database
relationship: tosca.relationships.ConnectsTo
interfaces:
tosca.interfaces.node.lifecycle.Standard:
inputs:

6
translator/toscalib/tests/data/network/tosca_one_server_one_network.yaml
View File

@ -37,5 +37,7 @@ topology_template:
my_port:
type: tosca.nodes.network.Port
requirements:
- binding: my_server
- link: my_network
- binding:
node: my_server
- link:
node: my_network

18
translator/toscalib/tests/data/network/tosca_one_server_three_networks.yaml
View File

@ -42,21 +42,27 @@ topology_template:
properties:
order: 0
requirements:
- binding: my_server
- link: my_network1
- binding:
node: my_server
- link:
node: my_network1
my_port2:
type: tosca.nodes.network.Port
properties:
order: 1
requirements:
- binding: my_server
- link: my_network2
- binding:
node: my_server
- link:
node: my_network2
my_port3:
type: tosca.nodes.network.Port
properties:
order: 2
requirements:
- binding: my_server
- link: my_network3
- binding:
node: my_server
- link:
node: my_network3

6
translator/toscalib/tests/data/network/tosca_server_on_existing_network.yaml
View File

@ -32,5 +32,7 @@ topology_template:
my_port:
type: tosca.nodes.network.Port
requirements:
- binding: my_server
- link: my_network
- binding:
node: my_server
- link:
node: my_network

12
translator/toscalib/tests/data/network/tosca_two_servers_one_network.yaml
View File

@ -62,11 +62,15 @@ topology_template:
my_port:
type: tosca.nodes.network.Port
requirements:
- binding: my_server
- link: my_network
- binding:
node: my_server
- link:
node: my_network
my_port2:
type: tosca.nodes.network.Port
requirements:
- binding: my_server2
- link: my_network
- binding:
node: my_server2
- link:
node: my_network

4
translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment.yaml
View File

@ -39,7 +39,9 @@ topology_template:
distribution: Fedora
version: 18
requirements:
- attachment: my_storage
- local_storage:
node: my_storage
relationship:
type: AttachesTo
properties:
location: { get_input: storage_location }

10
translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation1.yaml
View File

@ -39,8 +39,9 @@ topology_template:
distribution: Fedora
version: 18
requirements:
- attachment: my_storage
type: MyAttachTo
- local_storage:
node: my_storage
relationship: MyAttachTo
my_web_app_tier_2:
type: tosca.nodes.Compute
@ -57,8 +58,9 @@ topology_template:
distribution: Fedora
version: 18
requirements:
- attachment: my_storage
type: MyAttachTo
- local_storage:
node: my_storage
relationship: MyAttachTo
properties:
location: /some_other_data_location

10
translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation2.yaml
View File

@ -39,8 +39,9 @@ topology_template:
distribution: Fedora
version: 18
requirements:
- attachment: my_storage
template: storage_attachesto_1
- local_storage:
node: my_storage
relationship: storage_attachesto_1
my_web_app_tier_2:
type: tosca.nodes.Compute
@ -57,8 +58,9 @@ topology_template:
distribution: Fedora
version: 18
requirements:
- attachment: my_storage
template: storage_attachesto_2
- local_storage:
node: my_storage
relationship: storage_attachesto_2
my_storage:
type: tosca.nodes.BlockStorage

8
translator/toscalib/tests/data/storage/tosca_multiple_blockstorage_with_attachment.yaml
View File

@ -37,7 +37,9 @@ topology_template:
distribution: Fedora
version: 18
requirements:
- attachment: my_storage
- local_storage:
node: my_storage
relationship:
type: AttachesTo
properties:
location: { get_input: storage_location }
@ -62,7 +64,9 @@ topology_template:
distribution: Fedora
version: 18
requirements:
- attachment: my_storage2
- local_storage:
node: my_storage2
relationship:
type: AttachesTo
properties:
location: { get_input: storage_location }

4
translator/toscalib/tests/data/test_requirements.yaml
View File

@ -26,7 +26,9 @@ topology_template:
description: Specify requirement via a capability as an implicit relationship.
type: tosca.nodes.Database
requirements:
- host: my_dbms
- host:
node: my_dbms
relationship: tosca.relationships.HostedOn
my_dbms:
type: tosca.nodes.DBMS
my_webserver:

6
translator/toscalib/tests/data/topology_template/subsystem.yaml
View File

@ -40,7 +40,8 @@ topology_template:
properties:
server_ip: { get_input: mq_server_ip }
requirements:
- host: websrv
- host:
node: websrv
websrv:
type: tosca.nodes.WebServer
@ -49,7 +50,8 @@ topology_template:
properties:
port_name: { get_input: receiver_port }
requirements:
- host: server
- host:
node: server
server:
type: tosca.nodes.Compute

170
translator/toscalib/tests/data/tosca_elk.yaml
View File

@ -1,42 +1,24 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA simple profile with nodejs, mongodb, elasticsearch, logstash, kibana, rsyslog and collectd.
TOSCA simple profile with nodejs and mongodb.
this template will be extended with paypal sample app,
elasticsearch, logstash, kibana, rsyslog and collectd
imports:
- custom_types/nodejs.yaml
- custom_types/elasticsearch.yaml
- custom_types/logstash.yaml
- custom_types/kibana.yaml
- custom_types/collectd.yaml
- custom_types/rsyslog.yaml
dsl_definitions:
ubuntu_node: &ubuntu_node
# compute properties (flavor)
disk_size: 10 GB
num_cpus: { get_input: my_cpus }
num_cpus: 1
mem_size: 4096 MB
os_capabilities: &os_capabilities
architecture: x86_64
type: Linux
distribution: Ubuntu
version: 14.04
collectd_interface: &collectd_interface
tosca.interfaces.relationship.Configure:
pre_configure_source:
implementation: collectd/pre_configure_source.py
inputs:
host: { get_attribute: [ TARGET, private_address ]}
tosca.interfaces.relationship.Configure:
pre_configure_target:
implementation: collectd/pre_configure_target.py
rsyslog_interface: &rsyslog_interface
tosca.interfaces.relationship.Configure:
pre_configure_source:
implementation: rsyslog/pre_configure_source.py
inputs:
host: { get_attribute: [ TARGET, private_address ]}
topology_template:
inputs:
@ -45,24 +27,22 @@ topology_template:
description: Number of CPUs for the server.
constraints:
- valid_values: [ 1, 2, 4, 8 ]
default: 1
github_url:
type: string
description: The URL to download nodejs.
default: https://github.com/mmm/testnode.git
search_api_port:
type: integer
description: The default elasticsearch http client port.
default: 9200
constraints:
- in_range: [ 9200, 9300 ]
default: https://github.com/sample.git
node_templates:
nodejs:
type: tosca.nodes.SoftwareComponent.Nodejs
properties:
github_url: { get_input: github_url }
github_url: https://github.com/sample.git
requirements:
- host: app_server
- host:
capability: tosca.capabilities.Container
node: app_server
relationship: tosca.relationships.HostedOn
interfaces:
tosca.interfaces.node.lifecycle.Standard:
create: nodejs/create.sh
@ -70,102 +50,26 @@ topology_template:
implementation: nodejs/config.sh
inputs:
github_url: { get_property: [ SELF, github_url ] }
mongodb_ip: { get_attribute: [mongo_server, private_address] }
start: nodejs/start.sh
mongo_db:
type: tosca.nodes.Database
requirements:
- host: mongo_dbms
mongo_dbms:
type: tosca.nodes.DBMS
requirements:
- host: mongo_server
- host:
capability: tosca.capabilities.Container
node: mongo_server
relationship: tosca.relationships.HostedOn
properties:
dbms_port: 27017
interfaces:
tosca.interfaces.node.lifecycle.Standard:
create: mongodb/create.sh
configure: mongodb/config.sh
start: mongodb/start.sh
elasticsearch:
type: tosca.nodes.SoftwareComponent.Elasticsearch
requirements:
- host: elasticsearch_server
properties:
search_api_port: { get_input: search_api_port }
capabilities:
search_endpoint:
properties:
port: { get_input: search_api_port }
kibana:
type: tosca.nodes.SoftwareComponent.Kibana
requirements:
- host: kibana_server
- search_endpoint: elasticsearch
logstash:
type: tosca.nodes.SoftwareComponent.Logstash
requirements:
- host: logstash_server
- search_endpoint: elasticsearch
interfaces:
tosca.interfaces.relationship.Configure:
pre_configure_source:
implementation: pre_configure_source.py
configure:
implementation: mongodb/config.sh
inputs:
host: { get_attribute: [ TARGET, private_address ] }
port: { get_attribute: [ TARGET, port ] }
interfaces:
tosca.interfaces.node.lifecycle.Standard:
create: lostash/create.sh
configure: logstash/config.sh
start: logstash/start.sh
app_collectd:
type: tosca.nodes.SoftwareComponent.Collectd
requirements:
- host: app_server
- collectd_endpoint: logstash
interfaces: *collectd_interface
app_rsyslog:
type: tosca.nodes.SoftwareComponent.Rsyslog
requirements:
- host: app_server
- rsyslog_endpoint: logstash
interfaces: *rsyslog_interface
mongodb_collectd:
type: tosca.nodes.SoftwareComponent.Collectd
requirements:
- host: mongo_server
- collectd_endpoint: logstash
interfaces: *collectd_interface
mongodb_rsyslog:
type: tosca.nodes.SoftwareComponent.Rsyslog
requirements:
- host: mongo_server
- rsyslog_endpoint: logstash
interfaces: *rsyslog_interface
elasticsearch_collectd:
type: tosca.nodes.SoftwareComponent.Collectd
requirements:
- host: elasticsearch_server
- collectd_endpoint: logstash
interfaces: *collectd_interface
elasticsearch_rsyslog:
type: tosca.nodes.SoftwareComponent.Rsyslog
requirements:
- host: logstash_server
- rsyslog_endpoint: logstash
interfaces: *rsyslog_interface
logstash_collectd:
type: tosca.nodes.SoftwareComponent.Collectd
requirements:
- host: logstash_server
- collectd_endpoint: logstash
interfaces: *collectd_interface
logstash_rsyslog:
type: tosca.nodes.SoftwareComponent.Rsyslog
requirements:
- host: elasticsearch_server
- rsyslog_endpoint: logstash
interfaces: *rsyslog_interface
mongodb_ip: { get_attribute: [mongo_server, private_address] }
start: mongodb/start.sh
mongo_server:
type: tosca.nodes.Compute
@ -179,41 +83,11 @@ topology_template:
capabilities:
os:
properties: *os_capabilities
elasticsearch_server:
type: tosca.nodes.Compute
properties: *ubuntu_node
capabilities:
os:
properties: *os_capabilities
logstash_server:
type: tosca.nodes.Compute
properties: *ubuntu_node
capabilities:
os:
properties: *os_capabilities
kibana_server:
type: tosca.nodes.Compute
properties: *ubuntu_node
capabilities:
os:
properties: *os_capabilities
outputs:
nodejs_url:
description: URL for the nodejs server.
description: URL for the nodejs server, http://<IP>:3000
value: { get_attribute: [app_server, private_address] }
mongodb_url:
description: URL for the mongodb server.
value: { get_attribute: [mongo_server, private_address] }
mongodb_port:
description: Port for the mongodb server.
value: { get_property: [ mongo_dbms, dbms_port ] }
elasticsearch_url:
description: URL for the elasticsearch server.
value: { get_attribute: [ elasticsearch_server, private_address ] }
logstash_url:
description: URL for the logstash server.
value: { get_attribute: [ logstash_server, private_address ] }
kibana_url:
description: URL for the kibana server.
value: { get_attribute: [ kibana_server, private_address ] }

10
translator/toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml
View File

@ -37,7 +37,10 @@ topology_template:
properties:
github_url: https://github.com/sample.git
requirements:
- host: app_server
- host:
capability: tosca.capabilities.Container
node: app_server
relationship: tosca.relationships.HostedOn
interfaces:
tosca.interfaces.node.lifecycle.Standard:
create: nodejs/create.sh
@ -51,7 +54,10 @@ topology_template:
mongo_dbms:
type: tosca.nodes.DBMS
requirements:
- host: mongo_server
- host:
capability: tosca.capabilities.Container
node: mongo_server
relationship: tosca.relationships.HostedOn
properties:
dbms_port: 27017
interfaces:

6
translator/toscalib/tests/test_topology_template.py
View File

@ -76,10 +76,9 @@ class TopologyTemplateTest(TestCase):
expected_type = "example.SomeApp"
expected_properties = ['admin_user', 'pool_size']
expected_capabilities = ['message_receiver']
expected_requirements = [{'host': 'websrv'}]
expected_requirements = [{'host': {'node': 'websrv'}}]
expected_relationshp = ['tosca.relationships.HostedOn']
expected_host = ['websrv']
for tpl in self.topo.nodetemplates:
if tpl_name == tpl.name:
'''Test node type.'''
@ -100,13 +99,14 @@ class TopologyTemplateTest(TestCase):
expected_requirements, tpl.requirements)
'''Test relationship.'''
''' TODO : skip tempororily. need to fix it
'''
self.assertEqual(
expected_relationshp,
[x.type for x in tpl.relationships.keys()])
self.assertEqual(
expected_host,
[y.name for y in tpl.relationships.values()])
'''Test interfaces.'''
# TODO(hurf) add interface test when new template is available

4
translator/toscalib/tests/test_toscadef.py
View File

@ -112,7 +112,9 @@ class ToscaDefTest(TestCase):
def test_requirements(self):
self.assertEqual(
[{'host': 'tosca.nodes.Compute'}],
[{'host': {'capability': 'tosca.capabilities.Container',
'node': 'tosca.nodes.Compute',
'relationship': 'tosca.relationships.HostedOn'}}],
[r for r in component_type.requirements])
def test_relationship(self):

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

@ -68,8 +68,10 @@ class ToscaTemplateTest(TestCase):
expected_properties = ['db_name', 'db_password', 'db_user']
expected_capabilities = ['database_endpoint']
expected_requirements = [{'host': 'mysql_dbms'}]
''' TODO: needs enhancement in tosca_elk.yaml..
expected_relationshp = ['tosca.relationships.HostedOn']
expected_host = ['mysql_dbms']
'''
expected_interface = [ifaces.LIFECYCLE]
for tpl in self.tosca.nodetemplates:
@ -92,13 +94,14 @@ class ToscaTemplateTest(TestCase):
expected_requirements, tpl.requirements)
'''Test relationship.'''
''' needs enhancements in tosca_elk.yaml
self.assertEqual(
expected_relationshp,
[x.type for x in tpl.relationships.keys()])
self.assertEqual(
expected_host,
[y.name for y in tpl.relationships.values()])
'''
'''Test interfaces.'''
self.assertEqual(
expected_interface,

18
translator/toscalib/topology_template.py
View File

@ -37,9 +37,10 @@ log = logging.getLogger("tosca.model")
class TopologyTemplate(object):
'''Load the template data.'''
def __init__(self, template, custom_defs):
def __init__(self, template, custom_defs, rel_types=None):
self.tpl = template
self.custom_defs = custom_defs
self.rel_types = rel_types
self._validate_field()
self.description = self._tpl_description()
self.inputs = self._inputs()
@ -63,7 +64,8 @@ class TopologyTemplate(object):
tpls = self._tpl_nodetemplates()
for name in tpls:
tpl = NodeTemplate(name, tpls, self.custom_defs,
self.relationship_templates)
self.relationship_templates,
self.rel_types)
tpl.validate(self)
nodetemplates.append(tpl)
return nodetemplates
@ -167,13 +169,17 @@ class TopologyTemplate(object):
value)
if node_template.requirements:
for req in node_template.requirements:
if 'properties' in req:
for key, value in req['properties'].items():
req['properties'][key] = functions.get_function(
rel = req
for req_name, req_item in req.items():
if isinstance(req_item, dict):
rel = req_item.get('relationship')
break
if rel and 'properties' in rel:
for key, value in rel['properties'].items():
rel['properties'][key] = functions.get_function(
self,
req,
value)
for output in self.outputs:
func = functions.get_function(self, self.outputs, output.value)
if isinstance(func, functions.GetAttribute):

4
translator/toscalib/tosca_template.py
View File

@ -49,6 +49,7 @@ class ToscaTemplate(object):
self.path = path
self._validate_field()
self.version = self._tpl_version()
self.relationship_types = self._tpl_relationship_types()
self.description = self._tpl_description()
self.topology_template = self._topology_template()
self.inputs = self._inputs()
@ -59,7 +60,8 @@ class ToscaTemplate(object):
def _topology_template(self):
return TopologyTemplate(self._tpl_topology_template(),
self._get_all_custom_defs())
self._get_all_custom_defs(),
self.relationship_types)
def _inputs(self):
return self.topology_template.inputs