[GitHub] incubator-ariatosca pull request #192: ARIA-352 Package name "aria[ssh]" inc...

2017-08-20 Thread vishwanathj 
Github user vishwanathj commented on a diff in the pull request:

https://github.com/apache/incubator-ariatosca/pull/192#discussion_r134123326
  
--- Diff: README.rst ---
@@ -53,7 +53,7 @@ To install ARIA from source, download the source tarball 
from
 **Ubuntu/Debian** (tested on Ubuntu14.04, Ubuntu16.04)::
 
 apt-get install -y python-dev gcc libffi-dev libssl-dev
-pip install aria[ssh]
+pip install apache-ariatosca[ssh]
--- End diff --

Sure, will update the CentOS, ArchLinux and Windows section as well


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-ariatosca pull request #193: ARIA-348 Validate substitution_mappin...

2017-08-20 Thread AviaE 
GitHub user AviaE opened a pull request:

https://github.com/apache/incubator-ariatosca/pull/193

ARIA-348 Validate substitution_mapping field



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/apache/incubator-ariatosca 
ARIA-348-validate-substitution-mapping

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-ariatosca/pull/193.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #193


commit eca048c16aee89fde53b557ce17af72de46669fc
Author: Avia Efrat 
Date:   2017-08-16T15:54:57Z

ARIA-348 Validate substitution_mapping field




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-ariatosca issue #193: ARIA-348 Validate substitution_mapping field

2017-08-20 Thread asfgit 
Github user asfgit commented on the issue:

https://github.com/apache/incubator-ariatosca/pull/193
  
Can one of the admins verify this patch?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

incubator-ariatosca git commit: ARIA-348 Validate substitution_mapping field [Forced Update!]

2017-08-20 Thread avia 
Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-348-validate-substitution-mapping 8839eb375 -> eca048c16 
(forced update)


ARIA-348 Validate substitution_mapping field


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

Branch: refs/heads/ARIA-348-validate-substitution-mapping
Commit: eca048c16aee89fde53b557ce17af72de46669fc
Parents: 8981791
Author: Avia Efrat 
Authored: Wed Aug 16 18:54:57 2017 +0300
Committer: Avia Efrat 
Committed: Sun Aug 20 17:28:15 2017 +0300

--
 .../aria_extension_tosca/simple_v1_0/misc.py|   8 +-
 .../modeling/substitution_mappings.py   | 171 +++
 .../aria_extension_tosca/simple_v1_0/types.py   |   9 +-
 3 files changed, 112 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/eca048c1/extensions/aria_extension_tosca/simple_v1_0/misc.py
--
diff --git a/extensions/aria_extension_tosca/simple_v1_0/misc.py 
b/extensions/aria_extension_tosca/simple_v1_0/misc.py
index a65ff41..221163c 100644
--- a/extensions/aria_extension_tosca/simple_v1_0/misc.py
+++ b/extensions/aria_extension_tosca/simple_v1_0/misc.py
@@ -25,8 +25,8 @@ from aria.parser.presentation import (AsIsPresentation, 
has_fields, allow_unknow
 
 from .modeling.data_types import (get_data_type, get_data_type_value, 
get_property_constraints,
   apply_constraint_to_value)
-from .modeling.substitution_mappings import 
(validate_subtitution_mappings_requirement,
- 
validate_subtitution_mappings_capability)
+from .modeling.substitution_mappings import 
(validate_substitution_mappings_requirement,
+ 
validate_substitution_mappings_capability)
 from .presentation.extensible import ExtensiblePresentation
 from .presentation.field_validators import (constraint_clause_field_validator,
 
constraint_clause_in_range_validator,
@@ -380,7 +380,7 @@ class SubstitutionMappingsRequirement(AsIsPresentation):
 
 def _validate(self, context):
 super(SubstitutionMappingsRequirement, self)._validate(context)
-validate_subtitution_mappings_requirement(context, self)
+validate_substitution_mappings_requirement(context, self)
 
 
 class SubstitutionMappingsCapability(AsIsPresentation):
@@ -400,7 +400,7 @@ class SubstitutionMappingsCapability(AsIsPresentation):
 
 def _validate(self, context):
 super(SubstitutionMappingsCapability, self)._validate(context)
-validate_subtitution_mappings_capability(context, self)
+validate_substitution_mappings_capability(context, self)
 
 
 @has_fields

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/eca048c1/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
--
diff --git 
a/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
index 8f7ec4c..7eb2f08 100644
--- 
a/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
+++ 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
@@ -17,88 +17,112 @@ from aria.utils.formatting import safe_repr
 from aria.parser.validation import Issue
 
 
-def validate_subtitution_mappings_requirement(context, presentation):
-if not validate_format(context, presentation, 'requirement'):
+def validate_substitution_mappings_requirement(context, presentation):
+if not validate_format(presentation):
+report_invalid_format(context, presentation, field='requirement')
 return
 
-node_template = get_node_template(context, presentation, 'requirement')
-if node_template is None:
-return
-
-node_type = presentation._container._get_type(context)
-if node_type is None:
+# validate that the requirement in substitution_mapping is defined in the 
substitution node type
+substitution_node_type = presentation._container._get_type(context)
+if substitution_node_type is None:
 return
-
-requirements = node_type._get_requirements(context)
-type_requirement = None
-for name, the_requirement in requirements:
-if name == presentation._name:
-type_requirement = the_requirement
+for req_name, req in

[2/2] incubator-ariatosca git commit: ARIA-348 Validate substitution_mapping field

2017-08-20 Thread avia 
ARIA-348 Validate substitution_mapping field


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

Branch: refs/heads/ARIA-348-validate-substitution-mapping
Commit: 8839eb3752026fe2fd323bd131455d93216d25fe
Parents: 8981791
Author: Avia Efrat 
Authored: Wed Aug 16 18:54:57 2017 +0300
Committer: Avia Efrat 
Committed: Sun Aug 20 16:20:12 2017 +0300

--
 .../aria_extension_tosca/simple_v1_0/misc.py|   8 +-
 .../modeling/substitution_mappings.py   | 171 +++
 2 files changed, 107 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8839eb37/extensions/aria_extension_tosca/simple_v1_0/misc.py
--
diff --git a/extensions/aria_extension_tosca/simple_v1_0/misc.py 
b/extensions/aria_extension_tosca/simple_v1_0/misc.py
index a65ff41..221163c 100644
--- a/extensions/aria_extension_tosca/simple_v1_0/misc.py
+++ b/extensions/aria_extension_tosca/simple_v1_0/misc.py
@@ -25,8 +25,8 @@ from aria.parser.presentation import (AsIsPresentation, 
has_fields, allow_unknow
 
 from .modeling.data_types import (get_data_type, get_data_type_value, 
get_property_constraints,
   apply_constraint_to_value)
-from .modeling.substitution_mappings import 
(validate_subtitution_mappings_requirement,
- 
validate_subtitution_mappings_capability)
+from .modeling.substitution_mappings import 
(validate_substitution_mappings_requirement,
+ 
validate_substitution_mappings_capability)
 from .presentation.extensible import ExtensiblePresentation
 from .presentation.field_validators import (constraint_clause_field_validator,
 
constraint_clause_in_range_validator,
@@ -380,7 +380,7 @@ class SubstitutionMappingsRequirement(AsIsPresentation):
 
 def _validate(self, context):
 super(SubstitutionMappingsRequirement, self)._validate(context)
-validate_subtitution_mappings_requirement(context, self)
+validate_substitution_mappings_requirement(context, self)
 
 
 class SubstitutionMappingsCapability(AsIsPresentation):
@@ -400,7 +400,7 @@ class SubstitutionMappingsCapability(AsIsPresentation):
 
 def _validate(self, context):
 super(SubstitutionMappingsCapability, self)._validate(context)
-validate_subtitution_mappings_capability(context, self)
+validate_substitution_mappings_capability(context, self)
 
 
 @has_fields

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8839eb37/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
--
diff --git 
a/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
index 8f7ec4c..c10f1a6 100644
--- 
a/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
+++ 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
@@ -17,88 +17,112 @@ from aria.utils.formatting import safe_repr
 from aria.parser.validation import Issue
 
 
-def validate_subtitution_mappings_requirement(context, presentation):
-if not validate_format(context, presentation, 'requirement'):
+def validate_substitution_mappings_requirement(context, presentation):
+if not validate_format(presentation):
+report_invalid_format(context, presentation, field='requirement')
 return
 
-node_template = get_node_template(context, presentation, 'requirement')
-if node_template is None:
-return
-
-node_type = presentation._container._get_type(context)
-if node_type is None:
+# validate that the requirement in substitution_mapping is defined in the 
substitution node type
+substitution_node_type = presentation._container._get_type(context)
+if substitution_node_type is None:
 return
-
-requirements = node_type._get_requirements(context)
-type_requirement = None
-for name, the_requirement in requirements:
-if name == presentation._name:
-type_requirement = the_requirement
+for req_name, req in substitution_node_type._get_requirements(context):
+if req_name == presentation._name:
+substitution_type_requirement = req
 break
-if type_requirement is None:
+else:

[1/2] incubator-ariatosca git commit: ARIA-349 get_attribute is not calculated at runtime [Forced Update!]

2017-08-20 Thread avia 
Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-348-validate-substitution-mapping 78e535a52 -> 8839eb375 
(forced update)


ARIA-349 get_attribute is not calculated at runtime


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

Branch: refs/heads/ARIA-348-validate-substitution-mapping
Commit: 8981791a10f91cb4f99ff8c01fd6b130b470ffae
Parents: df2b916
Author: max-orlov 
Authored: Tue Aug 15 15:20:16 2017 +0300
Committer: max-orlov 
Committed: Tue Aug 15 15:20:16 2017 +0300

--
 aria/cli/commands/executions.py | 2 +-
 aria/modeling/utils.py  | 6 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8981791a/aria/cli/commands/executions.py
--
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index f130d95..cecbbc5 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -185,7 +185,7 @@ def resume(execution_id,
 logger.info("Can't resume execution {execution.id} - "
 "execution is in status {execution.status}. "
 "Can only resume executions in status {valid_status}"
-.format(execution=execution, 
valid_status=execution.status.CANCELLED))
+.format(execution=execution, 
valid_status=execution.CANCELLED))
 return
 
 workflow_runner = \

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8981791a/aria/modeling/utils.py
--
diff --git a/aria/modeling/utils.py b/aria/modeling/utils.py
index 305020b..6e851f2 100644
--- a/aria/modeling/utils.py
+++ b/aria/modeling/utils.py
@@ -131,7 +131,11 @@ def merge_parameter_values(provided_values, 
declared_parameters, model_cls=None)
 value=value)
 else:
 # Copy default value from declaration
-model_parameters[declared_parameter_name] = 
model_cls(**declared_parameter.as_raw)
+model_parameters[declared_parameter_name] = model_cls(
+value=declared_parameter._value,
+name=declared_parameter.name,
+type_name=declared_parameter.type_name,
+description=declared_parameter.description)
 
 if provided_values_of_wrong_type:
 error_message = StringIO()

incubator-ariatosca git commit: ARIA-348 Validate substitution_mapping field [Forced Update!]

2017-08-20 Thread avia 
Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-348-validate-substitution-mapping b1d59e798 -> 78e535a52 
(forced update)


ARIA-348 Validate substitution_mapping field


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

Branch: refs/heads/ARIA-348-validate-substitution-mapping
Commit: 78e535a52d87c3321af6bee75baca23279d07947
Parents: df2b916
Author: Avia Efrat 
Authored: Wed Aug 16 18:54:57 2017 +0300
Committer: Avia Efrat 
Committed: Sun Aug 20 16:11:07 2017 +0300

--
 .../aria_extension_tosca/simple_v1_0/misc.py|   8 +-
 .../modeling/substitution_mappings.py   | 171 +++
 2 files changed, 107 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/78e535a5/extensions/aria_extension_tosca/simple_v1_0/misc.py
--
diff --git a/extensions/aria_extension_tosca/simple_v1_0/misc.py 
b/extensions/aria_extension_tosca/simple_v1_0/misc.py
index a65ff41..221163c 100644
--- a/extensions/aria_extension_tosca/simple_v1_0/misc.py
+++ b/extensions/aria_extension_tosca/simple_v1_0/misc.py
@@ -25,8 +25,8 @@ from aria.parser.presentation import (AsIsPresentation, 
has_fields, allow_unknow
 
 from .modeling.data_types import (get_data_type, get_data_type_value, 
get_property_constraints,
   apply_constraint_to_value)
-from .modeling.substitution_mappings import 
(validate_subtitution_mappings_requirement,
- 
validate_subtitution_mappings_capability)
+from .modeling.substitution_mappings import 
(validate_substitution_mappings_requirement,
+ 
validate_substitution_mappings_capability)
 from .presentation.extensible import ExtensiblePresentation
 from .presentation.field_validators import (constraint_clause_field_validator,
 
constraint_clause_in_range_validator,
@@ -380,7 +380,7 @@ class SubstitutionMappingsRequirement(AsIsPresentation):
 
 def _validate(self, context):
 super(SubstitutionMappingsRequirement, self)._validate(context)
-validate_subtitution_mappings_requirement(context, self)
+validate_substitution_mappings_requirement(context, self)
 
 
 class SubstitutionMappingsCapability(AsIsPresentation):
@@ -400,7 +400,7 @@ class SubstitutionMappingsCapability(AsIsPresentation):
 
 def _validate(self, context):
 super(SubstitutionMappingsCapability, self)._validate(context)
-validate_subtitution_mappings_capability(context, self)
+validate_substitution_mappings_capability(context, self)
 
 
 @has_fields

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/78e535a5/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
--
diff --git 
a/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
index 8f7ec4c..c10f1a6 100644
--- 
a/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
+++ 
b/extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
@@ -17,88 +17,112 @@ from aria.utils.formatting import safe_repr
 from aria.parser.validation import Issue
 
 
-def validate_subtitution_mappings_requirement(context, presentation):
-if not validate_format(context, presentation, 'requirement'):
+def validate_substitution_mappings_requirement(context, presentation):
+if not validate_format(presentation):
+report_invalid_format(context, presentation, field='requirement')
 return
 
-node_template = get_node_template(context, presentation, 'requirement')
-if node_template is None:
-return
-
-node_type = presentation._container._get_type(context)
-if node_type is None:
+# validate that the requirement in substitution_mapping is defined in the 
substitution node type
+substitution_node_type = presentation._container._get_type(context)
+if substitution_node_type is None:
 return
-
-requirements = node_type._get_requirements(context)
-type_requirement = None
-for name, the_requirement in requirements:
-if name == presentation._name:
-type_requirement = the_requirement
+for req_name, req in substitution_node_type._get_requirements(context):
+if req_name == presentation._name:
+

[GitHub] incubator-ariatosca pull request #192: ARIA-352 Package name "aria[ssh]" inc...

2017-08-20 Thread ran-z 
Github user ran-z commented on a diff in the pull request:

https://github.com/apache/incubator-ariatosca/pull/192#discussion_r134108006
  
--- Diff: README.rst ---
@@ -53,7 +53,7 @@ To install ARIA from source, download the source tarball 
from
 **Ubuntu/Debian** (tested on Ubuntu14.04, Ubuntu16.04)::
 
 apt-get install -y python-dev gcc libffi-dev libssl-dev
-pip install aria[ssh]
+pip install apache-ariatosca[ssh]
--- End diff --

This change should also be applied to the other platforms - i.e. it should 
be "apache-ariatosca" on centos/windows/.. as well.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---