date:20170522

[Slack] Notifications from the ASF team for May 23rd, 2017 at 8:17 AM

2017-05-22 Thread Slack

Hi ARIA TOSCA,

You have a new direct message from the ASF team
(https://the-asf.slack.com/x-185534614710-186089059713/).

---

@digestai
View in the archives:
https://the-asf.slack.com/x-185534614710-186089059713/archives/D5E4SCANM/p1495515655981019

Digest.AI (8:00 AM, May 23rd)
Hi ARIA,
*Here’s your digest for May 23rd 2017*
There are 26 messages yesterday, and the most active user is jamesbognar

*#ariatosca*
@avia: [UPDATE] continued researching the pros and cons of generic
foreign keys and polymorphic relationship. So far I got Output, Input,
and Property as separate tables (for now) with all the tests passing, so
the implementation of the polymorphic relationship will be much easier.
I'll do it tomorrow, and we'll finally be able to talk about it in the
evening.
@emblemparade: [UPDATE] fixed all tests and created PR for ARIA-149.
who wants to review???
https://github.com/apache/incubator-ariatosca/pull/138
note that i would very much like to further enhance it and rename the
fields in the Task API. see the email thread for more discussion of
that... the rename would be a trivial change, though, and would not
otherwise change any of the functionality introduced by this PR.

*Links shared by your team today:*

* * *

You can snooze these notifications for
an hour:
https://the-asf.slack.com/unsub/U5FFQJ2LW-5a1cb74d28-notify-mute-1h
eight hours:
https://the-asf.slack.com/unsub/U5FFQJ2LW-796e6535e1-notify-mute-8h
a day:
https://the-asf.slack.com/unsub/U5FFQJ2LW-4e6e073ada-notify-mute-1d
three days:
https://the-asf.slack.com/unsub/U5FFQJ2LW-806a2d8aa0-notify-mute-3d
or the next week:
https://the-asf.slack.com/unsub/U5FFQJ2LW-6adc840c34-notify-mute-7d.

You can also turn email notifications off:
https://the-asf.slack.com/unsub/U5FFQJ2LW-64de78982b-notify.

For more detailed preferences, see your account page:
https://the-asf.slack.com/account.

[2/2] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration

2017-05-22 Thread emblemparade

ARIA-149 Enhance operation configuration

* Parse special "dependencies" configuration parameters as YAML and
  treat as Parameter models, allowing them full use of intrinsic
  functions, type coersions, and validations
* Rename various functions that process "properties" to more generically
  process "parameters" (properties, inputs, attributes, arguments, etc.)
* The "configuration" field in OperationTemplate and Operation models
  is now now a dict of Parameter models
* Added "function" and "arguments" fields to Operation model to preserve
  user data (in "implementation" and "inputs") and to clearly demarcate
  orchestration data from user data
* Some cleanup of parser code touched by this commit


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

Branch: refs/heads/ARIA-149-functions-in-operation-configuration
Commit: 13888d24794458e818e01af75482feae6b6dded3
Parents: 3d22d36
Author: Tal Liron 
Authored: Thu Apr 20 17:54:47 2017 -0500
Committer: Tal Liron 
Committed: Mon May 22 18:41:39 2017 -0500

--
 aria/cli/commands/services.py   |   2 +-
 aria/core.py|  14 +-
 aria/modeling/constraints.py|  28 +++
 aria/modeling/contraints.py |  28 ---
 aria/modeling/exceptions.py |  16 +-
 aria/modeling/service_common.py |   4 +
 aria/modeling/service_instance.py   |  69 +++---
 aria/modeling/service_template.py   |  54 ++---
 aria/modeling/utils.py  | 105 -
 .../execution_plugin/instantiation.py   | 133 +++-
 aria/orchestrator/workflow_runner.py|   2 +-
 aria/orchestrator/workflows/api/task.py |   4 +-
 aria/orchestrator/workflows/core/task.py|   1 -
 .../profiles/aria-1.0/aria-1.0.yaml |  16 +-
 .../simple_v1_0/assignments.py  |   4 +-
 .../simple_v1_0/modeling/__init__.py|  65 --
 .../simple_v1_0/modeling/artifacts.py   |   2 +-
 .../simple_v1_0/modeling/capabilities.py|  24 ++-
 .../simple_v1_0/modeling/constraints.py |   2 +-
 .../simple_v1_0/modeling/data_types.py  |  16 ++
 .../simple_v1_0/modeling/interfaces.py  |  34 ++-
 .../simple_v1_0/modeling/parameters.py  | 211 +++
 .../simple_v1_0/modeling/policies.py|   2 +
 .../simple_v1_0/modeling/properties.py  | 202 --
 .../simple_v1_0/modeling/requirements.py|  20 +-
 .../modeling/substitution_mappings.py   |   4 +
 .../simple_v1_0/templates.py|  13 +-
 .../aria_extension_tosca/simple_v1_0/types.py   |  24 +--
 tests/cli/test_services.py  |  14 +-
 tests/mock/models.py|  10 +-
 tests/mock/topology.py  |  12 +-
 tests/orchestrator/context/test_operation.py|  53 +++--
 tests/orchestrator/context/test_serialize.py|   2 +-
 tests/orchestrator/context/test_toolbelt.py |  14 +-
 .../orchestrator/execution_plugin/test_local.py |  10 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  12 +-
 tests/orchestrator/test_workflow_runner.py  |   8 +-
 tests/orchestrator/workflows/api/test_task.py   |  26 +--
 .../workflows/builtin/test_execute_operation.py |   2 +-
 .../orchestrator/workflows/core/test_engine.py  |   6 +-
 .../orchestrator/workflows/core/test_events.py  |   3 +-
 tests/orchestrator/workflows/core/test_task.py  |   6 +-
 .../test_task_graph_into_execution_graph.py |   2 +-
 ...process_executor_concurrent_modifications.py |  10 +-
 .../executor/test_process_executor_extension.py |  13 +-
 .../test_process_executor_tracked_changes.py|   8 +-
 .../node-cellar/node-cellar.yaml|  24 ++-
 47 files changed, 737 insertions(+), 597 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/13888d24/aria/cli/commands/services.py
--
diff --git a/aria/cli/commands/services.py b/aria/cli/commands/services.py
index 24de7c5..476387c 100644
--- a/aria/cli/commands/services.py
+++ b/aria/cli/commands/services.py
@@ -151,7 +151,7 @@ def create(service_template_name,
 except storage_exceptions.StorageError as e:
 utils.check_overriding_storage_exceptions(e, 'service', service_name)
 raise
-except modeling_exceptions.InputsException:
+except modeling_exceptions.ParameterException:

[1/2] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration [Forced Update!]

2017-05-22 Thread emblemparade

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-149-functions-in-operation-configuration 50646f627 -> 
13888d247 (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/13888d24/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py
--
diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py
deleted file mode 100644
index 9c3ea42..000
--- a/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py
+++ /dev/null
@@ -1,202 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from aria.utils.collections import merge, deepcopy_with_locators, OrderedDict
-from aria.parser.presentation import Value
-from aria.parser.validation import Issue
-
-from .data_types import coerce_value
-
-#
-# ArtifactType, DataType, CapabilityType, RelationshipType, NodeType, 
GroupType, PolicyType
-#
-
-# Works on properties, parameters, inputs, and attributes
-def get_inherited_property_definitions(context, presentation, field_name, 
for_presentation=None):
-"""
-Returns our property definitions added on top of those of our parent, if 
we have one
-(recursively).
-
-Allows overriding all aspects of parent properties except data type.
-"""
-
-# Get definitions from parent
-# If we inherit from a primitive, it does not have a parent:
-parent = presentation._get_parent(context) if hasattr(presentation, 
'_get_parent') else None
-definitions = get_inherited_property_definitions(context, parent, 
field_name,
- 
for_presentation=presentation) \
- if parent is not None 
else OrderedDict()
-
-# Add/merge our definitions
-# If we inherit from a primitive, it does not have our field
-our_definitions = getattr(presentation, field_name, None)
-if our_definitions:
-our_definitions_clone = OrderedDict()
-for name, our_definition in our_definitions.iteritems():
-our_definitions_clone[name] = 
our_definition._clone(for_presentation)
-our_definitions = our_definitions_clone
-merge_property_definitions(context, presentation, definitions, 
our_definitions, field_name)
-
-for definition in definitions.itervalues():
-definition._reset_method_cache()
-
-return definitions
-
-#
-# NodeTemplate, RelationshipTemplate, GroupTemplate, PolicyTemplate
-#
-
-def get_assigned_and_defined_property_values(context, presentation, 
field_name='property',
- field_name_plural='properties'):
-"""
-Returns the assigned property values while making sure they are defined in 
our type.
-
-The property definition's default value, if available, will be used if we 
did not assign it.
-
-Makes sure that required properties indeed end up with a value.
-"""
-
-values = OrderedDict()
-
-the_type = presentation._get_type(context)
-assignments = getattr(presentation, field_name_plural)
-get_fn_name = '_get_{0}'.format(field_name_plural)
-definitions = getattr(the_type, get_fn_name)(context) if the_type is not 
None else None
-
-# Fill in our assignments, but make sure they are defined
-if assignments:
-for name, value in assignments.iteritems():
-if (definitions is not None) and (name in definitions):
-definition = definitions[name]
-values[name] = coerce_property_value(context, value, 
definition, value.value)
-else:
-context.validation.report('assignment to undefined {0} "{1}" 
in "{2}"'
-  .format(field_name, name, 
presentation._fullname),
-  locator=value._locator, 
level=Issue.BETWEEN_TYPES)
-
-# Fill in defaults from the definitions
-if definitions:
-for name, definition in definitions.iteritems():
-if values.get(name) is None:
-values[name] = coerce_property_value(context, presentation, 
definition,
-

[2/2] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration

2017-05-22 Thread emblemparade

ARIA-149 Enhance operation configuration

* Parse special "dependencies" configuration parameters as YAML and
  treat as Parameter models, allowing them full use of intrinsic
  functions, type coersions, and validations
* Rename various functions that process "properties" to more generically
  process "parameters" (properties, inputs, attributes, arguments, etc.)
* The "configuration" field in OperationTemplate and Operation models
  is now now a dict of Parameter models
* Added "function" and "arguments" fields to Operation model to preserve
  user data (in "implementation" and "inputs") and to clearly demarcate
  orchestration data from user data
* Some cleanup of parser code touched by this commit


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

Branch: refs/heads/ARIA-149-functions-in-operation-configuration
Commit: 50646f6279d442869410e8597e2b6215fca28782
Parents: 3d22d36
Author: Tal Liron 
Authored: Thu Apr 20 17:54:47 2017 -0500
Committer: Tal Liron 
Committed: Mon May 22 18:39:19 2017 -0500

--
 aria/cli/commands/services.py   |   2 +-
 aria/core.py|  18 +-
 aria/modeling/constraints.py|  28 +++
 aria/modeling/contraints.py |  28 ---
 aria/modeling/exceptions.py |  16 +-
 aria/modeling/service_common.py |   4 +
 aria/modeling/service_instance.py   |  69 +++---
 aria/modeling/service_template.py   |  54 ++---
 aria/modeling/utils.py  | 105 -
 .../execution_plugin/instantiation.py   | 133 +++-
 aria/orchestrator/workflow_runner.py|   2 +-
 aria/orchestrator/workflows/api/task.py |   4 +-
 aria/orchestrator/workflows/core/task.py|   1 -
 .../profiles/aria-1.0/aria-1.0.yaml |  16 +-
 .../simple_v1_0/assignments.py  |   4 +-
 .../simple_v1_0/modeling/__init__.py|  65 --
 .../simple_v1_0/modeling/artifacts.py   |   2 +-
 .../simple_v1_0/modeling/capabilities.py|  24 ++-
 .../simple_v1_0/modeling/constraints.py |   2 +-
 .../simple_v1_0/modeling/data_types.py  |  16 ++
 .../simple_v1_0/modeling/interfaces.py  |  34 ++-
 .../simple_v1_0/modeling/parameters.py  | 211 +++
 .../simple_v1_0/modeling/policies.py|   2 +
 .../simple_v1_0/modeling/properties.py  | 202 --
 .../simple_v1_0/modeling/requirements.py|  20 +-
 .../modeling/substitution_mappings.py   |   4 +
 .../simple_v1_0/templates.py|  13 +-
 .../aria_extension_tosca/simple_v1_0/types.py   |  24 +--
 tests/cli/test_services.py  |  14 +-
 tests/mock/models.py|  10 +-
 tests/mock/topology.py  |  12 +-
 tests/orchestrator/context/test_operation.py|  53 +++--
 tests/orchestrator/context/test_serialize.py|   2 +-
 tests/orchestrator/context/test_toolbelt.py |  14 +-
 .../orchestrator/execution_plugin/test_local.py |  10 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  12 +-
 tests/orchestrator/test_workflow_runner.py  |   8 +-
 tests/orchestrator/workflows/api/test_task.py   |  26 +--
 .../workflows/builtin/test_execute_operation.py |   2 +-
 .../orchestrator/workflows/core/test_engine.py  |   6 +-
 .../orchestrator/workflows/core/test_events.py  |   3 +-
 tests/orchestrator/workflows/core/test_task.py  |   6 +-
 .../test_task_graph_into_execution_graph.py |   2 +-
 ...process_executor_concurrent_modifications.py |  10 +-
 .../executor/test_process_executor_extension.py |  13 +-
 .../test_process_executor_tracked_changes.py|   8 +-
 .../node-cellar/node-cellar.yaml|  24 ++-
 47 files changed, 739 insertions(+), 599 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/50646f62/aria/cli/commands/services.py
--
diff --git a/aria/cli/commands/services.py b/aria/cli/commands/services.py
index 24de7c5..476387c 100644
--- a/aria/cli/commands/services.py
+++ b/aria/cli/commands/services.py
@@ -151,7 +151,7 @@ def create(service_template_name,
 except storage_exceptions.StorageError as e:
 utils.check_overriding_storage_exceptions(e, 'service', service_name)
 raise
-except modeling_exceptions.InputsException:
+except modeling_exceptions.ParameterException:

[1/4] incubator-ariatosca git commit: ARIA-208 Fix models relationships [Forced Update!]

2017-05-22 Thread emblemparade

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-149-functions-in-operation-configuration b1c97e244 -> 
84d8da592 (forced update)


ARIA-208 Fix models relationships


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

Branch: refs/heads/ARIA-149-functions-in-operation-configuration
Commit: 5798bbfc7d1a95965a4c44d2ebad5dad245c824a
Parents: 78d6019
Author: Ran Ziv 
Authored: Sun May 7 14:58:46 2017 +0300
Committer: Ran Ziv 
Committed: Mon May 22 15:17:21 2017 +0300

--
 aria/modeling/service_template.py | 49 --
 1 file changed, 23 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5798bbfc/aria/modeling/service_template.py
--
diff --git a/aria/modeling/service_template.py 
b/aria/modeling/service_template.py
index 1eb95a3..12195a1 100644
--- a/aria/modeling/service_template.py
+++ b/aria/modeling/service_template.py
@@ -211,10 +211,6 @@ class ServiceTemplateBase(TemplateModelMixin):
 return relationship.one_to_many(cls, 'service', dict_key='name')
 
 @declared_attr
-def operation_templates(cls):
-return relationship.one_to_many(cls, 'operation_template')
-
-@declared_attr
 def node_templates(cls):
 return relationship.one_to_many(cls, 'node_template', dict_key='name')
 
@@ -483,6 +479,22 @@ class NodeTemplateBase(TemplateModelMixin):
 def nodes(cls):
 return relationship.one_to_many(cls, 'node')
 
+@declared_attr
+def interface_templates(cls):
+return relationship.one_to_many(cls, 'interface_template', 
dict_key='name')
+
+@declared_attr
+def artifact_templates(cls):
+return relationship.one_to_many(cls, 'artifact_template', 
dict_key='name')
+
+@declared_attr
+def capability_templates(cls):
+return relationship.one_to_many(cls, 'capability_template', 
dict_key='name')
+
+@declared_attr
+def requirement_templates(cls):
+return relationship.one_to_many(cls, 'requirement_template', 
child_fk='node_template_fk')
+
 # endregion
 
 # region many_to_one relationships
@@ -507,22 +519,6 @@ class NodeTemplateBase(TemplateModelMixin):
 def attributes(cls):
 return relationship.many_to_many(cls, 'parameter', 
prefix='attributes', dict_key='name')
 
-@declared_attr
-def interface_templates(cls):
-return relationship.one_to_many(cls, 'interface_template', 
dict_key='name')
-
-@declared_attr
-def artifact_templates(cls):
-return relationship.one_to_many(cls, 'artifact_template', 
dict_key='name')
-
-@declared_attr
-def capability_templates(cls):
-return relationship.one_to_many(cls, 'capability_template', 
dict_key='name')
-
-@declared_attr
-def requirement_templates(cls):
-return relationship.one_to_many(cls, 'requirement_template', 
child_fk='node_template_fk')
-
 # endregion
 
 description = Column(Text)
@@ -1209,11 +1205,6 @@ class RequirementTemplateBase(TemplateModelMixin):
 def relationships(cls):
 return relationship.one_to_many(cls, 'relationship')
 
-@declared_attr
-def target_node_type(cls):
-return relationship.many_to_one(
-cls, 'type', fk='target_node_type_fk', 
back_populates=relationship.NO_BACK_POP)
-
 # endregion
 
 # region many_to_one relationships
@@ -1222,6 +1213,11 @@ class RequirementTemplateBase(TemplateModelMixin):
 def node_template(cls):
 return relationship.many_to_one(cls, 'node_template', 
fk='node_template_fk')
 
+@declared_attr
+def target_node_type(cls):
+return relationship.many_to_one(
+cls, 'type', fk='target_node_type_fk', 
back_populates=relationship.NO_BACK_POP)
+
 # endregion
 
 # region many_to_many relationships
@@ -1845,7 +1841,8 @@ class OperationTemplateBase(TemplateModelMixin):
 
 @declared_attr
 def service_template(cls):
-return relationship.many_to_one(cls, 'service_template')
+return relationship.many_to_one(cls, 'service_template',
+back_populates='workflow_templates')
 
 @declared_attr
 def interface_template(cls):

[1/2] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration [Forced Update!]

2017-05-22 Thread emblemparade

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-149-functions-in-operation-configuration 84d8da592 -> 
50646f627 (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/50646f62/extensions/aria_extension_tosca/simple_v1_0/modeling/policies.py
--
diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/policies.py 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/policies.py
index fba1972..7dd803b 100644
--- a/extensions/aria_extension_tosca/simple_v1_0/modeling/policies.py
+++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/policies.py
@@ -15,6 +15,7 @@
 
 from ..presentation.types import convert_shorthand_to_full_type_name
 
+
 #
 # PolicyType
 #
@@ -49,6 +50,7 @@ def get_inherited_targets(context, presentation):
 
 return node_types, group_types
 
+
 #
 # PolicyTemplate
 #

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/50646f62/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py
--
diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py
deleted file mode 100644
index 9c3ea42..000
--- a/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py
+++ /dev/null
@@ -1,202 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from aria.utils.collections import merge, deepcopy_with_locators, OrderedDict
-from aria.parser.presentation import Value
-from aria.parser.validation import Issue
-
-from .data_types import coerce_value
-
-#
-# ArtifactType, DataType, CapabilityType, RelationshipType, NodeType, 
GroupType, PolicyType
-#
-
-# Works on properties, parameters, inputs, and attributes
-def get_inherited_property_definitions(context, presentation, field_name, 
for_presentation=None):
-"""
-Returns our property definitions added on top of those of our parent, if 
we have one
-(recursively).
-
-Allows overriding all aspects of parent properties except data type.
-"""
-
-# Get definitions from parent
-# If we inherit from a primitive, it does not have a parent:
-parent = presentation._get_parent(context) if hasattr(presentation, 
'_get_parent') else None
-definitions = get_inherited_property_definitions(context, parent, 
field_name,
- 
for_presentation=presentation) \
- if parent is not None 
else OrderedDict()
-
-# Add/merge our definitions
-# If we inherit from a primitive, it does not have our field
-our_definitions = getattr(presentation, field_name, None)
-if our_definitions:
-our_definitions_clone = OrderedDict()
-for name, our_definition in our_definitions.iteritems():
-our_definitions_clone[name] = 
our_definition._clone(for_presentation)
-our_definitions = our_definitions_clone
-merge_property_definitions(context, presentation, definitions, 
our_definitions, field_name)
-
-for definition in definitions.itervalues():
-definition._reset_method_cache()
-
-return definitions
-
-#
-# NodeTemplate, RelationshipTemplate, GroupTemplate, PolicyTemplate
-#
-
-def get_assigned_and_defined_property_values(context, presentation, 
field_name='property',
- field_name_plural='properties'):
-"""
-Returns the assigned property values while making sure they are defined in 
our type.
-
-The property definition's default value, if available, will be used if we 
did not assign it.
-
-Makes sure that required properties indeed end up with a value.
-"""
-
-values = OrderedDict()
-
-the_type = presentation._get_type(context)
-assignments = getattr(presentation, field_name_plural)
-get_fn_name = '_get_{0}'.format(field_name_plural)
-definitions = getattr(the_type, get_fn_name)(context) if the_type is not 
None else None
-
-# Fill in our assignments, but make sure they are defined
-if assignments:
-for name, value in assignments.iteritems():

[4/4] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration

2017-05-22 Thread emblemparade

ARIA-149 Enhance operation configuration

* Parse special "dependencies" configuration parameters as YAML and
treat as Parameter models, allowing them full use of intrinsic
functions, type coersions, and validations
* Rename various functions that process "properties" to more generically
process "parameters" (properties, inputs, attributes, arguments, etc.)
* The "configuration" field in OperationTemplate and Operation models
is now now a dict of Parameter models
* Added "function" and "arguments" fields to Operation model to preserve
user data (in "implementation" and "inputs") and to clearly demarcate
orchestration data from user data
* Some cleanup of parser code touched by this commit


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

Branch: refs/heads/ARIA-149-functions-in-operation-configuration
Commit: 84d8da592b3534cecbc896e7ee60704d660f4a26
Parents: 3d22d36
Author: Tal Liron 
Authored: Thu Apr 20 17:54:47 2017 -0500
Committer: Tal Liron 
Committed: Mon May 22 18:33:11 2017 -0500

--
 aria/cli/commands/services.py   |   2 +-
 aria/core.py|  18 +-
 aria/modeling/constraints.py|  28 +++
 aria/modeling/contraints.py |  28 ---
 aria/modeling/exceptions.py |  16 +-
 aria/modeling/service_common.py |   4 +
 aria/modeling/service_instance.py   |  69 +++---
 aria/modeling/service_template.py   |  54 ++---
 aria/modeling/utils.py  | 105 -
 .../execution_plugin/instantiation.py   | 133 +++-
 aria/orchestrator/workflow_runner.py|   2 +-
 aria/orchestrator/workflows/api/task.py |   4 +-
 aria/orchestrator/workflows/core/task.py|   1 -
 .../profiles/aria-1.0/aria-1.0.yaml |  16 +-
 .../simple_v1_0/assignments.py  |   4 +-
 .../simple_v1_0/modeling/__init__.py|  65 --
 .../simple_v1_0/modeling/artifacts.py   |   2 +-
 .../simple_v1_0/modeling/capabilities.py|  24 ++-
 .../simple_v1_0/modeling/constraints.py |   2 +-
 .../simple_v1_0/modeling/data_types.py  |  16 ++
 .../simple_v1_0/modeling/interfaces.py  |  34 ++-
 .../simple_v1_0/modeling/parameters.py  | 211 +++
 .../simple_v1_0/modeling/policies.py|   2 +
 .../simple_v1_0/modeling/properties.py  | 202 --
 .../simple_v1_0/modeling/requirements.py|  20 +-
 .../modeling/substitution_mappings.py   |   4 +
 .../simple_v1_0/templates.py|  13 +-
 .../aria_extension_tosca/simple_v1_0/types.py   |  24 +--
 tests/cli/test_services.py  |  14 +-
 tests/mock/models.py|  10 +-
 tests/mock/topology.py  |  12 +-
 tests/orchestrator/context/test_operation.py|  53 +++--
 tests/orchestrator/context/test_serialize.py|   2 +-
 tests/orchestrator/context/test_toolbelt.py |  14 +-
 .../orchestrator/execution_plugin/test_local.py |  10 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  12 +-
 tests/orchestrator/test_workflow_runner.py  |   8 +-
 tests/orchestrator/workflows/api/test_task.py   |  26 +--
 .../workflows/builtin/test_execute_operation.py |   2 +-
 .../orchestrator/workflows/core/test_engine.py  |   6 +-
 .../orchestrator/workflows/core/test_events.py  |   3 +-
 tests/orchestrator/workflows/core/test_task.py  |   6 +-
 .../test_task_graph_into_execution_graph.py |   2 +-
 ...process_executor_concurrent_modifications.py |  10 +-
 .../executor/test_process_executor_extension.py |  13 +-
 .../test_process_executor_tracked_changes.py|   8 +-
 .../node-cellar/node-cellar.yaml|  24 ++-
 47 files changed, 739 insertions(+), 599 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/84d8da59/aria/cli/commands/services.py
--
diff --git a/aria/cli/commands/services.py b/aria/cli/commands/services.py
index 24de7c5..476387c 100644
--- a/aria/cli/commands/services.py
+++ b/aria/cli/commands/services.py
@@ -151,7 +151,7 @@ def create(service_template_name,
 except storage_exceptions.StorageError as e:
 utils.check_overriding_storage_exceptions(e, 'service', service_name)
 raise
-except modeling_exceptions.InputsException:
+except modeling_exceptions.ParameterException:

[2/4] incubator-ariatosca git commit: ARIA-162 Upgrade Colorama library version

2017-05-22 Thread emblemparade

ARIA-162 Upgrade Colorama library version

Upgraded the Colorama library version - This should
take care of the closed-stream error that appeared
sporadically after test runs.


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

Branch: refs/heads/ARIA-149-functions-in-operation-configuration
Commit: 3d22d36fc5c9fb780facfb8880143dda46d16f6f
Parents: 5798bbf
Author: Ran Ziv 
Authored: Mon May 22 16:44:00 2017 +0300
Committer: Ran Ziv 
Committed: Mon May 22 16:44:00 2017 +0300

--
 requirements.in  | 2 +-
 requirements.txt | 5 +
 2 files changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3d22d36f/requirements.in
--
diff --git a/requirements.in b/requirements.in
index 3950140..1dd5b1f 100644
--- a/requirements.in
+++ b/requirements.in
@@ -29,7 +29,7 @@ wagon==0.6.0
 bottle>=0.12.0, <0.13
 Fabric>=1.13.0, <1.14
 click>=4.1, < 5.0
-colorama>=0.3.3, < 0.3.5
+colorama>=0.3.7, <= 0.3.9
 PrettyTable>=0.7,<0.8
 click_didyoumean==0.0.3
 backports.shutil_get_terminal_size==1.0.0

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3d22d36f/requirements.txt
--
diff --git a/requirements.txt b/requirements.txt
index 3accaa3..f7efce9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,7 +27,7 @@ cffi==1.10.0  # via cryptography
 click==4.1
 click_didyoumean==0.0.3
 clint==0.5.1
-colorama==0.3.4
+colorama==0.3.9
 cryptography==1.8.1   # via paramiko
 decorator==4.0.11 # via networkx
 enum34==1.1.6 # via cryptography
@@ -57,6 +57,3 @@ six==1.10.0   # via cryptography, packaging, 
retrying
 sqlalchemy==1.1.6
 wagon==0.6.0
 wheel==0.29.0 # via wagon
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools# via cryptography

[3/4] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration

2017-05-22 Thread emblemparade

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/84d8da59/extensions/aria_extension_tosca/simple_v1_0/modeling/policies.py
--
diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/policies.py 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/policies.py
index fba1972..7dd803b 100644
--- a/extensions/aria_extension_tosca/simple_v1_0/modeling/policies.py
+++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/policies.py
@@ -15,6 +15,7 @@
 
 from ..presentation.types import convert_shorthand_to_full_type_name
 
+
 #
 # PolicyType
 #
@@ -49,6 +50,7 @@ def get_inherited_targets(context, presentation):
 
 return node_types, group_types
 
+
 #
 # PolicyTemplate
 #

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/84d8da59/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py
--
diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py
deleted file mode 100644
index 9c3ea42..000
--- a/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py
+++ /dev/null
@@ -1,202 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from aria.utils.collections import merge, deepcopy_with_locators, OrderedDict
-from aria.parser.presentation import Value
-from aria.parser.validation import Issue
-
-from .data_types import coerce_value
-
-#
-# ArtifactType, DataType, CapabilityType, RelationshipType, NodeType, 
GroupType, PolicyType
-#
-
-# Works on properties, parameters, inputs, and attributes
-def get_inherited_property_definitions(context, presentation, field_name, 
for_presentation=None):
-"""
-Returns our property definitions added on top of those of our parent, if 
we have one
-(recursively).
-
-Allows overriding all aspects of parent properties except data type.
-"""
-
-# Get definitions from parent
-# If we inherit from a primitive, it does not have a parent:
-parent = presentation._get_parent(context) if hasattr(presentation, 
'_get_parent') else None
-definitions = get_inherited_property_definitions(context, parent, 
field_name,
- 
for_presentation=presentation) \
- if parent is not None 
else OrderedDict()
-
-# Add/merge our definitions
-# If we inherit from a primitive, it does not have our field
-our_definitions = getattr(presentation, field_name, None)
-if our_definitions:
-our_definitions_clone = OrderedDict()
-for name, our_definition in our_definitions.iteritems():
-our_definitions_clone[name] = 
our_definition._clone(for_presentation)
-our_definitions = our_definitions_clone
-merge_property_definitions(context, presentation, definitions, 
our_definitions, field_name)
-
-for definition in definitions.itervalues():
-definition._reset_method_cache()
-
-return definitions
-
-#
-# NodeTemplate, RelationshipTemplate, GroupTemplate, PolicyTemplate
-#
-
-def get_assigned_and_defined_property_values(context, presentation, 
field_name='property',
- field_name_plural='properties'):
-"""
-Returns the assigned property values while making sure they are defined in 
our type.
-
-The property definition's default value, if available, will be used if we 
did not assign it.
-
-Makes sure that required properties indeed end up with a value.
-"""
-
-values = OrderedDict()
-
-the_type = presentation._get_type(context)
-assignments = getattr(presentation, field_name_plural)
-get_fn_name = '_get_{0}'.format(field_name_plural)
-definitions = getattr(the_type, get_fn_name)(context) if the_type is not 
None else None
-
-# Fill in our assignments, but make sure they are defined
-if assignments:
-for name, value in assignments.iteritems():
-if (definitions is not None) and (name in definitions):
-definition = definitions[name]
-values[name] =

incubator-ariatosca git commit: fix1 [Forced Update!]

2017-05-22 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-185-NullPool-logging-messages-appear-during-execution 
95cc3d100 -> aea7cebc8 (forced update)


fix1


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

Branch: refs/heads/ARIA-185-NullPool-logging-messages-appear-during-execution
Commit: aea7cebc8789d5b76844f87bf31f2a87af0b3429
Parents: 57555fe
Author: max-orlov 
Authored: Mon May 22 19:07:37 2017 +0300
Committer: max-orlov 
Committed: Mon May 22 22:54:39 2017 +0300

--
 aria/orchestrator/context/common.py|  4 
 aria/orchestrator/context/operation.py | 17 ++---
 .../execution_plugin/ctx_proxy/server.py   |  2 +-
 aria/orchestrator/workflows/executor/process.py|  3 +--
 .../execution_plugin/test_ctx_proxy_server.py  |  3 ++-
 tests/orchestrator/workflows/executor/__init__.py  |  6 +-
 6 files changed, 23 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/aea7cebc/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index 3918408..c98e026 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -194,7 +194,3 @@ class BaseContext(object):
 variables.setdefault('ctx', self)
 resource_template = jinja2.Template(resource_content)
 return resource_template.render(variables)
-
-def _teardown_db_resources(self):
-self.model.log._session.remove()
-self.model.log._engine.dispose()

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/aea7cebc/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index 68a02aa..e0eb927 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -29,10 +29,11 @@ class BaseOperationContext(BaseContext):
 Context object used during operation creation and execution
 """
 
-def __init__(self, task_id, actor_id, **kwargs):
+def __init__(self, task_id, actor_id, instantiated_from_dict=False, 
**kwargs):
 self._task_id = task_id
 self._actor_id = actor_id
 self._thread_local = threading.local()
+self._instantiated_from_dict = instantiated_from_dict
 logger_level = kwargs.pop('logger_level', None)
 super(BaseOperationContext, self).__init__(**kwargs)
 self._register_logger(task_id=self.task.id, level=logger_level)
@@ -90,14 +91,24 @@ class BaseOperationContext(BaseContext):
 }
 
 @classmethod
-def deserialize_from_dict(cls, model_storage=None, resource_storage=None, 
**kwargs):
+def instantiate_from_dict(cls, model_storage=None, resource_storage=None, 
**kwargs):
 if model_storage:
 model_storage = aria.application_model_storage(**model_storage)
 if resource_storage:
 resource_storage = 
aria.application_resource_storage(**resource_storage)
 
-return cls(model_storage=model_storage, 
resource_storage=resource_storage, **kwargs)
+return cls(model_storage=model_storage,
+   resource_storage=resource_storage,
+   instantiated_from_dict=True,
+   **kwargs)
 
+def __del__(self):
+self.close()
+
+def close(self):
+if self._instantiated_from_dict:
+self.model.log._session.remove()
+self.model.log._engine.dispose()
 
 class NodeOperationContext(BaseOperationContext):
 """

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/aea7cebc/aria/orchestrator/execution_plugin/ctx_proxy/server.py
--
diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py 
b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
index ef25491..e3496b9 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -128,7 +128,7 @@ class CtxProxy(object):
 finally:
 # Since this runs in a daemon thread, we need to close the session 
each time we process
 # a request (a new session would be supplied by SQLAlchemy 
scoped_session).
-# log mapi is chosen randomly.
+# log mapi is chosen

incubator-ariatosca git commit: fix1 [Forced Update!]

2017-05-22 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-185-NullPool-logging-messages-appear-during-execution 
1f093d06f -> 95cc3d100 (forced update)


fix1


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

Branch: refs/heads/ARIA-185-NullPool-logging-messages-appear-during-execution
Commit: 95cc3d1002889e2b83a19fc6b620bdf9d77245b0
Parents: 57555fe
Author: max-orlov 
Authored: Mon May 22 19:07:37 2017 +0300
Committer: max-orlov 
Committed: Mon May 22 22:34:36 2017 +0300

--
 aria/orchestrator/context/common.py|  4 
 aria/orchestrator/context/operation.py | 17 ++---
 .../execution_plugin/ctx_proxy/server.py   |  2 +-
 aria/orchestrator/workflows/executor/process.py|  3 +--
 .../execution_plugin/test_ctx_proxy_server.py  |  3 ++-
 tests/orchestrator/workflows/executor/__init__.py  |  6 +-
 6 files changed, 23 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/95cc3d10/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index 3918408..c98e026 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -194,7 +194,3 @@ class BaseContext(object):
 variables.setdefault('ctx', self)
 resource_template = jinja2.Template(resource_content)
 return resource_template.render(variables)
-
-def _teardown_db_resources(self):
-self.model.log._session.remove()
-self.model.log._engine.dispose()

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/95cc3d10/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index 68a02aa..e0eb927 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -29,10 +29,11 @@ class BaseOperationContext(BaseContext):
 Context object used during operation creation and execution
 """
 
-def __init__(self, task_id, actor_id, **kwargs):
+def __init__(self, task_id, actor_id, instantiated_from_dict=False, 
**kwargs):
 self._task_id = task_id
 self._actor_id = actor_id
 self._thread_local = threading.local()
+self._instantiated_from_dict = instantiated_from_dict
 logger_level = kwargs.pop('logger_level', None)
 super(BaseOperationContext, self).__init__(**kwargs)
 self._register_logger(task_id=self.task.id, level=logger_level)
@@ -90,14 +91,24 @@ class BaseOperationContext(BaseContext):
 }
 
 @classmethod
-def deserialize_from_dict(cls, model_storage=None, resource_storage=None, 
**kwargs):
+def instantiate_from_dict(cls, model_storage=None, resource_storage=None, 
**kwargs):
 if model_storage:
 model_storage = aria.application_model_storage(**model_storage)
 if resource_storage:
 resource_storage = 
aria.application_resource_storage(**resource_storage)
 
-return cls(model_storage=model_storage, 
resource_storage=resource_storage, **kwargs)
+return cls(model_storage=model_storage,
+   resource_storage=resource_storage,
+   instantiated_from_dict=True,
+   **kwargs)
 
+def __del__(self):
+self.close()
+
+def close(self):
+if self._instantiated_from_dict:
+self.model.log._session.remove()
+self.model.log._engine.dispose()
 
 class NodeOperationContext(BaseOperationContext):
 """

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/95cc3d10/aria/orchestrator/execution_plugin/ctx_proxy/server.py
--
diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py 
b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
index ef25491..e3496b9 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -128,7 +128,7 @@ class CtxProxy(object):
 finally:
 # Since this runs in a daemon thread, we need to close the session 
each time we process
 # a request (a new session would be supplied by SQLAlchemy 
scoped_session).
-# log mapi is chosen randomly.
+# log mapi is chosen

incubator-ariatosca git commit: fix1

2017-05-22 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-185-NullPool-logging-messages-appear-during-execution 
57555fe91 -> 1f093d06f


fix1


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

Branch: refs/heads/ARIA-185-NullPool-logging-messages-appear-during-execution
Commit: 1f093d06ff8ba3ec2d14716ae1d05530c8d0e7f9
Parents: 57555fe
Author: max-orlov 
Authored: Mon May 22 19:07:37 2017 +0300
Committer: max-orlov 
Committed: Mon May 22 19:10:13 2017 +0300

--
 aria/orchestrator/context/common.py   |  4 
 aria/orchestrator/context/operation.py| 14 +++---
 .../orchestrator/execution_plugin/ctx_proxy/server.py |  2 +-
 aria/orchestrator/workflows/executor/process.py   |  4 ++--
 .../execution_plugin/test_ctx_proxy_server.py |  3 ++-
 tests/orchestrator/workflows/executor/__init__.py |  5 +
 6 files changed, 21 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1f093d06/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index 3918408..c98e026 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -194,7 +194,3 @@ class BaseContext(object):
 variables.setdefault('ctx', self)
 resource_template = jinja2.Template(resource_content)
 return resource_template.render(variables)
-
-def _teardown_db_resources(self):
-self.model.log._session.remove()
-self.model.log._engine.dispose()

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1f093d06/aria/orchestrator/context/operation.py
--
diff --git a/aria/orchestrator/context/operation.py 
b/aria/orchestrator/context/operation.py
index 68a02aa..47ebddb 100644
--- a/aria/orchestrator/context/operation.py
+++ b/aria/orchestrator/context/operation.py
@@ -29,10 +29,11 @@ class BaseOperationContext(BaseContext):
 Context object used during operation creation and execution
 """
 
-def __init__(self, task_id, actor_id, **kwargs):
+def __init__(self, task_id, actor_id, instantiated_from_dict=False, 
**kwargs):
 self._task_id = task_id
 self._actor_id = actor_id
 self._thread_local = threading.local()
+self._instantiated_from_dict = instantiated_from_dict
 logger_level = kwargs.pop('logger_level', None)
 super(BaseOperationContext, self).__init__(**kwargs)
 self._register_logger(task_id=self.task.id, level=logger_level)
@@ -90,14 +91,21 @@ class BaseOperationContext(BaseContext):
 }
 
 @classmethod
-def deserialize_from_dict(cls, model_storage=None, resource_storage=None, 
**kwargs):
+def instantiate_from_dict(cls, model_storage=None, resource_storage=None, 
**kwargs):
 if model_storage:
 model_storage = aria.application_model_storage(**model_storage)
 if resource_storage:
 resource_storage = 
aria.application_resource_storage(**resource_storage)
 
-return cls(model_storage=model_storage, 
resource_storage=resource_storage, **kwargs)
+return cls(model_storage=model_storage,
+   resource_storage=resource_storage,
+   instantiated_from_dict=True,
+   **kwargs)
 
+def close(self):
+if self._instantiated_from_dict:
+self.model.log._session.remove()
+self.model.log._engine.dispose()
 
 class NodeOperationContext(BaseOperationContext):
 """

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1f093d06/aria/orchestrator/execution_plugin/ctx_proxy/server.py
--
diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py 
b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
index ef25491..e3496b9 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -128,7 +128,7 @@ class CtxProxy(object):
 finally:
 # Since this runs in a daemon thread, we need to close the session 
each time we process
 # a request (a new session would be supplied by SQLAlchemy 
scoped_session).
-# log mapi is chosen randomly.
+# log mapi is chosen arbitrarily.

Re: [UPDATE] Work on ARIA-149: Support intrinsic functions in "dependencies" operation configuration

2017-05-22 Thread Tal Liron

I see Avia merged ARIA-180, so definitely will convert to one-to-many now.

The reason the original values are preserved are the same reason all our
original values are preserved. The idea is that we don't want to make
service instance models dependent on service template models. They are
instantiated from them, but these foreign-key fields are all nullable. The
reason is to allow freedom for orchestration policies with on-the-fly
changes the topology. For example, a special kind of scaling policy might
involve adding an Nginx load balancer node for HTTP connections. However,
what if the user did not have a node template for that kind of the node? If
we require the creation of an OperationTemplate for every Operation, we
make this awkward, because it changes the original template. So, anyway,
this has been our principle until now and I suggest we continue this for
operations, too.

Let's walk through a simple example.

   1. A service template with a simple compute node, with a single "dazzle"
   operation on a custom interface, and this "dazzle" has a single
   implementation string, "dazzle_node.sh", with a single string input:
   "duration"="forever". To keep things simple, no special configuration is
   added via dependencies.
   2. The parser will create an OperationTemplate with these values:
  1. implementation = "dazzle_node.sh"
  2. inputs = {
 1. duration = "forever"}
  3. plugin_specification = None
  4. configuration = {}
  3. During initial instantiation phase, the above values will be
   copied to Operation model as is. At this early stage, "function" and
   "arguments" are still both empty.
   4. Now during instantiation *configuration* phase, we see that this
   operation uses the default execution plugin (plugin_specification=None).
   Because this node is a host, it will be configured to be a *remote*
   operation with very specific arguments. Also, we decided that for all
   plugins inputs get sent as *extra* arguments. So, here are all final
   values for Operation:
  1. implementation = "dazzle_node.sh"
  2. inputs = {
 1. duration = "forever"}
  3. configuration = {}
  4. plugin = None
  5. function = "aria.orchestrator.execution_
  plugin.operations.run_script_with_ssh"
  6. arguments = {
  1. process = {}
 2. script_path = "create_node.sh"
 3. use_sudo = False
 4. hide_output = []
 5. fabric_env = {user: DEFAULT_USER, password: DEFAULT_PASSWORD,
 key: None, key_filename: None}
 6. duration = forever}

So, you can see here that if we change "implementation" to be
"aria.orchestrator.execution_plugin.operations.run_script_with_ssh" (like
we did before), the implementation is hidden in one of the arguments
(script_path), which would be very tricky for users to discover. That's an
implementation detail of the execution plugin, not something you want to
rely on. Also, if we merge everything into inputs, the original distinction
between what is an input and what is an implementation detail is lost.

The fields in this suggested scheme have distinct and clear meanings:

   1. "implementation" and "inputs" are directly from the TOSCA spec. They
   are preserved and never change.
   2. "configuration" is an extra optional ARIA extension dict allowing
   users to configure how the plugin will execute the operation.
   3. "function" and "arguments" are internal implementation details of the
   ARIA orchestrator. In a nicely straightforward sense they become a Python
   function with kwargs.

How this clears things up!

On Sun, May 21, 2017 at 7:18 AM, Ran Ziv  wrote:

> +1 for examples, or perhaps a link to specific code sections.
>
> From what I did understand though, before we talk about additional changes,
> I'm not at all sure I'm in favor of the current ones.
>
> First, the many-to-many relationship sounds in contrast to what Avia is
> currently working on with (changing Parameters relationship type)
>
> Second, so what you're saying is that now Operation models will have both
> "implementation" and "function", and both "inputs" and "arguments"? This
> seems very confusing.
> I'm both not convinced the original values are needed at that stage (can we
> have an actual use case?), but even if they are, do we really need to keep
> all four on the same model?
> How about having the original values on the OperationTemplate, and the
> "coerced values" (for lack of a better term..) on the Operation model?
>
>
>
> On Sun, May 21, 2017 at 11:45 AM, Arthur Berezin 
> wrote:
>
> > On Sat, May 20, 2017 at 3:47 AM Tal Liron  wrote:
> >
> > > Phew! Everything seems to work now: functions are parsed and evaluated
> > > properly. But there are some changes that require explaining.
> > >
> > > The "configuration" field in OperationTemplate and Operation models is
> > now
> > > a many-to-many with Parameter. This allows the

incubator-ariatosca git commit: NullPool logging messages appear during execution

2017-05-22 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-185-NullPool-logging-messages-appear-during-execution 
[created] 57555fe91


NullPool logging messages appear during execution


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

Branch: refs/heads/ARIA-185-NullPool-logging-messages-appear-during-execution
Commit: 57555fe9141b3b8efe39c3161815e9d5809ed2f0
Parents: 3d22d36
Author: max-orlov 
Authored: Mon May 22 18:28:12 2017 +0300
Committer: max-orlov 
Committed: Mon May 22 18:28:12 2017 +0300

--
 aria/orchestrator/context/common.py| 5 -
 aria/orchestrator/execution_plugin/ctx_proxy/server.py | 6 ++
 aria/orchestrator/workflows/executor/process.py| 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/57555fe9/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index 0854a27..3918408 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -16,7 +16,6 @@
 """
 A common context for both workflow and operation
 """
-
 import logging
 from contextlib import contextmanager
 from functools import partial
@@ -195,3 +194,7 @@ class BaseContext(object):
 variables.setdefault('ctx', self)
 resource_template = jinja2.Template(resource_content)
 return resource_template.render(variables)
+
+def _teardown_db_resources(self):
+self.model.log._session.remove()
+self.model.log._engine.dispose()

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/57555fe9/aria/orchestrator/execution_plugin/ctx_proxy/server.py
--
diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py 
b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
index 52a5312..ef25491 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -125,6 +125,12 @@ class CtxProxy(object):
 'type': 'error',
 'payload': payload
 })
+finally:
+# Since this runs in a daemon thread, we need to close the session 
each time we process
+# a request (a new session would be supplied by SQLAlchemy 
scoped_session).
+# log mapi is chosen randomly.
+self.ctx.model.log._session.remove()
+
 return result
 
 def __enter__(self):

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/57555fe9/aria/orchestrator/workflows/executor/process.py
--
diff --git a/aria/orchestrator/workflows/executor/process.py 
b/aria/orchestrator/workflows/executor/process.py
index 824c4e1..1060aed 100644
--- a/aria/orchestrator/workflows/executor/process.py
+++ b/aria/orchestrator/workflows/executor/process.py
@@ -395,6 +395,7 @@ def _main():
  new_instances=instrument.new_instances)
 finally:
 instrument.expunge_session()
+ctx._teardown_db_resources()
 
 if __name__ == '__main__':
 _main()

[3/4] incubator-ariatosca git commit: added documentation and testing

2017-05-22 Thread mxmrlv

added documentation and testing


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

Branch: refs/heads/ARIA-258-Convert-runtime-properties-to-attributes
Commit: 4e8510573d27377d88c9e7811153c2e1c96a9144
Parents: 82d9616
Author: max-orlov 
Authored: Mon May 22 16:46:50 2017 +0300
Committer: max-orlov 
Committed: Mon May 22 16:46:50 2017 +0300

--
 aria/orchestrator/context/common.py  | 169 ++
 tests/orchestrator/context/test_operation.py |  48 --
 2 files changed, 147 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4e851057/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index 07596f6..a5c01fa 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -203,69 +203,132 @@ class BaseContext(object):
 
 
 class _InstrumentedCollection(object):
-def _get_instrumented_collection(self, key, value):
+
+def __init__(self,
+ model,
+ parent,
+ field_name=None,
+ item_cls=None,
+ seq=None,
+ is_top_level=True,
+ **kwargs):
+self._model = model
+self._parent = parent
+self._field_name = field_name
+self._item_cls = item_cls
+self._is_top_level = is_top_level
+self._load(seq, **kwargs)
+
+def _load(self, seq, **kwargs):
+"""
+Instantiates the object from existing seq.
+
+:param seq: the original sequence to load from  
+:return: 
+"""
+raise NotImplementedError
+
+def _set_field(self, collection, key, value):
+"""
+enables updating the current change in the ancestors 
+:param collection: the collection to change
+:param key: the key for the specific field
+:param value: the new value
+:return: 
+"""
+raise NotImplementedError
+
+def _set(self, key, value):
+"""
+set the changes for the current object (not in the db)
+
+:param key: 
+:param value: 
+:return: 
+"""
+raise NotImplementedError
+
+def _instrument(self, key, value):
+"""
+Instruments any collection to track changes (and ease of access)
+:param key: 
+:param value: 
+:return: 
+"""
 if isinstance(value, _InstrumentedCollection):
 return value
 elif isinstance(value, dict):
-return _InstrumentedDict(self._model, self, key, seq=value)
+instrumentation_cls = _InstrumentedDict
 elif isinstance(value, list):
-return _InstrumentedList(self._model, self, key, seq=value)
+instrumentation_cls = _InstrumentedList
+else:
+return value
 
-return value
+return instrumentation_cls(self._model, self, key, self._item_cls, 
value, False)
 
 def _raw_value(self, value):
-if self._item_cls and isinstance(value, self._item_cls):
+"""
+Get the raw value. 
+:param value: 
+:return: 
+"""
+if self._is_top_level and isinstance(value, self._item_cls):
 return value.value
 return value
 
 def _encapsulate_value(self, key, value):
+"""
+Create a new item cls if needed.
+:param key: 
+:param value: 
+:return: 
+"""
 if isinstance(value, self._item_cls):
 return value
 # If it is not wrapped
 return self._item_cls.wrap(key, value)
 
 def __setitem__(self, key, value):
+"""
+Update the values in both the local and the db locations.  
+:param key: 
+:param value: 
+:return: 
+"""
 self._set(key, value)
-if self._item_cls:
-# We are at the top level
+mapi = getattr(self._model, self._item_cls.__modelname__)
+if self._is_top_level:
 field = getattr(self._parent, self._field_name)
-mapi = getattr(self._model, self._item_cls.__modelname__)
-
+# We are at the top level
 if key in field:
 # Is this a existing field
-value = self._set_parent(field, key, value)
+value = self._set_field(field, key, value)

[4/4] incubator-ariatosca git commit: created new module and linting

2017-05-22 Thread mxmrlv

created new module and linting


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

Branch: refs/heads/ARIA-258-Convert-runtime-properties-to-attributes
Commit: 0b1a306f6905fbe838e96108f65d47cf075efdbb
Parents: 4e85105
Author: max-orlov 
Authored: Mon May 22 17:52:02 2017 +0300
Committer: max-orlov 
Committed: Mon May 22 17:52:02 2017 +0300

--
 aria/orchestrator/context/common.py | 144 ++-
 .../context/test_attribute_suggaring.py | 253 +++
 tests/orchestrator/context/test_operation.py| 236 -
 3 files changed, 331 insertions(+), 302 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0b1a306f/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index a5c01fa..8b83883 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -16,9 +16,7 @@
 """
 A common context for both workflow and operation
 """
-import copy
 import logging
-import collections
 from contextlib import contextmanager
 from functools import partial
 
@@ -219,41 +217,38 @@ class _InstrumentedCollection(object):
 self._is_top_level = is_top_level
 self._load(seq, **kwargs)
 
+@property
+def _raw(self):
+raise NotImplementedError
+
 def _load(self, seq, **kwargs):
 """
 Instantiates the object from existing seq.
-
-:param seq: the original sequence to load from  
-:return: 
-"""
-raise NotImplementedError
 
-def _set_field(self, collection, key, value):
-"""
-enables updating the current change in the ancestors 
-:param collection: the collection to change
-:param key: the key for the specific field
-:param value: the new value
-:return: 
+:param seq: the original sequence to load from
+:return:
 """
 raise NotImplementedError
 
 def _set(self, key, value):
 """
 set the changes for the current object (not in the db)
-
-:param key: 
-:param value: 
-:return: 
+
+:param key:
+:param value:
+:return:
 """
 raise NotImplementedError
 
+def _del(self, collection, key):
+raise NotImplementedError
+
 def _instrument(self, key, value):
 """
 Instruments any collection to track changes (and ease of access)
-:param key: 
-:param value: 
-:return: 
+:param key:
+:param value:
+:return:
 """
 if isinstance(value, _InstrumentedCollection):
 return value
@@ -268,9 +263,9 @@ class _InstrumentedCollection(object):
 
 def _raw_value(self, value):
 """
-Get the raw value. 
-:param value: 
-:return: 
+Get the raw value.
+:param value:
+:return:
 """
 if self._is_top_level and isinstance(value, self._item_cls):
 return value.value
@@ -279,9 +274,9 @@ class _InstrumentedCollection(object):
 def _encapsulate_value(self, key, value):
 """
 Create a new item cls if needed.
-:param key: 
-:param value: 
-:return: 
+:param key:
+:param value:
+:return:
 """
 if isinstance(value, self._item_cls):
 return value
@@ -290,30 +285,53 @@ class _InstrumentedCollection(object):
 
 def __setitem__(self, key, value):
 """
-Update the values in both the local and the db locations.  
-:param key: 
-:param value: 
-:return: 
+Update the values in both the local and the db locations.
+:param key:
+:param value:
+:return:
 """
 self._set(key, value)
-mapi = getattr(self._model, self._item_cls.__modelname__)
 if self._is_top_level:
-field = getattr(self._parent, self._field_name)
 # We are at the top level
-if key in field:
-# Is this a existing field
-value = self._set_field(field, key, value)
-else:
-value = self._set_field(field, key, 
self._encapsulate_value(key, value))
+field = getattr(self._parent, self._field_name)
+mapi = getattr(self._model, self._item_cls.__modelname__)
+value =

[2/4] incubator-ariatosca git commit: added list support

2017-05-22 Thread mxmrlv

added list support


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

Branch: refs/heads/ARIA-258-Convert-runtime-properties-to-attributes
Commit: 82d9616661d1c6797e1d5561a5379b97b0070942
Parents: b2014b9
Author: max-orlov 
Authored: Mon May 22 15:21:53 2017 +0300
Committer: max-orlov 
Committed: Mon May 22 15:21:53 2017 +0300

--
 aria/orchestrator/context/common.py  | 128 --
 tests/orchestrator/context/test_operation.py |  44 ++--
 2 files changed, 125 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/82d96166/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index d85f284..07596f6 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -202,7 +202,49 @@ class BaseContext(object):
 self.model.log._engine.dispose()
 
 
-class _InstrumentedDict(dict):
+class _InstrumentedCollection(object):
+def _get_instrumented_collection(self, key, value):
+if isinstance(value, _InstrumentedCollection):
+return value
+elif isinstance(value, dict):
+return _InstrumentedDict(self._model, self, key, seq=value)
+elif isinstance(value, list):
+return _InstrumentedList(self._model, self, key, seq=value)
+
+return value
+
+def _raw_value(self, value):
+if self._item_cls and isinstance(value, self._item_cls):
+return value.value
+return value
+
+def _encapsulate_value(self, key, value):
+if isinstance(value, self._item_cls):
+return value
+# If it is not wrapped
+return self._item_cls.wrap(key, value)
+
+def __setitem__(self, key, value):
+self._set(key, value)
+if self._item_cls:
+# We are at the top level
+field = getattr(self._parent, self._field_name)
+mapi = getattr(self._model, self._item_cls.__modelname__)
+
+if key in field:
+# Is this a existing field
+value = self._set_parent(field, key, value)
+else:
+value = self._set_parent(field, key, 
self._encapsulate_value(key, value))
+
+mapi.update(value)
+else:
+self._set(key, value)
+# We are not at the top level
+self._parent[self._field_name] = self
+
+
+class _InstrumentedDict(_InstrumentedCollection, dict):
 def __init__(self, model, parent, field_name=None, item_cls=None, 
seq=None, **kwargs):
 self._model = model
 self._parent = parent
@@ -223,12 +265,7 @@ class _InstrumentedDict(dict):
 self[key] = value
 
 def __getitem__(self, key):
-value = dict.__getitem__(self, key)
-if isinstance(value, _InstrumentedDict):
-return value
-elif isinstance(value, dict):
-return _InstrumentedDict(self._model, self, key, seq=value)
-return value
+return self._get_instrumented_collection(key, dict.__getitem__(self, 
key))
 
 def values(self):
 return [self[key] for key in self.keys()]
@@ -240,40 +277,55 @@ class _InstrumentedDict(dict):
 return (key for key in self.keys())
 
 def _set(self, key, value):
-if self._item_cls and isinstance(value, self._item_cls):
-value = value.value
-dict.__setitem__(self, key, value)
+dict.__setitem__(self, key, self._raw_value(value))
 
-def __setitem__(self, key, value):
-self._set(key, value)
-def _set_parent(value):
-if key in field and isinstance(field[key], self._item_cls):
-if isinstance(field[key], dict):
-field[key].clear()
-field[key].value = value
-else:
-field[key] = value
-return field[key]
+def _set_parent(self, field, key, value):
+if key in field and isinstance(field[key], self._item_cls):
+if isinstance(field[key], dict):
+field[key].clear()
+field[key].value = value
+else:
+field[key] = value
+return field[key]
+
+
+class _InstrumentedList(list, _InstrumentedCollection):
+def __init__(self, model, parent, field_name=None, item_cls=None, 
seq=None, **kwargs):
+self._model = model
+self._parent = parent
+self._field_name =

[1/4] incubator-ariatosca git commit: fixed dict

2017-05-22 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-258-Convert-runtime-properties-to-attributes ff3d9647d -> 
0b1a306f6


fixed dict


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

Branch: refs/heads/ARIA-258-Convert-runtime-properties-to-attributes
Commit: b2014b9341398a431703c1ff7cde3722b72c53bc
Parents: ff3d964
Author: max-orlov 
Authored: Mon May 22 14:28:44 2017 +0300
Committer: max-orlov 
Committed: Mon May 22 14:28:44 2017 +0300

--
 aria/orchestrator/context/common.py  | 181 +++---
 tests/orchestrator/context/test_operation.py |  78 ++
 2 files changed, 108 insertions(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b2014b93/aria/orchestrator/context/common.py
--
diff --git a/aria/orchestrator/context/common.py 
b/aria/orchestrator/context/common.py
index e1dbf5f..d85f284 100644
--- a/aria/orchestrator/context/common.py
+++ b/aria/orchestrator/context/common.py
@@ -202,146 +202,78 @@ class BaseContext(object):
 self.model.log._engine.dispose()
 
 
-class _InstrumentedCollection(dict):
-def __init__(self, parent, model, actor=None, field_name=None, 
nested_key=None, **kwargs):
-super(_InstrumentedCollection, self).__init__(**kwargs)
-
-self._parent = parent
+class _InstrumentedDict(dict):
+def __init__(self, model, parent, field_name=None, item_cls=None, 
seq=None, **kwargs):
 self._model = model
-self._item_cls = self._model.parameter.model_cls
-self._nested_key = nested_key
-
-# Actor is not None only at the top level, where it should be updated
-self._actor = actor
+self._parent = parent
 self._field_name = field_name
-if self._actor:
-# Only the root parent has an _actor
-self._init_from_parent()
-
-def __getitem__(self, key):
-if self._nested_key is None:
-value = self._parent[key].value
-elif isinstance(self, dict):
-value = dict.__getitem__(self, key)
-else:
-raise BaseException()
-
-if isinstance(value, (list, _InstrumentedList)):
-return _InstrumentedList(self, self._model, nested_key=key, 
_list=value)
-elif isinstance(value, dict):
-return _InstrumentedDict(self, self._model, nested_key=key, 
**value)
-else:
-return value
-
-def _set(self, i, y):
-self._insert(i, y)
-if self._nested_key is None:
-nested_key = i
-if not isinstance(y, self._item_cls):
-y = self._item_cls.wrap(i, y)
-self._model.parameter.put(y)
-else:
-nested_key = self._nested_key
-
-self._update_parent(nested_key, i, y)
-return y
-
-def _init_from_parent(self):
-for key, value in self._parent.items():
-self._insert(key, value)
-
-def _insert(self, key, value):
-value = value.value if isinstance(value, self._item_cls) else value
-super(_InstrumentedCollection, self).__setitem__(key, value)
-
-def _update_parent(self, nested_key, key, value):
-if isinstance(self._parent, _InstrumentedCollection):
-self._parent._update_from_child(nested_key, {key: value})
-else:
-if self._nested_key is not None:
-self._parent[nested_key] = {key: value}
-else:
-self._parent[key] = value
-
-def _update_from_child(self, nested_key, value):
-self[nested_key] = value
-if isinstance(value, self._item_cls):
-# We are the the top level
-getattr(self._actor, self._field_name)[nested_key] = value
-self._model.parameter.update(value)
+self._item_cls = item_cls
+self._load(seq, **kwargs)
 
-def _update_actor(self, key, value):
-raise NotImplementedError
+def _load(self, seq=None, **kwargs):
+seq = dict((key, value.value if isinstance(value, self._item_cls) else 
value)
+   for key, value in (seq or {}).items())
+super(_InstrumentedDict, self).__init__(seq, **kwargs)
 
-def __setitem__(self, key, value):
-value = self._set(key, value)
-
-if self._actor:
-self._update_actor(key, value)
-
-if isinstance(value, self._item_cls):
-self._model.parameter.update(value)
-
-
-class

47 matches

Mail list logo