You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by ra...@apache.org on 2017/03/29 17:24:23 UTC
incubator-ariatosca git commit: fixed main_file_name,
runtime_properties fields
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-48-aria-cli 46c70a43f -> 2bba961c8
fixed main_file_name, runtime_properties fields
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/2bba961c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/2bba961c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/2bba961c
Branch: refs/heads/ARIA-48-aria-cli
Commit: 2bba961c89bc0a8b96a44544910ea2c843ec010c
Parents: 46c70a4
Author: Ran Ziv <ra...@gigaspaces.com>
Authored: Wed Mar 29 20:24:16 2017 +0300
Committer: Ran Ziv <ra...@gigaspaces.com>
Committed: Wed Mar 29 20:24:16 2017 +0300
----------------------------------------------------------------------
aria/cli/commands/node_templates.py | 5 ++++-
aria/cli/commands/nodes.py | 11 +++++++----
aria/cli/commands/service_templates.py | 5 ++++-
aria/modeling/service_template.py | 1 +
.../simple_v1_0/modeling/__init__.py | 3 ++-
5 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2bba961c/aria/cli/commands/node_templates.py
----------------------------------------------------------------------
diff --git a/aria/cli/commands/node_templates.py b/aria/cli/commands/node_templates.py
index a76596f..5614aee 100644
--- a/aria/cli/commands/node_templates.py
+++ b/aria/cli/commands/node_templates.py
@@ -56,7 +56,10 @@ def show(node_template_id, model_storage, logger):
# print node template properties
logger.info('Node template properties:')
- logger.info(utils.get_parameter_templates_as_string(node_template.properties))
+ if node_template.properties:
+ logger.info(utils.get_parameter_templates_as_string(node_template.properties))
+ else:
+ logger.info('\tNo properties')
# print node IDs
nodes = node_template.nodes.all()
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2bba961c/aria/cli/commands/nodes.py
----------------------------------------------------------------------
diff --git a/aria/cli/commands/nodes.py b/aria/cli/commands/nodes.py
index 2d90bea..fad96fc 100644
--- a/aria/cli/commands/nodes.py
+++ b/aria/cli/commands/nodes.py
@@ -44,16 +44,19 @@ def show(node_id, model_storage, logger):
"""
logger.info('Showing node {0}'.format(node_id))
try:
- node = model_storage.node.get(node_id).to_dict()
+ node = model_storage.node.get(node_id)
except StorageError:
raise AriaCliError('Node {0} not found'.format(node_id))
- print_data(NODE_COLUMNS, node, 'Node:', 50)
+ print_data(NODE_COLUMNS, node.to_dict(), 'Node:', 50)
# print node attributes
logger.info('Node attributes:')
- for prop_name, prop_value in node.runtime_properties.iteritems():
- logger.info('\t{0}: {1}'.format(prop_name, prop_value))
+ if node.runtime_properties:
+ for prop_name, prop_value in node.runtime_properties.iteritems():
+ logger.info('\t{0}: {1}'.format(prop_name, prop_value))
+ else:
+ logger.info('\tNo attributes')
logger.info('')
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2bba961c/aria/cli/commands/service_templates.py
----------------------------------------------------------------------
diff --git a/aria/cli/commands/service_templates.py b/aria/cli/commands/service_templates.py
index 0f163d5..b855529 100644
--- a/aria/cli/commands/service_templates.py
+++ b/aria/cli/commands/service_templates.py
@@ -201,4 +201,7 @@ def print_service_template_inputs(model_storage, service_template_name, logger):
service_template = model_storage.service_template.get_by_name(service_template_name)
logger.info('Service template inputs:')
- logger.info(utils.get_parameter_templates_as_string(service_template.inputs))
+ if service_template.inputs:
+ logger.info(utils.get_parameter_templates_as_string(service_template.inputs))
+ else:
+ logger.info('\tNo inputs')
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2bba961c/aria/modeling/service_template.py
----------------------------------------------------------------------
diff --git a/aria/modeling/service_template.py b/aria/modeling/service_template.py
index 12a5334..20c24b6 100644
--- a/aria/modeling/service_template.py
+++ b/aria/modeling/service_template.py
@@ -502,6 +502,7 @@ class NodeTemplateBase(TemplateModelMixin):
type=self.type,
description=deepcopy_with_locators(self.description),
state=models.Node.INITIAL,
+ runtime_properties={},
node_template=self)
utils.instantiate_dict(node, node.properties, self.properties)
utils.instantiate_dict(node, node.interfaces, self.interface_templates)
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2bba961c/extensions/aria_extension_tosca/simple_v1_0/modeling/__init__.py
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/__init__.py b/extensions/aria_extension_tosca/simple_v1_0/modeling/__init__.py
index d0a39e6..1661623 100644
--- a/extensions/aria_extension_tosca/simple_v1_0/modeling/__init__.py
+++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/__init__.py
@@ -19,6 +19,7 @@ Creates ARIA service template models based on the TOSCA presentation.
Relies on many helper methods in the presentation classes.
"""
+import os
import re
from types import FunctionType
from datetime import datetime
@@ -34,7 +35,7 @@ from ..data_types import coerce_value
def create_service_template_model(context): # pylint: disable=too-many-locals,too-many-branches
model = ServiceTemplate(created_at=datetime.now(),
- main_file_name=str(context.presentation.location))
+ main_file_name=os.path.basename(str(context.presentation.location)))
model.description = context.presentation.get('service_template', 'description', 'value')