You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by av...@apache.org on 2017/03/30 08:15:45 UTC
[1/2] incubator-ariatosca git commit: fixed main_file_name,
runtime_properties fields [Forced Update!]
Repository: incubator-ariatosca
Updated Branches:
refs/heads/avia-cli 3d75a911a -> 1d153e6c7 (forced update)
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/avia-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')
[2/2] incubator-ariatosca git commit: Show tracebacks on console when
in debug logging mode
Posted by av...@apache.org.
Show tracebacks on console when in debug logging mode
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/1d153e6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/1d153e6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/1d153e6c
Branch: refs/heads/avia-cli
Commit: 1d153e6c72d8f0022f81cd2791e62c8439e96c0d
Parents: 2bba961
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Wed Mar 29 19:57:38 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Thu Mar 30 11:08:26 2017 +0300
----------------------------------------------------------------------
aria/cli/cli/aria.py | 4 ++--
aria/cli/logger.py | 5 ++++-
aria/cli/main.py | 6 +++---
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1d153e6c/aria/cli/cli/aria.py
----------------------------------------------------------------------
diff --git a/aria/cli/cli/aria.py b/aria/cli/cli/aria.py
index b699d05..bec0242 100644
--- a/aria/cli/cli/aria.py
+++ b/aria/cli/cli/aria.py
@@ -122,7 +122,7 @@ def set_verbosity_level(ctx, param, value):
env.logging.verbosity_level = value
-def set_cli_except_hook(global_verbosity_level):
+def set_cli_except_hook():
def recommend(possible_solutions):
logger.info('Possible solutions:')
@@ -130,7 +130,7 @@ def set_cli_except_hook(global_verbosity_level):
logger.info(' - {0}'.format(solution))
def new_excepthook(tpe, value, tb):
- if global_verbosity_level:
+ if env.logging.is_high_verbose_level():
# log error including traceback
logger.error(get_exception_as_string(tpe, value, tb))
else:
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1d153e6c/aria/cli/logger.py
----------------------------------------------------------------------
diff --git a/aria/cli/logger.py b/aria/cli/logger.py
index be08860..289dbd3 100644
--- a/aria/cli/logger.py
+++ b/aria/cli/logger.py
@@ -72,10 +72,13 @@ class Logging(object):
def verbosity_level(self):
return self._verbosity_level
+ def is_high_verbose_level(self):
+ return self.verbosity_level == HIGH_VERBOSE
+
@verbosity_level.setter
def verbosity_level(self, level):
self._verbosity_level = level
- if self._verbosity_level >= HIGH_VERBOSE:
+ if self.is_high_verbose_level():
for logger_name in self._all_loggers:
logging.getLogger(logger_name).setLevel(logging.DEBUG)
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1d153e6c/aria/cli/main.py
----------------------------------------------------------------------
diff --git a/aria/cli/main.py b/aria/cli/main.py
index aca3340..65db170 100644
--- a/aria/cli/main.py
+++ b/aria/cli/main.py
@@ -32,9 +32,9 @@ from .. import install_aria_extensions
@aria.group(name='aria')
-@aria.options.verbose(expose_value=True)
+@aria.options.verbose()
@aria.options.version
-def _aria(verbose):
+def _aria():
"""ARIA's Command Line Interface
To activate bash-completion. Run: `eval "$(_ARIA_COMPLETE=source aria)"`
@@ -42,7 +42,7 @@ def _aria(verbose):
ARIA's working directory resides by default in ~/.aria. To change it, set
the environment variable `ARIA_WORKDIR` to something else (e.g. /tmp/).
"""
- aria.set_cli_except_hook(verbose)
+ aria.set_cli_except_hook()
def _register_commands():