incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite 12d8fef11 -> 285b29e9a (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/285b29e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/285b29e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/285b29e9 Branch: refs/heads/ARIA-1-parser-test-suite Commit: 285b29e9a0b474b12682bbe41e5ed7091d8d6544 Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 16:44:18 2017 -0500 -- .travis.yml | 4 + .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 146 -- aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 3 +- tests/mechanisms/web_server.py | 12 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- tox.ini | 39 +++-- 20 files changed, 596 insertions(+), 132 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/285b29e9/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index c8b7645..5a4d7b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ sudo: false +dist: precise + language: python python: @@ -24,6 +26,8 @@ env: - TOX_ENV=py26 - TOX_ENV=py27e2e - TOX_ENV=py26e2e + - TOX_ENV=py27extensions + - TOX_ENV=py26extensions - TOX_ENV=py27ssh - TOX_ENV=py26ssh - TOX_ENV=docs http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/285b29e9/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/285b29e9/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, + print_exceptions=self.conte
incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite 7ba18de93 -> 12d8fef11 (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/12d8fef1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/12d8fef1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/12d8fef1 Branch: refs/heads/ARIA-1-parser-test-suite Commit: 12d8fef11efe0141f256ca1b6affcd2b21c15b86 Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 16:42:47 2017 -0500 -- .travis.yml | 4 + .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 146 -- aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 3 +- tests/mechanisms/web_server.py | 12 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- tox.ini | 39 +++-- 20 files changed, 596 insertions(+), 132 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/12d8fef1/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index c8b7645..6927294 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ sudo: false +dist: trusty + language: python python: @@ -24,6 +26,8 @@ env: - TOX_ENV=py26 - TOX_ENV=py27e2e - TOX_ENV=py26e2e + - TOX_ENV=py27extensions + - TOX_ENV=py26extensions - TOX_ENV=py27ssh - TOX_ENV=py26ssh - TOX_ENV=docs http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/12d8fef1/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/12d8fef1/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, + print_exceptions=self.contex
incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite 35b8bb68e -> 7ba18de93 (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/7ba18de9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/7ba18de9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/7ba18de9 Branch: refs/heads/ARIA-1-parser-test-suite Commit: 7ba18de93bee15795e909b214e1a748dd3753dd5 Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 16:39:48 2017 -0500 -- .travis.yml | 2 + .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 146 -- aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 3 +- tests/mechanisms/web_server.py | 12 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- tox.ini | 39 +++-- 20 files changed, 594 insertions(+), 132 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7ba18de9/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index c8b7645..9272bc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,8 @@ env: - TOX_ENV=py26 - TOX_ENV=py27e2e - TOX_ENV=py26e2e + - TOX_ENV=py27extensions + - TOX_ENV=py26extensions - TOX_ENV=py27ssh - TOX_ENV=py26ssh - TOX_ENV=docs http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7ba18de9/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7ba18de9/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, + print_exceptions=self.context.presentation \ + .print_exceptio
incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite e1fbeacff -> 35b8bb68e (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/35b8bb68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/35b8bb68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/35b8bb68 Branch: refs/heads/ARIA-1-parser-test-suite Commit: 35b8bb68ef570d938940d46b6e829f8559a12f96 Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 16:35:37 2017 -0500 -- .travis.yml | 3 + .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 146 -- aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 3 +- tests/mechanisms/web_server.py | 12 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- tox.ini | 39 +++-- 20 files changed, 595 insertions(+), 132 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/35b8bb68/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index c8b7645..3c6d1d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,11 +24,14 @@ env: - TOX_ENV=py26 - TOX_ENV=py27e2e - TOX_ENV=py26e2e + - TOX_ENV=py27extensions + - TOX_ENV=py26extensions - TOX_ENV=py27ssh - TOX_ENV=py26ssh - TOX_ENV=docs install: + - apt-get install python2.6 python2.6-dev - pip install --upgrade pip - pip install --upgrade setuptools - pip install tox http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/35b8bb68/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/35b8bb68/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, +
incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite f27426962 -> e1fbeacff (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/e1fbeacf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/e1fbeacf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/e1fbeacf Branch: refs/heads/ARIA-1-parser-test-suite Commit: e1fbeacff6f708b57e4e8c99865f9fc9e87964a1 Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 16:33:14 2017 -0500 -- .travis.yml | 3 + .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 146 -- aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 3 +- tests/mechanisms/web_server.py | 12 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- tox.ini | 39 +++-- 20 files changed, 595 insertions(+), 132 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e1fbeacf/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index c8b7645..2e02810 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ language: python python: - '2.7' + - '2.6' env: - TOX_ENV=pylint_code @@ -24,6 +25,8 @@ env: - TOX_ENV=py26 - TOX_ENV=py27e2e - TOX_ENV=py26e2e + - TOX_ENV=py27extensions + - TOX_ENV=py26extensions - TOX_ENV=py27ssh - TOX_ENV=py26ssh - TOX_ENV=docs http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e1fbeacf/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e1fbeacf/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, + print_e
incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite fd35542bc -> f27426962 (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/f2742696 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f2742696 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f2742696 Branch: refs/heads/ARIA-1-parser-test-suite Commit: f2742696297df639a758f57193d16b71e454d974 Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 16:25:29 2017 -0500 -- .travis.yml | 2 + .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 146 -- aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 3 +- tests/mechanisms/web_server.py | 12 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- tox.ini | 39 +++-- 20 files changed, 594 insertions(+), 132 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f2742696/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index c8b7645..9272bc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,8 @@ env: - TOX_ENV=py26 - TOX_ENV=py27e2e - TOX_ENV=py26e2e + - TOX_ENV=py27extensions + - TOX_ENV=py26extensions - TOX_ENV=py27ssh - TOX_ENV=py26ssh - TOX_ENV=docs http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f2742696/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f2742696/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, + print_exceptions=self.context.presentation \ + .print_exceptio
incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite abb35d114 -> fd35542bc (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/fd35542b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/fd35542b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/fd35542b Branch: refs/heads/ARIA-1-parser-test-suite Commit: fd35542bca00debff16eec5e8b454b51fb00c26c Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 14:33:46 2017 -0500 -- .travis.yml | 2 + .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 146 -- aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 1 + tests/mechanisms/web_server.py | 11 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- tox.ini | 37 +++-- 20 files changed, 591 insertions(+), 130 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fd35542b/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index c8b7645..9272bc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,8 @@ env: - TOX_ENV=py26 - TOX_ENV=py27e2e - TOX_ENV=py26e2e + - TOX_ENV=py27extensions + - TOX_ENV=py26extensions - TOX_ENV=py27ssh - TOX_ENV=py26ssh - TOX_ENV=docs http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fd35542b/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fd35542b/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, + print_exceptions=self.context.presentation \ + .print_exception
incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite fe6f8c038 -> abb35d114 (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/abb35d11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/abb35d11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/abb35d11 Branch: refs/heads/ARIA-1-parser-test-suite Commit: abb35d11485d8284a656f2d38908df5102d3400b Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 14:28:28 2017 -0500 -- .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 146 -- aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 1 + tests/mechanisms/web_server.py | 11 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- tox.ini | 37 +++-- 19 files changed, 589 insertions(+), 130 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/abb35d11/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/abb35d11/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, + print_exceptions=self.context.presentation \ + .print_exceptions) + try: presenter = self._present(self.context.presentation.location, None, None, executor) executor.drain() http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/abb35d11/aria/parser/presentation/fields.py -- diff --git a/aria/parser/presentation/fields.py b/aria/parser/presentation/fields.py index 5c08d4a..98394d9 100644 --- a/aria/parser/presentation/fields.py +++ b/aria/parser/presentation/fie
incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite c587f77bd -> fe6f8c038 (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/fe6f8c03 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/fe6f8c03 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/fe6f8c03 Branch: refs/heads/ARIA-1-parser-test-suite Commit: fe6f8c038beb5c8e3d578a67ec8763e644c8f875 Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 14:24:42 2017 -0500 -- .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 146 -- aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 1 + tests/mechanisms/web_server.py | 11 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- tox.ini | 35 +++-- 19 files changed, 587 insertions(+), 130 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fe6f8c03/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fe6f8c03/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, + print_exceptions=self.context.presentation \ + .print_exceptions) + try: presenter = self._present(self.context.presentation.location, None, None, executor) executor.drain() http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fe6f8c03/aria/parser/presentation/fields.py -- diff --git a/aria/parser/presentation/fields.py b/aria/parser/presentation/fields.py index 5c08d4a..98394d9 100644 --- a/aria/parser/presentation/fields.py +++ b/aria/parser/presentation/fie
incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite d34991906 -> c587f77bd (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/c587f77b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/c587f77b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/c587f77b Branch: refs/heads/ARIA-1-parser-test-suite Commit: c587f77bda7892df8efb8204426c679500c6e842 Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 14:02:04 2017 -0500 -- .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 146 -- aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 1 + tests/mechanisms/web_server.py | 11 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- 18 files changed, 561 insertions(+), 121 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c587f77b/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c587f77b/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, + print_exceptions=self.context.presentation \ + .print_exceptions) + try: presenter = self._present(self.context.presentation.location, None, None, executor) executor.drain() http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c587f77b/aria/parser/presentation/fields.py -- diff --git a/aria/parser/presentation/fields.py b/aria/parser/presentation/fields.py index 5c08d4a..98394d9 100644 --- a/aria/parser/presentation/fields.py +++ b/aria/parser/presentation/fields.py @@ -733,7 +733,7 @@ class Field(object):
incubator-ariatosca git commit: Testing types and templates [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-1-parser-test-suite 93c88803b -> d34991906 (forced update) Testing types and templates * Fix "version" fields in types * Improve version 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/d3499190 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/d3499190 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/d3499190 Branch: refs/heads/ARIA-1-parser-test-suite Commit: d3499190607b2a1e6252a137736094b160c3bf2a Parents: 526befd Author: Tal Liron Authored: Fri Aug 18 15:52:31 2017 -0500 Committer: Tal Liron Committed: Mon Aug 21 13:51:43 2017 -0500 -- .../execution_plugin/ctx_proxy/server.py| 1 + aria/parser/consumption/presentation.py | 15 +- aria/parser/presentation/fields.py | 2 +- aria/utils/threading.py | 46 ++ aria/utils/versions.py | 2 +- .../simple_v1_0/presentation/field_getters.py | 20 +-- .../aria_extension_tosca/simple_v1_0/types.py | 23 ++- .../simple_v1_0/conftest.py | 23 ++- .../aria_extension_tosca/simple_v1_0/data.py| 40 + .../simple_v1_0/test_imports.py | 18 ++- .../simple_v1_0/test_metadata.py| 58 --- .../simple_v1_0/test_templates.py | 129 .../simple_v1_0/test_types.py | 153 +++ tests/mechanisms/parsing/__init__.py| 30 +++- tests/mechanisms/parsing/aria.py| 1 + tests/mechanisms/web_server.py | 11 +- .../node-cellar/node-cellar.yaml| 2 +- tests/utils/test_versions.py| 8 +- 18 files changed, 506 insertions(+), 76 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d3499190/aria/orchestrator/execution_plugin/ctx_proxy/server.py -- diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py index 91b95d9..ecdfc2f 100644 --- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py +++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py @@ -144,6 +144,7 @@ class CtxProxy(object): def __exit__(self, *args, **kwargs): self.close() +return False class CtxError(RuntimeError): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d3499190/aria/parser/consumption/presentation.py -- diff --git a/aria/parser/consumption/presentation.py b/aria/parser/consumption/presentation.py index 542b3f0..6d34ee1 100644 --- a/aria/parser/consumption/presentation.py +++ b/aria/parser/consumption/presentation.py @@ -14,8 +14,8 @@ # limitations under the License. -from ...utils.threading import FixedThreadPoolExecutor -from ...utils.formatting import json_dumps, yaml_dumps +from ...utils.threading import (BlockingExecutor, FixedThreadPoolExecutor) +from ...utils.formatting import (json_dumps, yaml_dumps) from ..loading import UriLocation from ..reading import AlreadyReadException from ..presentation import PresenterNotFoundError @@ -47,9 +47,14 @@ class Read(Consumer): presenter = None imported_presentations = None -executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, - timeout=self.context.presentation.timeout) -executor.print_exceptions = self.context.presentation.print_exceptions +if self.context.presentation.threads == 1: +executor = BlockingExecutor(print_exceptions=self.context.presentation.print_exceptions) +else: +executor = FixedThreadPoolExecutor(size=self.context.presentation.threads, + timeout=self.context.presentation.timeout, + print_exceptions=self.context.presentation \ + .print_exceptions) + try: presenter = self._present(self.context.presentation.location, None, None, executor) executor.drain() http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d3499190/aria/parser/presentation/fields.py -- diff --git a/aria/parser/presentation/fields.py b/aria/parser/presentation/fields.py index 5c08d4a..98394d9 100644 --- a/aria/parser/presentation/fields.py +++ b/aria/parser/presentation/fields.py @@ -733,7 +733,7 @@ class Field(object):
incubator-ariatosca git commit: ARIA-348 Validate substitution_mapping field [Forced Update!]
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-348-validate-substitution-mapping 8e0700e1b -> 15a1d89b9
(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/15a1d89b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/15a1d89b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/15a1d89b
Branch: refs/heads/ARIA-348-validate-substitution-mapping
Commit: 15a1d89b95bb99cbeb98c4ac810b9a7aa90698a9
Parents: a5b450a
Author: Avia Efrat
Authored: Wed Aug 16 18:54:57 2017 +0300
Committer: Avia Efrat
Committed: Mon Aug 21 18:30:28 2017 +0300
--
.../aria_extension_tosca/simple_v1_0/misc.py| 8 +-
.../modeling/substitution_mappings.py | 175 +++
.../aria_extension_tosca/simple_v1_0/types.py | 9 +-
3 files changed, 115 insertions(+), 77 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/15a1d89b/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/15a1d89b/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..e2af4b8 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,113 @@ 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'):
-return
+def validate_substitution_mappings_requirement(context, presentation):
-node_template = get_node_template(context, presentation, 'requirement')
-if node_template 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
+for req_name, req in substitution_node_type._get_requirements(context):
+if req_name == presentation._name:
+substitution_type_requirement = req
+break
+else:
+context.validation.report(
+'substitution mapping requirement "{0}" is not declared in node
type "{1}"'.format(
+presentation._name, substitution_node_type._name),
+locator=presentation._locator, level=Issue.BETWEEN_TYPES)
return
-node_type = presentation._container._get_type(context)
-
[GitHub] incubator-ariatosca pull request #193: ARIA-348 Validate substitution_mappin...
Github user ran-z commented on a diff in the pull request:
https://github.com/apache/incubator-ariatosca/pull/193#discussion_r134229278
--- Diff:
extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
---
@@ -17,114 +17,149 @@
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:
context.validation.report(
-'substitution mappings requirement "%s" is not declared in
node type "%s"'
-% (presentation._name, node_type._name),
+'substitution mapping requirement "{0}" is not declared in
node type "{1}"'.format(
+presentation._name, substitution_node_type._name),
locator=presentation._locator, level=Issue.BETWEEN_TYPES)
return
-requirement_name = presentation._raw[1]
-requirements = node_template._get_requirements(context)
-requirement = None
-for name, the_requirement in requirements:
-if name == requirement_name:
-requirement = the_requirement
+# validate that the mapped requirement is defined in the corresponding
node template
+node_template = get_node_template(context, presentation)
+if node_template is None:
+report_missing_node_template(context, presentation,
field='requirement')
+return
+mapped_requirement_name = presentation._raw[1]
+for req_name, req in node_template._get_requirements(context):
+if req_name == mapped_requirement_name:
+node_template_requirement = req
break
-
-if requirement is None:
+else:
context.validation.report(
-'substitution mappings requirement "%s" refers to an unknown
requirement of node '
-'template "%s": %s'
-% (presentation._name, node_template._name,
safe_repr(requirement_name)),
+'substitution mapping requirement "{0}" refers to an unknown
requirement of node '
+'template "{1}": {mapped_requirement_name}'.format(
+presentation._name, node_template._name,
+
mapped_requirement_name=safe_repr(mapped_requirement_name)),
locator=presentation._locator, level=Issue.BETWEEN_TYPES)
return
+# validate that the requirement's capability type in
substitution_mapping is derived from the
+# requirement's capability type in the corresponding node template
+substitution_type_requirement_capability_type = \
+substitution_type_requirement._get_capability_type(context)
+node_template_requirement_capability_type = \
+node_template_requirement._get_capability(context)[0]
+if not node_template_requirement_capability_type._is_descendant(
+context, substitution_type_requirement_capability_type):
+context.validation.report(
+'substitution mapping requirement "{0}" of capability type
"{1}" is not a descendant '
+'of the mapped node template capability type "{2}"'.format(
+presentation._name,
+substitution_type_requirement_capability_type._name,
+node_template_requirement_capability_type._name),
+locator=presentation._locator, level=Issue.BETWEEN_TYPES)
-def validate_subtitution_mappings_capability(context, presentation):
-if not validate_format(context, presentation, 'capability'):
-return
-node_template
[GitHub] incubator-ariatosca pull request #193: ARIA-348 Validate substitution_mappin...
Github user ran-z commented on a diff in the pull request:
https://github.com/apache/incubator-ariatosca/pull/193#discussion_r134229923
--- Diff:
extensions/aria_extension_tosca/simple_v1_0/modeling/substitution_mappings.py
---
@@ -17,114 +17,149 @@
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:
context.validation.report(
-'substitution mappings requirement "%s" is not declared in
node type "%s"'
-% (presentation._name, node_type._name),
+'substitution mapping requirement "{0}" is not declared in
node type "{1}"'.format(
+presentation._name, substitution_node_type._name),
locator=presentation._locator, level=Issue.BETWEEN_TYPES)
return
-requirement_name = presentation._raw[1]
-requirements = node_template._get_requirements(context)
-requirement = None
-for name, the_requirement in requirements:
-if name == requirement_name:
-requirement = the_requirement
+# validate that the mapped requirement is defined in the corresponding
node template
+node_template = get_node_template(context, presentation)
+if node_template is None:
+report_missing_node_template(context, presentation,
field='requirement')
+return
+mapped_requirement_name = presentation._raw[1]
+for req_name, req in node_template._get_requirements(context):
+if req_name == mapped_requirement_name:
+node_template_requirement = req
break
-
-if requirement is None:
+else:
context.validation.report(
-'substitution mappings requirement "%s" refers to an unknown
requirement of node '
-'template "%s": %s'
-% (presentation._name, node_template._name,
safe_repr(requirement_name)),
+'substitution mapping requirement "{0}" refers to an unknown
requirement of node '
+'template "{1}": {mapped_requirement_name}'.format(
+presentation._name, node_template._name,
+
mapped_requirement_name=safe_repr(mapped_requirement_name)),
locator=presentation._locator, level=Issue.BETWEEN_TYPES)
return
+# validate that the requirement's capability type in
substitution_mapping is derived from the
+# requirement's capability type in the corresponding node template
+substitution_type_requirement_capability_type = \
+substitution_type_requirement._get_capability_type(context)
+node_template_requirement_capability_type = \
+node_template_requirement._get_capability(context)[0]
+if not node_template_requirement_capability_type._is_descendant(
+context, substitution_type_requirement_capability_type):
+context.validation.report(
+'substitution mapping requirement "{0}" of capability type
"{1}" is not a descendant '
+'of the mapped node template capability type "{2}"'.format(
+presentation._name,
+substitution_type_requirement_capability_type._name,
+node_template_requirement_capability_type._name),
+locator=presentation._locator, level=Issue.BETWEEN_TYPES)
-def validate_subtitution_mappings_capability(context, presentation):
-if not validate_format(context, presentation, 'capability'):
-return
-node_template
[1/2] incubator-ariatosca git commit: ARIA-352 Fixed package name aria[ssh] incorrect in the installation document link [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-348-validate-substitution-mapping d2daec579 -> 8e0700e1b (forced update) ARIA-352 Fixed package name aria[ssh] incorrect in the installation document link Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/a5b450aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/a5b450aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/a5b450aa Branch: refs/heads/ARIA-348-validate-substitution-mapping Commit: a5b450aa66c816a6334c00be96d7f50cb6b248e6 Parents: 8981791 Author: Vishwanath Jayaraman Authored: Mon Aug 21 13:50:55 2017 + Committer: Vishwanath Jayaraman Committed: Mon Aug 21 13:50:55 2017 + -- README.rst | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/a5b450aa/README.rst -- diff --git a/README.rst b/README.rst index b9a8213..b1a48c2 100644 --- a/README.rst +++ b/README.rst @@ -53,22 +53,22 @@ 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] **Centos** (tested on Centos6.6, Centos7):: yum install -y python-devel gcc libffi-devel openssl-devel -pip install aria[ssh] +pip install apache-ariatosca[ssh] **Archlinux**:: pacman -Syu --noconfirm python2 gcc libffi openssl -pip2 install aria[ssh] +pip2 install apache-ariatosca[ssh] **Windows** (tested on Win10):: # no additional system requirements are needed -pip install aria[ssh] +pip install apache-ariatosca[ssh] **MacOS**::
[2/2] incubator-ariatosca git commit: ARIA-348 Validate substitution_mapping field
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/8e0700e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8e0700e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8e0700e1
Branch: refs/heads/ARIA-348-validate-substitution-mapping
Commit: 8e0700e1baa72e3a18bfd821a9123691b194a8d4
Parents: a5b450a
Author: Avia Efrat
Authored: Wed Aug 16 18:54:57 2017 +0300
Committer: Avia Efrat
Committed: Mon Aug 21 17:45:49 2017 +0300
--
.../aria_extension_tosca/simple_v1_0/misc.py| 8 +-
.../modeling/substitution_mappings.py | 175 +++
.../aria_extension_tosca/simple_v1_0/types.py | 9 +-
3 files changed, 115 insertions(+), 77 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8e0700e1/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/8e0700e1/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..26bcb60 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,113 @@ 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'):
-return
+def validate_substitution_mappings_requirement(context, presentation):
-node_template = get_node_template(context, presentation, 'requirement')
-if node_template 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
+for req_name, req in substitution_node_type._get_requirements(context):
+if req_name == presentation._name:
+substitution_type_requirement = req
+break
+else:
+context.validation.report(
+'substitution mapping requirement "{0}" is not declared in node
type "{1}"'.format(
+presentation._name, substitution_node_type._name),
+locator=presentation._locator, level=Issue.BETWEEN_TYPES)
return
-node_type = presentation._container._get_type(context)
-if node_type is None:
+if not validate_mapping_format(presentation):
+report_invalid_format(context, presentation, field='requireme
[GitHub] incubator-ariatosca pull request #192: ARIA-352 Package name "aria[ssh]" inc...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-ariatosca/pull/192 --- 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-352 Fixed package name aria[ssh] incorrect in the installation document link
Repository: incubator-ariatosca Updated Branches: refs/heads/master 8981791a1 -> a5b450aa6 ARIA-352 Fixed package name aria[ssh] incorrect in the installation document link Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/a5b450aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/a5b450aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/a5b450aa Branch: refs/heads/master Commit: a5b450aa66c816a6334c00be96d7f50cb6b248e6 Parents: 8981791 Author: Vishwanath Jayaraman Authored: Mon Aug 21 13:50:55 2017 + Committer: Vishwanath Jayaraman Committed: Mon Aug 21 13:50:55 2017 + -- README.rst | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/a5b450aa/README.rst -- diff --git a/README.rst b/README.rst index b9a8213..b1a48c2 100644 --- a/README.rst +++ b/README.rst @@ -53,22 +53,22 @@ 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] **Centos** (tested on Centos6.6, Centos7):: yum install -y python-devel gcc libffi-devel openssl-devel -pip install aria[ssh] +pip install apache-ariatosca[ssh] **Archlinux**:: pacman -Syu --noconfirm python2 gcc libffi openssl -pip2 install aria[ssh] +pip2 install apache-ariatosca[ssh] **Windows** (tested on Win10):: # no additional system requirements are needed -pip install aria[ssh] +pip install apache-ariatosca[ssh] **MacOS**::
[GitHub] incubator-ariatosca pull request #192: ARIA-352 Package name "aria[ssh]" inc...
Github user vishwanathj commented on a diff in the pull request: https://github.com/apache/incubator-ariatosca/pull/192#discussion_r134246108 --- 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 -- Please go ahead and merge. Thanks for your guidance and help. --- 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 #192: ARIA-352 Package name "aria[ssh]" inc...
Github user ran-z commented on a diff in the pull request: https://github.com/apache/incubator-ariatosca/pull/192#discussion_r134244356 --- 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 -- Yeah, it seems like Github has been malfunctioning today.. I don't have permissions for the AppVeyor account, only Apache Infra does; Supposedly it's easiest to simply re-push (after "modifying" the commit, e.g. by empty rebase). Since this is only a README change, though, we could simply merge despite the tests having failed. It's simply less pretty to see the red X :) Up to you, let me know whether you'd like to push again or I should merge right now Thanks :) --- 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 #192: ARIA-352 Package name "aria[ssh]" inc...
Github user vishwanathj commented on a diff in the pull request: https://github.com/apache/incubator-ariatosca/pull/192#discussion_r134239981 --- 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 -- I am seeing the below failure in AppVeyor build after squishing the commits, is there a way to restart the AppVeyor build? git clone -q https://github.com/apache/incubator-ariatosca.git C:\projects\incubator-ariatosca fatal: unable to access 'https://github.com/apache/incubator-ariatosca.git/': Failed to connect to github.com port 443: Timed out Command exited with code 128 --- 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!]
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-348-validate-substitution-mapping eca048c16 -> d2daec579
(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/d2daec57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/d2daec57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/d2daec57
Branch: refs/heads/ARIA-348-validate-substitution-mapping
Commit: d2daec5799f1515bbb83a6050711ed9379e44eaa
Parents: 8981791
Author: Avia Efrat
Authored: Wed Aug 16 18:54:57 2017 +0300
Committer: Avia Efrat
Committed: Mon Aug 21 13:18:36 2017 +0300
--
.../aria_extension_tosca/simple_v1_0/misc.py| 8 +-
.../modeling/substitution_mappings.py | 175 +++
.../aria_extension_tosca/simple_v1_0/types.py | 9 +-
3 files changed, 115 insertions(+), 77 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d2daec57/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/d2daec57/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..26bcb60 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,113 @@ 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'):
-return
+def validate_substitution_mappings_requirement(context, presentation):
-node_template = get_node_template(context, presentation, 'requirement')
-if node_template 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
+for req_name, req in substitution_node_type._get_requirements(context):
+if req_name == presentation._name:
+substitution_type_requirement = req
+break
+else:
+context.validation.report(
+'substitution mapping requirement "{0}" is not declared in node
type "{1}"'.format(
+presentation._name, substitution_node_type._name),
+locator=presentation._locator, level=Issue.BETWEEN_TYPES)
return
-node_type = presentation._container._get_type(context)
-
[GitHub] incubator-ariatosca pull request #192: ARIA-352 Package name "aria[ssh]" inc...
Github user ran-z commented on a diff in the pull request: https://github.com/apache/incubator-ariatosca/pull/192#discussion_r134171829 --- 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 -- Thanks. Now I just have to ask that you squash the two commits into a single one, and make sure you're rebased on top of master once you do that - then I'll be able to merge this. --- 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. ---
