date:20170612

RE: Support for TOSCA Simple Profile NFV 1.0

2017-06-12 Thread D Jayachandran

Thanks for the information Avia.
I will check on that.

Regards,
DJ

-Original Message-
From: Avia Efrat [mailto:a...@gigaspaces.com] 
Sent: Tuesday, June 13, 2017 2:59 AM
To: dev@ariatosca.incubator.apache.org
Subject: Re: Support for TOSCA Simple Profile NFV 1.0

Hi DJ,

Just updating that the pull request was merged.

Note that there are some inconsistencies in csd04, so if you have any questions 
regarding our reasoning in resolving them, feel encouraged to ask.

On Wed, Jun 7, 2017 at 10:09 AM, D Jayachandran  wrote:

> Thanks for the update Avia.
>
> Regards,
> DJ
>
> -Original Message-
> From: Avia Efrat [mailto:a...@gigaspaces.com]
> Sent: Wednesday, June 07, 2017 3:03 AM
> To: dev@ariatosca.incubator.apache.org
> Subject: Re: Support for TOSCA Simple Profile NFV 1.0
>
> 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
>  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]

[DRAFT] What the new Status Pages potentially look like

2017-06-12 Thread John D. Ament

All,

We're piloting a new format for the podling status pages.  Specifically,
the current status page leaves a lot to be desired - it's basically crafted
html, there's no structure and its hard to find missing items.  The end
goal is to have a web form editable in Whimsy, but until we get more input
on what the content looks like I don't want to make changes like that.  I'm
asking at this point for podlings to take a look at the status output,
potentially update their own content, and see if they like the output.

If you navigate to https://whimsy.apache.org/roster/ppmc/ (authentication
is via your ASF committer username/password) and find your podling, you'll
see your current roster as well as your current status information.

The status pages can be found in SVN at this directory
https://svn.apache.org/repos/asf/incubator/public/trunk/content/podlings/

Some more information can be found at
https://lists.apache.org/thread.html/9504139b5ee9880fdb278f86757803c711fbc962e1934ef2c01a8ed0@%3Cgeneral.incubator.apache.org%3E

If you're not sure what to fill out, feel free to reach out.

John

Re: Let's talk about scaling (ARIA-254)

2017-06-12 Thread Tal Liron

Let's talk about scaling some more. :)

Earlier, I complete missed the definition of tosca.capabilities.Scalable:

http://docs.oasis-open.org/tosca/TOSCA-Simple-Profile-YAML/v1.0/cos01/TOSCA-Simple-Profile-YAML-v1.0-cos01.html#DEFN_TYPE_CAPABILITIES_SCALABLE

The reason I missed it is that it's actually *not* declared in
tosca.nodes.Root, but specifically declared only for tosca.nodes.Compute
and tosca.nodes.Container.Runtime. This seems a bit odd to me. From our
experience, we know that it's not only VM nodes that need to be scaled, but
in fact *any* node in the topology is a template that can have more than
one instances (or possibly even zero in some situations). I'm honestly
confused as to why TOSCA did it this way.

So, I currently propose this: support *both* the capability and a policy.
The mechanism works by first looking through the node templates
capabilities to find whether it has a "scalable"-role capability. If it
doesn't, it will see if there is a "scalable"-role policy that applies to
it.

I'll note that the "scalable"-role policy is part of the ARIA Profile, but
even without that profile we will still support the more basic scalability
defined in the Simple Profile. Supporting both is actually very easy in
terms of the code, just a few lines for each once the mechanism is in
place: the properties names and usages are the same in each.

One quirk is how tosca.capabilities.Scalable defines its properties. We're
used to thinking that max_instances defaults to infinity, and
default_instances defaults to 1. The way the Simple Profile defines it,
max_instances defaults to 1, and default_instances is an optional field.
Meaning that in a sense it is up to the orchestrator to define the default
number of instances for a node template. I recommend we switch to the way
the Simple Profile works, for our policy as well.

What this means is that if, for example, you want a node to have 5
instances, then you need to set default_instances to 5, but *also* set
max_instances to >=5, otherwise you will get a validation error. I
personally think this is annoying, and prefer our way of thinking, but I
think we should adhere to TOSCA here.

[incubator-ariatosca] Git Push Summary

2017-06-12 Thread avia

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-275-update-NFV-profile-to-csd04 [deleted] 1e883c57a

Re: Support for TOSCA Simple Profile NFV 1.0

2017-06-12 Thread Avia Efrat

Hi DJ,

Just updating that the pull request was merged.

Note that there are some inconsistencies in csd04, so if you have any
questions regarding our reasoning in resolving them, feel encouraged to ask.

On Wed, Jun 7, 2017 at 10:09 AM, D Jayachandran  wrote:

> Thanks for the update Avia.
>
> Regards,
> DJ
>
> -Original Message-
> From: Avia Efrat [mailto:a...@gigaspaces.com]
> Sent: Wednesday, June 07, 2017 3:03 AM
> To: dev@ariatosca.incubator.apache.org
> Subject: Re: Support for TOSCA Simple Profile NFV 1.0
>
> 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
>  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]

incubator-ariatosca git commit: ARIA-275 Update NFV profile to csd04

2017-06-12 Thread avia

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/master 22f6e9efd -> 1e883c57a


ARIA-275 Update NFV profile to csd04

This update was done according to:
http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html

We resolved some inconsistencies of csd04 with the TOSCA spec, and within csd04 
itself. Wherever we resolved such inconsistencies, we added a detailed
comment describing our reasoning.


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

Branch: refs/heads/master
Commit: 1e883c57abb733b10e13f0b7005cf564886d3fb1
Parents: 22f6e9e
Author: Avia Efrat 
Authored: Sun Jun 4 22:11:10 2017 +0300
Committer: Avia Efrat 
Committed: Mon Jun 12 22:24:04 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 +-
 .../tosca-simple-nfv-1.0/artifacts.yaml |  84 +
 .../tosca-simple-nfv-1.0/capabilities.yaml  |  99 ++
 .../profiles/tosca-simple-nfv-1.0/data.yaml | 305 ++---
 .../profiles/tosca-simple-nfv-1.0/groups.yaml   |  56 
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 323 ---
 .../tosca-simple-nfv-1.0/relationships.yaml |  37 +--
 .../tosca-simple-nfv-1.0.yaml   |   2 +-
 15 files changed, 604 insertions(+), 332 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1e883c57/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/1e883c57/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

[1/2] incubator-ariatosca git commit: ARIA-166 Update README file [Forced Update!]

2017-06-12 Thread avia

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-275-update-NFV-profile-to-csd04 692f61299 -> 1e883c57a 
(forced update)


ARIA-166 Update README file


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 22f6e9efd5300f33bee51a1c1622c22b1531bbf5
Parents: 5afa2f7
Author: Ran Ziv 
Authored: Thu Jun 8 18:26:29 2017 +0300
Committer: Ran Ziv 
Committed: Mon Jun 12 19:08:44 2017 +0300

--
 README.md | 231 +++--
 1 file changed, 75 insertions(+), 156 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/22f6e9ef/README.md
--
diff --git a/README.md b/README.md
index e534645..6aee414 100644
--- a/README.md
+++ b/README.md
@@ -1,201 +1,120 @@
 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)
+[![Build 
Status](https://img.shields.io/travis/apache/incubator-ariatosca/master.svg)](https://travis-ci.org/apache/incubator-ariatosca)
+[![Appveyor Build 
Status](https://img.shields.io/appveyor/ci/ApacheSoftwareFoundation/incubator-ariatosca/master.svg)](https://ci.appveyor.com/project/ApacheSoftwareFoundation/incubator-ariatosca/history)
+[![License](https://img.shields.io/github/license/apache/incubator-ariatosca.svg)](http://www.apache.org/licenses/LICENSE-2.0)
+[![PyPI 
release](https://img.shields.io/pypi/v/ariatosca.svg)](https://pypi.python.org/pypi/ariatosca)
+![Python Versions](https://img.shields.io/pypi/pyversions/ariatosca.svg)
+![Wheel](https://img.shields.io/pypi/wheel/ariatosca.svg)
+![Contributors](https://img.shields.io/github/contributors/apache/incubator-ariatosca.svg)
+[![Open Pull 
Requests](https://img.shields.io/github/issues-pr/apache/incubator-ariatosca.svg)](https://github.com/apache/incubator-ariatosca/pulls)
+[![Closed Pull 
Requests](https://img.shields.io/github/issues-pr-closed-raw/apache/incubator-ariatosca.svg)](https://github.com/apache/incubator-ariatosca/pulls?q=is%3Apr+is%3Aclosed)
 
 
-[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.
+What is ARIA?
+
 
-On its own, ARIA provides built-in tools for blueprint validation and for 
creating ready-to-run
-service instances. 
+[ARIA](http://ariatosca.incubator.apache.org/) is a an open-source, 
[TOSCA](https://www.oasis-open.org/committees/tosca/)-based, lightweight 
library and CLI for orchestration and for consumption by projects building 
TOSCA-based solutions for resources and services orchestration.
 
-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:
+ARIA can be utilized by any organization that wants to implement TOSCA-based 
orchestration in its solutions, whether a multi-cloud enterprise application, 
or an NFV or SDN solution for multiple virtual infrastructure managers.
 
-
-Platform errors. E.g. network, hardware, or even an internal bug in ARIA 
(let us know,
-   please!).
-Syntax and format errors. E.g. non-compliant YAML, XML, JSON.
-Field validation. E.g. assigning a string where an integer is expected, 
using a list instead of
-   a dict.
-Relationships between fields within a type. This is "grammar" as it 
applies to rules for
-setting the values of fields in relation to each other.
-Relationships between types. E.g. referring to an unknown type, causing a 
type inheritance
-loop.
-Topology. These errors happen if requirements and capabilities cannot be 
matched in order to
-   assemble a valid topology.
-External dependencies. These errors happen if requirement/capability 
matching fails due to
-external resources missing, e.g. the lack of a valid virtual machine, API 
credentials, etc.
- 
-
+With ARIA, you can utilize TOSCA's cloud portability out-of-the-box, to

[2/2] incubator-ariatosca git commit: ARIA-275 Update NFV profile to csd04

2017-06-12 Thread avia

ARIA-275 Update NFV profile to csd04

This update was done according to:
http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html

We resolved some inconsistencies of csd04 with the TOSCA spec, and within csd04 
itself. Wherever we resolved such inconsistencies, we added a detailed
comment describing our reasoning.


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 1e883c57abb733b10e13f0b7005cf564886d3fb1
Parents: 22f6e9e
Author: Avia Efrat 
Authored: Sun Jun 4 22:11:10 2017 +0300
Committer: Avia Efrat 
Committed: Mon Jun 12 22:24:04 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 +-
 .../tosca-simple-nfv-1.0/artifacts.yaml |  84 +
 .../tosca-simple-nfv-1.0/capabilities.yaml  |  99 ++
 .../profiles/tosca-simple-nfv-1.0/data.yaml | 305 ++---
 .../profiles/tosca-simple-nfv-1.0/groups.yaml   |  56 
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 323 ---
 .../tosca-simple-nfv-1.0/relationships.yaml |  37 +--
 .../tosca-simple-nfv-1.0.yaml   |   2 +-
 15 files changed, 604 insertions(+), 332 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1e883c57/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/1e883c57/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

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

2017-06-12 Thread emblemparade

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

[12/13] incubator-ariatosca git commit: Merge branch 'ARIA-275-update-NFV-profile-to-csd04' of https://git-wip-us.apache.org/repos/asf/incubator-ariatosca into ARIA-275-update-NFV-profile-to-csd04

2017-06-12 Thread emblemparade

Merge branch 'ARIA-275-update-NFV-profile-to-csd04' of 
https://git-wip-us.apache.org/repos/asf/incubator-ariatosca into 
ARIA-275-update-NFV-profile-to-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/a62f4c23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/a62f4c23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/a62f4c23

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: a62f4c239a6b94232e11224411d7b8a6e9217966
Parents: 5e8044d 9240e20
Author: Tal Liron 
Authored: Wed Jun 7 15:32:25 2017 -0500
Committer: Tal Liron 
Committed: Wed Jun 7 15:32:25 2017 -0500

--
 aria/cli/commands/services.py   | 23 -
 aria/modeling/models.py |  4 +--
 aria/storage/sql_mapi.py|  3 ++-
 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 +
 8 files changed, 78 insertions(+), 28 deletions(-)
--

[02/13] incubator-ariatosca git commit: remove two relationship types

2017-06-12 Thread emblemparade

remove two relationship types

- tosca.relationships.nfv.ForwardsTo
- tosca.relationships.nfv.VirtualLinksTo

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 relationship was a part of the NSD model.
The first relationship 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/bdf117c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/bdf117c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/bdf117c5

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: bdf117c5163525e48538695825d8035e493e4058
Parents: 7bffd18
Author: Avia Efrat 
Authored: Tue Jun 6 01:05:13 2017 +0300
Committer: Avia Efrat 
Committed: Tue Jun 6 22:33:10 2017 +0300

--
 .../tosca-simple-nfv-1.0/relationships.yaml | 35 
 1 file changed, 7 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/bdf117c5/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/relationships.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/relationships.yaml
 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/relationships.yaml
index b745735..6cf0f6e 100644
--- 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/relationships.yaml
+++ 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/relationships.yaml
@@ -20,8 +20,8 @@ relationship_types:
   shorthand_name: VirtualBindsTo
   type_qualified_name: tosca:VirtualBindsTo
   specification: tosca-simple-nfv-1.0
-  specification_section: 8.4.1
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290234'
+  specification_section: 5.7.1
+  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896074'
 description: >-
   This relationship type represents an association relationship between 
VDU and CP node types.
 derived_from: tosca.relationships.DependsOn
@@ -32,33 +32,12 @@ relationship_types:
   shorthand_name: Monitor
   type_qualified_name: tosca:Monitor
   specification: tosca-simple-nfv-1.0
-  specification_section: 8.4.2
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc418607880'
+  specification_section: 5.7.2
+  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896075'
 description: >-
   This relationship type represents an association relationship to the 
Metric capability of VDU node types.
 derived_from: tosca.relationships.ConnectsTo
 valid_target_types: [ tosca.capabilities.nfv.Metric ]
-
-  tosca.relationships.nfv.ForwardsTo:
-_extensions:
-  shorthand_name: ForwardsTo
-  type_qualified_name: tosca:ForwardsTo
-  specification: tosca-simple-nfv-1.0
-  specification_section: 10.4.1
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714720'
-description: >-
-  This relationship type represents a traffic flow between two connection 
point node types.
-derived_from: tosca.relationships.Root
-valid_target_types: [ tosca.capabilities.nfv.Forwarder ]
-
-  tosca.relationships.nfv.VirtualLinksTo:
-_extensions:
-  shorthand_name: VirtualLinksTo
-  type_qualified_name: tosca:VirtualLinksTo
-  specification: tosca-simple-nfv-1.0
-  specification_section: 11.4.1
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714737'
-description: >-
-  This relationship type represents an association relationship between 
VNFs and VL node types.
-derived_from: tosca.relationships.DependsOn
-valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ]
+# ARIA NOTE: csd04 lacks the definition of tosca.relationships.nfv.Monitor 
(the derived_from and
+# valid_target_types). It took the liberty of copying their values from 
csd03 as I feel they
+# just got lost in an extensive cut-and-paste session that took place 
between csd03 and csd04.

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

2017-06-12 Thread emblemparade

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:
-

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

2017-06-12 Thread emblemparade

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-275-update-NFV-profile-to-csd04 9240e20ec -> 692f61299


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

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

2017-06-12 Thread emblemparade

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

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

2017-06-12 Thread emblemparade

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

[13/13] incubator-ariatosca git commit: Cleanup and streamlining

2017-06-12 Thread emblemparade

Cleanup and streamlining


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 692f61299722b81158a24bf0e9fcd49df7e37487
Parents: a62f4c2
Author: Tal Liron 
Authored: Mon Jun 12 12:48:46 2017 -0500
Committer: Tal Liron 
Committed: Mon Jun 12 12:48:46 2017 -0500

--
 .../tosca-simple-nfv-1.0/artifacts.yaml |  38 ++--
 .../tosca-simple-nfv-1.0/capabilities.yaml  |  12 +-
 .../profiles/tosca-simple-nfv-1.0/data.yaml |  83 
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml| 202 +--
 .../tosca-simple-nfv-1.0/relationships.yaml |   8 +-
 5 files changed, 131 insertions(+), 212 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/692f6129/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
index 2e68f57..2427d9f 100644
--- 
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
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 artifact_types:
+
   tosca.artifacts.nfv.SwImage:
 _extensions:
   shorthand_name: SwImage
@@ -24,53 +25,60 @@ artifact_types:
 derived_from: tosca.artifacts.Deployment.Image
 properties:
   name:
-description: Name of this software image
+description: >-
+  Name of this software image.
 type: string
 required: true
   version:
-description: Version of this software image
+description: >-
+  Version of this software image.
 type: string
 required: true
   checksum:
-description: Checksum of the software image file
+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
+  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
+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.
+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.
+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
+  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.
+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.
+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
+  image.
 type: list
 entry_schema:
   type: string
 required: false
-
-
-

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

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

2017-06-12 Thread emblemparade

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:
-

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

2017-06-12 Thread emblemparade

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

incubator-ariatosca git commit: wip2

2017-06-12 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-278-Remove-core-tasks f36fe86c1 -> 62fa985c6


wip2


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

Branch: refs/heads/ARIA-278-Remove-core-tasks
Commit: 62fa985c6bf1e888710dd109a35cc122d7841ba2
Parents: f36fe86
Author: max-orlov 
Authored: Mon Jun 12 19:47:50 2017 +0300
Committer: max-orlov 
Committed: Mon Jun 12 19:47:50 2017 +0300

--
 aria/modeling/orchestration.py  |  68 ++-
 aria/orchestrator/workflows/core/engine.py  |  13 +-
 .../workflows/core/events_handler.py|  72 +--
 aria/orchestrator/workflows/core/translation.py |   6 +-
 aria/orchestrator/workflows/events_logging.py   |  25 +-
 aria/orchestrator/workflows/executor/base.py|  31 +-
 aria/orchestrator/workflows/executor/process.py |  18 +-
 aria/orchestrator/workflows/executor/thread.py  |  19 +-
 tests/orchestrator/context/__init__.py  |   5 +-
 tests/orchestrator/context/test_operation.py|  14 +-
 .../orchestrator/execution_plugin/test_local.py |   4 +-
 .../orchestrator/workflows/core/_test_engine.py | 519 ---
 .../orchestrator/workflows/core/test_engine.py  | 519 +++
 .../orchestrator/workflows/core/test_events.py  |   2 +-
 .../orchestrator/workflows/executor/__init__.py |  22 +-
 .../workflows/executor/test_executor.py |   2 +-
 16 files changed, 665 insertions(+), 674 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/62fa985c/aria/modeling/orchestration.py
--
diff --git a/aria/modeling/orchestration.py b/aria/modeling/orchestration.py
index 36f1421..9ac885d 100644
--- a/aria/modeling/orchestration.py
+++ b/aria/modeling/orchestration.py
@@ -21,6 +21,7 @@ classes:
 """
 
 # pylint: disable=no-self-argument, no-member, abstract-method
+from contextlib import contextmanager
 from datetime import datetime
 
 from sqlalchemy import (
@@ -308,25 +309,8 @@ class TaskBase(mixins.ModelMixin):
 api_id = Column(String)
 
 _executor = Column(PickleType)
-_executor_kwargs = Column(PickleType, default=None)
-
-_context = Column(PickleType)
-_context_kwargs = Column(PickleType, default=None)
-
-@property
-def executor(self):
-return self._executor(**(self._executor_kwargs or {}))
-
-@property
-def context(self):
-return self._context.instantiate_from_dict(task_id=self.id, 
**self._context_kwargs)
-
-def execute(self):
-executor = self.executor
-try:
-return executor.execute(self)
-finally:
-executor.close()
+_executor_kwargs = Column(modeling_types.Dict)
+_context_cls = Column(PickleType)
 
 @declared_attr
 def logs(cls):
@@ -438,17 +422,14 @@ class TaskBase(mixins.ModelMixin):
 return self.status in (self.PENDING, self.RETRYING)
 
 @classmethod
-def from_api_task(cls, api_task, executor, executor_kwargs=None):
-from aria.modeling import models
+def from_api_task(cls, api_task, executor, executor_kwargs=None, **kwargs):
 from aria.orchestrator import context
+instantiation_kwargs = {}
 
-instantiation_kwargs = {'_executor': executor,
-'_executor_kwargs': executor_kwargs}
-
-if isinstance(api_task.actor, models.Node):
+if hasattr(api_task.actor, 'outbound_relationships'):
 context_cls = context.operation.NodeOperationContext
 instantiation_kwargs['node'] = api_task.actor
-elif isinstance(api_task.actor, models.Relationship):
+elif hasattr(api_task.actor, 'source_node'):
 context_cls = context.operation.RelationshipOperationContext
 instantiation_kwargs['relationship'] = api_task.actor
 else:
@@ -471,21 +452,34 @@ class TaskBase(mixins.ModelMixin):
 'function': api_task.function,
 'arguments': api_task.arguments,
 'api_id': api_task.id,
-
-'_context': context_cls,
-'_context_kwargs': {
-'name': api_task.name,
-'model_storage': 
api_task._workflow_context.model.serialization_dict,
-'resource_storage': 
api_task._workflow_context.resource.serialization_dict,
-'service_id': api_task._workflow_context._service_id,
-'actor_id': api_task.id,
-'execution_id':

40 matches

Mail list logo