[3/3] incubator-ariatosca git commit: wip

[mxmrlv]

wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/6e4495d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/6e4495d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/6e4495d9

Branch: refs/heads/ARIA-174-Refactor-instantiation-phase
Commit: 6e4495d985a056cdae9e733735b3d3b5fa605193
Parents: 51e4ed0
Author: max-orlov 
Authored: Thu Jul 13 16:49:15 2017 +0300
Committer: max-orlov 
Committed: Mon Jul 31 11:53:55 2017 +0300

--
 aria/cli/commands/executions.py |   2 +-
 aria/cli/commands/service_templates.py  |   7 +-
 aria/cli/commands/services.py   |   6 +-
 aria/core.py|  36 +-
 aria/modeling/functions.py  |   9 +-
 aria/modeling/mixins.py |  34 +-
 aria/modeling/service_common.py |  27 -
 aria/modeling/service_instance.py   | 535 +-
 aria/modeling/service_template.py   | 706 +--
 aria/modeling/utils.py  |  85 +--
 .../execution_plugin/instantiation.py   |  64 +-
 aria/orchestrator/topology/__init__.py  |  16 +
 aria/orchestrator/topology/common.py|  52 ++
 aria/orchestrator/topology/instance_handler.py  | 644 +
 aria/orchestrator/topology/template_handler.py  | 597 
 aria/orchestrator/topology/topology.py  | 217 ++
 aria/orchestrator/topology/utils.py |  67 ++
 aria/orchestrator/workflow_runner.py|   5 +-
 aria/orchestrator/workflows/api/task.py |   5 +-
 aria/parser/consumption/__init__.py |   3 -
 aria/parser/consumption/consumer.py |   6 +
 aria/parser/consumption/context.py  |   4 +-
 aria/parser/consumption/modeling.py |  49 +-
 aria/parser/consumption/style.py|  54 --
 aria/parser/modeling/context.py |   6 +-
 aria/parser/presentation/fields.py  |  10 +-
 aria/parser/presentation/presentation.py|   4 +-
 aria/parser/reading/__init__.py |   6 +-
 aria/parser/reading/locator.py  |  35 -
 aria/parser/validation/context.py   |  59 +-
 aria/parser/validation/issue.py |  72 +-
 aria/utils/console.py   |  53 +-
 .../simple_v1_0/modeling/__init__.py|   4 +-
 tests/instantiation/test_configuration.py   |  13 +-
 tests/parser/service_templates.py   |  17 +-
 tests/parser/test_reqs_caps.py  |  29 +
 .../tosca-simple-1.0/reqs_caps/reqs_caps1.yaml  |  40 ++
 tests/storage/__init__.py   |   2 -
 38 files changed, 1950 insertions(+), 1630 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/6e4495d9/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 4783442..f130d95 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -181,7 +181,7 @@ def resume(execution_id,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 execution = model_storage.execution.get(execution_id)
-if execution.status != execution.status.CANCELLED:
+if execution.status != execution.CANCELLED:
 logger.info("Can't resume execution {execution.id} - "
 "execution is in status {execution.status}. "
 "Can only resume executions in status {valid_status}"

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/6e4495d9/aria/cli/commands/service_templates.py
--
diff --git a/aria/cli/commands/service_templates.py 
b/aria/cli/commands/service_templates.py
index f567aa8..608d178 100644
--- a/aria/cli/commands/service_templates.py
+++ b/aria/cli/commands/service_templates.py
@@ -28,7 +28,7 @@ from ...core import Core
 from ...storage import exceptions as storage_exceptions
 from ...parser import consumption
 from ...utils import (formatting, collections, console)
-
+from ... orchestrator.topology import Topology
 
 DESCRIPTION_FIELD_LENGTH_LIMIT = 20
 SERVICE_TEMPLATE_COLUMNS = \
@@ -73,10 +73,9 @@ def show(service_template_name, model_storage, mode_full, 
mode_types, format_jso
 elif format_yaml:
 
console.puts(formatting.yaml_dumps(collections.prune(service_template.as_raw)))
 else:
-service_template.dump()
+console.puts(Topology().dump(service_template))
 elif 

[3/3] incubator-ariatosca git commit: wip

[mxmrlv]

wip


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/90107846
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/90107846
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/90107846

Branch: refs/heads/ARIA-174-Refactor-instantiation-phase
Commit: 9010784679c291738bba06c70f446b12893cd1df
Parents: b841c01
Author: max-orlov 
Authored: Thu Jul 13 16:49:15 2017 +0300
Committer: max-orlov 
Committed: Sun Jul 30 19:13:06 2017 +0300

--
 aria/cli/commands/executions.py |   2 +-
 aria/cli/commands/service_templates.py  |   7 +-
 aria/cli/commands/services.py   |   6 +-
 aria/core.py|  36 +-
 aria/modeling/functions.py  |   9 +-
 aria/modeling/mixins.py |  34 +-
 aria/modeling/service_common.py |  27 -
 aria/modeling/service_instance.py   | 535 +-
 aria/modeling/service_template.py   | 701 +--
 aria/modeling/utils.py  |  83 +--
 .../execution_plugin/instantiation.py   |  64 +-
 aria/orchestrator/topology/__init__.py  |  16 +
 aria/orchestrator/topology/common.py|  52 ++
 aria/orchestrator/topology/instance_handler.py  | 644 +
 aria/orchestrator/topology/template_handler.py  | 591 
 aria/orchestrator/topology/topology.py  | 266 +++
 aria/orchestrator/topology/utils.py |  67 ++
 aria/parser/consumption/__init__.py |   3 -
 aria/parser/consumption/consumer.py |   6 +
 aria/parser/consumption/context.py  |   2 -
 aria/parser/consumption/modeling.py |  49 +-
 aria/parser/consumption/style.py|  50 --
 aria/parser/modeling/context.py |   6 +-
 aria/parser/reading/__init__.py |   6 +-
 aria/parser/reading/locator.py  |  35 -
 aria/parser/validation/context.py   |  59 +-
 aria/parser/validation/issue.py |  72 +-
 .../simple_v1_0/modeling/__init__.py|   4 +-
 tests/instantiation/test_configuration.py   |  13 +-
 tests/parser/service_templates.py   |  16 +-
 tests/parser/test_reqs_caps.py  |  29 +
 .../tosca-simple-1.0/reqs_caps/reqs_caps1.yaml  |  40 ++
 tests/storage/__init__.py   |   2 -
 33 files changed, 1928 insertions(+), 1604 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/90107846/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index 4783442..f130d95 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -181,7 +181,7 @@ def resume(execution_id,
 executor = DryExecutor() if dry else None  # use WorkflowRunner's default 
executor
 
 execution = model_storage.execution.get(execution_id)
-if execution.status != execution.status.CANCELLED:
+if execution.status != execution.CANCELLED:
 logger.info("Can't resume execution {execution.id} - "
 "execution is in status {execution.status}. "
 "Can only resume executions in status {valid_status}"

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/90107846/aria/cli/commands/service_templates.py
--
diff --git a/aria/cli/commands/service_templates.py 
b/aria/cli/commands/service_templates.py
index f567aa8..608d178 100644
--- a/aria/cli/commands/service_templates.py
+++ b/aria/cli/commands/service_templates.py
@@ -28,7 +28,7 @@ from ...core import Core
 from ...storage import exceptions as storage_exceptions
 from ...parser import consumption
 from ...utils import (formatting, collections, console)
-
+from ... orchestrator.topology import Topology
 
 DESCRIPTION_FIELD_LENGTH_LIMIT = 20
 SERVICE_TEMPLATE_COLUMNS = \
@@ -73,10 +73,9 @@ def show(service_template_name, model_storage, mode_full, 
mode_types, format_jso
 elif format_yaml:
 
console.puts(formatting.yaml_dumps(collections.prune(service_template.as_raw)))
 else:
-service_template.dump()
+console.puts(Topology().dump(service_template))
 elif mode_types:
-consumption.ConsumptionContext()
-service_template.dump_types()
+console.puts(Topology().dump_types(service_template=service_template))
 else:
 logger.info('Showing service template 
{0}...'.format(service_template_name))