[3/3] incubator-ariatosca git commit: ARIA-30 SQL based storage implementation
ARIA-30 SQL based storage implementation Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/c9df5b14 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/c9df5b14 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/c9df5b14 Branch: refs/heads/ARIA-30-SQL-based-storage-implementation Commit: c9df5b140498ca907d0f5b6ebca6cdd2163bcfcd Parents: fe974e4 Author: mxmrlv Authored: Sun Nov 27 13:20:46 2016 +0200 Committer: mxmrlv Committed: Thu Dec 1 15:52:25 2016 +0200 -- aria/__init__.py| 43 +- aria/orchestrator/__init__.py | 4 +- aria/orchestrator/context/common.py | 2 +- aria/orchestrator/context/exceptions.py | 4 +- aria/orchestrator/context/operation.py | 8 +- aria/orchestrator/context/toolbelt.py | 13 +- aria/orchestrator/context/workflow.py | 20 +- aria/orchestrator/exceptions.py | 7 +- aria/orchestrator/workflows/api/task.py | 10 +- aria/orchestrator/workflows/builtin/heal.py | 25 +- aria/orchestrator/workflows/builtin/install.py | 7 +- .../orchestrator/workflows/builtin/uninstall.py | 7 +- .../orchestrator/workflows/builtin/workflows.py | 13 +- aria/orchestrator/workflows/core/task.py| 21 +- aria/storage/__init__.py| 379 ++-- aria/storage/api.py | 219 + aria/storage/drivers.py | 416 - aria/storage/exceptions.py | 4 +- aria/storage/filesystem_api.py | 39 + aria/storage/mapi/__init__.py | 20 + aria/storage/mapi/filesystem.py | 118 +++ aria/storage/mapi/inmemory.py | 148 +++ aria/storage/mapi/sql.py| 368 aria/storage/models.py | 912 +-- aria/storage/rapi/__init__.py | 18 + aria/storage/rapi/filesystem.py | 119 +++ aria/storage/structures.py | 402 requirements.txt| 1 + tests/mock/context.py | 50 +- tests/mock/models.py| 68 +- tests/orchestrator/context/test_operation.py| 36 +- tests/orchestrator/context/test_toolbelt.py | 47 +- tests/orchestrator/context/test_workflow.py | 10 +- tests/orchestrator/workflows/api/test_task.py | 68 +- .../orchestrator/workflows/builtin/__init__.py | 35 +- .../workflows/builtin/test_execute_operation.py | 11 +- .../orchestrator/workflows/builtin/test_heal.py | 18 +- .../workflows/builtin/test_install.py | 14 +- .../workflows/builtin/test_uninstall.py | 12 +- .../orchestrator/workflows/core/test_engine.py | 71 +- tests/orchestrator/workflows/core/test_task.py | 20 +- .../test_task_graph_into_exececution_graph.py | 10 +- tests/requirements.txt | 2 +- tests/storage/__init__.py | 38 +- tests/storage/test_drivers.py | 135 --- tests/storage/test_field.py | 124 --- tests/storage/test_model_storage.py | 167 ++-- tests/storage/test_models.py| 364 tests/storage/test_models_api.py| 70 -- tests/storage/test_resource_storage.py | 57 +- 50 files changed, 2296 insertions(+), 2478 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c9df5b14/aria/__init__.py -- diff --git a/aria/__init__.py b/aria/__init__.py index 3f81f98..6e810f0 100644 --- a/aria/__init__.py +++ b/aria/__init__.py @@ -23,7 +23,6 @@ import pkgutil from .VERSION import version as __version__ from .orchestrator.decorators import workflow, operation -from .storage import ModelStorage, ResourceStorage, models, ModelDriver, ResourceDriver from . import ( utils, parser, @@ -58,37 +57,37 @@ def install_aria_extensions(): del sys.modules[module_name] -def application_model_storage(driver): +def application_model_storage(api, api_params=None): """ Initiate model storage for the supplied storage driver """ - -assert isinstance(driver, ModelDriver) -if driver not in _model_storage: -_model_storage[driver] = ModelStorage( -driver, model_classes=[ -models.Node, -models.NodeInstance, -models.Plugin, -models.Blueprint, -models.Snapshot, -models.Deployment, -models.DeploymentUpdate,
[3/3] incubator-ariatosca git commit: ARIA-30 SQL based storage implementation
ARIA-30 SQL based storage implementation Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/f6981ddb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f6981ddb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f6981ddb Branch: refs/heads/ARIA-30-SQL-based-storage-implementation Commit: f6981ddbf31fd1adba12e65c725e77aba84b7c03 Parents: fe974e4 Author: mxmrlv Authored: Sun Nov 27 13:20:46 2016 +0200 Committer: mxmrlv Committed: Thu Dec 1 15:37:43 2016 +0200 -- aria/__init__.py| 43 +- aria/orchestrator/__init__.py | 4 +- aria/orchestrator/context/common.py | 2 +- aria/orchestrator/context/exceptions.py | 4 +- aria/orchestrator/context/operation.py | 8 +- aria/orchestrator/context/toolbelt.py | 13 +- aria/orchestrator/context/workflow.py | 20 +- aria/orchestrator/exceptions.py | 7 +- aria/orchestrator/workflows/api/task.py | 10 +- aria/orchestrator/workflows/builtin/heal.py | 25 +- aria/orchestrator/workflows/builtin/install.py | 7 +- .../orchestrator/workflows/builtin/uninstall.py | 5 +- .../orchestrator/workflows/builtin/workflows.py | 4 +- aria/orchestrator/workflows/core/task.py| 21 +- aria/storage/__init__.py| 379 ++-- aria/storage/api.py | 219 + aria/storage/drivers.py | 416 - aria/storage/exceptions.py | 4 +- aria/storage/filesystem_api.py | 39 + aria/storage/mapi/__init__.py | 20 + aria/storage/mapi/filesystem.py | 118 +++ aria/storage/mapi/inmemory.py | 148 +++ aria/storage/mapi/sql.py| 368 aria/storage/models.py | 912 +-- aria/storage/rapi/__init__.py | 18 + aria/storage/rapi/filesystem.py | 119 +++ aria/storage/structures.py | 402 requirements.txt| 1 + tests/mock/context.py | 50 +- tests/mock/models.py| 68 +- tests/orchestrator/context/test_operation.py| 36 +- tests/orchestrator/context/test_toolbelt.py | 47 +- tests/orchestrator/context/test_workflow.py | 10 +- tests/orchestrator/workflows/api/test_task.py | 68 +- .../orchestrator/workflows/builtin/__init__.py | 35 +- .../workflows/builtin/test_execute_operation.py | 11 +- .../orchestrator/workflows/builtin/test_heal.py | 18 +- .../workflows/builtin/test_install.py | 14 +- .../workflows/builtin/test_uninstall.py | 12 +- .../orchestrator/workflows/core/test_engine.py | 71 +- tests/orchestrator/workflows/core/test_task.py | 20 +- .../test_task_graph_into_exececution_graph.py | 10 +- tests/requirements.txt | 2 +- tests/storage/__init__.py | 38 +- tests/storage/test_drivers.py | 135 --- tests/storage/test_field.py | 124 --- tests/storage/test_model_storage.py | 167 ++-- tests/storage/test_models.py| 364 tests/storage/test_models_api.py| 70 -- tests/storage/test_resource_storage.py | 57 +- 50 files changed, 2295 insertions(+), 2468 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f6981ddb/aria/__init__.py -- diff --git a/aria/__init__.py b/aria/__init__.py index 3f81f98..6e810f0 100644 --- a/aria/__init__.py +++ b/aria/__init__.py @@ -23,7 +23,6 @@ import pkgutil from .VERSION import version as __version__ from .orchestrator.decorators import workflow, operation -from .storage import ModelStorage, ResourceStorage, models, ModelDriver, ResourceDriver from . import ( utils, parser, @@ -58,37 +57,37 @@ def install_aria_extensions(): del sys.modules[module_name] -def application_model_storage(driver): +def application_model_storage(api, api_params=None): """ Initiate model storage for the supplied storage driver """ - -assert isinstance(driver, ModelDriver) -if driver not in _model_storage: -_model_storage[driver] = ModelStorage( -driver, model_classes=[ -models.Node, -models.NodeInstance, -models.Plugin, -models.Blueprint, -models.Snapshot, -models.Deployment, -models.DeploymentUpdate,
[3/3] incubator-ariatosca git commit: ARIA-30 SQL based storage implementation
ARIA-30 SQL based storage implementation Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/358cbe05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/358cbe05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/358cbe05 Branch: refs/heads/ARIA-30-SQL-based-storage-implementation Commit: 358cbe053190c20d0674252345586bd8b199809f Parents: fe974e4 Author: mxmrlv Authored: Sun Nov 27 13:20:46 2016 +0200 Committer: mxmrlv Committed: Thu Dec 1 14:49:48 2016 +0200 -- aria/__init__.py| 43 +- aria/orchestrator/__init__.py | 4 +- aria/orchestrator/context/common.py | 2 +- aria/orchestrator/context/exceptions.py | 4 +- aria/orchestrator/context/operation.py | 8 +- aria/orchestrator/context/toolbelt.py | 13 +- aria/orchestrator/context/workflow.py | 20 +- aria/orchestrator/exceptions.py | 7 +- aria/orchestrator/workflows/api/task.py | 10 +- aria/orchestrator/workflows/builtin/heal.py | 25 +- aria/orchestrator/workflows/builtin/install.py | 7 +- .../orchestrator/workflows/builtin/uninstall.py | 5 +- .../orchestrator/workflows/builtin/workflows.py | 4 +- aria/orchestrator/workflows/core/task.py| 21 +- aria/storage/__init__.py| 379 ++-- aria/storage/api.py | 219 + aria/storage/drivers.py | 416 - aria/storage/exceptions.py | 4 +- aria/storage/filesystem_api.py | 39 + aria/storage/mapi/__init__.py | 20 + aria/storage/mapi/filesystem.py | 118 +++ aria/storage/mapi/inmemory.py | 148 +++ aria/storage/mapi/sql.py| 369 aria/storage/models.py | 912 +-- aria/storage/rapi/__init__.py | 18 + aria/storage/rapi/filesystem.py | 119 +++ aria/storage/structures.py | 402 requirements.txt| 1 + tests/mock/context.py | 50 +- tests/mock/models.py| 68 +- tests/orchestrator/context/test_operation.py| 36 +- tests/orchestrator/context/test_toolbelt.py | 47 +- tests/orchestrator/context/test_workflow.py | 10 +- tests/orchestrator/workflows/api/test_task.py | 68 +- .../orchestrator/workflows/builtin/__init__.py | 35 +- .../workflows/builtin/test_execute_operation.py | 11 +- .../orchestrator/workflows/builtin/test_heal.py | 18 +- .../workflows/builtin/test_install.py | 14 +- .../workflows/builtin/test_uninstall.py | 12 +- .../orchestrator/workflows/core/test_engine.py | 71 +- tests/orchestrator/workflows/core/test_task.py | 20 +- .../test_task_graph_into_exececution_graph.py | 10 +- tests/requirements.txt | 2 +- tests/storage/__init__.py | 38 +- tests/storage/test_drivers.py | 135 --- tests/storage/test_field.py | 124 --- tests/storage/test_model_storage.py | 167 ++-- tests/storage/test_models.py| 364 tests/storage/test_models_api.py| 70 -- tests/storage/test_resource_storage.py | 57 +- 50 files changed, 2296 insertions(+), 2468 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/358cbe05/aria/__init__.py -- diff --git a/aria/__init__.py b/aria/__init__.py index 3f81f98..6e810f0 100644 --- a/aria/__init__.py +++ b/aria/__init__.py @@ -23,7 +23,6 @@ import pkgutil from .VERSION import version as __version__ from .orchestrator.decorators import workflow, operation -from .storage import ModelStorage, ResourceStorage, models, ModelDriver, ResourceDriver from . import ( utils, parser, @@ -58,37 +57,37 @@ def install_aria_extensions(): del sys.modules[module_name] -def application_model_storage(driver): +def application_model_storage(api, api_params=None): """ Initiate model storage for the supplied storage driver """ - -assert isinstance(driver, ModelDriver) -if driver not in _model_storage: -_model_storage[driver] = ModelStorage( -driver, model_classes=[ -models.Node, -models.NodeInstance, -models.Plugin, -models.Blueprint, -models.Snapshot, -models.Deployment, -models.DeploymentUpdate,
[3/3] incubator-ariatosca git commit: ARIA-30-SQL-based-storage-implementation
ARIA-30-SQL-based-storage-implementation Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/f68e11bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f68e11bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f68e11bf Branch: refs/heads/ARIA-30-SQL-based-storage-implementation Commit: f68e11bfb8ea6e59a496887773af321a46bcd81d Parents: fe974e4 Author: mxmrlv Authored: Sun Nov 27 13:20:46 2016 +0200 Committer: mxmrlv Committed: Thu Dec 1 14:36:13 2016 +0200 -- aria/__init__.py| 43 +- aria/orchestrator/__init__.py | 4 +- aria/orchestrator/context/common.py | 2 +- aria/orchestrator/context/exceptions.py | 4 +- aria/orchestrator/context/operation.py | 8 +- aria/orchestrator/context/toolbelt.py | 13 +- aria/orchestrator/context/workflow.py | 20 +- aria/orchestrator/exceptions.py | 7 +- aria/orchestrator/workflows/api/task.py | 10 +- aria/orchestrator/workflows/builtin/heal.py | 25 +- aria/orchestrator/workflows/builtin/install.py | 7 +- .../orchestrator/workflows/builtin/uninstall.py | 5 +- .../orchestrator/workflows/builtin/workflows.py | 4 +- aria/orchestrator/workflows/core/task.py| 21 +- aria/storage/__init__.py| 379 ++-- aria/storage/api.py | 219 + aria/storage/drivers.py | 416 - aria/storage/exceptions.py | 4 +- aria/storage/filesystem_api.py | 39 + aria/storage/mapi/__init__.py | 20 + aria/storage/mapi/filesystem.py | 118 +++ aria/storage/mapi/inmemory.py | 148 +++ aria/storage/mapi/sql.py| 369 aria/storage/models.py | 912 +-- aria/storage/rapi/__init__.py | 18 + aria/storage/rapi/filesystem.py | 119 +++ aria/storage/structures.py | 424 - requirements.txt| 1 + tests/mock/context.py | 50 +- tests/mock/models.py| 68 +- tests/orchestrator/context/test_operation.py| 36 +- tests/orchestrator/context/test_toolbelt.py | 47 +- tests/orchestrator/context/test_workflow.py | 10 +- tests/orchestrator/workflows/api/test_task.py | 68 +- .../orchestrator/workflows/builtin/__init__.py | 35 +- .../workflows/builtin/test_execute_operation.py | 11 +- .../orchestrator/workflows/builtin/test_heal.py | 18 +- .../workflows/builtin/test_install.py | 14 +- .../workflows/builtin/test_uninstall.py | 12 +- .../orchestrator/workflows/core/test_engine.py | 71 +- tests/orchestrator/workflows/core/test_task.py | 20 +- .../test_task_graph_into_exececution_graph.py | 10 +- tests/requirements.txt | 2 +- tests/storage/__init__.py | 38 +- tests/storage/test_drivers.py | 135 --- tests/storage/test_field.py | 124 --- tests/storage/test_model_storage.py | 167 ++-- tests/storage/test_models.py| 364 tests/storage/test_models_api.py| 70 -- tests/storage/test_resource_storage.py | 57 +- 50 files changed, 2318 insertions(+), 2468 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f68e11bf/aria/__init__.py -- diff --git a/aria/__init__.py b/aria/__init__.py index 3f81f98..6e810f0 100644 --- a/aria/__init__.py +++ b/aria/__init__.py @@ -23,7 +23,6 @@ import pkgutil from .VERSION import version as __version__ from .orchestrator.decorators import workflow, operation -from .storage import ModelStorage, ResourceStorage, models, ModelDriver, ResourceDriver from . import ( utils, parser, @@ -58,37 +57,37 @@ def install_aria_extensions(): del sys.modules[module_name] -def application_model_storage(driver): +def application_model_storage(api, api_params=None): """ Initiate model storage for the supplied storage driver """ - -assert isinstance(driver, ModelDriver) -if driver not in _model_storage: -_model_storage[driver] = ModelStorage( -driver, model_classes=[ -models.Node, -models.NodeInstance, -models.Plugin, -models.Blueprint, -models.Snapshot, -models.Deployment, -models.DeploymentUpdate,
[3/3] incubator-ariatosca git commit: ARIA-30 SQL based storage implementation
ARIA-30 SQL based storage implementation Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/fe944e58 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/fe944e58 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/fe944e58 Branch: refs/heads/ARIA-30-SQL-based-storage-implementation Commit: fe944e58da8c492041aa2ffb364b27ecec0193ec Parents: fe974e4 Author: mxmrlv Authored: Sun Nov 27 13:20:46 2016 +0200 Committer: mxmrlv Committed: Thu Dec 1 14:38:41 2016 +0200 -- aria/__init__.py| 43 +- aria/orchestrator/__init__.py | 4 +- aria/orchestrator/context/common.py | 2 +- aria/orchestrator/context/exceptions.py | 4 +- aria/orchestrator/context/operation.py | 8 +- aria/orchestrator/context/toolbelt.py | 13 +- aria/orchestrator/context/workflow.py | 20 +- aria/orchestrator/exceptions.py | 7 +- aria/orchestrator/workflows/api/task.py | 10 +- aria/orchestrator/workflows/builtin/heal.py | 25 +- aria/orchestrator/workflows/builtin/install.py | 7 +- .../orchestrator/workflows/builtin/uninstall.py | 5 +- .../orchestrator/workflows/builtin/workflows.py | 4 +- aria/orchestrator/workflows/core/task.py| 21 +- aria/storage/__init__.py| 379 ++-- aria/storage/api.py | 219 + aria/storage/drivers.py | 416 - aria/storage/exceptions.py | 4 +- aria/storage/filesystem_api.py | 39 + aria/storage/mapi/__init__.py | 20 + aria/storage/mapi/filesystem.py | 118 +++ aria/storage/mapi/inmemory.py | 148 +++ aria/storage/mapi/sql.py| 369 aria/storage/models.py | 912 +-- aria/storage/rapi/__init__.py | 18 + aria/storage/rapi/filesystem.py | 119 +++ aria/storage/structures.py | 424 - requirements.txt| 1 + tests/mock/context.py | 50 +- tests/mock/models.py| 68 +- tests/orchestrator/context/test_operation.py| 36 +- tests/orchestrator/context/test_toolbelt.py | 47 +- tests/orchestrator/context/test_workflow.py | 10 +- tests/orchestrator/workflows/api/test_task.py | 68 +- .../orchestrator/workflows/builtin/__init__.py | 35 +- .../workflows/builtin/test_execute_operation.py | 11 +- .../orchestrator/workflows/builtin/test_heal.py | 18 +- .../workflows/builtin/test_install.py | 14 +- .../workflows/builtin/test_uninstall.py | 12 +- .../orchestrator/workflows/core/test_engine.py | 71 +- tests/orchestrator/workflows/core/test_task.py | 20 +- .../test_task_graph_into_exececution_graph.py | 10 +- tests/requirements.txt | 2 +- tests/storage/__init__.py | 38 +- tests/storage/test_drivers.py | 135 --- tests/storage/test_field.py | 124 --- tests/storage/test_model_storage.py | 167 ++-- tests/storage/test_models.py| 364 tests/storage/test_models_api.py| 70 -- tests/storage/test_resource_storage.py | 57 +- 50 files changed, 2318 insertions(+), 2468 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/fe944e58/aria/__init__.py -- diff --git a/aria/__init__.py b/aria/__init__.py index 3f81f98..6e810f0 100644 --- a/aria/__init__.py +++ b/aria/__init__.py @@ -23,7 +23,6 @@ import pkgutil from .VERSION import version as __version__ from .orchestrator.decorators import workflow, operation -from .storage import ModelStorage, ResourceStorage, models, ModelDriver, ResourceDriver from . import ( utils, parser, @@ -58,37 +57,37 @@ def install_aria_extensions(): del sys.modules[module_name] -def application_model_storage(driver): +def application_model_storage(api, api_params=None): """ Initiate model storage for the supplied storage driver """ - -assert isinstance(driver, ModelDriver) -if driver not in _model_storage: -_model_storage[driver] = ModelStorage( -driver, model_classes=[ -models.Node, -models.NodeInstance, -models.Plugin, -models.Blueprint, -models.Snapshot, -models.Deployment, -models.DeploymentUpdate,