From 647728a698298ba679e52e4016e5107f07ad30ca Mon Sep 17 00:00:00 2001 From: Sourabh Jain <45626610+SumoSourabh@users.noreply.github.com> Date: Mon, 6 Jun 2022 11:18:12 +0530 Subject: [PATCH 01/12] Updating code owners for the github repository (#439) Updating code owners Co-authored-by: Sourabh Jain --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b9a5cc1a..2da0a40c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @ankursarin @nhlien93 @mothslaw +* @nhlien93 @SumoSourabh @vimleshmishra From 5cf8cb97a2894e6ff13c6d2269708e1ca09e4b4a Mon Sep 17 00:00:00 2001 From: Terraform User Date: Tue, 28 Jun 2022 04:53:48 +0000 Subject: [PATCH 02/12] Create CodeOwners File [Terraform] --- .github/CODEOWNERS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2da0a40c..30c28255 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,5 @@ -* @nhlien93 @SumoSourabh @vimleshmishra +# +# Copyright (c) 2022 by Delphix. All rights reserved. +# + +* @delphix/gatekeepers-appdata From b3696ba1934dd08ced9557960410f689141d503d Mon Sep 17 00:00:00 2001 From: vimleshmishra Date: Tue, 12 Jul 2022 13:11:49 +0530 Subject: [PATCH 03/12] CP-8174 VSDK Changes to support source sizing decorators (#441) * __hash__ is needed in python 3 * DLPX-79760 SnapshotDefinitionDataPaths object is not hashable since py2-3 transition * DOC-2234 Update new logo in developer.delphix.com * Resolved COnflicts * revert logo chnages * revert logo chnages * Resolve Conflicts * revert changes * revert logo.png * Resolve Conflicts * DOC-2234 Update new logo in developer.delphix.com * logo chnages * DOC-2234 Update new logo in developer.delphix.com * new favicon * incorporated review comments * DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code * DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code * Changes suggested by Aleks * CP-8174 VSDK Changes to support source sizing decorators * reverted dvp version related changes * reverted extra comma * update engine API version * Fixed Formatting Issues * Fixed Formatting Issues * Fixed Unit Tests * Fixed Unit Tests --- .../dlpx/virtualization/platform/_linked.py | 125 +++++++++++++++++- .../dlpx/virtualization/platform/_virtual.py | 65 +++++++++ .../dlpx/virtualization/platform/operation.py | 2 + .../_internal/plugin_importer.py | 4 + .../virtualization/_internal/settings.cfg | 2 +- .../validation_schemas/plugin_importer.yaml | 17 +++ .../dlpx/virtualization/_internal/conftest.py | 6 +- .../_internal/test_package_util.py | 6 +- 8 files changed, 220 insertions(+), 7 deletions(-) diff --git a/platform/src/main/python/dlpx/virtualization/platform/_linked.py b/platform/src/main/python/dlpx/virtualization/platform/_linked.py index 4e6c07ee..adecb6fc 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/_linked.py +++ b/platform/src/main/python/dlpx/virtualization/platform/_linked.py @@ -32,6 +32,7 @@ def __init__(self): self.status_impl = None self.worker_impl = None self.mount_specification_impl = None + self.source_size_impl = None def pre_snapshot(self): def pre_snapshot_decorator(pre_snapshot_impl): @@ -101,6 +102,16 @@ def mount_specification_decorator(mount_specification_impl): return mount_specification_decorator + def source_size(self): + def source_size_decorator(source_size_impl): + if self.source_size_impl: + raise OperationAlreadyDefinedError(Op.LINKED_SOURCE_SIZE) + self.source_size_impl = v.check_function(source_size_impl, + Op.LINKED_SOURCE_SIZE) + return source_size_impl + + return source_size_decorator + def _internal_direct_pre_snapshot(self, request): """Pre Snapshot Wrapper for direct plugins. @@ -237,6 +248,57 @@ def to_protobuf(snapshot): return direct_post_snapshot_response + def _internal_direct_source_size(self, request): + """Direct Source Size Wrapper for direct plugins. + + Executed as part of several operations to get the source size + of a direct source + + Run source_size operation for a direct source. + + Args: + request (DirectSourceSizeRequest): Source Size Request arguments. + + Returns: + DirectSourceSizeResponse: A response containing the return value - + DirectSourceSizeResult which has source size. In + case of errors, response object will contain PluginErrorResult. + """ + # Reasoning for method imports are in this file's docstring. + from generated.definitions import RepositoryDefinition + from generated.definitions import LinkedSourceDefinition + from generated.definitions import SourceConfigDefinition + + # + # While linked.source_size() is not a required operation, this should + # not be called if it wasn't implemented. + # + if not self.source_size_impl: + raise OperationNotDefinedError(Op.LINKED_SOURCE_SIZE) + + direct_source_definition = LinkedSourceDefinition.from_dict( + json.loads(request.direct_source.linked_source.parameters.json)) + direct_source = DirectSource( + guid=request.direct_source.linked_source.guid, + connection=RemoteConnection.from_proto( + request.direct_source.connection), + parameters=direct_source_definition) + + repository = RepositoryDefinition.from_dict( + json.loads(request.repository.parameters.json)) + source_config = SourceConfigDefinition.from_dict( + json.loads(request.source_config.parameters.json)) + + size = self.source_size_impl( + direct_source=direct_source, + repository=repository, + source_config=source_config) + + direct_source_size_response = platform_pb2.DirectSourceSizeResponse() + direct_source_size_response.return_value.database_size = size + + return direct_source_size_response + def _internal_staged_pre_snapshot(self, request): """Pre Snapshot Wrapper for staged plugins. @@ -272,8 +334,8 @@ def _internal_staged_pre_snapshot(self, request): staged_mount = request.staged_source.staged_mount mount = Mount(remote_environment=RemoteEnvironment.from_proto( staged_mount.remote_environment), - mount_path=staged_mount.mount_path, - shared_path=staged_mount.shared_path) + mount_path=staged_mount.mount_path, + shared_path=staged_mount.shared_path) staged_source = StagedSource( guid=linked_source.guid, source_connection=RemoteConnection.from_proto( @@ -719,3 +781,62 @@ def to_protobuf_ownership_spec(ownership_spec): ownership_spec) return staged_mount_spec_response + + def _internal_staged_source_size(self, request): + """Staged Source Size Wrapper for staged plugins. + + Executed as part of several operations to get the source size + of a staged source + + Run source_size operation for a staged source. + + Args: + request (StagedSourceSizeRequest): Source Size Request arguments. + + Returns: + StagedSourceSizeResponse: A response containing the return value - + StagedSourceSizeResult which has source size. In + case of errors, response object will contain PluginErrorResult. + """ + # Reasoning for method imports are in this file's docstring. + from generated.definitions import RepositoryDefinition + from generated.definitions import LinkedSourceDefinition + from generated.definitions import SourceConfigDefinition + + # + # While linked.source_size() is not a required operation, this should + # not be called if it wasn't implemented. + # + if not self.source_size_impl: + raise OperationNotDefinedError(Op.LINKED_SOURCE_SIZE) + + staged_source_definition = LinkedSourceDefinition.from_dict( + json.loads(request.staged_source.linked_source.parameters.json)) + mount = Mount( + remote_environment=(RemoteEnvironment.from_proto( + request.staged_source.staged_mount.remote_environment)), + mount_path=request.staged_source.staged_mount.mount_path, + shared_path=request.staged_source.staged_mount.shared_path) + staged_source = StagedSource( + guid=request.staged_source.linked_source.guid, + source_connection=RemoteConnection.from_proto( + request.staged_source.source_connection), + parameters=staged_source_definition, + mount=mount, + staged_connection=RemoteConnection.from_proto( + request.staged_source.staged_connection)) + + repository = RepositoryDefinition.from_dict( + json.loads(request.repository.parameters.json)) + source_config = SourceConfigDefinition.from_dict( + json.loads(request.source_config.parameters.json)) + + size = self.source_size_impl( + staged_source=staged_source, + repository=repository, + source_config=source_config) + + staged_source_size_response = platform_pb2.StagedSourceSizeResponse() + staged_source_size_response.return_value.database_size = size + + return staged_source_size_response diff --git a/platform/src/main/python/dlpx/virtualization/platform/_virtual.py b/platform/src/main/python/dlpx/virtualization/platform/_virtual.py index 02d8826e..9f8ca084 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/_virtual.py +++ b/platform/src/main/python/dlpx/virtualization/platform/_virtual.py @@ -34,6 +34,7 @@ def __init__(self): self.status_impl = None self.initialize_impl = None self.mount_specification_impl = None + self.source_size_impl = None def configure(self): def configure_decorator(configure_impl): @@ -142,6 +143,16 @@ def mount_specification_decorator(mount_specification_impl): return mount_specification_decorator + def source_size(self): + def source_size_decorator(source_size_impl): + if self.source_size_impl: + raise OperationAlreadyDefinedError(Op.VIRTUAL_SOURCE_SIZE) + self.source_size_impl = v.check_function(source_size_impl, + Op.VIRTUAL_SOURCE_SIZE) + return source_size_impl + + return source_size_decorator + @staticmethod def _from_protobuf_single_subset_mount(single_subset_mount): return Mount(remote_environment=RemoteEnvironment.from_proto( @@ -783,3 +794,57 @@ def to_protobuf_ownership_spec(ownership_spec): ] virtual_mount_spec_response.return_value.mounts.extend(mounts_list) return virtual_mount_spec_response + + def _internal_virtual_source_size(self, request): + """Virtual Source Size Wrapper. + + Executed as part of several operations to get the virtual source size + of a virtual source + + Run source_size operation for a virtual source. + + Args: + request (VirtualSourceSizeRequest): Source Size Request arguments. + + Returns: + VirtualSourceSizeResponse: A response containing the return value - + VirtualSourceSizeResult which has source size. In + case of errors, response object will contain PluginErrorResult. + """ + # Reasoning for method imports are in this file's docstring. + from generated.definitions import VirtualSourceDefinition + from generated.definitions import RepositoryDefinition + from generated.definitions import SourceConfigDefinition + + # + # While virtual.source_size() is not a required operation, this should + # not be called if it wasn't implemented. + # + if not self.source_size_impl: + raise OperationNotDefinedError(Op.VIRTUAL_SOURCE_SIZE) + + virtual_source_definition = VirtualSourceDefinition.from_dict( + json.loads(request.virtual_source.parameters.json)) + mounts = [ + VirtualOperations._from_protobuf_single_subset_mount(m) + for m in request.virtual_source.mounts + ] + virtual_source = VirtualSource(guid=request.virtual_source.guid, + connection=RemoteConnection.from_proto( + request.virtual_source.connection), + parameters=virtual_source_definition, + mounts=mounts) + repository = RepositoryDefinition.from_dict( + json.loads(request.repository.parameters.json)) + source_config = SourceConfigDefinition.from_dict( + json.loads(request.source_config.parameters.json)) + + size = self.source_size_impl( + virtual_source=virtual_source, + repository=repository, + source_config=source_config) + + virtual_source_size_response = platform_pb2.VirtualSourceSizeResponse() + virtual_source_size_response.return_value.database_size = size + + return virtual_source_size_response diff --git a/platform/src/main/python/dlpx/virtualization/platform/operation.py b/platform/src/main/python/dlpx/virtualization/platform/operation.py index 87a06c31..6d033d21 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/operation.py +++ b/platform/src/main/python/dlpx/virtualization/platform/operation.py @@ -17,6 +17,7 @@ class Operation(Enum): LINKED_STATUS = 'linked.status()' LINKED_WORKER = 'linked.worker()' LINKED_MOUNT_SPEC = 'linked.mount_specification()' + LINKED_SOURCE_SIZE = 'linked.source_size()' VIRTUAL_CONFIGURE = 'virtual.configure()' VIRTUAL_UNCONFIGURE = 'virtual.unconfigure()' @@ -29,6 +30,7 @@ class Operation(Enum): VIRTUAL_STATUS = 'virtual.status()' VIRTUAL_INITIALIZE = 'virtual.initialize()' VIRTUAL_MOUNT_SPEC = 'virtual.mount_specification()' + VIRTUAL_SOURCE_SIZE = 'virtual.source_size()' UPGRADE_REPOSITORY = 'upgrade.repository()' UPGRADE_SOURCE_CONFIG = 'upgrade.source_config()' diff --git a/tools/src/main/python/dlpx/virtualization/_internal/plugin_importer.py b/tools/src/main/python/dlpx/virtualization/_internal/plugin_importer.py index 858ef5a9..f569c120 100644 --- a/tools/src/main/python/dlpx/virtualization/_internal/plugin_importer.py +++ b/tools/src/main/python/dlpx/virtualization/_internal/plugin_importer.py @@ -358,6 +358,8 @@ def _prepare_manifest(entry_point, module_content): bool(plugin_object.linked.worker_impl), 'hasLinkedMountSpecification': bool(plugin_object.linked.mount_specification_impl), + 'hasLinkedSourceSize': + bool(plugin_object.linked.source_size_impl), 'hasVirtualConfigure': bool(plugin_object.virtual.configure_impl), 'hasVirtualUnconfigure': @@ -380,6 +382,8 @@ def _prepare_manifest(entry_point, module_content): bool(plugin_object.virtual.status_impl), 'hasInitialize': bool(plugin_object.virtual.initialize_impl), + 'hasVirtualSourceSize': + bool(plugin_object.virtual.source_size_impl), 'migrationIdList': plugin_object.upgrade.migration_id_list } diff --git a/tools/src/main/python/dlpx/virtualization/_internal/settings.cfg b/tools/src/main/python/dlpx/virtualization/_internal/settings.cfg index d71b6a5d..93477cdc 100644 --- a/tools/src/main/python/dlpx/virtualization/_internal/settings.cfg +++ b/tools/src/main/python/dlpx/virtualization/_internal/settings.cfg @@ -20,7 +20,7 @@ # versions in those packages until they are shipped out of band. # [General] -engine_api_version = 1.11.11 +engine_api_version = 1.12.0 distribution_name = dvp-tools package_author = Delphix namespace_package = dlpx diff --git a/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_importer.yaml b/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_importer.yaml index b04e88fc..9193e581 100644 --- a/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_importer.yaml +++ b/tools/src/main/python/dlpx/virtualization/_internal/validation_schemas/plugin_importer.yaml @@ -38,6 +38,10 @@ EXPECTED_STAGED_ARGS_BY_OP: mount_specification_impl: - staged_source - repository + source_size_impl: + - staged_source + - repository + - source_config VirtualOperations: configure_impl: - virtual_source @@ -82,6 +86,11 @@ EXPECTED_STAGED_ARGS_BY_OP: mount_specification_impl: - virtual_source - repository + source_size_impl: + - virtual_source + - repository + - source_config + EXPECTED_DIRECT_ARGS_BY_OP: @@ -102,6 +111,10 @@ EXPECTED_DIRECT_ARGS_BY_OP: - repository - source_config - optional_snapshot_parameters + source_size_impl: + - direct_source + - repository + - source_config VirtualOperations: configure_impl: - virtual_source @@ -146,6 +159,10 @@ EXPECTED_DIRECT_ARGS_BY_OP: mount_specification_impl: - virtual_source - repository + source_size_impl: + - virtual_source + - repository + - source_config EXPECTED_UPGRADE_ARGS: _repository_id_to_impl: diff --git a/tools/src/test/python/dlpx/virtualization/_internal/conftest.py b/tools/src/test/python/dlpx/virtualization/_internal/conftest.py index de6c79eb..3b05daae 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/conftest.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/conftest.py @@ -368,6 +368,7 @@ def post_snapshot(direct_source, repository, source_config): linked.status_impl = None linked.worker_impl = None linked.mount_specification_impl = None + linked.source_size_impl = None return linked @@ -408,6 +409,7 @@ def mount_specification(virtual_source, repository): virtual.status_impl = None virtual.initialize_impl = None virtual.cleanup_impl = None + virtual.source_size_impl = None return virtual @@ -441,6 +443,7 @@ def plugin_manifest(upgrade_operation): 'hasLinkedStatus': False, 'hasLinkedWorker': False, 'hasLinkedMountSpecification': False, + 'hasLinkedSourceSize': False, 'hasVirtualConfigure': True, 'hasVirtualUnconfigure': False, 'hasVirtualReconfigure': True, @@ -450,6 +453,7 @@ def plugin_manifest(upgrade_operation): 'hasVirtualPostSnapshot': True, 'hasVirtualMountSpecification': True, 'hasVirtualStatus': False, + 'hasVirtualSourceSize': False, 'hasInitialize': False, 'migrationIdList': upgrade_operation.migration_id_list, 'hasVirtualCleanup': False, @@ -706,7 +710,7 @@ def artifact_content(engine_api, virtual_source_definition, @pytest.fixture def engine_api(): - return {'type': 'APIVersion', 'major': 1, 'minor': 11, 'micro': 11} + return {'type': 'APIVersion', 'major': 1, 'minor': 12, 'micro': 0} @pytest.fixture diff --git a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py index 49671c5e..11b8b726 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py @@ -18,7 +18,7 @@ def test_get_virtualization_api_version(): @staticmethod def test_get_engine_api_version(): - assert package_util.get_engine_api_version_from_settings() == '1.11.11' + assert package_util.get_engine_api_version_from_settings() == '1.12.0' @staticmethod def test_get_build_api_version_json(): @@ -35,8 +35,8 @@ def test_get_engine_api_version_json(): engine_api_version = { 'type': 'APIVersion', 'major': 1, - 'minor': 11, - 'micro': 11 + 'minor': 12, + 'micro': 0 } assert package_util.get_engine_api_version() == engine_api_version From 00c359d87874a959aee89ef0b531d06c51c81b95 Mon Sep 17 00:00:00 2001 From: vimleshmishra Date: Mon, 18 Jul 2022 20:55:16 +0530 Subject: [PATCH 04/12] CP-8293 Update version to 4.0.5.dev0 for virtualization-sdk develop branch before updating github actions (#442) * __hash__ is needed in python 3 * DLPX-79760 SnapshotDefinitionDataPaths object is not hashable since py2-3 transition * DOC-2234 Update new logo in developer.delphix.com * Resolved COnflicts * revert logo chnages * revert logo chnages * Resolve Conflicts * revert changes * revert logo.png * Resolve Conflicts * DOC-2234 Update new logo in developer.delphix.com * logo chnages * DOC-2234 Update new logo in developer.delphix.com * new favicon * incorporated review comments * DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code * DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code * Changes suggested by Aleks * CP-8174 VSDK Changes to support source sizing decorators * reverted dvp version related changes * reverted extra comma * update engine API version * Fixed Formatting Issues * Fixed Formatting Issues * Fixed Unit Tests * Fixed Unit Tests * Bumping up dvp-api, vsdk * uppdate formatting --- .bumpversion.cfg | 2 +- common/setup.py | 2 +- .../python/dlpx/virtualization/common/VERSION | 2 +- .../main/python/dlpx/virtualization/VERSION | 2 +- libs/setup.py | 2 +- .../python/dlpx/virtualization/libs/VERSION | 2 +- platform/setup.py | 2 +- .../dlpx/virtualization/platform/VERSION | 2 +- .../dlpx/virtualization/platform/_linked.py | 8 +++--- .../dlpx/virtualization/platform/_virtual.py | 4 +-- .../python/dlpx/virtualization/test_plugin.py | 25 ++++++++++++++++--- .../dlpx/virtualization/_internal/VERSION | 2 +- .../fake_plugin/direct/successful.py | 12 +++++++++ .../_internal/test_package_util.py | 8 +++--- 14 files changed, 53 insertions(+), 22 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c3164d8b..dd520fbc 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.4 +current_version = 4.0.5.dev0 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? diff --git a/common/setup.py b/common/setup.py index d3593d72..8943b6cc 100644 --- a/common/setup.py +++ b/common/setup.py @@ -4,7 +4,7 @@ PYTHON_SRC = 'src/main/python' install_requires = [ - "dvp-api == 1.6.3", + "dvp-api == 1.7.0.dev0", ] with open(os.path.join(PYTHON_SRC, 'dlpx/virtualization/common/VERSION')) as version_file: diff --git a/common/src/main/python/dlpx/virtualization/common/VERSION b/common/src/main/python/dlpx/virtualization/common/VERSION index c5106e6d..eaf58ac5 100644 --- a/common/src/main/python/dlpx/virtualization/common/VERSION +++ b/common/src/main/python/dlpx/virtualization/common/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5.dev0 diff --git a/dvp/src/main/python/dlpx/virtualization/VERSION b/dvp/src/main/python/dlpx/virtualization/VERSION index c5106e6d..eaf58ac5 100644 --- a/dvp/src/main/python/dlpx/virtualization/VERSION +++ b/dvp/src/main/python/dlpx/virtualization/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5.dev0 diff --git a/libs/setup.py b/libs/setup.py index f443840a..21f0aad2 100644 --- a/libs/setup.py +++ b/libs/setup.py @@ -7,7 +7,7 @@ version = version_file.read().strip() install_requires = [ - "dvp-api == 1.6.3", + "dvp-api == 1.7.0.dev0", "dvp-common == {}".format(version) ] diff --git a/libs/src/main/python/dlpx/virtualization/libs/VERSION b/libs/src/main/python/dlpx/virtualization/libs/VERSION index c5106e6d..eaf58ac5 100644 --- a/libs/src/main/python/dlpx/virtualization/libs/VERSION +++ b/libs/src/main/python/dlpx/virtualization/libs/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5.dev0 diff --git a/platform/setup.py b/platform/setup.py index 6cd76b71..29b4ba6f 100644 --- a/platform/setup.py +++ b/platform/setup.py @@ -7,7 +7,7 @@ version = version_file.read().strip() install_requires = [ - "dvp-api == 1.6.3", + "dvp-api == 1.7.0.dev0", "dvp-common == {}".format(version), "enum34;python_version < '3.4'", ] diff --git a/platform/src/main/python/dlpx/virtualization/platform/VERSION b/platform/src/main/python/dlpx/virtualization/platform/VERSION index c5106e6d..eaf58ac5 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/VERSION +++ b/platform/src/main/python/dlpx/virtualization/platform/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5.dev0 diff --git a/platform/src/main/python/dlpx/virtualization/platform/_linked.py b/platform/src/main/python/dlpx/virtualization/platform/_linked.py index adecb6fc..5b780674 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/_linked.py +++ b/platform/src/main/python/dlpx/virtualization/platform/_linked.py @@ -289,13 +289,13 @@ def _internal_direct_source_size(self, request): source_config = SourceConfigDefinition.from_dict( json.loads(request.source_config.parameters.json)) - size = self.source_size_impl( + source_size = self.source_size_impl( direct_source=direct_source, repository=repository, source_config=source_config) direct_source_size_response = platform_pb2.DirectSourceSizeResponse() - direct_source_size_response.return_value.database_size = size + direct_source_size_response.return_value.database_size = source_size return direct_source_size_response @@ -831,12 +831,12 @@ def _internal_staged_source_size(self, request): source_config = SourceConfigDefinition.from_dict( json.loads(request.source_config.parameters.json)) - size = self.source_size_impl( + source_size = self.source_size_impl( staged_source=staged_source, repository=repository, source_config=source_config) staged_source_size_response = platform_pb2.StagedSourceSizeResponse() - staged_source_size_response.return_value.database_size = size + staged_source_size_response.return_value.database_size = source_size return staged_source_size_response diff --git a/platform/src/main/python/dlpx/virtualization/platform/_virtual.py b/platform/src/main/python/dlpx/virtualization/platform/_virtual.py index 9f8ca084..05fa5cd2 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/_virtual.py +++ b/platform/src/main/python/dlpx/virtualization/platform/_virtual.py @@ -839,12 +839,12 @@ def _internal_virtual_source_size(self, request): source_config = SourceConfigDefinition.from_dict( json.loads(request.source_config.parameters.json)) - size = self.source_size_impl( + source_size = self.source_size_impl( virtual_source=virtual_source, repository=repository, source_config=source_config) virtual_source_size_response = platform_pb2.VirtualSourceSizeResponse() - virtual_source_size_response.return_value.database_size = size + virtual_source_size_response.return_value.database_size = source_size return virtual_source_size_response diff --git a/platform/src/test/python/dlpx/virtualization/test_plugin.py b/platform/src/test/python/dlpx/virtualization/test_plugin.py index f69258ca..5dd65f3c 100755 --- a/platform/src/test/python/dlpx/virtualization/test_plugin.py +++ b/platform/src/test/python/dlpx/virtualization/test_plugin.py @@ -65,8 +65,8 @@ })) TEST_POST_UPGRADE_PARAMS = ({ u'obj': - '"{\\"obj\\": {\\"name\\": \\"upgrade\\", ' - '\\"prettyName\\": \\"prettyUpgrade\\", \\"metadata\\": \\"metadata\\"}}"' + '"{\\"obj\\": {\\"name\\": \\"upgrade\\", ' + '\\"prettyName\\": \\"prettyUpgrade\\", \\"metadata\\": \\"metadata\\"}}"' }) MIGRATION_IDS = ('2020.1.1', '2020.2.2') @@ -94,7 +94,6 @@ def configure_impl(): pass with pytest.raises(OperationAlreadyDefinedError): - @my_plugin.virtual.configure() # noqa F811 def configure_impl(): # noqa F811 pass @@ -1189,6 +1188,26 @@ def staged_status_impl(staged_source, repository, source_config): assert staged_status_response.return_value.status == expected_status + @staticmethod + def test_source_size(my_plugin, staged_source, repository, + source_config): + + @my_plugin.linked.source_size() + def staged_source_size_impl(staged_source, repository, source_config): + TestPlugin.assert_plugin_args(staged_source=staged_source, + repository=repository, + source_config=source_config) + return 0 + staged_source_size_request = platform_pb2.StagedSourceSizeRequest() + TestPlugin.setup_request(request=staged_source_size_request, + staged_source=staged_source, + repository=repository, + source_config=source_config) + staged_source_size_response = my_plugin.linked._internal_staged_source_size( + staged_source_size_request) + + assert staged_source_size_response.return_value.database_size == 0 + @staticmethod def test_staged_worker(my_plugin, staged_source, repository, source_config): diff --git a/tools/src/main/python/dlpx/virtualization/_internal/VERSION b/tools/src/main/python/dlpx/virtualization/_internal/VERSION index c5106e6d..eaf58ac5 100644 --- a/tools/src/main/python/dlpx/virtualization/_internal/VERSION +++ b/tools/src/main/python/dlpx/virtualization/_internal/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5.dev0 diff --git a/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py b/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py index da568732..c03c499a 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py @@ -29,18 +29,25 @@ def direct_post_snapshot(direct_source, repository, source_config, return None +@direct.linked.source_size() +def source_size(repository, source_config, direct_source): + return 0 + + @direct.virtual.configure() def configure(virtual_source, repository, snapshot): path = virtual_source.parameters.path name = "VDB mounted to " + path return None + @direct.virtual.initialize() def initialize(virtual_source, repository): path = virtual_source.parameters.path name = "VDB mounted to " + path return None + @direct.virtual.mount_specification() def mount_specification(repository, virtual_source): return None @@ -86,6 +93,11 @@ def cleanup(repository, source_config, virtual_source): pass +@direct.virtual.source_size() +def source_size(repository, source_config, virtual_source): + return 0 + + @direct.upgrade.repository('1.3', MigrationType.LUA) def repo_upgrade(old_repository): return old_repository diff --git a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py index 11b8b726..109935c5 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py @@ -10,11 +10,11 @@ class TestPackageUtil: @staticmethod def test_get_version(): - assert package_util.get_version() == '4.0.4' + assert package_util.get_version() == '4.0.5.dev0' @staticmethod def test_get_virtualization_api_version(): - assert package_util.get_virtualization_api_version() == '1.6.3' + assert package_util.get_virtualization_api_version() == '1.7.0' @staticmethod def test_get_engine_api_version(): @@ -25,8 +25,8 @@ def test_get_build_api_version_json(): build_api_version = { 'type': 'APIVersion', 'major': 1, - 'minor': 6, - 'micro': 3 + 'minor': 7, + 'micro': 0 } assert package_util.get_build_api_version() == build_api_version From 7a619d2b7100c758293716b5d7df7e84c5c39760 Mon Sep 17 00:00:00 2001 From: vimleshmishra Date: Mon, 18 Jul 2022 21:27:37 +0530 Subject: [PATCH 05/12] Revert "CP-8293 Update version to 4.0.5.dev0 for virtualization-sdk develop branch before updating github actions (#442)" (#443) This reverts commit 222517e1b5917ff1f28879050582fe02f8f85ae8. --- .bumpversion.cfg | 2 +- common/setup.py | 2 +- .../python/dlpx/virtualization/common/VERSION | 2 +- .../main/python/dlpx/virtualization/VERSION | 2 +- libs/setup.py | 2 +- .../python/dlpx/virtualization/libs/VERSION | 2 +- platform/setup.py | 2 +- .../dlpx/virtualization/platform/VERSION | 2 +- .../dlpx/virtualization/platform/_linked.py | 8 +++--- .../dlpx/virtualization/platform/_virtual.py | 4 +-- .../python/dlpx/virtualization/test_plugin.py | 25 +++---------------- .../dlpx/virtualization/_internal/VERSION | 2 +- .../fake_plugin/direct/successful.py | 12 --------- .../_internal/test_package_util.py | 8 +++--- 14 files changed, 22 insertions(+), 53 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index dd520fbc..c3164d8b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.5.dev0 +current_version = 4.0.4 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? diff --git a/common/setup.py b/common/setup.py index 8943b6cc..d3593d72 100644 --- a/common/setup.py +++ b/common/setup.py @@ -4,7 +4,7 @@ PYTHON_SRC = 'src/main/python' install_requires = [ - "dvp-api == 1.7.0.dev0", + "dvp-api == 1.6.3", ] with open(os.path.join(PYTHON_SRC, 'dlpx/virtualization/common/VERSION')) as version_file: diff --git a/common/src/main/python/dlpx/virtualization/common/VERSION b/common/src/main/python/dlpx/virtualization/common/VERSION index eaf58ac5..c5106e6d 100644 --- a/common/src/main/python/dlpx/virtualization/common/VERSION +++ b/common/src/main/python/dlpx/virtualization/common/VERSION @@ -1 +1 @@ -4.0.5.dev0 +4.0.4 diff --git a/dvp/src/main/python/dlpx/virtualization/VERSION b/dvp/src/main/python/dlpx/virtualization/VERSION index eaf58ac5..c5106e6d 100644 --- a/dvp/src/main/python/dlpx/virtualization/VERSION +++ b/dvp/src/main/python/dlpx/virtualization/VERSION @@ -1 +1 @@ -4.0.5.dev0 +4.0.4 diff --git a/libs/setup.py b/libs/setup.py index 21f0aad2..f443840a 100644 --- a/libs/setup.py +++ b/libs/setup.py @@ -7,7 +7,7 @@ version = version_file.read().strip() install_requires = [ - "dvp-api == 1.7.0.dev0", + "dvp-api == 1.6.3", "dvp-common == {}".format(version) ] diff --git a/libs/src/main/python/dlpx/virtualization/libs/VERSION b/libs/src/main/python/dlpx/virtualization/libs/VERSION index eaf58ac5..c5106e6d 100644 --- a/libs/src/main/python/dlpx/virtualization/libs/VERSION +++ b/libs/src/main/python/dlpx/virtualization/libs/VERSION @@ -1 +1 @@ -4.0.5.dev0 +4.0.4 diff --git a/platform/setup.py b/platform/setup.py index 29b4ba6f..6cd76b71 100644 --- a/platform/setup.py +++ b/platform/setup.py @@ -7,7 +7,7 @@ version = version_file.read().strip() install_requires = [ - "dvp-api == 1.7.0.dev0", + "dvp-api == 1.6.3", "dvp-common == {}".format(version), "enum34;python_version < '3.4'", ] diff --git a/platform/src/main/python/dlpx/virtualization/platform/VERSION b/platform/src/main/python/dlpx/virtualization/platform/VERSION index eaf58ac5..c5106e6d 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/VERSION +++ b/platform/src/main/python/dlpx/virtualization/platform/VERSION @@ -1 +1 @@ -4.0.5.dev0 +4.0.4 diff --git a/platform/src/main/python/dlpx/virtualization/platform/_linked.py b/platform/src/main/python/dlpx/virtualization/platform/_linked.py index 5b780674..adecb6fc 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/_linked.py +++ b/platform/src/main/python/dlpx/virtualization/platform/_linked.py @@ -289,13 +289,13 @@ def _internal_direct_source_size(self, request): source_config = SourceConfigDefinition.from_dict( json.loads(request.source_config.parameters.json)) - source_size = self.source_size_impl( + size = self.source_size_impl( direct_source=direct_source, repository=repository, source_config=source_config) direct_source_size_response = platform_pb2.DirectSourceSizeResponse() - direct_source_size_response.return_value.database_size = source_size + direct_source_size_response.return_value.database_size = size return direct_source_size_response @@ -831,12 +831,12 @@ def _internal_staged_source_size(self, request): source_config = SourceConfigDefinition.from_dict( json.loads(request.source_config.parameters.json)) - source_size = self.source_size_impl( + size = self.source_size_impl( staged_source=staged_source, repository=repository, source_config=source_config) staged_source_size_response = platform_pb2.StagedSourceSizeResponse() - staged_source_size_response.return_value.database_size = source_size + staged_source_size_response.return_value.database_size = size return staged_source_size_response diff --git a/platform/src/main/python/dlpx/virtualization/platform/_virtual.py b/platform/src/main/python/dlpx/virtualization/platform/_virtual.py index 05fa5cd2..9f8ca084 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/_virtual.py +++ b/platform/src/main/python/dlpx/virtualization/platform/_virtual.py @@ -839,12 +839,12 @@ def _internal_virtual_source_size(self, request): source_config = SourceConfigDefinition.from_dict( json.loads(request.source_config.parameters.json)) - source_size = self.source_size_impl( + size = self.source_size_impl( virtual_source=virtual_source, repository=repository, source_config=source_config) virtual_source_size_response = platform_pb2.VirtualSourceSizeResponse() - virtual_source_size_response.return_value.database_size = source_size + virtual_source_size_response.return_value.database_size = size return virtual_source_size_response diff --git a/platform/src/test/python/dlpx/virtualization/test_plugin.py b/platform/src/test/python/dlpx/virtualization/test_plugin.py index 5dd65f3c..f69258ca 100755 --- a/platform/src/test/python/dlpx/virtualization/test_plugin.py +++ b/platform/src/test/python/dlpx/virtualization/test_plugin.py @@ -65,8 +65,8 @@ })) TEST_POST_UPGRADE_PARAMS = ({ u'obj': - '"{\\"obj\\": {\\"name\\": \\"upgrade\\", ' - '\\"prettyName\\": \\"prettyUpgrade\\", \\"metadata\\": \\"metadata\\"}}"' + '"{\\"obj\\": {\\"name\\": \\"upgrade\\", ' + '\\"prettyName\\": \\"prettyUpgrade\\", \\"metadata\\": \\"metadata\\"}}"' }) MIGRATION_IDS = ('2020.1.1', '2020.2.2') @@ -94,6 +94,7 @@ def configure_impl(): pass with pytest.raises(OperationAlreadyDefinedError): + @my_plugin.virtual.configure() # noqa F811 def configure_impl(): # noqa F811 pass @@ -1188,26 +1189,6 @@ def staged_status_impl(staged_source, repository, source_config): assert staged_status_response.return_value.status == expected_status - @staticmethod - def test_source_size(my_plugin, staged_source, repository, - source_config): - - @my_plugin.linked.source_size() - def staged_source_size_impl(staged_source, repository, source_config): - TestPlugin.assert_plugin_args(staged_source=staged_source, - repository=repository, - source_config=source_config) - return 0 - staged_source_size_request = platform_pb2.StagedSourceSizeRequest() - TestPlugin.setup_request(request=staged_source_size_request, - staged_source=staged_source, - repository=repository, - source_config=source_config) - staged_source_size_response = my_plugin.linked._internal_staged_source_size( - staged_source_size_request) - - assert staged_source_size_response.return_value.database_size == 0 - @staticmethod def test_staged_worker(my_plugin, staged_source, repository, source_config): diff --git a/tools/src/main/python/dlpx/virtualization/_internal/VERSION b/tools/src/main/python/dlpx/virtualization/_internal/VERSION index eaf58ac5..c5106e6d 100644 --- a/tools/src/main/python/dlpx/virtualization/_internal/VERSION +++ b/tools/src/main/python/dlpx/virtualization/_internal/VERSION @@ -1 +1 @@ -4.0.5.dev0 +4.0.4 diff --git a/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py b/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py index c03c499a..da568732 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py @@ -29,25 +29,18 @@ def direct_post_snapshot(direct_source, repository, source_config, return None -@direct.linked.source_size() -def source_size(repository, source_config, direct_source): - return 0 - - @direct.virtual.configure() def configure(virtual_source, repository, snapshot): path = virtual_source.parameters.path name = "VDB mounted to " + path return None - @direct.virtual.initialize() def initialize(virtual_source, repository): path = virtual_source.parameters.path name = "VDB mounted to " + path return None - @direct.virtual.mount_specification() def mount_specification(repository, virtual_source): return None @@ -93,11 +86,6 @@ def cleanup(repository, source_config, virtual_source): pass -@direct.virtual.source_size() -def source_size(repository, source_config, virtual_source): - return 0 - - @direct.upgrade.repository('1.3', MigrationType.LUA) def repo_upgrade(old_repository): return old_repository diff --git a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py index 109935c5..11b8b726 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py @@ -10,11 +10,11 @@ class TestPackageUtil: @staticmethod def test_get_version(): - assert package_util.get_version() == '4.0.5.dev0' + assert package_util.get_version() == '4.0.4' @staticmethod def test_get_virtualization_api_version(): - assert package_util.get_virtualization_api_version() == '1.7.0' + assert package_util.get_virtualization_api_version() == '1.6.3' @staticmethod def test_get_engine_api_version(): @@ -25,8 +25,8 @@ def test_get_build_api_version_json(): build_api_version = { 'type': 'APIVersion', 'major': 1, - 'minor': 7, - 'micro': 0 + 'minor': 6, + 'micro': 3 } assert package_util.get_build_api_version() == build_api_version From 6533a5f39e31e4b0e4f8658692343574735d3491 Mon Sep 17 00:00:00 2001 From: vimleshmishra Date: Fri, 22 Jul 2022 17:04:55 +0530 Subject: [PATCH 06/12] CP-8293 Update version to 4.0.5.dev0 for virtualization-sdk develop branch before updating github actions (#444) * __hash__ is needed in python 3 * DLPX-79760 SnapshotDefinitionDataPaths object is not hashable since py2-3 transition * DOC-2234 Update new logo in developer.delphix.com * Resolved COnflicts * revert logo chnages * revert logo chnages * Resolve Conflicts * revert changes * revert logo.png * Resolve Conflicts * DOC-2234 Update new logo in developer.delphix.com * logo chnages * DOC-2234 Update new logo in developer.delphix.com * new favicon * incorporated review comments * DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code * DLPX-81195 develop version of vSDK needs to be bumped up to 4.0.4 for testing to use latest vSDK code * Changes suggested by Aleks * CP-8174 VSDK Changes to support source sizing decorators * reverted dvp version related changes * reverted extra comma * update engine API version * Fixed Formatting Issues * Fixed Formatting Issues * Fixed Unit Tests * Fixed Unit Tests * Bumping up dvp-api, vsdk * uppdate formatting * for rerun the failed runs * bumpversion support dev bumping * revert bumpversion support dev bumping * bump up version from dev0 to dev1 * bump up version from dev0 to dev1 --- .bumpversion.cfg | 2 +- common/setup.py | 2 +- .../python/dlpx/virtualization/common/VERSION | 2 +- .../main/python/dlpx/virtualization/VERSION | 2 +- libs/setup.py | 2 +- .../python/dlpx/virtualization/libs/VERSION | 2 +- platform/setup.py | 2 +- .../dlpx/virtualization/platform/VERSION | 2 +- .../dlpx/virtualization/platform/_linked.py | 8 +++--- .../dlpx/virtualization/platform/_virtual.py | 4 +-- .../python/dlpx/virtualization/test_plugin.py | 25 ++++++++++++++++--- .../dlpx/virtualization/_internal/VERSION | 2 +- .../fake_plugin/direct/successful.py | 12 +++++++++ .../_internal/test_package_util.py | 8 +++--- 14 files changed, 53 insertions(+), 22 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c3164d8b..fedf6332 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.4 +current_version = 4.0.5.dev1 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? diff --git a/common/setup.py b/common/setup.py index d3593d72..8943b6cc 100644 --- a/common/setup.py +++ b/common/setup.py @@ -4,7 +4,7 @@ PYTHON_SRC = 'src/main/python' install_requires = [ - "dvp-api == 1.6.3", + "dvp-api == 1.7.0.dev0", ] with open(os.path.join(PYTHON_SRC, 'dlpx/virtualization/common/VERSION')) as version_file: diff --git a/common/src/main/python/dlpx/virtualization/common/VERSION b/common/src/main/python/dlpx/virtualization/common/VERSION index c5106e6d..1b348fba 100644 --- a/common/src/main/python/dlpx/virtualization/common/VERSION +++ b/common/src/main/python/dlpx/virtualization/common/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5.dev1 diff --git a/dvp/src/main/python/dlpx/virtualization/VERSION b/dvp/src/main/python/dlpx/virtualization/VERSION index c5106e6d..1b348fba 100644 --- a/dvp/src/main/python/dlpx/virtualization/VERSION +++ b/dvp/src/main/python/dlpx/virtualization/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5.dev1 diff --git a/libs/setup.py b/libs/setup.py index f443840a..21f0aad2 100644 --- a/libs/setup.py +++ b/libs/setup.py @@ -7,7 +7,7 @@ version = version_file.read().strip() install_requires = [ - "dvp-api == 1.6.3", + "dvp-api == 1.7.0.dev0", "dvp-common == {}".format(version) ] diff --git a/libs/src/main/python/dlpx/virtualization/libs/VERSION b/libs/src/main/python/dlpx/virtualization/libs/VERSION index c5106e6d..1b348fba 100644 --- a/libs/src/main/python/dlpx/virtualization/libs/VERSION +++ b/libs/src/main/python/dlpx/virtualization/libs/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5.dev1 diff --git a/platform/setup.py b/platform/setup.py index 6cd76b71..29b4ba6f 100644 --- a/platform/setup.py +++ b/platform/setup.py @@ -7,7 +7,7 @@ version = version_file.read().strip() install_requires = [ - "dvp-api == 1.6.3", + "dvp-api == 1.7.0.dev0", "dvp-common == {}".format(version), "enum34;python_version < '3.4'", ] diff --git a/platform/src/main/python/dlpx/virtualization/platform/VERSION b/platform/src/main/python/dlpx/virtualization/platform/VERSION index c5106e6d..1b348fba 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/VERSION +++ b/platform/src/main/python/dlpx/virtualization/platform/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5.dev1 diff --git a/platform/src/main/python/dlpx/virtualization/platform/_linked.py b/platform/src/main/python/dlpx/virtualization/platform/_linked.py index adecb6fc..5b780674 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/_linked.py +++ b/platform/src/main/python/dlpx/virtualization/platform/_linked.py @@ -289,13 +289,13 @@ def _internal_direct_source_size(self, request): source_config = SourceConfigDefinition.from_dict( json.loads(request.source_config.parameters.json)) - size = self.source_size_impl( + source_size = self.source_size_impl( direct_source=direct_source, repository=repository, source_config=source_config) direct_source_size_response = platform_pb2.DirectSourceSizeResponse() - direct_source_size_response.return_value.database_size = size + direct_source_size_response.return_value.database_size = source_size return direct_source_size_response @@ -831,12 +831,12 @@ def _internal_staged_source_size(self, request): source_config = SourceConfigDefinition.from_dict( json.loads(request.source_config.parameters.json)) - size = self.source_size_impl( + source_size = self.source_size_impl( staged_source=staged_source, repository=repository, source_config=source_config) staged_source_size_response = platform_pb2.StagedSourceSizeResponse() - staged_source_size_response.return_value.database_size = size + staged_source_size_response.return_value.database_size = source_size return staged_source_size_response diff --git a/platform/src/main/python/dlpx/virtualization/platform/_virtual.py b/platform/src/main/python/dlpx/virtualization/platform/_virtual.py index 9f8ca084..05fa5cd2 100644 --- a/platform/src/main/python/dlpx/virtualization/platform/_virtual.py +++ b/platform/src/main/python/dlpx/virtualization/platform/_virtual.py @@ -839,12 +839,12 @@ def _internal_virtual_source_size(self, request): source_config = SourceConfigDefinition.from_dict( json.loads(request.source_config.parameters.json)) - size = self.source_size_impl( + source_size = self.source_size_impl( virtual_source=virtual_source, repository=repository, source_config=source_config) virtual_source_size_response = platform_pb2.VirtualSourceSizeResponse() - virtual_source_size_response.return_value.database_size = size + virtual_source_size_response.return_value.database_size = source_size return virtual_source_size_response diff --git a/platform/src/test/python/dlpx/virtualization/test_plugin.py b/platform/src/test/python/dlpx/virtualization/test_plugin.py index f69258ca..5dd65f3c 100755 --- a/platform/src/test/python/dlpx/virtualization/test_plugin.py +++ b/platform/src/test/python/dlpx/virtualization/test_plugin.py @@ -65,8 +65,8 @@ })) TEST_POST_UPGRADE_PARAMS = ({ u'obj': - '"{\\"obj\\": {\\"name\\": \\"upgrade\\", ' - '\\"prettyName\\": \\"prettyUpgrade\\", \\"metadata\\": \\"metadata\\"}}"' + '"{\\"obj\\": {\\"name\\": \\"upgrade\\", ' + '\\"prettyName\\": \\"prettyUpgrade\\", \\"metadata\\": \\"metadata\\"}}"' }) MIGRATION_IDS = ('2020.1.1', '2020.2.2') @@ -94,7 +94,6 @@ def configure_impl(): pass with pytest.raises(OperationAlreadyDefinedError): - @my_plugin.virtual.configure() # noqa F811 def configure_impl(): # noqa F811 pass @@ -1189,6 +1188,26 @@ def staged_status_impl(staged_source, repository, source_config): assert staged_status_response.return_value.status == expected_status + @staticmethod + def test_source_size(my_plugin, staged_source, repository, + source_config): + + @my_plugin.linked.source_size() + def staged_source_size_impl(staged_source, repository, source_config): + TestPlugin.assert_plugin_args(staged_source=staged_source, + repository=repository, + source_config=source_config) + return 0 + staged_source_size_request = platform_pb2.StagedSourceSizeRequest() + TestPlugin.setup_request(request=staged_source_size_request, + staged_source=staged_source, + repository=repository, + source_config=source_config) + staged_source_size_response = my_plugin.linked._internal_staged_source_size( + staged_source_size_request) + + assert staged_source_size_response.return_value.database_size == 0 + @staticmethod def test_staged_worker(my_plugin, staged_source, repository, source_config): diff --git a/tools/src/main/python/dlpx/virtualization/_internal/VERSION b/tools/src/main/python/dlpx/virtualization/_internal/VERSION index c5106e6d..1b348fba 100644 --- a/tools/src/main/python/dlpx/virtualization/_internal/VERSION +++ b/tools/src/main/python/dlpx/virtualization/_internal/VERSION @@ -1 +1 @@ -4.0.4 +4.0.5.dev1 diff --git a/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py b/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py index da568732..c03c499a 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/fake_plugin/direct/successful.py @@ -29,18 +29,25 @@ def direct_post_snapshot(direct_source, repository, source_config, return None +@direct.linked.source_size() +def source_size(repository, source_config, direct_source): + return 0 + + @direct.virtual.configure() def configure(virtual_source, repository, snapshot): path = virtual_source.parameters.path name = "VDB mounted to " + path return None + @direct.virtual.initialize() def initialize(virtual_source, repository): path = virtual_source.parameters.path name = "VDB mounted to " + path return None + @direct.virtual.mount_specification() def mount_specification(repository, virtual_source): return None @@ -86,6 +93,11 @@ def cleanup(repository, source_config, virtual_source): pass +@direct.virtual.source_size() +def source_size(repository, source_config, virtual_source): + return 0 + + @direct.upgrade.repository('1.3', MigrationType.LUA) def repo_upgrade(old_repository): return old_repository diff --git a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py index 11b8b726..501815f5 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py @@ -10,11 +10,11 @@ class TestPackageUtil: @staticmethod def test_get_version(): - assert package_util.get_version() == '4.0.4' + assert package_util.get_version() == '4.0.5.dev1' @staticmethod def test_get_virtualization_api_version(): - assert package_util.get_virtualization_api_version() == '1.6.3' + assert package_util.get_virtualization_api_version() == '1.7.0' @staticmethod def test_get_engine_api_version(): @@ -25,8 +25,8 @@ def test_get_build_api_version_json(): build_api_version = { 'type': 'APIVersion', 'major': 1, - 'minor': 6, - 'micro': 3 + 'minor': 7, + 'micro': 0 } assert package_util.get_build_api_version() == build_api_version From 1e3348fc8c2ef276eb158f607240dd97bc7f89d3 Mon Sep 17 00:00:00 2001 From: Vimlesh Mishra Date: Mon, 8 Aug 2022 17:47:02 +0530 Subject: [PATCH 07/12] virtualization-sdk master branch will always refer dlpx-appgate stage/release --- .../src/main/python/dlpx/virtualization/_internal/settings.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/src/main/python/dlpx/virtualization/_internal/settings.cfg b/tools/src/main/python/dlpx/virtualization/_internal/settings.cfg index 93477cdc..c80f2be1 100644 --- a/tools/src/main/python/dlpx/virtualization/_internal/settings.cfg +++ b/tools/src/main/python/dlpx/virtualization/_internal/settings.cfg @@ -20,7 +20,7 @@ # versions in those packages until they are shipped out of band. # [General] -engine_api_version = 1.12.0 +engine_api_version = 1.11.16 distribution_name = dvp-tools package_author = Delphix namespace_package = dlpx From 1c32d8647e730c345d5a1a709a52c01776fea3f7 Mon Sep 17 00:00:00 2001 From: Vimlesh Mishra Date: Mon, 8 Aug 2022 17:47:02 +0530 Subject: [PATCH 08/12] virtualization-sdk master branch will always refer dlpx-appgate stage/release --- tools/src/test/python/dlpx/virtualization/_internal/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/src/test/python/dlpx/virtualization/_internal/conftest.py b/tools/src/test/python/dlpx/virtualization/_internal/conftest.py index 3b05daae..57059fa9 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/conftest.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/conftest.py @@ -710,7 +710,7 @@ def artifact_content(engine_api, virtual_source_definition, @pytest.fixture def engine_api(): - return {'type': 'APIVersion', 'major': 1, 'minor': 12, 'micro': 0} + return {'type': 'APIVersion', 'major': 1, 'minor': 11, 'micro': 16} @pytest.fixture From 859ba36b5f98c23a834a9dbb699c2ea3584929d0 Mon Sep 17 00:00:00 2001 From: Vimlesh Mishra Date: Mon, 8 Aug 2022 17:47:02 +0530 Subject: [PATCH 09/12] virtualization-sdk master branch will always refer dlpx-appgate stage/release --- .../python/dlpx/virtualization/_internal/test_package_util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py index 501815f5..4135a0a4 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py @@ -18,7 +18,7 @@ def test_get_virtualization_api_version(): @staticmethod def test_get_engine_api_version(): - assert package_util.get_engine_api_version_from_settings() == '1.12.0' + assert package_util.get_engine_api_version_from_settings() == '1.11.16' @staticmethod def test_get_build_api_version_json(): @@ -52,4 +52,4 @@ def test_get_internal_package_root(): ]) def test_get_external_version_string(version_string): assert package_util.get_external_version_string( - version_string) == '1.1.0' + version_string) == '1.11.16' From e825c03499919d57a239ca09fea4a6fe1b193da4 Mon Sep 17 00:00:00 2001 From: Vimlesh Mishra Date: Mon, 8 Aug 2022 17:47:02 +0530 Subject: [PATCH 10/12] virtualization-sdk master branch will always refer dlpx-appgate stage/release --- .../python/dlpx/virtualization/_internal/test_package_util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py index 4135a0a4..a72586d6 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py @@ -35,8 +35,8 @@ def test_get_engine_api_version_json(): engine_api_version = { 'type': 'APIVersion', 'major': 1, - 'minor': 12, - 'micro': 0 + 'minor': 11, + 'micro': 16 } assert package_util.get_engine_api_version() == engine_api_version From 64c7907c6afa10ae8d8bca0363d06ef4b5c30033 Mon Sep 17 00:00:00 2001 From: Vimlesh Mishra Date: Mon, 8 Aug 2022 17:47:02 +0530 Subject: [PATCH 11/12] virtualization-sdk master branch will always refer dlpx-appgate stage/release --- .../python/dlpx/virtualization/_internal/test_package_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py index a72586d6..930d1a65 100644 --- a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py +++ b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py @@ -52,4 +52,4 @@ def test_get_internal_package_root(): ]) def test_get_external_version_string(version_string): assert package_util.get_external_version_string( - version_string) == '1.11.16' + version_string) == '1.1.0' From 8fd66cd870665ed89be58b2cd14ccfabaf97624e Mon Sep 17 00:00:00 2001 From: Vimlesh Mishra Date: Mon, 8 Aug 2022 18:12:02 +0530 Subject: [PATCH 12/12] Fixed Issue: Lint common - Python38 --- .../python/dlpx/virtualization/common/_common_classes.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/src/main/python/dlpx/virtualization/common/_common_classes.py b/common/src/main/python/dlpx/virtualization/common/_common_classes.py index 57a698f4..ad701824 100644 --- a/common/src/main/python/dlpx/virtualization/common/_common_classes.py +++ b/common/src/main/python/dlpx/virtualization/common/_common_classes.py @@ -65,7 +65,8 @@ def user(self): return self.__user def to_proto(self): - """Converts plugin class RemoteConnection to protobuf class common_pb2.RemoteConnection + """Converts plugin class RemoteConnection to protobuf class + common_pb2.RemoteConnection """ remote_connection = common_pb2.RemoteConnection() remote_connection.environment.CopyFrom(self.environment.to_proto()) @@ -74,7 +75,8 @@ def to_proto(self): @staticmethod def from_proto(connection): - """Converts protobuf class common_pb2.RemoteConnection to plugin class RemoteConnection + """Converts protobuf class common_pb2.RemoteConnection to plugin class + RemoteConnection """ if not isinstance(connection, common_pb2.RemoteConnection): raise IncorrectTypeError( @@ -411,7 +413,8 @@ def public_key(self): @staticmethod def from_proto(credentials_result): - """Converts protobuf class libs_pb2.CredentialsResult to plugin class KeyPairCredentials + """Converts protobuf class libs_pb2.CredentialsResult to plugin class + KeyPairCredentials """ if not isinstance(credentials_result, libs_pb2.CredentialsResult): raise IncorrectTypeError(