Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-21-reorder-repository-sturcutre ee06b34d5 -> 61dc4d9e1 (forced update)
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/extensions/aria_extension_tosca/simple_v1_0/modeling/artifacts.py ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/artifacts.py b/extensions/aria_extension_tosca/simple_v1_0/modeling/artifacts.py index f28f429..f5667a6 100644 --- a/extensions/aria_extension_tosca/simple_v1_0/modeling/artifacts.py +++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/artifacts.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from collections import OrderedDict +try: + from collections import OrderedDict +except ImportError: + from ordereddict import OrderedDict # # NodeType, NodeTemplate http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py b/extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py index f9e293d..4a96b04 100644 --- a/extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py +++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from collections import OrderedDict +try: + from collections import OrderedDict +except ImportError: + from ordereddict import OrderedDict from aria.parser.utils import deepcopy_with_locators from aria.parser.validation import Issue http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/extensions/aria_extension_tosca/simple_v1_0/modeling/data_types.py ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/data_types.py b/extensions/aria_extension_tosca/simple_v1_0/modeling/data_types.py index 9b0edb8..d98bc54 100644 --- a/extensions/aria_extension_tosca/simple_v1_0/modeling/data_types.py +++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/data_types.py @@ -14,7 +14,10 @@ # limitations under the License. import re -from collections import OrderedDict +try: + from collections import OrderedDict +except ImportError: + from ordereddict import OrderedDict from aria.parser import dsl_specification from aria.parser.presentation import (get_locator, validate_primitive) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/extensions/aria_extension_tosca/simple_v1_0/modeling/interfaces.py ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/interfaces.py b/extensions/aria_extension_tosca/simple_v1_0/modeling/interfaces.py index 1d734cf..bffb5dc 100644 --- a/extensions/aria_extension_tosca/simple_v1_0/modeling/interfaces.py +++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/interfaces.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from collections import OrderedDict +try: + from collections import OrderedDict +except ImportError: + from ordereddict import OrderedDict from aria.parser.presentation import get_locator from aria.parser.utils import (merge, deepcopy_with_locators) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py b/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py index d803609..439f44c 100644 --- a/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py +++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/properties.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from collections import OrderedDict +try: + from collections import OrderedDict +except ImportError: + from ordereddict import OrderedDict from aria.parser.presentation import Value from aria.parser.utils import (merge, deepcopy_with_locators) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/extensions/aria_extension_tosca/simple_v1_0/modeling/requirements.py ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/requirements.py b/extensions/aria_extension_tosca/simple_v1_0/modeling/requirements.py index 721ea09..068dde0 100644 --- a/extensions/aria_extension_tosca/simple_v1_0/modeling/requirements.py +++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/requirements.py @@ -13,8 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from collections import OrderedDict - +try: + from collections import OrderedDict +except ImportError: + from ordereddict import OrderedDict from aria.parser.validation import Issue from aria.parser.utils import deepcopy_with_locators http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/context/__init__.py ---------------------------------------------------------------------- diff --git a/tests/context/__init__.py b/tests/context/__init__.py index afd5cd7..ea0fea9 100644 --- a/tests/context/__init__.py +++ b/tests/context/__init__.py @@ -15,9 +15,7 @@ import sys -import pytest - -from aria.workflows.core import engine +from aria.orchestrator.workflows.core import engine def op_path(func, module_path=None): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/context/test_operation.py ---------------------------------------------------------------------- diff --git a/tests/context/test_operation.py b/tests/context/test_operation.py index 0c34a0f..9128bd6 100644 --- a/tests/context/test_operation.py +++ b/tests/context/test_operation.py @@ -18,10 +18,10 @@ import pytest from aria import ( workflow, operation, - context, ) -from aria.workflows import api -from aria.workflows.executor import thread +from aria.orchestrator import context +from aria.orchestrator.workflows import api +from aria.orchestrator.workflows.executor import thread from .. import mock from . import ( http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/context/test_toolbelt.py ---------------------------------------------------------------------- diff --git a/tests/context/test_toolbelt.py b/tests/context/test_toolbelt.py index 4288ce9..ede1864 100644 --- a/tests/context/test_toolbelt.py +++ b/tests/context/test_toolbelt.py @@ -15,10 +15,11 @@ import pytest -from aria import workflow, operation, context -from aria.workflows import api -from aria.workflows.executor import thread -from aria.context.toolbelt import RelationshipToolBelt +from aria import workflow, operation +from aria.orchestrator import context +from aria.orchestrator.workflows import api +from aria.orchestrator.workflows.executor import thread +from aria.orchestrator.context.toolbelt import RelationshipToolBelt from .. import mock from . import ( http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/context/test_workflow.py ---------------------------------------------------------------------- diff --git a/tests/context/test_workflow.py b/tests/context/test_workflow.py index 4b71855..bc73b9c 100644 --- a/tests/context/test_workflow.py +++ b/tests/context/test_workflow.py @@ -17,7 +17,8 @@ from datetime import datetime import pytest -from aria import context, application_model_storage +from aria import application_model_storage +from aria.orchestrator import context from ..mock import models from ..storage import InMemoryModelDriver http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/mock/context.py ---------------------------------------------------------------------- diff --git a/tests/mock/context.py b/tests/mock/context.py index c48ed9a..5fda07e 100644 --- a/tests/mock/context.py +++ b/tests/mock/context.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from aria import context, application_model_storage +from aria import application_model_storage +from aria.orchestrator import context from . import models from ..storage import InMemoryModelDriver http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/storage/test_drivers.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_drivers.py b/tests/storage/test_drivers.py index 06e0e40..dccbe98 100644 --- a/tests/storage/test_drivers.py +++ b/tests/storage/test_drivers.py @@ -17,7 +17,7 @@ import os import pytest from aria.storage.drivers import FileSystemModelDriver, Driver, ModelDriver, ResourceDriver -from aria.exceptions import StorageError +from aria.storage.exceptions import StorageError from . import InMemoryModelDriver, TestFileSystem http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/storage/test_model_storage.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_model_storage.py b/tests/storage/test_model_storage.py index a06cd5f..17e11ae 100644 --- a/tests/storage/test_model_storage.py +++ b/tests/storage/test_model_storage.py @@ -20,8 +20,8 @@ from aria.storage import ( ModelStorage, models, ) -from aria.exceptions import StorageError from aria.storage import structures +from aria.storage.exceptions import StorageError from aria.storage.structures import Model, Field, PointerField from aria import application_model_storage http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/storage/test_models.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_models.py b/tests/storage/test_models.py index f2fce90..7e289e6 100644 --- a/tests/storage/test_models.py +++ b/tests/storage/test_models.py @@ -19,7 +19,7 @@ from datetime import datetime import pytest from aria.storage import Model, Field -from aria.exceptions import StorageError +from aria.storage.exceptions import StorageError from aria.storage.models import ( DeploymentUpdateStep, Relationship, http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/storage/test_models_api.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_models_api.py b/tests/storage/test_models_api.py index 80826c3..2b92820 100644 --- a/tests/storage/test_models_api.py +++ b/tests/storage/test_models_api.py @@ -16,7 +16,7 @@ import pytest from aria.storage import _ModelApi, models -from aria.exceptions import StorageError +from aria.storage.exceptions import StorageError from . import InMemoryModelDriver http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/storage/test_resource_storage.py ---------------------------------------------------------------------- diff --git a/tests/storage/test_resource_storage.py b/tests/storage/test_resource_storage.py index 9673a26..918b270 100644 --- a/tests/storage/test_resource_storage.py +++ b/tests/storage/test_resource_storage.py @@ -18,7 +18,7 @@ import tempfile import pytest -from aria.exceptions import StorageError +from aria.storage.exceptions import StorageError from aria.storage import ResourceStorage, FileSystemResourceDriver from . import TestFileSystem http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/test_logger.py ---------------------------------------------------------------------- diff --git a/tests/test_logger.py b/tests/test_logger.py index 37731bb..8c7a9af 100644 --- a/tests/test_logger.py +++ b/tests/test_logger.py @@ -23,7 +23,6 @@ from aria.logger import (create_logger, LoggerMixin, _DefaultConsoleFormat) - def test_create_logger(): logger = create_logger() http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/workflows/api/test_task.py ---------------------------------------------------------------------- diff --git a/tests/workflows/api/test_task.py b/tests/workflows/api/test_task.py index 58f9760..8f0e1d4 100644 --- a/tests/workflows/api/test_task.py +++ b/tests/workflows/api/test_task.py @@ -16,8 +16,8 @@ import pytest -from aria import context -from aria.workflows import api +from aria.orchestrator import context +from aria.orchestrator.workflows import api from ... import mock http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/workflows/api/test_task_graph.py ---------------------------------------------------------------------- diff --git a/tests/workflows/api/test_task_graph.py b/tests/workflows/api/test_task_graph.py index 0ec0b0e..a569386 100644 --- a/tests/workflows/api/test_task_graph.py +++ b/tests/workflows/api/test_task_graph.py @@ -15,7 +15,7 @@ import pytest -from aria.workflows.api import task_graph, task +from aria.orchestrator.workflows.api import task_graph, task class MockTask(task.BaseTask): http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/workflows/builtin/test_execute_operation.py ---------------------------------------------------------------------- diff --git a/tests/workflows/builtin/test_execute_operation.py b/tests/workflows/builtin/test_execute_operation.py index 0bd59ed..3009367 100644 --- a/tests/workflows/builtin/test_execute_operation.py +++ b/tests/workflows/builtin/test_execute_operation.py @@ -15,8 +15,8 @@ import pytest -from aria.workflows.api import task -from aria.workflows.builtin.execute_operation import execute_operation +from aria.orchestrator.workflows.api import task +from aria.orchestrator.workflows.builtin.execute_operation import execute_operation from ... import mock from . import ctx_with_basic_graph http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/workflows/builtin/test_heal.py ---------------------------------------------------------------------- diff --git a/tests/workflows/builtin/test_heal.py b/tests/workflows/builtin/test_heal.py index edffe2c..940194b 100644 --- a/tests/workflows/builtin/test_heal.py +++ b/tests/workflows/builtin/test_heal.py @@ -15,8 +15,8 @@ import pytest -from aria.workflows.api import task -from aria.workflows.builtin.heal import heal +from aria.orchestrator.workflows.api import task +from aria.orchestrator.workflows.builtin.heal import heal from . import (assert_node_install_operations, assert_node_uninstall_operations, http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/workflows/builtin/test_install.py ---------------------------------------------------------------------- diff --git a/tests/workflows/builtin/test_install.py b/tests/workflows/builtin/test_install.py index 29212e3..3b23c5a 100644 --- a/tests/workflows/builtin/test_install.py +++ b/tests/workflows/builtin/test_install.py @@ -15,8 +15,8 @@ import pytest -from aria.workflows.builtin.install import install -from aria.workflows.api import task +from aria.orchestrator.workflows.builtin.install import install +from aria.orchestrator.workflows.api import task from . import (assert_node_install_operations, ctx_with_basic_graph) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/workflows/builtin/test_uninstall.py ---------------------------------------------------------------------- diff --git a/tests/workflows/builtin/test_uninstall.py b/tests/workflows/builtin/test_uninstall.py index 2d00673..889e1d2 100644 --- a/tests/workflows/builtin/test_uninstall.py +++ b/tests/workflows/builtin/test_uninstall.py @@ -15,8 +15,8 @@ import pytest -from aria.workflows.api import task -from aria.workflows.builtin.uninstall import uninstall +from aria.orchestrator.workflows.api import task +from aria.orchestrator.workflows.builtin.uninstall import uninstall from . import (assert_node_uninstall_operations, ctx_with_basic_graph) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/workflows/core/test_engine.py ---------------------------------------------------------------------- diff --git a/tests/workflows/core/test_engine.py b/tests/workflows/core/test_engine.py index 9e12c0b..0d668f2 100644 --- a/tests/workflows/core/test_engine.py +++ b/tests/workflows/core/test_engine.py @@ -20,19 +20,19 @@ from datetime import datetime import pytest import aria -from aria import ( +from aria.orchestrator import ( events, workflow, operation, context ) from aria.storage import models -from aria.workflows import ( +from aria.orchestrator.workflows import ( api, exceptions, ) -from aria.workflows.core import engine -from aria.workflows.executor import thread +from aria.orchestrator.workflows.core import engine +from aria.orchestrator.workflows.executor import thread import tests.storage http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/workflows/core/test_task.py ---------------------------------------------------------------------- diff --git a/tests/workflows/core/test_task.py b/tests/workflows/core/test_task.py index 56e49c6..42bf3ed 100644 --- a/tests/workflows/core/test_task.py +++ b/tests/workflows/core/test_task.py @@ -19,8 +19,8 @@ from datetime import ( import pytest -from aria.context import workflow as workflow_context -from aria.workflows import ( +from aria.orchestrator.context import workflow as workflow_context +from aria.orchestrator.workflows import ( api, core, exceptions, http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/workflows/core/test_task_graph_into_exececution_graph.py ---------------------------------------------------------------------- diff --git a/tests/workflows/core/test_task_graph_into_exececution_graph.py b/tests/workflows/core/test_task_graph_into_exececution_graph.py index 2e7c7df..2c95583 100644 --- a/tests/workflows/core/test_task_graph_into_exececution_graph.py +++ b/tests/workflows/core/test_task_graph_into_exececution_graph.py @@ -15,8 +15,8 @@ from networkx import topological_sort, DiGraph -from aria import context -from aria.workflows import api, core +from aria.orchestrator import context +from aria.orchestrator.workflows import api, core from ... import mock http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/61dc4d9e/tests/workflows/executor/test_executor.py ---------------------------------------------------------------------- diff --git a/tests/workflows/executor/test_executor.py b/tests/workflows/executor/test_executor.py index df2728c..ebcc6ae 100644 --- a/tests/workflows/executor/test_executor.py +++ b/tests/workflows/executor/test_executor.py @@ -20,9 +20,9 @@ from contextlib import contextmanager import pytest import retrying -from aria import events from aria.storage import models -from aria.workflows.executor import ( +from aria.orchestrator import events +from aria.orchestrator.workflows.executor import ( thread, multiprocess, blocking,
