CP-8293 Update version to 4.0.5.dev0 for virtualization-sdk develop b…

…ranch before updating github actions (delphix#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
SumoSourabh · Aug 8, 2022 · 00c359d · 00c359d
1 parent b3696ba
commit 00c359d
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 22 deletions.
diff --git 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<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?

diff --git 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
@@ -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
@@ -1 +1 @@
-4.0.4
+4.0.5.dev0
diff --git 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
@@ -1 +1 @@
-4.0.4
+4.0.5.dev0
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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