date:20170607

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

2017-06-07 Thread Slack

Hi ARIA TOSCA,

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

---

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

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

*#ariatosca*
 @ran: :thumbsup:
Tal take as much time as you need with 275, we won't merge it before you
approve it
 -
by the way, supposedly infra have disabled the remaining old git-jira
integration,  so there should be no more automatic comments made on
jiras (and the resulting emails, etc.). Let me know if you still see
anything around.



*Links shared by your team today:*



* * *

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

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

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

Podling Report Reminder - June 2017

2017-06-07 Thread 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

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

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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: bb8c4af454a505b33b1942adc2e6af09b7bfca4e
Parents: 422a95b
Author: Avia Efrat 
Authored: Mon Jun 5 16:21:19 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01:04 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/bb8c4af4/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:
+  -

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

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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: c80c5f6ee9447097d644b342362738ab5df277b0
Parents: f9bffe4
Author: Avia Efrat 
Authored: Tue Jun 6 00:50:47 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01:04 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/c80c5f6e/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:
-

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

2017-06-07 Thread 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/68c1b7ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/68c1b7ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/68c1b7ac

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 68c1b7acdf313cb2005279de67655074974fa598
Parents: f424164
Author: Avia Efrat 
Authored: Tue Jun 6 00:30:13 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01:04 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/68c1b7ac/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/68c1b7ac/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

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

2017-06-07 Thread avia

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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 5afa2f7fe11977593009b6da25733fa8dd61a1e9
Parents: cd83073
Author: Tal Liron 
Authored: Fri Jun 2 14:20:28 2017 -0500
Committer: Tal Liron 
Committed: Wed Jun 7 14:42:35 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/5afa2f7f/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/5afa2f7f/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/5afa2f7f/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:

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

2017-06-07 Thread 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/9240e20e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9240e20e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9240e20e

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 9240e20ec7442c1d47f94fd6c40fb5260f7b
Parents: 49cb98d
Author: Avia Efrat 
Authored: Tue Jun 6 22:32:02 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01:04 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/9240e20e/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/9240e20e/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
--
diff --git

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

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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: f4241645c3da8cfff9a52341e92cb10c724f887b
Parents: bb8c4af
Author: Avia Efrat 
Authored: Mon Jun 5 16:36:52 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01:04 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/f4241645/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/f4241645/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:
-

[01/13] incubator-ariatosca git commit: ARIA-213 sporadic tests failures over locked database issue [Forced Update!]

2017-06-07 Thread avia

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


ARIA-213 sporadic tests failures over locked database issue

Increased the timeout for acquiring database lock (for sqlite based db).


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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: cd830731bff21e836b5e661623b269aa40f92f52
Parents: 180e0a1
Author: max-orlov 
Authored: Tue Jun 6 17:05:21 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 17:21:01 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cd830731/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 4d7e233..bb6223a 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -405,7 +405,8 @@ 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)

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

2017-06-07 Thread avia

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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 325ae1e0ab41767a6e78492aebb59ea7207e2e56
Parents: c80c5f6
Author: Avia Efrat 
Authored: Tue Jun 6 01:05:13 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01:04 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/325ae1e0/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.

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

2017-06-07 Thread 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/422a95b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/422a95b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/422a95b2

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 422a95b277e28e83f24373ce9e2c903e6444e5b7
Parents: 5afa2f7
Author: Avia Efrat 
Authored: Sun Jun 4 22:11:10 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01: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 +-
 .../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/422a95b2/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/422a95b2/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/422a95b2/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

[12/13] incubator-ariatosca git commit: Remove tosca.groups.nfv.VNFFG

2017-06-07 Thread avia

Remove tosca.groups.nfv.VNFFG

It is  not present in csd04.
The changelog at the end of csd04 states:
"Deleted NSD related content, v1.0 will only cover VNFD model."
tosca.groups.nfv.VNFFG 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/49cb98de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/49cb98de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/49cb98de

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 49cb98de3bc2f1179fb6d287fc443867373f4dfa
Parents: 923787f
Author: Avia Efrat 
Authored: Tue Jun 6 01:30:48 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01:04 2017 +0300

--
 .../profiles/tosca-simple-nfv-1.0/groups.yaml   | 56 
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml|  2 +-
 .../tosca-simple-nfv-1.0.yaml   |  1 -
 3 files changed, 1 insertion(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/49cb98de/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/groups.yaml
--
diff --git 
a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/groups.yaml 
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/groups.yaml
deleted file mode 100644
index 5eb87c8..000
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/groups.yaml
+++ /dev/null
@@ -1,56 +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.
-
-group_types:
-
-  tosca.groups.nfv.VNFFG:
-_extensions:
-  shorthand_name: VNFFG # ARIA NOTE: the spec must be mistaken here, says 
"VL"
-  type_qualified_name: tosca:VNFFG
-  specification: tosca-simple-nfv-1.0
-  specification_section: 10.6.1
-  specification_url: 
'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714727'
-description: >-
-  The NFV VNFFG group type represents a logical VNF forwarding graph 
entity as defined by [ETSI GS NFV-MAN 001 v1.1.1].
-derived_from: tosca.groups.Root
-properties:
-  vendor:
-description: >-
-  Specify the vendor generating this VNFFG.
-type: string
-  version:
-description: >-
-  Specify the identifier (e.g. name), version, and description of 
service this VNFFG is describing.
-type: string
-  number_of_endpoints:
-description: >-
-  Count of the external endpoints included in this VNFFG, to form an 
index.
-type: integer
-  dependent_virtual_link:
-description: >-
-  Reference to a list of VLD used in this Forwarding Graph.
-type: list
-entry_schema: string
-  connection_point:
-description: >-
-  Reference to Connection Points forming the VNFFG.
-type: list
-entry_schema: string
-  constituent_vnfs:
-description: >-
-  Reference to a list of VNFD used in this VNF Forwarding Graph.
-type: list
-entry_schema: string
-members: [ tosca.nodes.nfv.FP ]

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/49cb98de/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 2e1b634..6d68190 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
@@ -42,7 +42,7 @@ node_types:
   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

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

2017-06-07 Thread 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/923787f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/923787f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/923787f7

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 923787f7be27742febbf1dbab183fac85c79f61c
Parents: 325ae1e
Author: Avia Efrat 
Authored: Tue Jun 6 01:26:08 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01:04 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/923787f7/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

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

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

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: f9bffe46e413b4824a5746ab8a02bacbb16e81c3
Parents: 0acb187
Author: Avia Efrat 
Authored: Tue Jun 6 00:45:31 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01:04 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/f9bffe46/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

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

2017-06-07 Thread 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/0acb187a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/0acb187a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/0acb187a

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 0acb187ad2352d7bb3d85d3d41377a0553073459
Parents: 68c1b7a
Author: Avia Efrat 
Authored: Tue Jun 6 00:39:54 2017 +0300
Committer: Avia Efrat 
Committed: Wed Jun 7 23:01:04 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/0acb187a/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

[incubator-ariatosca] Git Push Summary

2017-06-07 Thread emblemparade

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-199-cli-service-output [deleted] 5afa2f7fe

incubator-ariatosca git commit: ARIA-199 Add "services outputs" CLI command

2017-06-07 Thread emblemparade

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/master cd830731b -> 5afa2f7fe


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

Branch: refs/heads/master
Commit: 5afa2f7fe11977593009b6da25733fa8dd61a1e9
Parents: cd83073
Author: Tal Liron 
Authored: Fri Jun 2 14:20:28 2017 -0500
Committer: Tal Liron 
Committed: Wed Jun 7 14:42:35 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/5afa2f7f/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/5afa2f7f/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/5afa2f7f/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:

[1/2] incubator-ariatosca git commit: ARIA-213 sporadic tests failures over locked database issue [Forced Update!]

2017-06-07 Thread emblemparade

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


ARIA-213 sporadic tests failures over locked database issue

Increased the timeout for acquiring database lock (for sqlite based db).


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

Branch: refs/heads/ARIA-199-cli-service-output
Commit: cd830731bff21e836b5e661623b269aa40f92f52
Parents: 180e0a1
Author: max-orlov 
Authored: Tue Jun 6 17:05:21 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 17:21:01 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cd830731/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 4d7e233..bb6223a 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -405,7 +405,8 @@ 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

2017-06-07 Thread emblemparade

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-128-test-engine-failures [deleted] 3dadc9f64

[incubator-ariatosca] Git Push Summary

2017-06-07 Thread emblemparade

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-92-plugin-in-implementation-string [deleted] a7e7826ed

incubator-ariatosca git commit: ARIA-213 sporadic tests failures over locked database issue

2017-06-07 Thread mxmrlv

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


ARIA-213 sporadic tests failures over locked database issue

Increased the timeout for acquiring database lock (for sqlite based db).


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

Branch: refs/heads/master
Commit: cd830731bff21e836b5e661623b269aa40f92f52
Parents: 180e0a1
Author: max-orlov 
Authored: Tue Jun 6 17:05:21 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 17:21:01 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cd830731/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 4d7e233..bb6223a 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -405,7 +405,8 @@ 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: ARIA-213 sporadic tests failures over locked database issue [Forced Update!]

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
ceb1c0525 -> cd830731b (forced update)


ARIA-213 sporadic tests failures over locked database issue

Increased the timeout for acquiring database lock (for sqlite based db).


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: cd830731bff21e836b5e661623b269aa40f92f52
Parents: 180e0a1
Author: max-orlov 
Authored: Tue Jun 6 17:05:21 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 17:21:01 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cd830731/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 4d7e233..bb6223a 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -405,7 +405,8 @@ 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 [forced push!] [Forced Update!]

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
f0d712c4c -> ceb1c0525 (forced update)

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
0bdfa17c3 -> f0d712c4c


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: f0d712c4c47f9eb174a5b39b728ac91ffe730370
Parents: 0bdfa17
Author: max-orlov 
Authored: Wed Jun 7 16:58:20 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:58:20 2017 +0300

--

--

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
0cbca8add -> 0bdfa17c3


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: 0bdfa17c38ff3deb4c341ed72a98744de6e62f33
Parents: 0cbca8a
Author: max-orlov 
Authored: Wed Jun 7 16:58:14 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:58:14 2017 +0300

--

--

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
ceb1c0525 -> 0cbca8add


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: 0cbca8add819916082cde1fbca90937f68b3d0e8
Parents: ceb1c05
Author: max-orlov 
Authored: Wed Jun 7 16:58:05 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:58:05 2017 +0300

--

--

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

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
6c055ce4e -> ceb1c0525 (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/ceb1c052
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/ceb1c052
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/ceb1c052

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: ceb1c05256b0fba949956bf460cd2e1f6da6362b
Parents: 180e0a1
Author: max-orlov 
Authored: Tue Jun 6 17:05:21 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:35:16 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ceb1c052/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 4d7e233..bb6223a 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -405,7 +405,8 @@ 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 [forced push!] [Forced Update!]

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
b0b8ce85f -> f8546e9cb (forced update)

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
bae26154d -> dfd26623b


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: dfd26623b24d36fe4e93757426958fcea4793412
Parents: bae2615
Author: max-orlov 
Authored: Wed Jun 7 16:18:44 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:18:44 2017 +0300

--

--

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
4410cea9d -> b0b8ce85f


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: b0b8ce85fdd7d6ee7c56f73165b41a84627b8c98
Parents: 4410cea
Author: max-orlov 
Authored: Wed Jun 7 16:19:03 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:19:03 2017 +0300

--

--

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
dfd26623b -> 4410cea9d


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: 4410cea9de2e56ad6d4f8b674edfca9e620375a1
Parents: dfd2662
Author: max-orlov 
Authored: Wed Jun 7 16:18:55 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:18:55 2017 +0300

--

--

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
7dc25e17d -> b0c15a807


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: b0c15a8077fb4e073c954d40cc79098da3135b7c
Parents: 7dc25e1
Author: max-orlov 
Authored: Wed Jun 7 16:18:32 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:18:32 2017 +0300

--

--

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
f8546e9cb -> 7dc25e17d


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: 7dc25e17d4b4bbe97a2ae3cd014710e03724c724
Parents: f8546e9
Author: max-orlov 
Authored: Wed Jun 7 16:18:26 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:18:26 2017 +0300

--

--

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
b0c15a807 -> bae26154d


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: bae26154df4986cebe9266cff6737f4d95141cfb
Parents: b0c15a8
Author: max-orlov 
Authored: Wed Jun 7 16:18:38 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:18:38 2017 +0300

--

--

incubator-ariatosca git commit: back to timeout

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
0433e828c -> f8546e9cb


back to timeout


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: f8546e9cb7d0a300148b68a2d2875dab145d0d99
Parents: 0433e82
Author: max-orlov 
Authored: Wed Jun 7 16:18:16 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 16:18:16 2017 +0300

--
 aria/storage/sql_mapi.py | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f8546e9c/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 657d769..e2a7ea4 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -406,8 +406,7 @@ def init_storage(base_dir, filename='db.sqlite'):
 
 path=os.path.join(base_dir, filename))
 
-engine = create_engine(uri)
-event.listen(engine, 'connect', do_connect)
+engine = create_engine(uri, connect_args=dict(timeout=15))
 
 session_factory = orm.sessionmaker(bind=engine)
 session = orm.scoped_session(session_factory=session_factory)
@@ -415,10 +414,6 @@ def init_storage(base_dir, filename='db.sqlite'):
 return dict(engine=engine, session=session)
 
 
-def do_connect(dbapi_connection, _):
-dbapi_connection.isolation_level = None
-
-
 class ListResult(list):
 """
 a ListResult contains results about the requested items.

Re: Plugin structure and specifications

2017-06-07 Thread Ran Ziv

As I've mentioned on another thread, we're currently lacking much where it
comes to documentation - we're working on updating the basic README file,
but it'll probably be a while until there's going to be proper,
comprehensive documentation.

As for an example, ARIA currently has no plugins, so there's no direct
example for this, however:

1) The "execution plugin" - whose name is somewhat inadequate  as it's not
quite a plugin, but rather built into the system - only uses the operation
context API to execute operations. This can be used as an example for how
to use ARIA's operation context API.

2) Cloudify has plugins whose code can be run on ARIA after installing a
lightweight API adapter. This would make Cloudify plugins work on ARIA
code-wise (Cloudify's plugins' "plugin.yaml" files are not written in TOSCA
and as such won't work out of the box like so - but the Openstack plugin's
"plugin.yaml" has been translated into TOSCA, and the AWS plugin's yaml is
being translated at this time as well).
This could be a good example for a "plugin.yaml" file in ARIA - but the
code itself is not a good example for plugin implementation, as it uses
Cloudify operation context API.

See these resources:
TOSCA Openstack plugin.yaml

TOSCA Openstack hello-world example

making
use of the Openstack plugin.yaml
Cloudify extension repository
 (where the
operation context API adapter resides as well)

Note that Cloudify plugins, as well as the adapter, are not part of ARIA,
but merely additions that may be used by ARIA users if they desire so.
Ideally, we'd like to have these plugins in ARIA using proper ARIA
operation context API - But translating those at this time would mean not
receiving updates from existing Cloudify plugins.

Hope this helps,
Ran

On Wed, Jun 7, 2017 at 3:29 PM, D Jayachandran 
wrote:

> Hi Ran,
>
> Thanks for the information. I do agree with you on having plugin.yaml as
> part of plugin and importing it to service template to have the plugin
> specific types.
> Could you point me to some documentation involving these or any example of
> plugin.yaml
>
>
> Regards,
> DJ
>
> -Original Message-
> From: Ran Ziv [mailto:r...@gigaspaces.com]
> Sent: Tuesday, June 06, 2017 6:41 PM
> To: dev@ariatosca.incubator.apache.org
> Subject: Re: Plugin structure and specifications
>
> ? 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

Missing support for type qualified name

2017-06-07 Thread D Jayachandran

Hi,

TOSCA Simple Yaml 1.0 profile specification supports usage of  the following 
Namespace Alias

  1.  Shorthand Name
  2.  Type Qualified Name
  3.  Type URI

ARIA currently supports only "Shorthand Name" and "Type URI". The support for 
"Type Qualified Name" is missing which is required to adhere with the TOSCA 
Simple yaml 1.0 specifications. Could this be considered as bug and a JIRA 
issue opened for this ?
We would like to start our contribution with this.


Regards,
DJ

RE: Plugin structure and specifications

2017-06-07 Thread D Jayachandran

Hi Ran,

Thanks for the information. I do agree with you on having plugin.yaml as part 
of plugin and importing it to service template to have the plugin specific 
types.
Could you point me to some documentation involving these or any example of 
plugin.yaml


Regards,
DJ

-Original Message-
From: Ran Ziv [mailto:r...@gigaspaces.com] 
Sent: Tuesday, June 06, 2017 6:41 PM
To: dev@ariatosca.incubator.apache.org
Subject: Re: Plugin structure and specifications

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

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

2017-06-07 Thread Ran Ziv

1. Got it.

2. Ok, makes sense. I might have been wrong thinking this policy should be
special then.
About storing in policy information in nodes/templates that the policy is
associated with in general - sounds interesting, I'm not sure I'd implement
this right away, I think it'd be better to hold off and see what sort of
policies might exist in the future and what data might be useful to keep on
the node/template first.

3. Yes, I understand it better now, thank you. It does seem somewhat
magic-ish and something that can lead to unintended effects.. I personally
think it'd be better to err on the safe side i.e. not allow such a topology
where 6 relationships are required and 5 is the allowed maximum - despite
the fact the template author probably did consider multiple router nodes.
But maybe I'm misinterpreting this :)
Either way, you're right, this is definitely not related to ARIA-254
directly.



On Mon, Jun 5, 2017 at 6:56 PM, Tal Liron  wrote:

> >
> >
> > The scaling policies are definitely needed e.g. for group, but it'd have
> > been nice to have some simplified manner for defining multiple instances
> of
> > a given node without having to go through actual scaling policies
> > definitions (e.g. a special property on the node to define this etc).
> >
>
> I simply cannot think of a way to do this in TOSCA. For our operation
> configuration we made use of dependencies in a creative way. But for nodes
> there just isn't much there to use. I considered using artifact definitions
> ... but this is really going too far in my view in terms of weirdness. And
> policies is the right way to do it in TOSCA.
>
>
> > 2) I'm not sure about removing the relevant fields from NodeTemplate. The
> > scaling policy is after all a special one, and having it fill these
> fields'
> > values seems somewhat logical IMO.
> >
>
> Actually, the scaling policy is not especially special :) -- it's parsed
> and stored like any other policy (unlike custom workflow policies, which
> become OperationTemplate models). And there can be many other TOSCA
> policies: placement, allotment, allocations, etc., that may or may not be
> supported by ARIA specifically, and may or may not be used by other TOSCA
> tools up or down the line.
>
> For example, someone might create an ARIA extension to support resource
> allocation policies with its own list of special properties. Why does
> scaling get a privileged column in NodeTemplate but not them? I say we
> treat all policies fairly and equally and not sully the NodeTemplate model
> with policy specifics. The policies are exactly designed to be in a
> separate section in the TOSCA template so you can look them and see all
> that apply to your nodes.
>
> There's actually something else interesting we can do here: create a
> special "policies" property for NodeTemplate that combines those directly
> associated with it with those that are associated indirectly via
> GroupTemplate (this extra combination was the only reason I didn't use SQL
> relationships directly to find them). This could be implemented via a SQL
> query. What do you think?
>
> 3) You've mentioned once before that TOSCA also defines an implicit
> > mechanism for creating multiple instances via the
> requirements
> > mechanism; What are your ideas regarding that, and how do they fit in
> > together with this?
> >
>
> So, here's how I understand it: in capabilities definition (section
> 3.6.1.1) you have an "occurrences" field, which by default is unbounded but
> can definitely be set to an explicit max. For example, a router might
> define an "upstream" capability limited to 5. During the reqs-and-caps
> matching process, let's say that 5 relationships have been forged with the
> node, and now you have an extra node that also requires "upstream" from us.
> To me, this seems to imply than an extra router node should be created.
>
> But ... I might very well be wrong here. This kind of auto-scaling might
> have unforeseen consequences if the template author was not aware that this
> could happen.
>
> I think it's best that we should not apply any magical autoscaling at the
> design phase, HOWEVER, we can take into consider the policy if it was set.
> If default_instances is 1, and max_instances is 5, then it means the
> template author has considered multiple router nodes.
>
> I hope this makes sense, it's a somewhat shadowy corner of the TOSCA
> spec... Note I would consider implementing this as a separate JIRA if we
> agree that this is correct.
>

incubator-ariatosca git commit: isolation level fix [Forced Update!]

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
cda826403 -> 0433e828c (forced update)


isolation level fix


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: 0433e828cd643b1504525a122f58af62982359d3
Parents: fedfb0d
Author: max-orlov 
Authored: Wed Jun 7 11:49:03 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 12:53:45 2017 +0300

--
 aria/storage/sql_mapi.py | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0433e828/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 68d0ff6..657d769 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -21,6 +21,7 @@ import platform
 from sqlalchemy import (
 create_engine,
 orm,
+event
 )
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm.exc import StaleDataError
@@ -405,13 +406,19 @@ def init_storage(base_dir, filename='db.sqlite'):
 
 path=os.path.join(base_dir, filename))
 
-engine = create_engine(uri, connect_args=dict(timeout=15))
+engine = create_engine(uri)
+event.listen(engine, 'connect', do_connect)
+
 session_factory = orm.sessionmaker(bind=engine)
 session = orm.scoped_session(session_factory=session_factory)
 
 return dict(engine=engine, session=session)
 
 
+def do_connect(dbapi_connection, _):
+dbapi_connection.isolation_level = None
+
+
 class ListResult(list):
 """
 a ListResult contains results about the requested items.

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
61821d2af -> cda826403


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: cda826403083b2f7e82c13a342ee474a00793be2
Parents: 61821d2
Author: max-orlov 
Authored: Wed Jun 7 12:35:14 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 12:35:14 2017 +0300

--

--

incubator-ariatosca git commit: test3

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
64690d2f6 -> fc1d2f47c


test3


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: fc1d2f47c04ac9476b7655b17f0e4a8be3376f5a
Parents: 64690d2
Author: max-orlov 
Authored: Wed Jun 7 12:34:36 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 12:34:36 2017 +0300

--

--

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
cbdcf05b7 -> 61821d2af


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: 61821d2af0a8757ffeaae5cc17dd8f97ba03d09a
Parents: cbdcf05
Author: max-orlov 
Authored: Wed Jun 7 12:35:08 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 12:35:08 2017 +0300

--

--

incubator-ariatosca git commit: testing...

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
fc1d2f47c -> cbdcf05b7


testing...


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: cbdcf05b74e6d869c75c6c6b886f780c131eeca9
Parents: fc1d2f4
Author: max-orlov 
Authored: Wed Jun 7 12:34:59 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 12:34:59 2017 +0300

--

--

Re: How can I use aria CLI options correctly?

2017-06-07 Thread Ran Ziv

Hi Dave,

Unfortunately, the README is currently much outddated. That is why the
"aria parse" command raises an invalid command error.

We're working on updating the quick start guide, and hopefully it'll be up
to date early next week, although that too isn't going to provide a full
documentation at this time to ARIA but rather only an introduction.
In the meanwhile however, we'll be glad to help over on this mailing list.


The "parse" command indeed no longer exists; Similar functionality can be
found under "aria service-templates show", but first one has to use "aria
service-templates store", like so:
*aria service-templates store node-cellar.yaml nodecellar*
*aria service-templates show nodecellar -f*


To actually run workflows etc., you'd have to first create a service for a
given service-template, e.g.:
*aria service-templates store examples/hello-world/helloworld.yaml hello*
*aria services create hello-service -t hello*
*aria executions start install -s hello-service*



hope this helps.
Ran



On Wed, Jun 7, 2017 at 4:59 AM, Chen, Wei D  wrote:

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

incubator-ariatosca git commit: isolation level fix [Forced Update!]

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
a27d7a4b8 -> f3ecea1f4 (forced update)


isolation level fix


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: f3ecea1f4d531d689c478b2ab69e9cb02e2007f7
Parents: fedfb0d
Author: max-orlov 
Authored: Wed Jun 7 11:49:03 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 11:53:03 2017 +0300

--
 aria/storage/sql_mapi.py | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f3ecea1f/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 68d0ff6..49876ee 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -21,6 +21,7 @@ import platform
 from sqlalchemy import (
 create_engine,
 orm,
+event
 )
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm.exc import StaleDataError
@@ -405,13 +406,20 @@ def init_storage(base_dir, filename='db.sqlite'):
 
 path=os.path.join(base_dir, filename))
 
-engine = create_engine(uri, connect_args=dict(timeout=15))
+engine = create_engine(uri)
+event.listen(engine, 'connect', do_connect)
+
 session_factory = orm.sessionmaker(bind=engine)
 session = orm.scoped_session(session_factory=session_factory)
 
 return dict(engine=engine, session=session)
 
 
+def do_connect(dbapi_connection, _):
+dbapi_connection.isolation_level = None
+
+
+
 class ListResult(list):
 """
 a ListResult contains results about the requested items.

incubator-ariatosca git commit: isolation level fix

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue 
[created] a27d7a4b8


isolation level fix


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

Branch: refs/heads/ARIA-213-Sporadic-tests-failures-over-locked-database-issue
Commit: a27d7a4b85eb69d664b93137ac06144df5b1b24b
Parents: fedfb0d
Author: max-orlov 
Authored: Wed Jun 7 11:49:03 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 11:49:03 2017 +0300

--
 aria/storage/sql_mapi.py | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/a27d7a4b/aria/storage/sql_mapi.py
--
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 68d0ff6..d9b8d70 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -21,6 +21,7 @@ import platform
 from sqlalchemy import (
 create_engine,
 orm,
+event
 )
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm.exc import StaleDataError
@@ -405,13 +406,21 @@ def init_storage(base_dir, filename='db.sqlite'):
 
 path=os.path.join(base_dir, filename))
 
-engine = create_engine(uri, connect_args=dict(timeout=15))
+engine = create_engine(uri)
+event.listen(engine, 'connect', do_connect)
+event.listen(engine, 'begin', do_begin)
+
 session_factory = orm.sessionmaker(bind=engine)
 session = orm.scoped_session(session_factory=session_factory)
 
 return dict(engine=engine, session=session)
 
 
+def do_connect(dbapi_connection, _):
+dbapi_connection.isolation_level = None
+
+
+
 class ListResult(list):
 """
 a ListResult contains results about the requested items.

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

2017-06-07 Thread mxmrlv

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/database_locked_poc 7e70d719f -> fedfb0d40 (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/fedfb0d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/fedfb0d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/fedfb0d4

Branch: refs/heads/database_locked_poc
Commit: fedfb0d406937f93ac1376166162419719e09d09
Parents: 180e0a1
Author: max-orlov 
Authored: Tue Jun 6 17:05:21 2017 +0300
Committer: max-orlov 
Committed: Wed Jun 7 11:05:05 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/fedfb0d4/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)

RE: Support for TOSCA Simple Profile NFV 1.0

2017-06-07 Thread D Jayachandran

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




   
[image: Azure Webinar]

49 matches

Mail list logo