[Slack] Notifications from the ASF team for June 7th, 2017 at 8:17 AM

[Slack]

Hi ARIA TOSCA,

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

---

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

Digest.AI (8:00 AM, June 7th)
Hi ARIA,
*Here’s your digest for June 7th 2017*
There are 24 messages yesterday, and the most active user is ran

*#ariatosca*
 @emblemparade: [UPDATE] i updated my 3 open PRs according to comments
and also rebased on master. hope they are mergeable. starting work now
on ARIA-275 (nfv profile) review. there a lot of little detail there, so
i will go slowly and double-check avia's work. if someone reviews them
and thinks it's OK, feel free to merge.

i also did some more work on my testing system branch, but i think i
will abandon it for now and work on it here and there. if it wasn't
obvious: i'm in no way suggesting we overhaul our testing right now,
this is something to possibly consider for the future.





* * *

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.

How can I use aria CLI options correctly?

[Chen, Wei D]

Dear developers,

I am currently learning ARIA, and try to follow the quickstack guide from this 
post (https://github.com/apache/incubator-ariatosca), but I am lost there since 
the CLI option mentioned in the guide is supported yet.

It said the below command can create a service instance, but seems like "parse" 
is not a valid option.
- aria parse blueprints/tosca/node-cellar/node-cellar.yaml

This is help manual I can see:
$ aria -h
Usage: aria [OPTIONS] COMMAND [ARGS]...

ARIA's Command Line Interface

To activate bash-completion. Run: eval "$(_ARIA_COMPLETE=source aria)"

ARIA's working directory resides by default in ~/.aria. To change it, set
the environment variable ARIA_WORKDIR to something else (e.g. /tmp/).

Options:
-v, --verbose Show verbose output. You can supply this up to three times
(i.e. -vvv)
--version Display the version and exit
-h, --help Show this message and exit.

Commands:
executions Handle workflow executions
logs Show logs from workflow executions
node-templates Handle a service template's node templates
nodes Handle a service's nodes
plugins Handle plugins
reset Reset ARIA's working directory
service-templates Handle service templates on the manager
services Handle services
workflows Handle service workflows

There is no "parse" option list there. I have also tried the installation via 
'pip' with version 0.1,  and this is what I can see:
$ aria node-cellar.yaml
Validation issues:
  0: location: aria-1.0
 ReaderNotFoundError: location: aria-1.0


So, what the error here means? How can I fix it?

This is how the imports defined in the "node-cellar.yaml" from the code base.
imports:
  - types/openstack.yaml
  - types/nodejs.yaml
  - types/mongodb.yaml
  - types/nginx.yaml
  - aria-1.0

Thank you very much!

Best Regards,
Dave Chen

Podling Report Reminder - June 2017

[johndament]

Dear podling,

This email was sent by an automated system on behalf of the Apache
Incubator PMC. It is an initial reminder to give you plenty of time to
prepare your quarterly board report.

The board meeting is scheduled for Wed, 21 June 2017, 10:30 am PDT.
The report for your podling will form a part of the Incubator PMC
report. The Incubator PMC requires your report to be submitted 2 weeks
before the board meeting, to allow sufficient time for review and
submission (Wed, June 07).

Please submit your report with sufficient time to allow the Incubator
PMC, and subsequently board members to review and digest. Again, the
very latest you should submit your report is 2 weeks prior to the board
meeting.

Thanks,

The Apache Incubator PMC

Submitting your Report

--

Your report should contain the following:

*   Your project name
*   A brief description of your project, which assumes no knowledge of
the project or necessarily of its field
*   A list of the three most important issues to address in the move
towards graduation.
*   Any issues that the Incubator PMC or ASF Board might wish/need to be
aware of
*   How has the community developed since the last report
*   How has the project developed since the last report.
*   How does the podling rate their own maturity.

This should be appended to the Incubator Wiki page at:

https://wiki.apache.org/incubator/June2017

Note: This is manually populated. You may need to wait a little before
this page is created from a template.

Mentors
---

Mentors should review reports for their project(s) and sign them off on
the Incubator wiki page. Signing off reports shows that you are
following the project - projects that are not signed may raise alarms
for the Incubator PMC.

Incubator PMC

Re: Support for TOSCA Simple Profile NFV 1.0

[Avia Efrat]

Hi DJ,

I've created a pull request for the issue that Tal opened:
https://github.com/apache/incubator-ariatosca/pull/147
I expect it to be merged on Thursday/Friday.

On Thu, Jun 1, 2017 at 7:02 PM, Tal Liron  wrote:

> Thanks DJ, I opened a new JIRA issue for this if you want to track it:
>
> https://issues.apache.org/jira/browse/ARIA-275
>
> It shouldn't be too hard to do, just some busy work in YAML. Anyone on the
> mailing list want to tackle this?
>
> On Thu, Jun 1, 2017 at 4:53 AM, D Jayachandran <
> d.jayachand...@ericsson.com>
> wrote:
>
> > Hi,
> >
> > I hope ARIA currently supports , TOSCA Simple Profile NFV 1.0 draft 03.
> > The Latest available TOSCA NFV profile is Simple profile NFV 1.0 draft
> 04,
> > released on 11 May 2017.
> >
> > Could you kindly confirm the current level of support from ARIA for NFV
> > profiles and do you have any timelines to support draft 04 ?
> >
> >
> > Regards,
> > DJ
> >
>
>
>
> --
> Tal Liron
> Senior Engineer
> t...@gigaspaces.com | +1 (773) 828-9339
> Cloudify | http://getcloudify.org
>  medium=email_campaign=general_signature>
>
> 
> 
>    
> [image: Azure Webinar]
>  cloudify-webinar.html?utm_source=signaturesatori_
> medium=email_campaign=general_signature>
>



-- 
Avia Efrat
SW Engineer
a...@gigaspaces.com | +972546204553
Cloudify | http://getcloudify.org




   
[image: Azure Webinar]

[5/5] incubator-ariatosca git commit: ARIA-254 Create of multiple nodes per template

[emblemparade]

ARIA-254 Create of multiple nodes per template

* New aria.Scaling policy (and "scaling" role)
* NodeTemplate model no longer stores scaling values (default_instances,
etc.) but instead fetches them from applicable scaling policies
* Some code cleanup


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

Branch: refs/heads/ARIA-254-multiple-nodes-per-template
Commit: f5f5852ad61a59c1904a9316b4e4b31e2553c6e5
Parents: 180e0a1
Author: Tal Liron 
Authored: Thu Jun 1 14:17:17 2017 -0500
Committer: Tal Liron 
Committed: Tue Jun 6 14:53:59 2017 -0500

--
 aria/cli/commands/workflows.py  |   4 +-
 aria/cli/execution_logging.py   |   4 +-
 aria/core.py|   2 +-
 aria/modeling/orchestration.py  |  12 +-
 aria/modeling/relationship.py   |   2 +-
 aria/modeling/service_changes.py|   8 +-
 aria/modeling/service_common.py |   2 +-
 aria/modeling/service_instance.py   |  59 +++
 aria/modeling/service_template.py   | 153 +--
 aria/modeling/types.py  |   4 +-
 aria/orchestrator/workflow_runner.py|   2 +-
 aria/orchestrator/workflows/executor/celery.py  |   2 +-
 aria/orchestrator/workflows/executor/process.py |   2 +-
 aria/orchestrator/workflows/executor/thread.py  |   2 +-
 aria/storage/core.py|   2 +-
 .../profiles/aria-1.0/aria-1.0.yaml |  25 ++-
 .../simple_v1_0/assignments.py  |   8 +
 .../simple_v1_0/data_types.py   |  22 ++-
 .../simple_v1_0/definitions.py  |   8 +
 .../aria_extension_tosca/simple_v1_0/filters.py |   2 +
 .../aria_extension_tosca/simple_v1_0/misc.py|  10 ++
 .../simple_v1_0/modeling/__init__.py|   3 -
 .../simple_v1_0/presentation/extensible.py  |   1 +
 .../presentation/field_validators.py|  20 +++
 .../simple_v1_0/presentation/types.py   |   2 +
 .../simple_v1_0/presenter.py|   3 +-
 .../simple_v1_0/templates.py|   8 +-
 .../aria_extension_tosca/simple_v1_0/types.py   |  10 +-
 tests/end2end/test_hello_world.py   |   2 +-
 tests/end2end/test_nodecellar.py|   2 +-
 tests/mock/models.py|   8 +-
 tests/modeling/test_mixins.py   |   3 -
 tests/modeling/test_models.py   |  20 +--
 tests/orchestrator/context/test_operation.py|   2 +-
 .../node-cellar/node-cellar.yaml|   1 +
 .../node-cellar/types/openstack.yaml|   3 +-
 36 files changed, 286 insertions(+), 137 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f5f5852a/aria/cli/commands/workflows.py
--
diff --git a/aria/cli/commands/workflows.py b/aria/cli/commands/workflows.py
index 221dbc4..baab973 100644
--- a/aria/cli/commands/workflows.py
+++ b/aria/cli/commands/workflows.py
@@ -42,7 +42,7 @@ def show(workflow_name, service_name, model_storage, logger):
 logger.info('Retrieving workflow {0} for service {1}'.format(
 workflow_name, service_name))
 service = model_storage.service.get_by_name(service_name)
-workflow = next((wf for wf in service.workflows.values() if
+workflow = next((wf for wf in service.workflows.itervalues() if
  wf.name == workflow_name), None)
 if not workflow:
 raise AriaCliError(
@@ -91,7 +91,7 @@ def list(service_name, model_storage, logger):
 """
 logger.info('Listing workflows for service {0}...'.format(service_name))
 service = model_storage.service.get_by_name(service_name)
-workflows_list = sorted(service.workflows.values(), key=lambda w: w.name)
+workflows_list = sorted(service.workflows.itervalues(), key=lambda w: 
w.name)
 
 defaults = {
 'service_template_name': service.service_template_name,

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f5f5852a/aria/cli/execution_logging.py
--
diff --git a/aria/cli/execution_logging.py b/aria/cli/execution_logging.py
index 248ff7c..467123c 100644
--- a/aria/cli/execution_logging.py
+++ b/aria/cli/execution_logging.py
@@ -106,11 +106,11 @@ def stylize_log(item, mark_pattern):
 if item.task:
 # operation task
 implementation = item.task.function
-inputs = 

[2/5] incubator-ariatosca git commit: ARIA-180 Separate Parameter models and change relationships

[emblemparade]

ARIA-180 Separate Parameter models and change relationships

First, the Parameter model was separated in 6 individual models:
Input, Output, Property, Attribute, Configuration, Argument.

The first four models are TOSCA-related, and we needed to separate them
as according to the TOSCA spec, all four of these represent different
things, and have different fields.

The other two models (Configuration, Argument) are
orchestration-related, as and such are not supposed to represent the
same object as the TOSCA-related objects.

Second, up until now, the relationships of the then-Parameter models
were many-to-many to any other object related to them. This was a problem,
as logically the relationships were one-to-many (from the other models
to the Parameter models).
In this commit, we changed them to one-to-many. In addition, separating
the Parameter models allowed us to more accurately represent the relationship 
of each individual Parameter-model with its related models.


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

Branch: refs/heads/ARIA-254-multiple-nodes-per-template
Commit: b6d3c43ba42ccc3fa7287aff132c83563abea035
Parents: 9174f94
Author: Avia Efrat 
Authored: Sun May 21 16:28:30 2017 +0300
Committer: Avia Efrat 
Committed: Sun Jun 4 15:40:03 2017 +0300

--
 aria/modeling/mixins.py | 216 +-
 aria/modeling/models.py |  42 +-
 aria/modeling/orchestration.py  |  37 +-
 aria/modeling/service_changes.py|  12 -
 aria/modeling/service_common.py | 423 +++
 aria/modeling/service_instance.py   | 177 
 aria/modeling/service_template.py   | 164 +++
 aria/modeling/utils.py  |   6 +-
 .../context/collection_instrumentation.py   |  10 +-
 .../execution_plugin/instantiation.py   |  36 +-
 aria/orchestrator/workflow_runner.py|   4 +-
 aria/orchestrator/workflows/api/task.py |   6 +-
 aria/orchestrator/workflows/executor/dry.py |   2 +-
 examples/hello-world/helloworld.yaml|   2 +-
 .../simple_v1_0/modeling/__init__.py|  71 ++--
 tests/cli/test_service_templates.py |   2 +-
 tests/mock/models.py|  21 +-
 tests/mock/topology.py  |   8 +-
 tests/modeling/test_models.py   |  49 ++-
 .../context/test_collection_instrumentation.py  |  64 +--
 tests/orchestrator/context/test_toolbelt.py |   2 +-
 tests/orchestrator/test_workflow_runner.py  |  14 +-
 .../workflows/executor/test_executor.py |   2 +-
 tests/storage/test_model_storage.py |   6 +-
 tox.ini |   2 -
 25 files changed, 867 insertions(+), 511 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b6d3c43b/aria/modeling/mixins.py
--
diff --git a/aria/modeling/mixins.py b/aria/modeling/mixins.py
index 38c812d..c98a866 100644
--- a/aria/modeling/mixins.py
+++ b/aria/modeling/mixins.py
@@ -23,10 +23,14 @@ from sqlalchemy.ext import associationproxy
 from sqlalchemy import (
 Column,
 Integer,
-Text
+Text,
+PickleType
 )
 
-from . import utils
+from ..parser.consumption import ConsumptionContext
+from ..utils import console, collections, caching, formatting
+from ..utils.type import canonical_type_name, full_type_name
+from . import utils, functions
 
 
 class ModelMixin(object):
@@ -140,3 +144,211 @@ class TemplateModelMixin(InstanceModelMixin):
 
 def instantiate(self, container):
 raise NotImplementedError
+
+
+class ParameterMixin(TemplateModelMixin, caching.HasCachedMethods):
 #pylint: disable=abstract-method
+"""
+Represents a typed value. The value can contain nested intrinsic functions.
+
+This model can be used as the ``container_holder`` argument for 
:func:`functions.evaluate`.
+
+:ivar name: Name
+:vartype name: basestring
+:ivar type_name: Type name
+:vartype type_name: basestring
+:ivar value: Value
+:ivar description: Description
+:vartype description: basestring
+"""
+
+__tablename__ = 'parameter'
+
+name = Column(Text)
+type_name = Column(Text)
+description = Column(Text)
+_value = Column(PickleType)
+
+@property
+def value(self):
+value = self._value
+if value is not None:
+

[4/5] incubator-ariatosca git commit: ARIA-262 Inconsistent node attributes behavior

[emblemparade]

ARIA-262 Inconsistent node attributes behavior

Inroduced a more comprehensive way to instrument relationship attributes.

Old behavior instrumented attributes only if they were accessed directly from 
the
parent model. Traversing the storage made the access to an attribute 
inconsistent.

The new solution enables encapsulating the attributes disregarding the way they
were retrieved.


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

Branch: refs/heads/ARIA-254-multiple-nodes-per-template
Commit: 180e0a1cf1ad6da0ddd611b90a58e71acbea52e7
Parents: e4d0036
Author: max-orlov 
Authored: Wed May 31 21:07:49 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 15:20:12 2017 +0300

--
 .../context/collection_instrumentation.py   | 242 ---
 aria/orchestrator/context/operation.py  |  21 +-
 aria/orchestrator/context/toolbelt.py   |   6 +-
 aria/orchestrator/decorators.py |   6 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +-
 aria/storage/api.py |  10 +
 aria/storage/collection_instrumentation.py  | 306 +++
 aria/storage/core.py|  15 +
 aria/storage/sql_mapi.py|  14 +-
 aria/utils/imports.py   |   2 +-
 .../context/test_collection_instrumentation.py  | 150 ++---
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/workflows/core/test_task.py  |   2 +-
 .../executor/test_process_executor_extension.py |   3 +-
 15 files changed, 490 insertions(+), 316 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/180e0a1c/aria/orchestrator/context/collection_instrumentation.py
--
diff --git a/aria/orchestrator/context/collection_instrumentation.py 
b/aria/orchestrator/context/collection_instrumentation.py
deleted file mode 100644
index 8f80d4a..000
--- a/aria/orchestrator/context/collection_instrumentation.py
+++ /dev/null
@@ -1,242 +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 functools import partial
-
-from aria.modeling import models
-
-
-class _InstrumentedCollection(object):
-
-def __init__(self,
- model,
- parent,
- field_name,
- seq=None,
- is_top_level=True,
- **kwargs):
-self._model = model
-self._parent = parent
-self._field_name = field_name
-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(self, key, value):
-"""
-set the changes for the current object (not in the db)
-
-: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:
-"""
-if isinstance(value, _InstrumentedCollection):
-return value
-elif isinstance(value, dict):
-instrumentation_cls = _InstrumentedDict
-elif isinstance(value, list):
-instrumentation_cls = _InstrumentedList
-else:
-return value
-
-return 

[1/5] incubator-ariatosca git commit: ARIA-180 Separate Parameter models and change relationships [Forced Update!]

[emblemparade]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-254-multiple-nodes-per-template eee540cbb -> f5f5852ad 
(forced update)


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b6d3c43b/tests/cli/test_service_templates.py
--
diff --git a/tests/cli/test_service_templates.py 
b/tests/cli/test_service_templates.py
index 7e86896..cc0150e 100644
--- a/tests/cli/test_service_templates.py
+++ b/tests/cli/test_service_templates.py
@@ -215,7 +215,7 @@ class TestServiceTemplatesInputs(TestCliBase):
 
 def test_inputs_existing_inputs(self, monkeypatch, mock_storage):
 monkeypatch.setattr(_Environment, 'model_storage', mock_storage)
-input = mock_models.create_parameter(name='input1', value='value1')
+input = mock_models.create_input(name='input1', value='value1')
 st = mock_models.create_service_template(inputs={'input1': input})
 monkeypatch.setattr(mock_storage.service_template, 'get_by_name',
 mock.MagicMock(return_value=st))

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b6d3c43b/tests/mock/models.py
--
diff --git a/tests/mock/models.py b/tests/mock/models.py
index 50aa340..56a6e3e 100644
--- a/tests/mock/models.py
+++ b/tests/mock/models.py
@@ -94,7 +94,7 @@ def create_service_with_dependencies(include_execution=False,
 service.executions = [execution]
 execution.id = '1'
 if include_input:
-input = create_parameter(name='input1', value='value1')
+input = create_input(name='input1', value='value1')
 service.inputs = {'input1': input}
 if include_node:
 node_template = create_node_template(service_template=service_template)
@@ -110,7 +110,7 @@ def 
create_node_template_with_dependencies(include_node=False, include_property=
 service = create_service(service_template=service_template)
 create_node(dependency_node_template=node_template, service=service)
 if include_property:
-node_template.properties = {'prop1': create_parameter(name='prop1', 
value='value1')}
+node_template.properties = {'prop1': create_property(name='prop1', 
value='value1')}
 return node_template
 
 
@@ -120,7 +120,7 @@ def create_node_with_dependencies(include_attribute=False):
 node_template.service_template.services[0] = 
create_service(node_template.service_template)
 node = create_node(node_template, 
node_template.service_template.services[0])
 if include_attribute:
-node.attributes['attribute1'] = models.Parameter.wrap('attribute1', 
'value1')   # pylint: disable=unsubscriptable-object
+node.attributes['attribute1'] = models.Attribute.wrap('attribute1', 
'value1')   # pylint: disable=unsubscriptable-object
 return node
 
 
@@ -227,7 +227,7 @@ def create_interface(service, interface_name, 
operation_name, operation_kwargs=N
 
 if operation_kwargs and operation_kwargs.get('arguments'):
 operation_kwargs['arguments'] = dict(
-(argument_name, models.Parameter.wrap(argument_name, 
argument_value))
+(argument_name, models.Argument.wrap(argument_name, 
argument_value))
 for argument_name, argument_value in 
operation_kwargs['arguments'].iteritems()
 if argument_value is not None)
 
@@ -278,9 +278,16 @@ def create_plugin_specification(name='test_plugin', 
version='0.1'):
 )
 
 
-def create_parameter(name, value):
-p = models.Parameter()
-return p.wrap(name, value)
+def _create_parameter(name, value, model_cls):
+return model_cls.wrap(name, value)
+
+
+def create_property(name, value):
+return _create_parameter(name, value, model_cls=models.Property)
+
+
+def create_input(name, value):
+return _create_parameter(name, value, model_cls=models.Input)
 
 
 def _dictify(item):

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b6d3c43b/tests/mock/topology.py
--
diff --git a/tests/mock/topology.py b/tests/mock/topology.py
index ab08dbd..9f0521f 100644
--- a/tests/mock/topology.py
+++ b/tests/mock/topology.py
@@ -28,8 +28,8 @@ def create_simple_topology_single_node(model_storage, 
create_operation):
 'Standard', 'create',
 operation_kwargs=dict(
 function=create_operation,
-arguments={'key': aria_models.Parameter.wrap('key', 'create'),
-   'value': aria_models.Parameter.wrap('value', True)})
+arguments={'key': aria_models.Argument.wrap('key', 'create'),
+   'value': aria_models.Argument.wrap('value', True)})
 )
 node_template.interface_templates[interface_template.name] = 
interface_template # pylint: disable=unsubscriptable-object
 
@@ -39,8 +39,8 @@ def 

[01/13] incubator-ariatosca git commit: ARIA-64 Remove PyYAML dependency [Forced Update!]

[avia]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-275-update-NFV-profile-to-csd04 fcdbdd702 -> 5e8044d4b 
(forced update)


ARIA-64 Remove PyYAML dependency


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: e4d003680acc1dc4bc442a044a5feb0688475b46
Parents: b6d3c43
Author: Tal Liron 
Authored: Fri Jun 2 12:39:00 2017 -0500
Committer: Ran Ziv 
Committed: Tue Jun 6 11:50:09 2017 +0300

--
 aria/cli/config/config.py | 2 +-
 aria/cli/inputs.py| 2 +-
 requirements.in   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/config/config.py
--
diff --git a/aria/cli/config/config.py b/aria/cli/config/config.py
index 8c4214c..d584fad 100644
--- a/aria/cli/config/config.py
+++ b/aria/cli/config/config.py
@@ -15,8 +15,8 @@
 
 
 import os
-import yaml
 import pkg_resources
+from ruamel import yaml
 
 from jinja2.environment import Template
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/inputs.py
--
diff --git a/aria/cli/inputs.py b/aria/cli/inputs.py
index 0ff48dc..4d46ebb 100644
--- a/aria/cli/inputs.py
+++ b/aria/cli/inputs.py
@@ -15,7 +15,7 @@
 
 import os
 import glob
-import yaml
+from ruamel import yaml
 
 from .env import logger
 from .exceptions import AriaCliError

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/requirements.in
--
diff --git a/requirements.in b/requirements.in
index ab06d93..54e8714 100644
--- a/requirements.in
+++ b/requirements.in
@@ -13,7 +13,6 @@
 # In order to create the requirements.txt file, execute
 # pip-compile --output-file requirements.txt requirements.in (pip-tools 
package is needed).
 
-PyYAML<3.13
 requests>=2.3.0, <2.14.0
 networkx>=1.9, <1.10 # version 1.10 dropped support of python 2.6
 retrying>=1.3.0, <1.4.0

[06/13] incubator-ariatosca git commit: Fixed WD03, Rev01 (2016-7-29)

[avia]

Fixed WD03, Rev01 (2016-7-29)

Also fixed a typo that repeated itself.


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 99fcd9d61303ac0840ce04b951aeaf5ac795e435
Parents: 180e0a1
Author: Avia Efrat 
Authored: Sun Jun 4 22:11:10 2017 +0300
Committer: Avia Efrat 
Committed: Tue Jun 6 22:33:10 2017 +0300

--
 .../profiles/tosca-simple-1.0/artifacts.yaml|  8 ++--
 .../profiles/tosca-simple-1.0/capabilities.yaml |  2 +-
 .../profiles/tosca-simple-1.0/data.yaml |  2 +-
 .../profiles/tosca-simple-1.0/groups.yaml   |  2 +-
 .../profiles/tosca-simple-1.0/interfaces.yaml   |  2 +-
 .../profiles/tosca-simple-1.0/nodes.yaml|  2 +-
 .../profiles/tosca-simple-1.0/policies.yaml | 10 ++--
 .../tosca-simple-1.0/relationships.yaml |  2 +-
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 48 ++--
 9 files changed, 40 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/99fcd9d6/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
index af99340..cfb0df5 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
@@ -17,7 +17,7 @@ artifact_types:
 
   tosca.artifacts.Root:
 _extensions:
-  shorthand_name: Root # ARIA NOTE: ommitted in the spec
+  shorthand_name: Root # ARIA NOTE: omitted in the spec
   type_qualified_name: tosca:Root
   specification: tosca-simple-1.0
   specification_section: 5.3.1
@@ -41,7 +41,7 @@ artifact_types:
   
   tosca.artifacts.Deployment:
 _extensions:
-  shorthand_name: Deployment # ARIA NOTE: ommitted in the spec
+  shorthand_name: Deployment # ARIA NOTE: omitted in the spec
   type_qualified_name: tosca:Deployment
   specification: tosca-simple-1.0
   specification_section: 5.3.3.1
@@ -67,7 +67,7 @@ artifact_types:
   
   tosca.artifacts.Deployment.Image.VM:
 _extensions:
-  shorthand_name: Deployment.VM # ARIA NOTE: ommitted in the spec
+  shorthand_name: Deployment.VM # ARIA NOTE: omitted in the spec
   type_qualified_name: tosca:Deployment.VM
   specification: tosca-simple-1.0
   specification_section: 5.3.3.4
@@ -85,7 +85,7 @@ artifact_types:
   
   tosca.artifacts.Implementation:
 _extensions:
-  shorthand_name: Implementation # ARIA NOTE: ommitted in the spec
+  shorthand_name: Implementation # ARIA NOTE: omitted in the spec
   type_qualified_name: tosca:Implementation
   specification: tosca-simple-1.0
   specification_section: 5.3.4.1

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/99fcd9d6/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
index 0b81a16..30abe10 100644
--- 
a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
+++ 
b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
@@ -17,7 +17,7 @@ capability_types:
 
   tosca.capabilities.Root:
 _extensions:
-  shorthand_name: Root # ARIA NOTE: ommitted in the spec
+  shorthand_name: Root # ARIA NOTE: omitted in the spec
   type_qualified_name: tosca:Root
   specification: tosca-simple-1.0
   specification_section: 5.4.1

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/99fcd9d6/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/data.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/data.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/data.yaml
index 5210aa0..771a969 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/data.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/data.yaml
@@ -95,7 +95,7 @@ data_types:
 
   tosca.datatypes.Root:
 _extensions:
-  shorthand_name: Root # ARIA NOTE: ommitted in the spec
+  shorthand_name: Root # ARIA NOTE: omitted in 

[02/13] incubator-ariatosca git commit: ARIA-262 Inconsistent node attributes behavior

[avia]

ARIA-262 Inconsistent node attributes behavior

Inroduced a more comprehensive way to instrument relationship attributes.

Old behavior instrumented attributes only if they were accessed directly from 
the
parent model. Traversing the storage made the access to an attribute 
inconsistent.

The new solution enables encapsulating the attributes disregarding the way they
were retrieved.


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 180e0a1cf1ad6da0ddd611b90a58e71acbea52e7
Parents: e4d0036
Author: max-orlov 
Authored: Wed May 31 21:07:49 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 15:20:12 2017 +0300

--
 .../context/collection_instrumentation.py   | 242 ---
 aria/orchestrator/context/operation.py  |  21 +-
 aria/orchestrator/context/toolbelt.py   |   6 +-
 aria/orchestrator/decorators.py |   6 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +-
 aria/storage/api.py |  10 +
 aria/storage/collection_instrumentation.py  | 306 +++
 aria/storage/core.py|  15 +
 aria/storage/sql_mapi.py|  14 +-
 aria/utils/imports.py   |   2 +-
 .../context/test_collection_instrumentation.py  | 150 ++---
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/workflows/core/test_task.py  |   2 +-
 .../executor/test_process_executor_extension.py |   3 +-
 15 files changed, 490 insertions(+), 316 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/180e0a1c/aria/orchestrator/context/collection_instrumentation.py
--
diff --git a/aria/orchestrator/context/collection_instrumentation.py 
b/aria/orchestrator/context/collection_instrumentation.py
deleted file mode 100644
index 8f80d4a..000
--- a/aria/orchestrator/context/collection_instrumentation.py
+++ /dev/null
@@ -1,242 +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 functools import partial
-
-from aria.modeling import models
-
-
-class _InstrumentedCollection(object):
-
-def __init__(self,
- model,
- parent,
- field_name,
- seq=None,
- is_top_level=True,
- **kwargs):
-self._model = model
-self._parent = parent
-self._field_name = field_name
-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(self, key, value):
-"""
-set the changes for the current object (not in the db)
-
-: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:
-"""
-if isinstance(value, _InstrumentedCollection):
-return value
-elif isinstance(value, dict):
-instrumentation_cls = _InstrumentedDict
-elif isinstance(value, list):
-instrumentation_cls = _InstrumentedList
-else:
-return value
-
-return 

[09/13] incubator-ariatosca git commit: Address more non-consistent issues of csd04

[avia]

Address more non-consistent issues of csd04


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 5e8044d4b8c937da6bdfcaac27314415a2f4a982
Parents: c8e4986
Author: Avia Efrat 
Authored: Tue Jun 6 22:32:02 2017 +0300
Committer: Avia Efrat 
Committed: Tue Jun 6 22:33:10 2017 +0300

--
 .../tosca-simple-nfv-1.0/artifacts.yaml |  76 +++
 .../tosca-simple-nfv-1.0/capabilities.yaml  |   2 +-
 .../profiles/tosca-simple-nfv-1.0/data.yaml |   2 +-
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 206 +++
 .../tosca-simple-nfv-1.0.yaml   |   1 +
 5 files changed, 204 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5e8044d4/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/artifacts.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/artifacts.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/artifacts.yaml
new file mode 100644
index 000..2e68f57
--- /dev/null
+++ 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/artifacts.yaml
@@ -0,0 +1,76 @@
+# 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.
+
+artifact_types:
+  tosca.artifacts.nfv.SwImage:
+_extensions:
+  shorthand_name: SwImage
+  type_qualified_name: tosca:SwImage
+  specification: tosca-simple-nfv-1.0
+  specification_section: 5.4.1
+  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896067'
+derived_from: tosca.artifacts.Deployment.Image
+properties:
+  name:
+description: Name of this software image
+type: string
+required: true
+  version:
+description: Version of this software image
+type: string
+required: true
+  checksum:
+description: Checksum of the software image file
+type: string
+  container_format:
+description: >-
+  The container format describes the container file format in which 
software image is provided
+type: string
+required: true
+  disk_format:
+description: The disk format of a software image is the format of the 
underlying disk image
+type: string
+required: true
+  min_disk:
+description: The minimal disk size requirement for this software image.
+type: scalar-unit.size
+required: true
+  min_ram:
+description: The minimal disk size requirement for this software image.
+type: scalar-unit.size
+required: false
+  size: # ARIA NOTE: section [5.4.1.1 Properties] calls this field 'Size'.
+description: The size of this software image
+type: scalar-unit.size
+required: true
+  sw_image:
+description: A reference to the actual software image within VNF 
Package, or url.
+type: string
+required: true
+  operating_system:
+description: Identifies the operating system used in the software 
image.
+type: string
+required: false
+  supported _virtualization_enviroment:
+description: >-
+  Identifies the virtualization environments (e.g. hypervisor) 
compatible with this software
+  image
+type: list
+entry_schema:
+  type: string
+required: false
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5e8044d4/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
--
diff --git 

[10/13] incubator-ariatosca git commit: Add tosca.nodes.nfv.VDU.Compute and tosca.nodes.nfv.VDU.VirtualStorage

[avia]

Add tosca.nodes.nfv.VDU.Compute and tosca.nodes.nfv.VDU.VirtualStorage


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 15b9054e219ca7176e5d2cbbfee8f2cd114e3f0d
Parents: 794af1c
Author: Avia Efrat 
Authored: Tue Jun 6 00:30:13 2017 +0300
Committer: Avia Efrat 
Committed: Tue Jun 6 22:33:10 2017 +0300

--
 .../profiles/tosca-simple-nfv-1.0/data.yaml |   2 +-
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 180 ++-
 2 files changed, 176 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/15b9054e/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
index cf35cba..cec230c 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
@@ -99,7 +99,7 @@ data_types:
   instantiated from the parent Connection Point Descriptor.
 type: tosca.datatypes.nfv.L3AddressData
 required: false
-# ARIA NOTE: states under the "constraints" column in the properties 
table:
+# ARIA NOTE: the spec states under the "constraints" column in the 
properties table:
 # "Shall be present when the addressType is ip_address."
 
   tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements:

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/15b9054e/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
index d0ccadd..b123aab 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
@@ -15,6 +15,176 @@
 
 node_types:
 
+  tosca.nodes.nfv.VDU.Compute:
+_extensions:
+  shorthand_name: VDU.Compute
+  type_qualified_name: tosca:VDU.Compute
+  specification: tosca-simple-nfv-1.0
+  specification_section: 5.9.2
+  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896079'
+description: >-
+  The TOSCA nfv.VDU.Compute node type represents the virtual compute part 
of a VDU entity which
+  it mainly describes the deployment and operational behavior of a VNF 
component (VNFC), as
+  defined by [ETSI NFV IFA011].
+derived_from: tosca.nodes.Compute
+properties:
+  name:
+description: Human readable name of the Vdu
+type: string
+required: true
+  description:
+description: Human readable description of the Vdu
+type: string
+required: true
+  boot_order:
+description: >-
+  The key indicates the boot index (lowest index defines highest boot 
priority).
+  The Value references a descriptor from which a valid boot device is 
created e.g.
+  VirtualStorageDescriptor from which a VirtualStorage instance is 
created. If no boot order
+  is defined the default boot order defined in the VIM or NFVI shall 
be used.
+type: type: # explicit index (boot index) not necessary, contrary to 
IFA011
+  entry_schema:
+type: string
+required: false
+  nfvi_constraints:
+description: >-
+  Describes constraints on the NFVI for the VNFC instance(s) created 
from this Vdu.
+  For example, aspects of a secure hosting environment for the VNFC 
instance that involve
+  additional entities or processes. More software images can be 
attached to the
+  virtualization container using virtual_storage.
+type: list
+entry_schema:
+  type: string
+required: false
+  configurable_properties:
+description: Describes the configurable properties of all VNFC 
instances based on this VDU.
+type: map
+entry_schema:
+  type: tosca.datatypes.nfv.VnfcConfigurableProperties
+required: true
+attributes: # ARIA NOTE: The attributes are only described in section 
[5.9.2.5 Definition], but
+# are 

[11/13] incubator-ariatosca git commit: Removed the virtual link (VL) node types, as they do not appear in csd04

[avia]

Removed the virtual link (VL) node types, as they do not appear in csd04


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 7bffd1881f26cd086e885424332f2f70f2db9faa
Parents: 0a22481
Author: Avia Efrat 
Authored: Tue Jun 6 00:50:47 2017 +0300
Committer: Avia Efrat 
Committed: Tue Jun 6 22:33:10 2017 +0300

--
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 109 ++-
 1 file changed, 35 insertions(+), 74 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7bffd188/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
index 5bd002d..2e1b634 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
@@ -192,41 +192,41 @@ node_types:
   specification: tosca-simple-nfv-1.0
   specification_section: 5.9.4
   specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896081'
-  derived_from: tosca.nodes.Root
-  description: >-
-The TOSCA nfv.Cpd node represents network connectivity to a compute 
resource or a VL as defined
-by [ETSI GS NFV-IFA 011]. This is an abstract type used as parent for the 
various Cpd types.
-  derived_from: tosca.nodes.Root
-  properties:
-layer_protocol:
-  description: Identifies which protocol the connection point uses for 
connectivity purposes
-  type: string
-  constraints:
-- valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ]
-  required: false
-role: # Name in ETSI NFV IFA011 v0.7.3 cpRole
-  description: >-
-Identifies the role of the port in the context of the traffic flow 
patterns in the VNF or
-parent NS. For example a VNF with a tree flow pattern within the VNF 
will have legal cpRoles
-of ROOT and LEAF
-  type: string
-  constraints:
-- valid_values: [ root, leaf ]
-  required: false
-description:
-  description: >-
-Provides human-readable information on the purpose of the connection 
point
-(e.g. connection point for control plane traffic).
-  type: string
-  required: false
-address_data:
-  description: >-
-Provides information on the addresses to be assigned to the connection 
point(s) instantiated
-from this Connection Point Descriptor.
-  type: list
-  entry_schema:
-type: tosca.datatype.nfv.AddressData
-  required: false
+derived_from: tosca.nodes.Root
+description: >-
+  The TOSCA nfv.Cpd node represents network connectivity to a compute 
resource or a VL as defined
+  by [ETSI GS NFV-IFA 011]. This is an abstract type used as parent for 
the various Cpd types.
+
+properties:
+  layer_protocol:
+description: Identifies which protocol the connection point uses for 
connectivity purposes
+type: string
+constraints:
+  - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ]
+required: false
+  role: # Name in ETSI NFV IFA011 v0.7.3 cpRole
+description: >-
+  Identifies the role of the port in the context of the traffic flow 
patterns in the VNF or
+  parent NS. For example a VNF with a tree flow pattern within the VNF 
will have legal cpRoles
+  of ROOT and LEAF
+type: string
+constraints:
+  - valid_values: [ root, leaf ]
+required: false
+  description:
+description: >-
+  Provides human-readable information on the purpose of the connection 
point
+  (e.g. connection point for control plane traffic).
+type: string
+required: false
+  address_data:
+description: >-
+  Provides information on the addresses to be assigned to the 
connection point(s) instantiated
+  from this Connection Point Descriptor.
+type: list
+entry_schema:
+  type: tosca.datatype.nfv.AddressData
+required: false
 
   tosca.nodes.nfv.VduCpd:
 _extensions:
@@ -320,42 +320,3 @@ node_types:
 
   # monitoring_parameters:
 # modeled as ad hoc (named) capabilities in node template
-
-  tosca.nodes.nfv.VL.ELine:
-  

[05/13] incubator-ariatosca git commit: Remove tosca.nodes.nfv.FP, as it does not appear in csd04

[avia]

Remove tosca.nodes.nfv.FP, as it does not appear in csd04


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 0a2248111548d8faadfb85832a2324de58ac471d
Parents: 41c9f25
Author: Avia Efrat 
Authored: Tue Jun 6 00:45:31 2017 +0300
Committer: Avia Efrat 
Committed: Tue Jun 6 22:33:10 2017 +0300

--
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 20 
 1 file changed, 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0a224811/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
index b123aab..5bd002d 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
@@ -321,26 +321,6 @@ node_types:
   # monitoring_parameters:
 # modeled as ad hoc (named) capabilities in node template
 
-  tosca.nodes.nfv.FP:
-_extensions:
-  shorthand_name: FP # ARIA NOTE: the spec must be mistaken here, says "VL"
-  type_qualified_name: tosca:FP
-  specification: tosca-simple-nfv-1.0
-  specification_section: 10.5.1
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714722'
-description: >-
-  The NFV FP node type represents a logical network forwarding path entity 
as defined by [ETSI GS NFV-MAN 001 v1.1.1].
-derived_from: tosca.nodes.Root
-properties:
-  policy:
-description: >-
-  A policy or rule to apply to the NFP
-type: string
-required: false
-requirements:
-  - forwarder:
-  capability: tosca.capabilities.nfv.Forwarder
-
   tosca.nodes.nfv.VL.ELine:
 _extensions:
   shorthand_name: VL.ELine # ARIA NOTE: omitted in the spec

[07/13] incubator-ariatosca git commit: Fixed WD04, Rev02 (2016-9-6) and WD04, Rev03 (2016-11-7)

[avia]

Fixed WD04, Rev02 (2016-9-6) and WD04, Rev03 (2016-11-7)


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: ca3dc4ad3fa6f2d9f603eaa73ad3b58a00754933
Parents: 99fcd9d
Author: Avia Efrat 
Authored: Mon Jun 5 16:21:19 2017 +0300
Committer: Avia Efrat 
Committed: Tue Jun 6 22:33:10 2017 +0300

--
 .../profiles/tosca-simple-nfv-1.0/data.yaml | 289 +++
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 240 +++
 2 files changed, 473 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ca3dc4ad/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
index 89e3565..f6a07ef 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
@@ -15,6 +15,295 @@
 
 data_types:
 
+  tosca.datatypes.nfv.L2AddressData:
+_extensions:
+  shorthand_name: L2AddressData
+  type_qualified_name: tosca:L2AddressData
+  specification: tosca-simple-nfv-1.0
+  specification_section: 5.3.1
+  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896055'
+# ARIA NOTE: This type is empty in csd04, and is only specified here since 
the
+# tosca.datatypes.nfv.AddressData references it (and states 'empty in "GS 
NFV IFA011 V0.7.3"')
+
+  tosca.datatypes.nfv.L3AddressData:
+_extensions:
+  shorthand_name: L3AddressData
+  type_qualified_name: tosca:L3AddressData
+  specification: tosca-simple-nfv-1.0
+  specification_section: 5.3.2
+  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896056'
+description: >-
+  The L3AddressData type is a complex TOSCA data type used to describe 
L3AddressData information
+  element as defined in [ETSI GS NFV-IFA 011], it provides the information 
on the IP addresses
+  to be assigned to the connection point instantiated from the parent 
Connection Point
+  Descriptor.
+derived_from: tosca.datatypes.Root
+properties:
+  ip_address_assignment:
+description: >-
+  Specify if the address assignment is the responsibility of 
management and orchestration
+  function or not. If it is set to True, it is the management and 
orchestration function
+  responsibility.
+type: boolean
+required: true
+  floating_ip_activated:
+description: Specify if the floating IP scheme is activated on the 
Connection Point or not.
+type: boolean
+required: true
+  ip_address_type:
+description: >-
+  Define address type. The address type should be aligned with the 
address type supported by
+  the layer_protocol properties of the parent VnfExtCpd
+type: string
+required: false
+constraints:
+  - valid_values: [ ipv4, ipv6 ]
+  number_of_ip_address:
+description: Minimum number of IP addresses to be assigned.
+type: integer
+required: false
+
+  tosca.datatypes.nfv.AddressData:
+_extensions:
+  shorthand_name: AddressData
+  type_qualified_name: tosca:AddressData
+  specification: tosca-simple-nfv-1.0
+  specification_section: 5.3.3
+  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896057'
+description: >-
+  The AddressData type is a complex TOSCA data type used to describe 
AddressData information
+  element as defined in [ETSI GS NFV-IFA 011], it provides information on 
the addresses to be
+  assigned to the connection point(s) instantiated from a Connection Point 
Descriptor.
+derived_from: tosca.datatypes.Root
+properties:
+  address_type:
+description: >-
+  Describes the type of the address to be assigned to the connection 
point instantiated from
+  the parent Connection Point Descriptor. The content type shall be 
aligned with the address
+  type supported by the layerProtocol property of the parent 
Connection Point Descriptor.
+type: string
+required: true
+constraints:
+  - 

[04/13] incubator-ariatosca git commit: Remove two capability types

[avia]

Remove two capability types

- tosca.capabilities.nfv.Forwarder
- tosca.capabilities.nfv.VirtualLinkable

They are not present in csd04.
The changelog at the end of csd04 states:
"Deleted NSD related content, v1.0 will only cover VNFD model."
The second capability was a part of the NSD model.
The first capability was a part of the VNFFGD model, which probably
also got deleted, since it is not the VNFD model.


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 6bad650eb673edd07b1aafca68dd3106a3774e42
Parents: bdf117c
Author: Avia Efrat 
Authored: Tue Jun 6 01:26:08 2017 +0300
Committer: Avia Efrat 
Committed: Tue Jun 6 22:33:10 2017 +0300

--
 .../tosca-simple-nfv-1.0/capabilities.yaml  | 32 +++-
 1 file changed, 4 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/6bad650e/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
index 6f50f61..db6a62b 100644
--- 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
+++ 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
@@ -20,8 +20,8 @@ capability_types:
   shorthand_name: VirtualBindable
   type_qualified_name: tosca:VirtualBindable
   specification: tosca-simple-nfv-1.0
-  specification_section: 8.2.2
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290220'
+  specification_section: 5.5.1
+  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896069'
 description: >-
   A node type that includes the VirtualBindable capability indicates that 
it can be pointed by
   tosca.relationships.nfv.VirtualBindsTo relationship type.
@@ -32,37 +32,13 @@ capability_types:
   shorthand_name: Metric
   type_qualified_name: tosca:Metric
   specification: tosca-simple-nfv-1.0
-  specification_section: 8.2.3
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc418607874'
+  specification_section: 5.5.2
+  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896070'
 description: >-
   A node type that includes the Metric capability indicates that it can be 
monitored using an nfv.relationships.Monitor
   relationship type.
 derived_from: tosca.capabilities.Endpoint
 
-  tosca.capabilities.nfv.Forwarder:
-_extensions:
-  shorthand_name: Forwarder
-  type_qualified_name: tosca:Forwarder
-  specification: tosca-simple-nfv-1.0
-  specification_section: 10.3.1
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714718'
-description: >-
-  A node type that includes the Forwarder capability indicates that it can 
be pointed by tosca.relationships.nfv.FowardsTo
-  relationship type.
-derived_from: tosca.capabilities.Root
-
-  tosca.capabilities.nfv.VirtualLinkable:
-_extensions:
-  shorthand_name: VirtualLinkable
-  type_qualified_name: tosca:VirtualLinkable
-  specification: tosca-simple-nfv-1.0
-  specification_section: 11.3.1
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714735'
-description: >-
-  A node type that includes the VirtualLinkable capability indicates that 
it can be pointed by
-  tosca.relationships.nfv.VirtualLinksTo relationship type.
-derived_from: tosca.capabilities.Node
-
   tosca.capabilites.nfv.VirtualCompute:
 _extensions:
   shorthand_name: VirtualCompute

[08/13] incubator-ariatosca git commit: Fixed WD04, Rev04 (2016-11-14) and WD04, Rev05 (2017-1-17)

[avia]

Fixed WD04, Rev04 (2016-11-14) and WD04, Rev05 (2017-1-17)


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 794af1c8ef3b9e53cf4beec3fdf87ac0c1799623
Parents: ca3dc4a
Author: Avia Efrat 
Authored: Mon Jun 5 16:36:52 2017 +0300
Committer: Avia Efrat 
Committed: Tue Jun 6 22:33:10 2017 +0300

--
 .../tosca-simple-nfv-1.0/capabilities.yaml  |  45 
 .../profiles/tosca-simple-nfv-1.0/data.yaml |  75 -
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 112 +--
 3 files changed, 5 insertions(+), 227 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/794af1c8/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
index 6bc6b67..375ba13 100644
--- 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
+++ 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
@@ -15,51 +15,6 @@
 
 capability_types:
 
-  tosca.capabilities.Compute.Container.Architecture:
-_extensions:
-  shorthand_name: Compute.Container.Architecture
-  type_qualified_name: tosca:Compute.Container.Architecture
-  specification: tosca-simple-nfv-1.0
-  specification_section: 8.2.1
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#DEFN_TYPE_CAPABILITIES_CONTAINER'
-description: >-
-  Enhance compute architecture capability that needs to be typically use 
for performance sensitive NFV workloads.
-derived_from: tosca.capabilities.Container
-properties:
-  mem_page_size:
-description: >-
-  Describe page size of the VM:
-  
-  * small page size is typically 4KB
-  * large page size is typically 2MB
-  * any page size maps to system default
-  * custom MB value: sets TLB size to this specific value
-type: string
-# ARIA NOTE: seems wrong in the spec
-#constraints:
-#  - [ normal, huge ]
-  cpu_allocation:
-description: >-
-  Describes CPU allocation requirements like dedicated CPUs (cpu 
pinning), socket count, thread count, etc.
-type: tosca.datatypes.compute.Container.Architecture.CPUAllocation
-required: false
-  numa_node_count:
-description: >-
-  Specifies the symmetric count of NUMA nodes to expose to the VM. 
vCPU and Memory equally split across this number of
-  NUMA.
-  
-  NOTE: the map of numa_nodes should not be specified.
-type: integer
-required: false 
-  numa_nodes:
-description: >-
-  Asymmetric allocation of vCPU and Memory across the specific NUMA 
nodes (CPU sockets and memory banks).
-  
-  NOTE: symmetric numa_node_count should not be specified.
-type: map
-entry_schema: tosca.datatypes.compute.Container.Architecture.NUMA
-required: false
-
   tosca.capabilities.nfv.VirtualBindable:
 _extensions:
   shorthand_name: VirtualBindable

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/794af1c8/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
index f6a07ef..cf35cba 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
@@ -303,78 +303,3 @@ data_types:
 entry_schema:
   type: string
 required: false
-
-  tosca.datatypes.compute.Container.Architecture.CPUAllocation:
-_extensions:
-  shorthand_name: Container.Architecture.CPUAllocation # seems to be a 
mistake in the spec; the norm is to add a "Container.Architecture." prefix
-  type_qualified_name: tosca:Container.Architecture.CPUAllocation
-  specification: tosca-simple-nfv-1.0
-  specification_section: 8.3.1
-description: >-
-  Granular CPU allocation requirements for NFV workloads.
-derived_from: tosca.datatypes.Root
-properties:
-  

[03/13] incubator-ariatosca git commit: Add tosca.capabilites.nfv.VirtualCompute

[avia]

Add tosca.capabilites.nfv.VirtualCompute


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 41c9f25ec920ad53c8b70699ea36a9b9d1a68980
Parents: 15b9054
Author: Avia Efrat 
Authored: Tue Jun 6 00:39:54 2017 +0300
Committer: Avia Efrat 
Committed: Tue Jun 6 22:33:10 2017 +0300

--
 .../tosca-simple-nfv-1.0/capabilities.yaml  | 26 
 1 file changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/41c9f25e/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
index 375ba13..6f50f61 100644
--- 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
+++ 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
@@ -62,3 +62,29 @@ capability_types:
   A node type that includes the VirtualLinkable capability indicates that 
it can be pointed by
   tosca.relationships.nfv.VirtualLinksTo relationship type.
 derived_from: tosca.capabilities.Node
+
+  tosca.capabilites.nfv.VirtualCompute:
+_extensions:
+  shorthand_name: VirtualCompute
+  type_qualified_name: tosca:VirtualCompute
+  specification: tosca-simple-nfv-1.0
+  specification_section: 5.5.3
+  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896071'
+derived_from: tosca.capabilities.Root
+properties:
+  requested_additional_capabilities:
+# ARIA NOTE: in section [5.5.3.1 Properties] the name of this property 
is
+# "request_additional_capabilities", and its type is not a map, but 
tosca.datatypes.nfv.RequestedAdditionalCapability
+description: Describes additional capability for a particular VDU.
+type: map
+entry_schema:
+   type: tosca.datatypes.nfv.RequestedAdditionalCapability
+required: false
+  virtual_memory:
+description: Describes virtual memory of the virtualized compute
+type: tosca.datatypes.nfv.VirtualMemory
+required: true
+  virtual_cpu:
+description: Describes virtual CPU(s) of the virtualized compute.
+type: tosca.datatypes.nfv.VirtualCpu
+required: true

[4/5] incubator-ariatosca git commit: ARIA-262 Inconsistent node attributes behavior

[emblemparade]

ARIA-262 Inconsistent node attributes behavior

Inroduced a more comprehensive way to instrument relationship attributes.

Old behavior instrumented attributes only if they were accessed directly from 
the
parent model. Traversing the storage made the access to an attribute 
inconsistent.

The new solution enables encapsulating the attributes disregarding the way they
were retrieved.


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

Branch: refs/heads/ARIA-260-send-interface-inputs
Commit: 180e0a1cf1ad6da0ddd611b90a58e71acbea52e7
Parents: e4d0036
Author: max-orlov 
Authored: Wed May 31 21:07:49 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 15:20:12 2017 +0300

--
 .../context/collection_instrumentation.py   | 242 ---
 aria/orchestrator/context/operation.py  |  21 +-
 aria/orchestrator/context/toolbelt.py   |   6 +-
 aria/orchestrator/decorators.py |   6 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +-
 aria/storage/api.py |  10 +
 aria/storage/collection_instrumentation.py  | 306 +++
 aria/storage/core.py|  15 +
 aria/storage/sql_mapi.py|  14 +-
 aria/utils/imports.py   |   2 +-
 .../context/test_collection_instrumentation.py  | 150 ++---
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/workflows/core/test_task.py  |   2 +-
 .../executor/test_process_executor_extension.py |   3 +-
 15 files changed, 490 insertions(+), 316 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/180e0a1c/aria/orchestrator/context/collection_instrumentation.py
--
diff --git a/aria/orchestrator/context/collection_instrumentation.py 
b/aria/orchestrator/context/collection_instrumentation.py
deleted file mode 100644
index 8f80d4a..000
--- a/aria/orchestrator/context/collection_instrumentation.py
+++ /dev/null
@@ -1,242 +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 functools import partial
-
-from aria.modeling import models
-
-
-class _InstrumentedCollection(object):
-
-def __init__(self,
- model,
- parent,
- field_name,
- seq=None,
- is_top_level=True,
- **kwargs):
-self._model = model
-self._parent = parent
-self._field_name = field_name
-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(self, key, value):
-"""
-set the changes for the current object (not in the db)
-
-: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:
-"""
-if isinstance(value, _InstrumentedCollection):
-return value
-elif isinstance(value, dict):
-instrumentation_cls = _InstrumentedDict
-elif isinstance(value, list):
-instrumentation_cls = _InstrumentedList
-else:
-return value
-
-return 

[2/5] incubator-ariatosca git commit: ARIA-180 Separate Parameter models and change relationships

[emblemparade]

ARIA-180 Separate Parameter models and change relationships

First, the Parameter model was separated in 6 individual models:
Input, Output, Property, Attribute, Configuration, Argument.

The first four models are TOSCA-related, and we needed to separate them
as according to the TOSCA spec, all four of these represent different
things, and have different fields.

The other two models (Configuration, Argument) are
orchestration-related, as and such are not supposed to represent the
same object as the TOSCA-related objects.

Second, up until now, the relationships of the then-Parameter models
were many-to-many to any other object related to them. This was a problem,
as logically the relationships were one-to-many (from the other models
to the Parameter models).
In this commit, we changed them to one-to-many. In addition, separating
the Parameter models allowed us to more accurately represent the relationship 
of each individual Parameter-model with its related models.


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

Branch: refs/heads/ARIA-260-send-interface-inputs
Commit: b6d3c43ba42ccc3fa7287aff132c83563abea035
Parents: 9174f94
Author: Avia Efrat 
Authored: Sun May 21 16:28:30 2017 +0300
Committer: Avia Efrat 
Committed: Sun Jun 4 15:40:03 2017 +0300

--
 aria/modeling/mixins.py | 216 +-
 aria/modeling/models.py |  42 +-
 aria/modeling/orchestration.py  |  37 +-
 aria/modeling/service_changes.py|  12 -
 aria/modeling/service_common.py | 423 +++
 aria/modeling/service_instance.py   | 177 
 aria/modeling/service_template.py   | 164 +++
 aria/modeling/utils.py  |   6 +-
 .../context/collection_instrumentation.py   |  10 +-
 .../execution_plugin/instantiation.py   |  36 +-
 aria/orchestrator/workflow_runner.py|   4 +-
 aria/orchestrator/workflows/api/task.py |   6 +-
 aria/orchestrator/workflows/executor/dry.py |   2 +-
 examples/hello-world/helloworld.yaml|   2 +-
 .../simple_v1_0/modeling/__init__.py|  71 ++--
 tests/cli/test_service_templates.py |   2 +-
 tests/mock/models.py|  21 +-
 tests/mock/topology.py  |   8 +-
 tests/modeling/test_models.py   |  49 ++-
 .../context/test_collection_instrumentation.py  |  64 +--
 tests/orchestrator/context/test_toolbelt.py |   2 +-
 tests/orchestrator/test_workflow_runner.py  |  14 +-
 .../workflows/executor/test_executor.py |   2 +-
 tests/storage/test_model_storage.py |   6 +-
 tox.ini |   2 -
 25 files changed, 867 insertions(+), 511 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b6d3c43b/aria/modeling/mixins.py
--
diff --git a/aria/modeling/mixins.py b/aria/modeling/mixins.py
index 38c812d..c98a866 100644
--- a/aria/modeling/mixins.py
+++ b/aria/modeling/mixins.py
@@ -23,10 +23,14 @@ from sqlalchemy.ext import associationproxy
 from sqlalchemy import (
 Column,
 Integer,
-Text
+Text,
+PickleType
 )
 
-from . import utils
+from ..parser.consumption import ConsumptionContext
+from ..utils import console, collections, caching, formatting
+from ..utils.type import canonical_type_name, full_type_name
+from . import utils, functions
 
 
 class ModelMixin(object):
@@ -140,3 +144,211 @@ class TemplateModelMixin(InstanceModelMixin):
 
 def instantiate(self, container):
 raise NotImplementedError
+
+
+class ParameterMixin(TemplateModelMixin, caching.HasCachedMethods):
 #pylint: disable=abstract-method
+"""
+Represents a typed value. The value can contain nested intrinsic functions.
+
+This model can be used as the ``container_holder`` argument for 
:func:`functions.evaluate`.
+
+:ivar name: Name
+:vartype name: basestring
+:ivar type_name: Type name
+:vartype type_name: basestring
+:ivar value: Value
+:ivar description: Description
+:vartype description: basestring
+"""
+
+__tablename__ = 'parameter'
+
+name = Column(Text)
+type_name = Column(Text)
+description = Column(Text)
+_value = Column(PickleType)
+
+@property
+def value(self):
+value = self._value
+if value is not None:
+evaluation = 

[5/5] incubator-ariatosca git commit: ARIA-260 Send interface inputs as arguments

[emblemparade]

ARIA-260 Send interface inputs as arguments


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

Branch: refs/heads/ARIA-260-send-interface-inputs
Commit: 2e50cfa4047b653661acf75fbbe0596571e0837b
Parents: 180e0a1
Author: Tal Liron 
Authored: Fri Jun 2 13:35:21 2017 -0500
Committer: Tal Liron 
Committed: Tue Jun 6 14:16:08 2017 -0500

--
 aria/modeling/service_instance.py   | 18 
 aria/modeling/utils.py  |  4 ++
 tests/instantiation/__init__.py | 14 ++
 tests/instantiation/test_configuration.py   | 48 
 .../node-cellar/node-cellar.yaml| 22 +++--
 5 files changed, 93 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2e50cfa4/aria/modeling/service_instance.py
--
diff --git a/aria/modeling/service_instance.py 
b/aria/modeling/service_instance.py
index 2bf9872..4f1712c 100644
--- a/aria/modeling/service_instance.py
+++ b/aria/modeling/service_instance.py
@@ -1742,19 +1742,19 @@ class OperationBase(InstanceModelMixin):
 # In the future plugins may be able to add their own 
"configure_operation" hook that
 # can validate the configuration and otherwise create specially 
derived arguments. For
 # now, we just send all configuration parameters as arguments 
without validation.
-configurations_as_arguments = {}
-for configuration in self.configurations.itervalues():
-configurations_as_arguments[configuration.name] = 
configuration.as_argument()
+utils.instantiate_dict(self, self.arguments,
+   
utils.dict_as_arguments(self.configurations))
 
-utils.instantiate_dict(self, self.arguments, 
configurations_as_arguments)
+if self.interface is not None:
+# Send all interface inputs as extra arguments
+# ("interface" is None for workflow operations)
+# Note that they will override existing arguments of the same names
+utils.instantiate_dict(self, self.arguments,
+   
utils.dict_as_arguments(self.interface.inputs))
 
 # Send all inputs as extra arguments
 # Note that they will override existing arguments of the same names
-inputs_as_arguments = {}
-for input in self.inputs.itervalues():
-inputs_as_arguments[input.name] = input.as_argument()
-
-utils.instantiate_dict(self, self.arguments, inputs_as_arguments)
+utils.instantiate_dict(self, self.arguments, 
utils.dict_as_arguments(self.inputs))
 
 # Check for reserved arguments
 from ..orchestrator.decorators import 
OPERATION_DECORATOR_RESERVED_ARGUMENTS

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2e50cfa4/aria/modeling/utils.py
--
diff --git a/aria/modeling/utils.py b/aria/modeling/utils.py
index 43be410..02fde23 100644
--- a/aria/modeling/utils.py
+++ b/aria/modeling/utils.py
@@ -201,6 +201,10 @@ def dump_interfaces(interfaces, name='Interfaces'):
 interface.dump()
 
 
+def dict_as_arguments(the_dict):
+return OrderedDict((name, value.as_argument()) for name, value in 
the_dict.iteritems())
+
+
 class classproperty(object):   
 # pylint: disable=invalid-name
 def __init__(self, f):
 self._func = f

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/2e50cfa4/tests/instantiation/__init__.py
--
diff --git a/tests/instantiation/__init__.py b/tests/instantiation/__init__.py
new file mode 100644
index 000..ae1e83e
--- /dev/null
+++ b/tests/instantiation/__init__.py
@@ -0,0 +1,14 @@
+# 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 

[3/5] incubator-ariatosca git commit: ARIA-64 Remove PyYAML dependency

[emblemparade]

ARIA-64 Remove PyYAML dependency


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

Branch: refs/heads/ARIA-260-send-interface-inputs
Commit: e4d003680acc1dc4bc442a044a5feb0688475b46
Parents: b6d3c43
Author: Tal Liron 
Authored: Fri Jun 2 12:39:00 2017 -0500
Committer: Ran Ziv 
Committed: Tue Jun 6 11:50:09 2017 +0300

--
 aria/cli/config/config.py | 2 +-
 aria/cli/inputs.py| 2 +-
 requirements.in   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/config/config.py
--
diff --git a/aria/cli/config/config.py b/aria/cli/config/config.py
index 8c4214c..d584fad 100644
--- a/aria/cli/config/config.py
+++ b/aria/cli/config/config.py
@@ -15,8 +15,8 @@
 
 
 import os
-import yaml
 import pkg_resources
+from ruamel import yaml
 
 from jinja2.environment import Template
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/inputs.py
--
diff --git a/aria/cli/inputs.py b/aria/cli/inputs.py
index 0ff48dc..4d46ebb 100644
--- a/aria/cli/inputs.py
+++ b/aria/cli/inputs.py
@@ -15,7 +15,7 @@
 
 import os
 import glob
-import yaml
+from ruamel import yaml
 
 from .env import logger
 from .exceptions import AriaCliError

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/requirements.in
--
diff --git a/requirements.in b/requirements.in
index ab06d93..54e8714 100644
--- a/requirements.in
+++ b/requirements.in
@@ -13,7 +13,6 @@
 # In order to create the requirements.txt file, execute
 # pip-compile --output-file requirements.txt requirements.in (pip-tools 
package is needed).
 
-PyYAML<3.13
 requests>=2.3.0, <2.14.0
 networkx>=1.9, <1.10 # version 1.10 dropped support of python 2.6
 retrying>=1.3.0, <1.4.0

[1/5] incubator-ariatosca git commit: ARIA-180 Separate Parameter models and change relationships [Forced Update!]

[emblemparade]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-260-send-interface-inputs a733be67b -> 2e50cfa40 (forced 
update)


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b6d3c43b/tests/cli/test_service_templates.py
--
diff --git a/tests/cli/test_service_templates.py 
b/tests/cli/test_service_templates.py
index 7e86896..cc0150e 100644
--- a/tests/cli/test_service_templates.py
+++ b/tests/cli/test_service_templates.py
@@ -215,7 +215,7 @@ class TestServiceTemplatesInputs(TestCliBase):
 
 def test_inputs_existing_inputs(self, monkeypatch, mock_storage):
 monkeypatch.setattr(_Environment, 'model_storage', mock_storage)
-input = mock_models.create_parameter(name='input1', value='value1')
+input = mock_models.create_input(name='input1', value='value1')
 st = mock_models.create_service_template(inputs={'input1': input})
 monkeypatch.setattr(mock_storage.service_template, 'get_by_name',
 mock.MagicMock(return_value=st))

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b6d3c43b/tests/mock/models.py
--
diff --git a/tests/mock/models.py b/tests/mock/models.py
index 50aa340..56a6e3e 100644
--- a/tests/mock/models.py
+++ b/tests/mock/models.py
@@ -94,7 +94,7 @@ def create_service_with_dependencies(include_execution=False,
 service.executions = [execution]
 execution.id = '1'
 if include_input:
-input = create_parameter(name='input1', value='value1')
+input = create_input(name='input1', value='value1')
 service.inputs = {'input1': input}
 if include_node:
 node_template = create_node_template(service_template=service_template)
@@ -110,7 +110,7 @@ def 
create_node_template_with_dependencies(include_node=False, include_property=
 service = create_service(service_template=service_template)
 create_node(dependency_node_template=node_template, service=service)
 if include_property:
-node_template.properties = {'prop1': create_parameter(name='prop1', 
value='value1')}
+node_template.properties = {'prop1': create_property(name='prop1', 
value='value1')}
 return node_template
 
 
@@ -120,7 +120,7 @@ def create_node_with_dependencies(include_attribute=False):
 node_template.service_template.services[0] = 
create_service(node_template.service_template)
 node = create_node(node_template, 
node_template.service_template.services[0])
 if include_attribute:
-node.attributes['attribute1'] = models.Parameter.wrap('attribute1', 
'value1')   # pylint: disable=unsubscriptable-object
+node.attributes['attribute1'] = models.Attribute.wrap('attribute1', 
'value1')   # pylint: disable=unsubscriptable-object
 return node
 
 
@@ -227,7 +227,7 @@ def create_interface(service, interface_name, 
operation_name, operation_kwargs=N
 
 if operation_kwargs and operation_kwargs.get('arguments'):
 operation_kwargs['arguments'] = dict(
-(argument_name, models.Parameter.wrap(argument_name, 
argument_value))
+(argument_name, models.Argument.wrap(argument_name, 
argument_value))
 for argument_name, argument_value in 
operation_kwargs['arguments'].iteritems()
 if argument_value is not None)
 
@@ -278,9 +278,16 @@ def create_plugin_specification(name='test_plugin', 
version='0.1'):
 )
 
 
-def create_parameter(name, value):
-p = models.Parameter()
-return p.wrap(name, value)
+def _create_parameter(name, value, model_cls):
+return model_cls.wrap(name, value)
+
+
+def create_property(name, value):
+return _create_parameter(name, value, model_cls=models.Property)
+
+
+def create_input(name, value):
+return _create_parameter(name, value, model_cls=models.Input)
 
 
 def _dictify(item):

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b6d3c43b/tests/mock/topology.py
--
diff --git a/tests/mock/topology.py b/tests/mock/topology.py
index ab08dbd..9f0521f 100644
--- a/tests/mock/topology.py
+++ b/tests/mock/topology.py
@@ -28,8 +28,8 @@ def create_simple_topology_single_node(model_storage, 
create_operation):
 'Standard', 'create',
 operation_kwargs=dict(
 function=create_operation,
-arguments={'key': aria_models.Parameter.wrap('key', 'create'),
-   'value': aria_models.Parameter.wrap('value', True)})
+arguments={'key': aria_models.Argument.wrap('key', 'create'),
+   'value': aria_models.Argument.wrap('value', True)})
 )
 node_template.interface_templates[interface_template.name] = 
interface_template # pylint: disable=unsubscriptable-object
 
@@ -39,8 +39,8 @@ def 

incubator-ariatosca git commit: ARIA-199 Add "services outputs" CLI command [Forced Update!]

[emblemparade]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-199-cli-service-output 7b665a23f -> 3e8186ba4 (forced update)


ARIA-199 Add "services outputs" CLI command

* Also add an output to hello world example


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

Branch: refs/heads/ARIA-199-cli-service-output
Commit: 3e8186ba44518991207ea3a6377aec7327018180
Parents: 180e0a1
Author: Tal Liron 
Authored: Fri Jun 2 14:20:28 2017 -0500
Committer: Tal Liron 
Committed: Tue Jun 6 10:17:58 2017 -0500

--
 aria/cli/commands/services.py   | 23 -
 aria/modeling/models.py |  4 +--
 examples/hello-world/helloworld.yaml| 16 
 tests/cli/test_services.py  | 26 ++--
 tests/end2end/test_hello_world.py   |  1 +
 tests/mock/models.py| 21 ++--
 .../node-cellar/node-cellar.yaml| 12 +
 7 files changed, 76 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3e8186ba/aria/cli/commands/services.py
--
diff --git a/aria/cli/commands/services.py b/aria/cli/commands/services.py
index 476387c..ae5895a 100644
--- a/aria/cli/commands/services.py
+++ b/aria/cli/commands/services.py
@@ -192,17 +192,16 @@ def outputs(service_name, model_storage, logger):
 """
 logger.info('Showing outputs for service {0}...'.format(service_name))
 service = model_storage.service.get_by_name(service_name)
-#TODO fix this section..
-outputs_def = service.outputs
-response = model_storage.service.outputs.get(service_name)
-outputs_ = StringIO()
-for output_name, output in response.outputs.iteritems():
-outputs_.write(' - "{0}":{1}'.format(output_name, os.linesep))
-description = outputs_def[output_name].get('description', '')
-outputs_.write(' Description: {0}{1}'.format(description,
- os.linesep))
-outputs_.write(' Value: {0}{1}'.format(output, os.linesep))
-logger.info(outputs_.getvalue())
+
+if service.outputs:
+outputs_string = StringIO()
+for output_name, output in service.outputs.iteritems():
+outputs_string.write(' - "{0}":{1}'.format(output_name, 
os.linesep))
+outputs_string.write(' Description: 
{0}{1}'.format(output.description, os.linesep))
+outputs_string.write(' Value: {0}{1}'.format(output.value, 
os.linesep))
+logger.info(outputs_string.getvalue())
+else:
+logger.info('\tNo outputs')
 
 
 @services.command(name='inputs',
@@ -218,10 +217,12 @@ def inputs(service_name, model_storage, logger):
 """
 logger.info('Showing inputs for service {0}...'.format(service_name))
 service = model_storage.service.get_by_name(service_name)
+
 if service.inputs:
 inputs_string = StringIO()
 for input_name, input_ in service.inputs.iteritems():
 inputs_string.write(' - "{0}":{1}'.format(input_name, os.linesep))
+inputs_string.write(' Description: 
{0}{1}'.format(input_.description, os.linesep))
 inputs_string.write(' Value: {0}{1}'.format(input_.value, 
os.linesep))
 logger.info(inputs_string.getvalue())
 else:

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3e8186ba/aria/modeling/models.py
--
diff --git a/aria/modeling/models.py b/aria/modeling/models.py
index 4102090..f30b86f 100644
--- a/aria/modeling/models.py
+++ b/aria/modeling/models.py
@@ -268,7 +268,7 @@ class Argument(aria_declarative_base, 
orchestration.ArgumentBase):
 
 
 # See also __all__ at the top of this file
-models_to_register = [
+models_to_register = (
 # Service template models
 ServiceTemplate,
 NodeTemplate,
@@ -317,4 +317,4 @@ models_to_register = [
 Task,
 Log,
 Argument
-]
+)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3e8186ba/examples/hello-world/helloworld.yaml
--
diff --git a/examples/hello-world/helloworld.yaml 
b/examples/hello-world/helloworld.yaml
index be78401..d3369b7 100644
--- a/examples/hello-world/helloworld.yaml
+++ b/examples/hello-world/helloworld.yaml
@@ -1,13 +1,14 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 

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

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/database_locked_poc a34d7b954 -> 7e70d719f (forced update)


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/7e70d719
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/7e70d719
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/7e70d719

Branch: refs/heads/database_locked_poc
Commit: 7e70d719ffec65ad8e166b872e04023c2e6bb496
Parents: 180e0a1
Author: max-orlov 
Authored: Tue Jun 6 17:05:21 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 18:11:25 2017 +0300

--
 aria/storage/sql_mapi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7e70d719/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 4d7e233..68d0ff6 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -405,7 +405,7 @@ def init_storage(base_dir, filename='db.sqlite'):
 
 path=os.path.join(base_dir, filename))
 
-engine = create_engine(uri)
+engine = create_engine(uri, connect_args=dict(timeout=15))
 session_factory = orm.sessionmaker(bind=engine)
 session = orm.scoped_session(session_factory=session_factory)
 

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

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/database_locked_poc 872d2feec -> 9f9de45da (forced update)


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/9f9de45d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9f9de45d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9f9de45d

Branch: refs/heads/database_locked_poc
Commit: 9f9de45da38ec735e9d9603b49f4c875af830218
Parents: 180e0a1
Author: max-orlov 
Authored: Tue Jun 6 17:05:21 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 17:24:48 2017 +0300

--
 aria/storage/sql_mapi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9f9de45d/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 4d7e233..68d0ff6 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -405,7 +405,7 @@ def init_storage(base_dir, filename='db.sqlite'):
 
 path=os.path.join(base_dir, filename))
 
-engine = create_engine(uri)
+engine = create_engine(uri, connect_args=dict(timeout=15))
 session_factory = orm.sessionmaker(bind=engine)
 session = orm.scoped_session(session_factory=session_factory)
 

[2/3] incubator-ariatosca git commit: ARIA-262 Inconsistent node attributes behavior

[emblemparade]

ARIA-262 Inconsistent node attributes behavior

Inroduced a more comprehensive way to instrument relationship attributes.

Old behavior instrumented attributes only if they were accessed directly from 
the
parent model. Traversing the storage made the access to an attribute 
inconsistent.

The new solution enables encapsulating the attributes disregarding the way they
were retrieved.


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

Branch: refs/heads/ARIA-199-cli-service-output
Commit: 180e0a1cf1ad6da0ddd611b90a58e71acbea52e7
Parents: e4d0036
Author: max-orlov 
Authored: Wed May 31 21:07:49 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 15:20:12 2017 +0300

--
 .../context/collection_instrumentation.py   | 242 ---
 aria/orchestrator/context/operation.py  |  21 +-
 aria/orchestrator/context/toolbelt.py   |   6 +-
 aria/orchestrator/decorators.py |   6 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +-
 aria/storage/api.py |  10 +
 aria/storage/collection_instrumentation.py  | 306 +++
 aria/storage/core.py|  15 +
 aria/storage/sql_mapi.py|  14 +-
 aria/utils/imports.py   |   2 +-
 .../context/test_collection_instrumentation.py  | 150 ++---
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/workflows/core/test_task.py  |   2 +-
 .../executor/test_process_executor_extension.py |   3 +-
 15 files changed, 490 insertions(+), 316 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/180e0a1c/aria/orchestrator/context/collection_instrumentation.py
--
diff --git a/aria/orchestrator/context/collection_instrumentation.py 
b/aria/orchestrator/context/collection_instrumentation.py
deleted file mode 100644
index 8f80d4a..000
--- a/aria/orchestrator/context/collection_instrumentation.py
+++ /dev/null
@@ -1,242 +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 functools import partial
-
-from aria.modeling import models
-
-
-class _InstrumentedCollection(object):
-
-def __init__(self,
- model,
- parent,
- field_name,
- seq=None,
- is_top_level=True,
- **kwargs):
-self._model = model
-self._parent = parent
-self._field_name = field_name
-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(self, key, value):
-"""
-set the changes for the current object (not in the db)
-
-: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:
-"""
-if isinstance(value, _InstrumentedCollection):
-return value
-elif isinstance(value, dict):
-instrumentation_cls = _InstrumentedDict
-elif isinstance(value, list):
-instrumentation_cls = _InstrumentedList
-else:
-return value
-
-return 

[3/3] incubator-ariatosca git commit: ARIA-199 Add "services outputs" CLI command

[emblemparade]

ARIA-199 Add "services outputs" CLI command

* Also add an output to hello world example


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

Branch: refs/heads/ARIA-199-cli-service-output
Commit: 7b665a23f68b88cb1c6dac16d75d05dfe4cafed8
Parents: 180e0a1
Author: Tal Liron 
Authored: Fri Jun 2 14:20:28 2017 -0500
Committer: Tal Liron 
Committed: Tue Jun 6 09:00:06 2017 -0500

--
 aria/cli/commands/services.py   | 23 -
 aria/modeling/models.py |  4 +--
 examples/hello-world/helloworld.yaml| 16 
 tests/cli/test_services.py  | 26 ++--
 tests/mock/models.py| 21 ++--
 .../node-cellar/node-cellar.yaml| 12 +
 6 files changed, 75 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b665a23/aria/cli/commands/services.py
--
diff --git a/aria/cli/commands/services.py b/aria/cli/commands/services.py
index 476387c..ae5895a 100644
--- a/aria/cli/commands/services.py
+++ b/aria/cli/commands/services.py
@@ -192,17 +192,16 @@ def outputs(service_name, model_storage, logger):
 """
 logger.info('Showing outputs for service {0}...'.format(service_name))
 service = model_storage.service.get_by_name(service_name)
-#TODO fix this section..
-outputs_def = service.outputs
-response = model_storage.service.outputs.get(service_name)
-outputs_ = StringIO()
-for output_name, output in response.outputs.iteritems():
-outputs_.write(' - "{0}":{1}'.format(output_name, os.linesep))
-description = outputs_def[output_name].get('description', '')
-outputs_.write(' Description: {0}{1}'.format(description,
- os.linesep))
-outputs_.write(' Value: {0}{1}'.format(output, os.linesep))
-logger.info(outputs_.getvalue())
+
+if service.outputs:
+outputs_string = StringIO()
+for output_name, output in service.outputs.iteritems():
+outputs_string.write(' - "{0}":{1}'.format(output_name, 
os.linesep))
+outputs_string.write(' Description: 
{0}{1}'.format(output.description, os.linesep))
+outputs_string.write(' Value: {0}{1}'.format(output.value, 
os.linesep))
+logger.info(outputs_string.getvalue())
+else:
+logger.info('\tNo outputs')
 
 
 @services.command(name='inputs',
@@ -218,10 +217,12 @@ def inputs(service_name, model_storage, logger):
 """
 logger.info('Showing inputs for service {0}...'.format(service_name))
 service = model_storage.service.get_by_name(service_name)
+
 if service.inputs:
 inputs_string = StringIO()
 for input_name, input_ in service.inputs.iteritems():
 inputs_string.write(' - "{0}":{1}'.format(input_name, os.linesep))
+inputs_string.write(' Description: 
{0}{1}'.format(input_.description, os.linesep))
 inputs_string.write(' Value: {0}{1}'.format(input_.value, 
os.linesep))
 logger.info(inputs_string.getvalue())
 else:

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b665a23/aria/modeling/models.py
--
diff --git a/aria/modeling/models.py b/aria/modeling/models.py
index 4102090..f30b86f 100644
--- a/aria/modeling/models.py
+++ b/aria/modeling/models.py
@@ -268,7 +268,7 @@ class Argument(aria_declarative_base, 
orchestration.ArgumentBase):
 
 
 # See also __all__ at the top of this file
-models_to_register = [
+models_to_register = (
 # Service template models
 ServiceTemplate,
 NodeTemplate,
@@ -317,4 +317,4 @@ models_to_register = [
 Task,
 Log,
 Argument
-]
+)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7b665a23/examples/hello-world/helloworld.yaml
--
diff --git a/examples/hello-world/helloworld.yaml 
b/examples/hello-world/helloworld.yaml
index be78401..d3369b7 100644
--- a/examples/hello-world/helloworld.yaml
+++ b/examples/hello-world/helloworld.yaml
@@ -1,13 +1,14 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 node_types:
-  web_server:
+
+  WebServer:
 derived_from: tosca.nodes.Root
 capabilities:
   host:
 type: tosca.capabilities.Container
 
-  web_app:
+  WebApp:
 

[1/3] incubator-ariatosca git commit: ARIA-64 Remove PyYAML dependency [Forced Update!]

[emblemparade]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-199-cli-service-output 12216189f -> 7b665a23f (forced update)


ARIA-64 Remove PyYAML dependency


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

Branch: refs/heads/ARIA-199-cli-service-output
Commit: e4d003680acc1dc4bc442a044a5feb0688475b46
Parents: b6d3c43
Author: Tal Liron 
Authored: Fri Jun 2 12:39:00 2017 -0500
Committer: Ran Ziv 
Committed: Tue Jun 6 11:50:09 2017 +0300

--
 aria/cli/config/config.py | 2 +-
 aria/cli/inputs.py| 2 +-
 requirements.in   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/config/config.py
--
diff --git a/aria/cli/config/config.py b/aria/cli/config/config.py
index 8c4214c..d584fad 100644
--- a/aria/cli/config/config.py
+++ b/aria/cli/config/config.py
@@ -15,8 +15,8 @@
 
 
 import os
-import yaml
 import pkg_resources
+from ruamel import yaml
 
 from jinja2.environment import Template
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/inputs.py
--
diff --git a/aria/cli/inputs.py b/aria/cli/inputs.py
index 0ff48dc..4d46ebb 100644
--- a/aria/cli/inputs.py
+++ b/aria/cli/inputs.py
@@ -15,7 +15,7 @@
 
 import os
 import glob
-import yaml
+from ruamel import yaml
 
 from .env import logger
 from .exceptions import AriaCliError

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/requirements.in
--
diff --git a/requirements.in b/requirements.in
index ab06d93..54e8714 100644
--- a/requirements.in
+++ b/requirements.in
@@ -13,7 +13,6 @@
 # In order to create the requirements.txt file, execute
 # pip-compile --output-file requirements.txt requirements.in (pip-tools 
package is needed).
 
-PyYAML<3.13
 requests>=2.3.0, <2.14.0
 networkx>=1.9, <1.10 # version 1.10 dropped support of python 2.6
 retrying>=1.3.0, <1.4.0

incubator-ariatosca git commit: wip

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/database_locked_poc [created] 872d2feec


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/872d2fee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/872d2fee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/872d2fee

Branch: refs/heads/database_locked_poc
Commit: 872d2feec5f5d9cb498e336867d84672f5c512ee
Parents: 180e0a1
Author: max-orlov 
Authored: Tue Jun 6 17:05:21 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 17:05:21 2017 +0300

--
 aria/storage/sql_mapi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/872d2fee/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 4d7e233..68d0ff6 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -405,7 +405,7 @@ def init_storage(base_dir, filename='db.sqlite'):
 
 path=os.path.join(base_dir, filename))
 
-engine = create_engine(uri)
+engine = create_engine(uri, connect_args=dict(timeout=15))
 session_factory = orm.sessionmaker(bind=engine)
 session = orm.scoped_session(session_factory=session_factory)
 

[incubator-ariatosca] Git Push Summary

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-122-Create-central-instantiation-module [deleted] 8cd3113fa

[incubator-ariatosca] Git Push Summary

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/misc_fixes_for_os_plugin [deleted] be8ffc2ec

[incubator-ariatosca] Git Push Summary

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/stub_task_branch [deleted] cc0ee52e4

Re: Plugin structure and specifications

[Ran Ziv]

? Do we have any specifications on the structure of plugin ?

--> A plugin should simply be a standard Python package really; There are
no special constraints on its structure.
If the plugin has dependencies, they do need to be compatible with ARIA's,
as the plugin's code will be loaded in the same environment as the ARIA
code which loads it; However, one plugin's dependencies do not need to be
compatible with another plugin's dependencies - those are completely
isolated from one another thanks to the PluginManager class.
Also see this related jira issue
, which could be taken into
consideration when deciding about the plugin's structure - although note
that the notation/syntax used in the "implementation" field might change at
some point to not be in "Python syntax".



? With the current state, a plugin can be referenced in different node
types.
? Can a plugin also contain node types specific to its implementation ? If
we can associate a plugin to specific node types there will not be need to
import the node types in our service template every time.
We think bundling node types as part of plugin and having them available to
those service templates using the plugins would be a good option. Do you
have any suggestions regarding this ? Do you already have something on this
in your roadmap ?

--> The plugin mechanism is a means of delivering code into ARIA. You can
have a "plugin.yaml" file to import manually from your service-template,
where that file is coupled with operations (and a policy definition) of a
specific plugin.
There is also a jira issue
 about
how this coupling might be made somewhat simpler.
However, I do not think that having the plugin "auto-import" the node type
definitions is a good idea: First, it's not standard TOSCA - All yaml
imports must be declared explicitly. Second, instead of being forced to
declare the import, you'd be forced to declare the plugin policy (otherwise
how would the parser know which "plugin.yaml" files to import for your
service-template?
I think the case where the user simply defines a single import "openstack"
and automatically receives the ability to refer to types from the openstack
plugin's "plugin.yaml" etc. is the way to go here.


Ran



On Tue, Jun 6, 2017 at 8:42 AM, D Jayachandran 
wrote:

> Hi,
>
> ARIA currently supports plugin based lifecycle operation. A plugin here
> refers to a python module packaged as a wagon archive.
> I have few queries on how the plugin is being seen at this moment
>
>
> ? Do we have any specifications on the structure of plugin ?
>
> ? With the current state, a plugin can be referenced in different node
> types.
>
> ? Can a plugin also contain node types specific to its implementation ? If
> we can associate a plugin to specific node types there will not be need to
> import the node types in our service template every time.
>
> We think bundling node types as part of plugin and having them available
> to those service templates using the plugins would be a good option. Do you
> have any suggestions regarding this ? Do you already have something on this
> in your roadmap ?
>
>
> Regards,
> DJ
>
>
>

[incubator-ariatosca] Git Push Summary

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior [deleted] 180e0a1cf

incubator-ariatosca git commit: ARIA-262 Inconsistent node attributes behavior

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/master e4d003680 -> 180e0a1cf


ARIA-262 Inconsistent node attributes behavior

Inroduced a more comprehensive way to instrument relationship attributes.

Old behavior instrumented attributes only if they were accessed directly from 
the
parent model. Traversing the storage made the access to an attribute 
inconsistent.

The new solution enables encapsulating the attributes disregarding the way they
were retrieved.


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

Branch: refs/heads/master
Commit: 180e0a1cf1ad6da0ddd611b90a58e71acbea52e7
Parents: e4d0036
Author: max-orlov 
Authored: Wed May 31 21:07:49 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 15:20:12 2017 +0300

--
 .../context/collection_instrumentation.py   | 242 ---
 aria/orchestrator/context/operation.py  |  21 +-
 aria/orchestrator/context/toolbelt.py   |   6 +-
 aria/orchestrator/decorators.py |   6 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +-
 aria/storage/api.py |  10 +
 aria/storage/collection_instrumentation.py  | 306 +++
 aria/storage/core.py|  15 +
 aria/storage/sql_mapi.py|  14 +-
 aria/utils/imports.py   |   2 +-
 .../context/test_collection_instrumentation.py  | 150 ++---
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/workflows/core/test_task.py  |   2 +-
 .../executor/test_process_executor_extension.py |   3 +-
 15 files changed, 490 insertions(+), 316 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/180e0a1c/aria/orchestrator/context/collection_instrumentation.py
--
diff --git a/aria/orchestrator/context/collection_instrumentation.py 
b/aria/orchestrator/context/collection_instrumentation.py
deleted file mode 100644
index 8f80d4a..000
--- a/aria/orchestrator/context/collection_instrumentation.py
+++ /dev/null
@@ -1,242 +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 functools import partial
-
-from aria.modeling import models
-
-
-class _InstrumentedCollection(object):
-
-def __init__(self,
- model,
- parent,
- field_name,
- seq=None,
- is_top_level=True,
- **kwargs):
-self._model = model
-self._parent = parent
-self._field_name = field_name
-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(self, key, value):
-"""
-set the changes for the current object (not in the db)
-
-: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:
-"""
-if isinstance(value, _InstrumentedCollection):
-return value
-elif isinstance(value, dict):
-instrumentation_cls = _InstrumentedDict
-elif isinstance(value, list):
-instrumentation_cls = _InstrumentedList
-

[1/2] incubator-ariatosca git commit: ARIA-64 Remove PyYAML dependency [Forced Update!]

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior 3510ff793 -> 
180e0a1cf (forced update)


ARIA-64 Remove PyYAML dependency


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: e4d003680acc1dc4bc442a044a5feb0688475b46
Parents: b6d3c43
Author: Tal Liron 
Authored: Fri Jun 2 12:39:00 2017 -0500
Committer: Ran Ziv 
Committed: Tue Jun 6 11:50:09 2017 +0300

--
 aria/cli/config/config.py | 2 +-
 aria/cli/inputs.py| 2 +-
 requirements.in   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/config/config.py
--
diff --git a/aria/cli/config/config.py b/aria/cli/config/config.py
index 8c4214c..d584fad 100644
--- a/aria/cli/config/config.py
+++ b/aria/cli/config/config.py
@@ -15,8 +15,8 @@
 
 
 import os
-import yaml
 import pkg_resources
+from ruamel import yaml
 
 from jinja2.environment import Template
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/inputs.py
--
diff --git a/aria/cli/inputs.py b/aria/cli/inputs.py
index 0ff48dc..4d46ebb 100644
--- a/aria/cli/inputs.py
+++ b/aria/cli/inputs.py
@@ -15,7 +15,7 @@
 
 import os
 import glob
-import yaml
+from ruamel import yaml
 
 from .env import logger
 from .exceptions import AriaCliError

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/requirements.in
--
diff --git a/requirements.in b/requirements.in
index ab06d93..54e8714 100644
--- a/requirements.in
+++ b/requirements.in
@@ -13,7 +13,6 @@
 # In order to create the requirements.txt file, execute
 # pip-compile --output-file requirements.txt requirements.in (pip-tools 
package is needed).
 
-PyYAML<3.13
 requests>=2.3.0, <2.14.0
 networkx>=1.9, <1.10 # version 1.10 dropped support of python 2.6
 retrying>=1.3.0, <1.4.0

[2/2] incubator-ariatosca git commit: ARIA-262 Inconsistent node attributes behavior

[mxmrlv]

ARIA-262 Inconsistent node attributes behavior

Inroduced a more comprehensive way to instrument relationship attributes.

Old behavior instrumented attributes only if they were accessed directly from 
the
parent model. Traversing the storage made the access to an attribute 
inconsistent.

The new solution enables encapsulating the attributes disregarding the way they
were retrieved.


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: 180e0a1cf1ad6da0ddd611b90a58e71acbea52e7
Parents: e4d0036
Author: max-orlov 
Authored: Wed May 31 21:07:49 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 15:20:12 2017 +0300

--
 .../context/collection_instrumentation.py   | 242 ---
 aria/orchestrator/context/operation.py  |  21 +-
 aria/orchestrator/context/toolbelt.py   |   6 +-
 aria/orchestrator/decorators.py |   6 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +-
 aria/storage/api.py |  10 +
 aria/storage/collection_instrumentation.py  | 306 +++
 aria/storage/core.py|  15 +
 aria/storage/sql_mapi.py|  14 +-
 aria/utils/imports.py   |   2 +-
 .../context/test_collection_instrumentation.py  | 150 ++---
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/workflows/core/test_task.py  |   2 +-
 .../executor/test_process_executor_extension.py |   3 +-
 15 files changed, 490 insertions(+), 316 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/180e0a1c/aria/orchestrator/context/collection_instrumentation.py
--
diff --git a/aria/orchestrator/context/collection_instrumentation.py 
b/aria/orchestrator/context/collection_instrumentation.py
deleted file mode 100644
index 8f80d4a..000
--- a/aria/orchestrator/context/collection_instrumentation.py
+++ /dev/null
@@ -1,242 +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 functools import partial
-
-from aria.modeling import models
-
-
-class _InstrumentedCollection(object):
-
-def __init__(self,
- model,
- parent,
- field_name,
- seq=None,
- is_top_level=True,
- **kwargs):
-self._model = model
-self._parent = parent
-self._field_name = field_name
-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(self, key, value):
-"""
-set the changes for the current object (not in the db)
-
-: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:
-"""
-if isinstance(value, _InstrumentedCollection):
-return value
-elif isinstance(value, dict):
-instrumentation_cls = _InstrumentedDict
-elif isinstance(value, list):
-instrumentation_cls = _InstrumentedList
-else:
-return value
-
-return 

incubator-ariatosca git commit: ARIA-262 Inconsistent node attributes behavior [Forced Update!]

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior 5e10681d2 -> 
3510ff793 (forced update)


ARIA-262 Inconsistent node attributes behavior

Inroduced a more comprehensive way to instrument relationship attributes.

Old behavior instrumented attributes only if they were accessed directly from 
the
parent model. Traversing the storage made the access to an attribute 
inconsistent.

The new solution enables encapsulating the attributes disregarding the way they
were retrieved.


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: 3510ff7931fd733e5216dfb61e79328b7e7792e3
Parents: b6d3c43
Author: max-orlov 
Authored: Wed May 31 21:07:49 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 15:15:26 2017 +0300

--
 .../context/collection_instrumentation.py   | 242 ---
 aria/orchestrator/context/operation.py  |  21 +-
 aria/orchestrator/context/toolbelt.py   |   6 +-
 aria/orchestrator/decorators.py |   6 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +-
 aria/storage/api.py |  10 +
 aria/storage/collection_instrumentation.py  | 306 +++
 aria/storage/core.py|  15 +
 aria/storage/sql_mapi.py|  14 +-
 aria/utils/imports.py   |   2 +-
 .../context/test_collection_instrumentation.py  | 150 ++---
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/workflows/core/test_task.py  |   2 +-
 .../executor/test_process_executor_extension.py |   3 +-
 15 files changed, 490 insertions(+), 316 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/3510ff79/aria/orchestrator/context/collection_instrumentation.py
--
diff --git a/aria/orchestrator/context/collection_instrumentation.py 
b/aria/orchestrator/context/collection_instrumentation.py
deleted file mode 100644
index 8f80d4a..000
--- a/aria/orchestrator/context/collection_instrumentation.py
+++ /dev/null
@@ -1,242 +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 functools import partial
-
-from aria.modeling import models
-
-
-class _InstrumentedCollection(object):
-
-def __init__(self,
- model,
- parent,
- field_name,
- seq=None,
- is_top_level=True,
- **kwargs):
-self._model = model
-self._parent = parent
-self._field_name = field_name
-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(self, key, value):
-"""
-set the changes for the current object (not in the db)
-
-: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:
-"""
-if isinstance(value, _InstrumentedCollection):
-return value
-elif isinstance(value, dict):
-instrumentation_cls = _InstrumentedDict
-   

incubator-ariatosca git commit: ARIA-262 Inconsistent node attributes behavior [Forced Update!]

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior 79a1f761f -> 
5e10681d2 (forced update)


ARIA-262 Inconsistent node attributes behavior


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: 5e10681d2b314f7e7d4007f61f37846416be404e
Parents: b6d3c43
Author: max-orlov 
Authored: Wed May 31 21:07:49 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 15:03:11 2017 +0300

--
 .../context/collection_instrumentation.py   | 242 ---
 aria/orchestrator/context/operation.py  |  21 +-
 aria/orchestrator/context/toolbelt.py   |   6 +-
 aria/orchestrator/decorators.py |   6 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +-
 aria/storage/api.py |  10 +
 aria/storage/collection_instrumentation.py  | 306 +++
 aria/storage/core.py|  15 +
 aria/storage/sql_mapi.py|  14 +-
 aria/utils/imports.py   |   2 +-
 .../context/test_collection_instrumentation.py  | 150 ++---
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/workflows/core/test_task.py  |   2 +-
 .../executor/test_process_executor_extension.py |   3 +-
 15 files changed, 490 insertions(+), 316 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5e10681d/aria/orchestrator/context/collection_instrumentation.py
--
diff --git a/aria/orchestrator/context/collection_instrumentation.py 
b/aria/orchestrator/context/collection_instrumentation.py
deleted file mode 100644
index 8f80d4a..000
--- a/aria/orchestrator/context/collection_instrumentation.py
+++ /dev/null
@@ -1,242 +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 functools import partial
-
-from aria.modeling import models
-
-
-class _InstrumentedCollection(object):
-
-def __init__(self,
- model,
- parent,
- field_name,
- seq=None,
- is_top_level=True,
- **kwargs):
-self._model = model
-self._parent = parent
-self._field_name = field_name
-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(self, key, value):
-"""
-set the changes for the current object (not in the db)
-
-: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:
-"""
-if isinstance(value, _InstrumentedCollection):
-return value
-elif isinstance(value, dict):
-instrumentation_cls = _InstrumentedDict
-elif isinstance(value, list):
-instrumentation_cls = _InstrumentedList
-else:
-return value
-
-return instrumentation_cls(self._model, self, key, value, False)
-
-@staticmethod
-def _raw_value(value):
-"""
-Get the raw value.
-:param value:
-:return:
-   

incubator-ariatosca git commit: ARIA-262 Inconsistent node attributes behavior [Forced Update!]

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior 1b86b08c6 -> 
79a1f761f (forced update)


ARIA-262 Inconsistent node attributes behavior


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: 79a1f761fb01c7b2d6ae1bb4b9adea7e61042426
Parents: b6d3c43
Author: max-orlov 
Authored: Wed May 31 21:07:49 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 14:27:11 2017 +0300

--
 .../context/collection_instrumentation.py   | 242 ---
 aria/orchestrator/context/operation.py  |  21 +-
 aria/orchestrator/context/toolbelt.py   |   6 +-
 aria/orchestrator/decorators.py |   6 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +-
 aria/storage/api.py |  10 +
 aria/storage/collection_instrumentation.py  | 306 +++
 aria/storage/core.py|  16 +
 aria/storage/sql_mapi.py|  14 +-
 aria/utils/imports.py   |   2 +-
 .../context/test_collection_instrumentation.py  | 150 ++---
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 tests/orchestrator/execution_plugin/test_ssh.py |  10 +-
 tests/orchestrator/workflows/core/test_task.py  |   2 +-
 .../executor/test_process_executor_extension.py |   3 +-
 15 files changed, 491 insertions(+), 316 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/79a1f761/aria/orchestrator/context/collection_instrumentation.py
--
diff --git a/aria/orchestrator/context/collection_instrumentation.py 
b/aria/orchestrator/context/collection_instrumentation.py
deleted file mode 100644
index 8f80d4a..000
--- a/aria/orchestrator/context/collection_instrumentation.py
+++ /dev/null
@@ -1,242 +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 functools import partial
-
-from aria.modeling import models
-
-
-class _InstrumentedCollection(object):
-
-def __init__(self,
- model,
- parent,
- field_name,
- seq=None,
- is_top_level=True,
- **kwargs):
-self._model = model
-self._parent = parent
-self._field_name = field_name
-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(self, key, value):
-"""
-set the changes for the current object (not in the db)
-
-: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:
-"""
-if isinstance(value, _InstrumentedCollection):
-return value
-elif isinstance(value, dict):
-instrumentation_cls = _InstrumentedDict
-elif isinstance(value, list):
-instrumentation_cls = _InstrumentedList
-else:
-return value
-
-return instrumentation_cls(self._model, self, key, value, False)
-
-@staticmethod
-def _raw_value(value):
-"""
-Get the raw value.
-:param value:
-:return:
-   

incubator-ariatosca git commit: review 1 fixups [Forced Update!]

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior 4c0306bba -> 
1b86b08c6 (forced update)


review 1 fixups


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: 1b86b08c666f8bdb2c2683fdb4859f3b654b5d9c
Parents: 94c6063
Author: max-orlov 
Authored: Mon Jun 5 15:29:42 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 14:26:54 2017 +0300

--
 aria/orchestrator/decorators.py |   8 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +--
 aria/storage/api.py |  11 +-
 aria/storage/collection_instrumentation.py  |   5 +-
 aria/storage/core.py|  17 ++-
 aria/storage/sql_mapi.py|   3 +-
 aria/utils/validation.py|   2 +-
 .../context/test_collection_instrumentation.py  | 134 ++-
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 9 files changed, 139 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1b86b08c/aria/orchestrator/decorators.py
--
diff --git a/aria/orchestrator/decorators.py b/aria/orchestrator/decorators.py
index 4622aef..80f6962 100644
--- a/aria/orchestrator/decorators.py
+++ b/aria/orchestrator/decorators.py
@@ -48,7 +48,7 @@ def workflow(func=None, suffix_template=''):
 
 workflow_parameters.setdefault('ctx', ctx)
 workflow_parameters.setdefault('graph', 
task_graph.TaskGraph(workflow_name))
-validate_function_arguments(func, **workflow_parameters)
+validate_function_arguments(func, workflow_parameters)
 with context.workflow.current.push(ctx):
 func(**workflow_parameters)
 return workflow_parameters['graph']
@@ -68,13 +68,13 @@ def operation(func=None, toolbelt=False, 
suffix_template='', logging_handlers=No
 
 @wraps(func)
 def _wrapper(**func_kwargs):
-ctx = func_kwargs.pop('ctx')
+ctx = func_kwargs['ctx']
 if toolbelt:
 operation_toolbelt = context.toolbelt(ctx)
 func_kwargs.setdefault('toolbelt', operation_toolbelt)
-validate_function_arguments(func, ctx=ctx, **func_kwargs)
+validate_function_arguments(func, func_kwargs)
 with ctx.model.instrument(*ctx.INSTRUMENTATION_FIELDS):
-return func(ctx=ctx, **func_kwargs)
+return func(**func_kwargs)
 return _wrapper
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1b86b08c/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 102ff9a..50d4c3a 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -117,14 +117,15 @@ class CtxProxy(object):
 
 def _process(self, request):
 try:
-typed_request = json.loads(request)
-args = typed_request['args']
-payload = _process_ctx_request(self.ctx, args)
-result_type = 'result'
-if isinstance(payload, exceptions.ScriptException):
-payload = dict(message=str(payload))
-result_type = 'stop_operation'
-result = {'type': result_type, 'payload': payload}
+with self.ctx.model.instrument(*self.ctx.INSTRUMENTATION_FIELDS):
+typed_request = json.loads(request)
+args = typed_request['args']
+payload = _process_ctx_request(self.ctx, args)
+result_type = 'result'
+if isinstance(payload, exceptions.ScriptException):
+payload = dict(message=str(payload))
+result_type = 'stop_operation'
+result = {'type': result_type, 'payload': payload}
 except Exception as e:
 traceback_out = StringIO.StringIO()
 traceback.print_exc(file=traceback_out)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1b86b08c/aria/storage/api.py
--
diff --git a/aria/storage/api.py b/aria/storage/api.py
index 1887ee3..3304721 100644
--- a/aria/storage/api.py
+++ b/aria/storage/api.py
@@ -15,6 

incubator-ariatosca git commit: review 1 fixups [Forced Update!]

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior bc4cf7f2a -> 
4c0306bba (forced update)


review 1 fixups


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: 4c0306bba31359b87087a09482c055a352321f69
Parents: 94c6063
Author: max-orlov 
Authored: Mon Jun 5 15:29:42 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 14:24:22 2017 +0300

--
 aria/orchestrator/decorators.py |   8 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +--
 aria/storage/api.py |  11 +-
 aria/storage/collection_instrumentation.py  |   5 +-
 aria/storage/core.py|  17 ++-
 aria/storage/sql_mapi.py|   3 +-
 aria/utils/validation.py|   2 +-
 .../context/test_collection_instrumentation.py  | 134 ++-
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 9 files changed, 139 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4c0306bb/aria/orchestrator/decorators.py
--
diff --git a/aria/orchestrator/decorators.py b/aria/orchestrator/decorators.py
index 4622aef..80f6962 100644
--- a/aria/orchestrator/decorators.py
+++ b/aria/orchestrator/decorators.py
@@ -48,7 +48,7 @@ def workflow(func=None, suffix_template=''):
 
 workflow_parameters.setdefault('ctx', ctx)
 workflow_parameters.setdefault('graph', 
task_graph.TaskGraph(workflow_name))
-validate_function_arguments(func, **workflow_parameters)
+validate_function_arguments(func, workflow_parameters)
 with context.workflow.current.push(ctx):
 func(**workflow_parameters)
 return workflow_parameters['graph']
@@ -68,13 +68,13 @@ def operation(func=None, toolbelt=False, 
suffix_template='', logging_handlers=No
 
 @wraps(func)
 def _wrapper(**func_kwargs):
-ctx = func_kwargs.pop('ctx')
+ctx = func_kwargs['ctx']
 if toolbelt:
 operation_toolbelt = context.toolbelt(ctx)
 func_kwargs.setdefault('toolbelt', operation_toolbelt)
-validate_function_arguments(func, ctx=ctx, **func_kwargs)
+validate_function_arguments(func, func_kwargs)
 with ctx.model.instrument(*ctx.INSTRUMENTATION_FIELDS):
-return func(ctx=ctx, **func_kwargs)
+return func(**func_kwargs)
 return _wrapper
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4c0306bb/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 102ff9a..50d4c3a 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -117,14 +117,15 @@ class CtxProxy(object):
 
 def _process(self, request):
 try:
-typed_request = json.loads(request)
-args = typed_request['args']
-payload = _process_ctx_request(self.ctx, args)
-result_type = 'result'
-if isinstance(payload, exceptions.ScriptException):
-payload = dict(message=str(payload))
-result_type = 'stop_operation'
-result = {'type': result_type, 'payload': payload}
+with self.ctx.model.instrument(*self.ctx.INSTRUMENTATION_FIELDS):
+typed_request = json.loads(request)
+args = typed_request['args']
+payload = _process_ctx_request(self.ctx, args)
+result_type = 'result'
+if isinstance(payload, exceptions.ScriptException):
+payload = dict(message=str(payload))
+result_type = 'stop_operation'
+result = {'type': result_type, 'payload': payload}
 except Exception as e:
 traceback_out = StringIO.StringIO()
 traceback.print_exc(file=traceback_out)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4c0306bb/aria/storage/api.py
--
diff --git a/aria/storage/api.py b/aria/storage/api.py
index 1887ee3..f8bb523 100644
--- a/aria/storage/api.py
+++ b/aria/storage/api.py
@@ -15,6 

incubator-ariatosca git commit: review 1 fixups [Forced Update!]

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior b4bb86ec2 -> 
bc4cf7f2a (forced update)


review 1 fixups


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: bc4cf7f2a1a0ef436e51260087f78a5a8246938f
Parents: 94c6063
Author: max-orlov 
Authored: Mon Jun 5 15:29:42 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 12:30:08 2017 +0300

--
 aria/orchestrator/decorators.py |   8 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +--
 aria/storage/api.py |  11 +-
 aria/storage/collection_instrumentation.py  |   5 +-
 aria/storage/core.py|  13 +-
 aria/storage/sql_mapi.py|   3 +-
 aria/utils/validation.py|   2 +-
 .../context/test_collection_instrumentation.py  | 134 ++-
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 9 files changed, 139 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/bc4cf7f2/aria/orchestrator/decorators.py
--
diff --git a/aria/orchestrator/decorators.py b/aria/orchestrator/decorators.py
index 4622aef..80f6962 100644
--- a/aria/orchestrator/decorators.py
+++ b/aria/orchestrator/decorators.py
@@ -48,7 +48,7 @@ def workflow(func=None, suffix_template=''):
 
 workflow_parameters.setdefault('ctx', ctx)
 workflow_parameters.setdefault('graph', 
task_graph.TaskGraph(workflow_name))
-validate_function_arguments(func, **workflow_parameters)
+validate_function_arguments(func, workflow_parameters)
 with context.workflow.current.push(ctx):
 func(**workflow_parameters)
 return workflow_parameters['graph']
@@ -68,13 +68,13 @@ def operation(func=None, toolbelt=False, 
suffix_template='', logging_handlers=No
 
 @wraps(func)
 def _wrapper(**func_kwargs):
-ctx = func_kwargs.pop('ctx')
+ctx = func_kwargs['ctx']
 if toolbelt:
 operation_toolbelt = context.toolbelt(ctx)
 func_kwargs.setdefault('toolbelt', operation_toolbelt)
-validate_function_arguments(func, ctx=ctx, **func_kwargs)
+validate_function_arguments(func, func_kwargs)
 with ctx.model.instrument(*ctx.INSTRUMENTATION_FIELDS):
-return func(ctx=ctx, **func_kwargs)
+return func(**func_kwargs)
 return _wrapper
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/bc4cf7f2/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 102ff9a..50d4c3a 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -117,14 +117,15 @@ class CtxProxy(object):
 
 def _process(self, request):
 try:
-typed_request = json.loads(request)
-args = typed_request['args']
-payload = _process_ctx_request(self.ctx, args)
-result_type = 'result'
-if isinstance(payload, exceptions.ScriptException):
-payload = dict(message=str(payload))
-result_type = 'stop_operation'
-result = {'type': result_type, 'payload': payload}
+with self.ctx.model.instrument(*self.ctx.INSTRUMENTATION_FIELDS):
+typed_request = json.loads(request)
+args = typed_request['args']
+payload = _process_ctx_request(self.ctx, args)
+result_type = 'result'
+if isinstance(payload, exceptions.ScriptException):
+payload = dict(message=str(payload))
+result_type = 'stop_operation'
+result = {'type': result_type, 'payload': payload}
 except Exception as e:
 traceback_out = StringIO.StringIO()
 traceback.print_exc(file=traceback_out)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/bc4cf7f2/aria/storage/api.py
--
diff --git a/aria/storage/api.py b/aria/storage/api.py
index 1887ee3..77b39ab 100644
--- a/aria/storage/api.py
+++ b/aria/storage/api.py
@@ -15,6 

incubator-ariatosca git commit: review 1 fixups [Forced Update!]

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior ea220b8dc -> 
b4bb86ec2 (forced update)


review 1 fixups


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: b4bb86ec299f87f1a0c8b52d272d2d489b1f9f03
Parents: 94c6063
Author: max-orlov 
Authored: Mon Jun 5 15:29:42 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 12:27:56 2017 +0300

--
 aria/orchestrator/decorators.py |   8 +-
 .../execution_plugin/ctx_proxy/server.py|  17 +--
 aria/storage/api.py |  11 +-
 aria/storage/collection_instrumentation.py  |   5 +-
 aria/storage/core.py|  13 +-
 aria/storage/sql_mapi.py|   3 +-
 aria/utils/validation.py|   2 +-
 .../context/test_collection_instrumentation.py  | 134 ++-
 tests/orchestrator/context/test_operation.py|   2 +-
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 10 files changed, 140 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b4bb86ec/aria/orchestrator/decorators.py
--
diff --git a/aria/orchestrator/decorators.py b/aria/orchestrator/decorators.py
index 4622aef..80f6962 100644
--- a/aria/orchestrator/decorators.py
+++ b/aria/orchestrator/decorators.py
@@ -48,7 +48,7 @@ def workflow(func=None, suffix_template=''):
 
 workflow_parameters.setdefault('ctx', ctx)
 workflow_parameters.setdefault('graph', 
task_graph.TaskGraph(workflow_name))
-validate_function_arguments(func, **workflow_parameters)
+validate_function_arguments(func, workflow_parameters)
 with context.workflow.current.push(ctx):
 func(**workflow_parameters)
 return workflow_parameters['graph']
@@ -68,13 +68,13 @@ def operation(func=None, toolbelt=False, 
suffix_template='', logging_handlers=No
 
 @wraps(func)
 def _wrapper(**func_kwargs):
-ctx = func_kwargs.pop('ctx')
+ctx = func_kwargs['ctx']
 if toolbelt:
 operation_toolbelt = context.toolbelt(ctx)
 func_kwargs.setdefault('toolbelt', operation_toolbelt)
-validate_function_arguments(func, ctx=ctx, **func_kwargs)
+validate_function_arguments(func, func_kwargs)
 with ctx.model.instrument(*ctx.INSTRUMENTATION_FIELDS):
-return func(ctx=ctx, **func_kwargs)
+return func(**func_kwargs)
 return _wrapper
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b4bb86ec/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 102ff9a..50d4c3a 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -117,14 +117,15 @@ class CtxProxy(object):
 
 def _process(self, request):
 try:
-typed_request = json.loads(request)
-args = typed_request['args']
-payload = _process_ctx_request(self.ctx, args)
-result_type = 'result'
-if isinstance(payload, exceptions.ScriptException):
-payload = dict(message=str(payload))
-result_type = 'stop_operation'
-result = {'type': result_type, 'payload': payload}
+with self.ctx.model.instrument(*self.ctx.INSTRUMENTATION_FIELDS):
+typed_request = json.loads(request)
+args = typed_request['args']
+payload = _process_ctx_request(self.ctx, args)
+result_type = 'result'
+if isinstance(payload, exceptions.ScriptException):
+payload = dict(message=str(payload))
+result_type = 'stop_operation'
+result = {'type': result_type, 'payload': payload}
 except Exception as e:
 traceback_out = StringIO.StringIO()
 traceback.print_exc(file=traceback_out)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b4bb86ec/aria/storage/api.py
--
diff --git a/aria/storage/api.py b/aria/storage/api.py
index 1887ee3..77b39ab 100644
--- 

[incubator-ariatosca] Git Push Summary

[ran]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-64-remove-pyyaml [deleted] e4d003680

incubator-ariatosca git commit: ARIA-64 Remove PyYAML dependency

[ran]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/master b6d3c43ba -> e4d003680


ARIA-64 Remove PyYAML dependency


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

Branch: refs/heads/master
Commit: e4d003680acc1dc4bc442a044a5feb0688475b46
Parents: b6d3c43
Author: Tal Liron 
Authored: Fri Jun 2 12:39:00 2017 -0500
Committer: Ran Ziv 
Committed: Tue Jun 6 11:50:09 2017 +0300

--
 aria/cli/config/config.py | 2 +-
 aria/cli/inputs.py| 2 +-
 requirements.in   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/config/config.py
--
diff --git a/aria/cli/config/config.py b/aria/cli/config/config.py
index 8c4214c..d584fad 100644
--- a/aria/cli/config/config.py
+++ b/aria/cli/config/config.py
@@ -15,8 +15,8 @@
 
 
 import os
-import yaml
 import pkg_resources
+from ruamel import yaml
 
 from jinja2.environment import Template
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/inputs.py
--
diff --git a/aria/cli/inputs.py b/aria/cli/inputs.py
index 0ff48dc..4d46ebb 100644
--- a/aria/cli/inputs.py
+++ b/aria/cli/inputs.py
@@ -15,7 +15,7 @@
 
 import os
 import glob
-import yaml
+from ruamel import yaml
 
 from .env import logger
 from .exceptions import AriaCliError

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/requirements.in
--
diff --git a/requirements.in b/requirements.in
index ab06d93..54e8714 100644
--- a/requirements.in
+++ b/requirements.in
@@ -13,7 +13,6 @@
 # In order to create the requirements.txt file, execute
 # pip-compile --output-file requirements.txt requirements.in (pip-tools 
package is needed).
 
-PyYAML<3.13
 requests>=2.3.0, <2.14.0
 networkx>=1.9, <1.10 # version 1.10 dropped support of python 2.6
 retrying>=1.3.0, <1.4.0

incubator-ariatosca git commit: fixed some bugs and added a test [Forced Update!]

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior cc729757a -> 
ea220b8dc (forced update)


fixed some bugs and added a test


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: ea220b8dce5b3104b1d57d2fdec1abf84498f410
Parents: b3abdce
Author: max-orlov 
Authored: Tue Jun 6 12:01:28 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 12:12:22 2017 +0300

--
 .../execution_plugin/ctx_proxy/server.py|  17 +--
 aria/storage/collection_instrumentation.py  |   5 +-
 .../context/test_collection_instrumentation.py  | 134 ++-
 .../execution_plugin/test_ctx_proxy_server.py   |   2 +-
 4 files changed, 113 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ea220b8d/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 102ff9a..50d4c3a 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -117,14 +117,15 @@ class CtxProxy(object):
 
 def _process(self, request):
 try:
-typed_request = json.loads(request)
-args = typed_request['args']
-payload = _process_ctx_request(self.ctx, args)
-result_type = 'result'
-if isinstance(payload, exceptions.ScriptException):
-payload = dict(message=str(payload))
-result_type = 'stop_operation'
-result = {'type': result_type, 'payload': payload}
+with self.ctx.model.instrument(*self.ctx.INSTRUMENTATION_FIELDS):
+typed_request = json.loads(request)
+args = typed_request['args']
+payload = _process_ctx_request(self.ctx, args)
+result_type = 'result'
+if isinstance(payload, exceptions.ScriptException):
+payload = dict(message=str(payload))
+result_type = 'stop_operation'
+result = {'type': result_type, 'payload': payload}
 except Exception as e:
 traceback_out = StringIO.StringIO()
 traceback.print_exc(file=traceback_out)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ea220b8d/aria/storage/collection_instrumentation.py
--
diff --git a/aria/storage/collection_instrumentation.py 
b/aria/storage/collection_instrumentation.py
index 6f02b34..27d8322 100644
--- a/aria/storage/collection_instrumentation.py
+++ b/aria/storage/collection_instrumentation.py
@@ -270,9 +270,8 @@ class _WrappedModel(object):
 if value.__class__ in (class_.class_ for class_ in 
self._instrumentation):
 return _create_instrumented_model(
 value, instrumentation=self._instrumentation, **self._kwargs)
-elif getattr(value, 'metadata', True) == getattr(self._wrapped, 
'metadata', False):
-# Basically checks that the value is indeed an sqlmodel and the 
metadata of it,
-# and the current wrapped model is the same
+elif hasattr(value, 'metadata') or isinstance(value, (dict, list)):
+# Basically checks that the value is indeed an sqlmodel (it should 
have metadata)
 return _create_wrapped_model(
 value, instrumentation=self._instrumentation, **self._kwargs)
 return value

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ea220b8d/tests/orchestrator/context/test_collection_instrumentation.py
--
diff --git a/tests/orchestrator/context/test_collection_instrumentation.py 
b/tests/orchestrator/context/test_collection_instrumentation.py
index 4afc737..ae3e8ac 100644
--- a/tests/orchestrator/context/test_collection_instrumentation.py
+++ b/tests/orchestrator/context/test_collection_instrumentation.py
@@ -15,8 +15,14 @@
 
 import pytest
 
-from aria.modeling.models import Attribute
+from aria.modeling import models
 from aria.storage import collection_instrumentation
+from aria.orchestrator.context import operation
+
+from tests import (
+mock,
+storage
+)
 
 
 class MockActor(object):
@@ -49,11 +55,11 @@ class 

incubator-ariatosca git commit: fixed some bugs and added a test

[mxmrlv]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-262-Inconsistent-node-attributes-behavior b3abdce5e -> 
cc729757a


fixed some bugs and added a test


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

Branch: refs/heads/ARIA-262-Inconsistent-node-attributes-behavior
Commit: cc729757abdc7ac9bae71e059d41cbfd07e4470b
Parents: b3abdce
Author: max-orlov 
Authored: Tue Jun 6 12:01:28 2017 +0300
Committer: max-orlov 
Committed: Tue Jun 6 12:01:28 2017 +0300

--
 .../execution_plugin/ctx_proxy/server.py|  17 +--
 aria/storage/collection_instrumentation.py  |   5 +-
 .../context/test_collection_instrumentation.py  | 134 ++-
 3 files changed, 112 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc729757/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 102ff9a..50d4c3a 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -117,14 +117,15 @@ class CtxProxy(object):
 
 def _process(self, request):
 try:
-typed_request = json.loads(request)
-args = typed_request['args']
-payload = _process_ctx_request(self.ctx, args)
-result_type = 'result'
-if isinstance(payload, exceptions.ScriptException):
-payload = dict(message=str(payload))
-result_type = 'stop_operation'
-result = {'type': result_type, 'payload': payload}
+with self.ctx.model.instrument(*self.ctx.INSTRUMENTATION_FIELDS):
+typed_request = json.loads(request)
+args = typed_request['args']
+payload = _process_ctx_request(self.ctx, args)
+result_type = 'result'
+if isinstance(payload, exceptions.ScriptException):
+payload = dict(message=str(payload))
+result_type = 'stop_operation'
+result = {'type': result_type, 'payload': payload}
 except Exception as e:
 traceback_out = StringIO.StringIO()
 traceback.print_exc(file=traceback_out)

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc729757/aria/storage/collection_instrumentation.py
--
diff --git a/aria/storage/collection_instrumentation.py 
b/aria/storage/collection_instrumentation.py
index 6f02b34..27d8322 100644
--- a/aria/storage/collection_instrumentation.py
+++ b/aria/storage/collection_instrumentation.py
@@ -270,9 +270,8 @@ class _WrappedModel(object):
 if value.__class__ in (class_.class_ for class_ in 
self._instrumentation):
 return _create_instrumented_model(
 value, instrumentation=self._instrumentation, **self._kwargs)
-elif getattr(value, 'metadata', True) == getattr(self._wrapped, 
'metadata', False):
-# Basically checks that the value is indeed an sqlmodel and the 
metadata of it,
-# and the current wrapped model is the same
+elif hasattr(value, 'metadata') or isinstance(value, (dict, list)):
+# Basically checks that the value is indeed an sqlmodel (it should 
have metadata)
 return _create_wrapped_model(
 value, instrumentation=self._instrumentation, **self._kwargs)
 return value

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cc729757/tests/orchestrator/context/test_collection_instrumentation.py
--
diff --git a/tests/orchestrator/context/test_collection_instrumentation.py 
b/tests/orchestrator/context/test_collection_instrumentation.py
index 4afc737..ae3e8ac 100644
--- a/tests/orchestrator/context/test_collection_instrumentation.py
+++ b/tests/orchestrator/context/test_collection_instrumentation.py
@@ -15,8 +15,14 @@
 
 import pytest
 
-from aria.modeling.models import Attribute
+from aria.modeling import models
 from aria.storage import collection_instrumentation
+from aria.orchestrator.context import operation
+
+from tests import (
+mock,
+storage
+)
 
 
 class MockActor(object):
@@ -49,11 +55,11 @@ class CollectionInstrumentation(object):
 
 @pytest.fixture
 def dict_(self, actor, 

incubator-ariatosca git commit: ARIA-64 Remove PyYAML dependency [Forced Update!]

[ran]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-64-remove-pyyaml 5d1e56b04 -> e4d003680 (forced update)


ARIA-64 Remove PyYAML dependency


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

Branch: refs/heads/ARIA-64-remove-pyyaml
Commit: e4d003680acc1dc4bc442a044a5feb0688475b46
Parents: b6d3c43
Author: Tal Liron 
Authored: Fri Jun 2 12:39:00 2017 -0500
Committer: Ran Ziv 
Committed: Tue Jun 6 11:50:09 2017 +0300

--
 aria/cli/config/config.py | 2 +-
 aria/cli/inputs.py| 2 +-
 requirements.in   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/config/config.py
--
diff --git a/aria/cli/config/config.py b/aria/cli/config/config.py
index 8c4214c..d584fad 100644
--- a/aria/cli/config/config.py
+++ b/aria/cli/config/config.py
@@ -15,8 +15,8 @@
 
 
 import os
-import yaml
 import pkg_resources
+from ruamel import yaml
 
 from jinja2.environment import Template
 

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/aria/cli/inputs.py
--
diff --git a/aria/cli/inputs.py b/aria/cli/inputs.py
index 0ff48dc..4d46ebb 100644
--- a/aria/cli/inputs.py
+++ b/aria/cli/inputs.py
@@ -15,7 +15,7 @@
 
 import os
 import glob
-import yaml
+from ruamel import yaml
 
 from .env import logger
 from .exceptions import AriaCliError

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e4d00368/requirements.in
--
diff --git a/requirements.in b/requirements.in
index ab06d93..54e8714 100644
--- a/requirements.in
+++ b/requirements.in
@@ -13,7 +13,6 @@
 # In order to create the requirements.txt file, execute
 # pip-compile --output-file requirements.txt requirements.in (pip-tools 
package is needed).
 
-PyYAML<3.13
 requests>=2.3.0, <2.14.0
 networkx>=1.9, <1.10 # version 1.10 dropped support of python 2.6
 retrying>=1.3.0, <1.4.0

incubator-ariatosca git commit: ARIA-54 Prepare for ARIA packaging [Forced Update!]

[ran]

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-54-prepare-aria-packaging 2301e44ca -> efdef5428 (forced 
update)


ARIA-54 Prepare for ARIA packaging

Preparations for ARIA packaging:
 - Added CHANGELOG file
 - Added CONTRIBUTING file
 - Added DISCLAIMER file
 - Converted README from md to rst for PyPI compatiability
 - Removed outdated TODO file
 - Added long_description, download_url to setup.py metadata
 - Modified setup.py url metadata to point at ASF domain
 - Added more badges to README


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

Branch: refs/heads/ARIA-54-prepare-aria-packaging
Commit: efdef5428f4d376895e9da085b6c996cf2942ad1
Parents: b6d3c43
Author: Ran Ziv 
Authored: Mon Jun 5 13:24:49 2017 +0300
Committer: Ran Ziv 
Committed: Tue Jun 6 11:48:44 2017 +0300

--
 CHANGELOG.rst |   4 +
 CONTRIBUTING  |   3 +
 DISCLAIMER|  10 ++
 MANIFEST.in   |   1 +
 README.md | 201 
 README.rst| 328 +
 TODO.md   |   8 --
 setup.py  |   8 +-
 8 files changed, 353 insertions(+), 210 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/efdef542/CHANGELOG.rst
--
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 000..6abb1af
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,4 @@
+0.1.0
+-
+
+ * Initial release.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/efdef542/CONTRIBUTING
--
diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 000..4124003
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,3 @@
+Contribution guide is available on our Confluence:
+
+https://cwiki.apache.org/confluence/display/ARIATOSCA/Contributing+to+ARIA
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/efdef542/DISCLAIMER
--
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 000..358d8e1
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,10 @@
+Apache AriaTosca is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be
+fully endorsed by the ASF.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/efdef542/MANIFEST.in
--
diff --git a/MANIFEST.in b/MANIFEST.in
index 6c79a3a..fe7df4c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
 include requirements.txt
 include VERSION
 include LICENSE
+include README.rst
 recursive-include examples *

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/efdef542/README.md
--
diff --git a/README.md b/README.md
deleted file mode 100644
index e534645..000
--- a/README.md
+++ /dev/null
@@ -1,201 +0,0 @@
-ARIA
-
-
-[![Build 
Status](https://travis-ci.org/apache/incubator-ariatosca.svg?branch=master)](https://travis-ci.org/apache/incubator-ariatosca)
-[![Appveyor Build 
Status](https://ci.appveyor.com/api/projects/status/ltv89jk63ahiu306?svg=true)](https://ci.appveyor.com/project/ApacheSoftwareFoundation/incubator-ariatosca/history)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-
-
-[ARIA](http://ariatosca.org/) is a minimal TOSCA orchestrator, as well as a 
platform for building
-TOSCA-based products. Its features can be accessed via a well-documented 
Python API.
-
-On its own, ARIA provides built-in tools for blueprint validation and for 
creating ready-to-run
-service instances. 
-
-ARIA adheres strictly and meticulously to the
-[TOSCA Simple Profile v1.0 cos01 
specification](http://docs.oasis-open.org/tosca/TOSCA-Simple-Profile-YAML/v1.0/cos01/TOSCA-Simple-Profile-YAML-v1.0-cos01.html),
-providing state-of-the-art validation at seven different levels:
-
-
-Platform errors.