From 486ec260bd709c3895a815b47852d5cff1e01338 Mon Sep 17 00:00:00 2001
From: Balamuruhan Suriyakumar <balamuruhan.suriyakumar@delphix.com>
Date: Sat, 5 Mar 2022 20:33:09 +0530
Subject: [PATCH] EBS-1070 Fix #427 VSDK fix required to handle empty system
 password during Lua to VSDK upgrade

---
 .bumpversion.cfg                                             | 2 +-
 common/src/main/python/dlpx/virtualization/common/VERSION    | 2 +-
 dvp/src/main/python/dlpx/virtualization/VERSION              | 2 +-
 libs/src/main/python/dlpx/virtualization/libs/VERSION        | 2 +-
 libs/src/main/python/dlpx/virtualization/libs/libs.py        | 5 ++++-
 .../src/main/python/dlpx/virtualization/platform/VERSION     | 2 +-
 tools/src/main/python/dlpx/virtualization/_internal/VERSION  | 2 +-
 .../dlpx/virtualization/_internal/test_package_util.py       | 2 +-
 8 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2d18460a..8d8a8fef 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.0.2
+current_version = 4.0.3
 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/src/main/python/dlpx/virtualization/common/VERSION b/common/src/main/python/dlpx/virtualization/common/VERSION
index 4d54dadd..c4e41f94 100644
--- a/common/src/main/python/dlpx/virtualization/common/VERSION
+++ b/common/src/main/python/dlpx/virtualization/common/VERSION
@@ -1 +1 @@
-4.0.2
+4.0.3
diff --git a/dvp/src/main/python/dlpx/virtualization/VERSION b/dvp/src/main/python/dlpx/virtualization/VERSION
index 4d54dadd..c4e41f94 100644
--- a/dvp/src/main/python/dlpx/virtualization/VERSION
+++ b/dvp/src/main/python/dlpx/virtualization/VERSION
@@ -1 +1 @@
-4.0.2
+4.0.3
diff --git a/libs/src/main/python/dlpx/virtualization/libs/VERSION b/libs/src/main/python/dlpx/virtualization/libs/VERSION
index 4d54dadd..c4e41f94 100644
--- a/libs/src/main/python/dlpx/virtualization/libs/VERSION
+++ b/libs/src/main/python/dlpx/virtualization/libs/VERSION
@@ -1 +1 @@
-4.0.2
+4.0.3
diff --git a/libs/src/main/python/dlpx/virtualization/libs/libs.py b/libs/src/main/python/dlpx/virtualization/libs/libs.py
index 50b57d5c..0ae7d318 100644
--- a/libs/src/main/python/dlpx/virtualization/libs/libs.py
+++ b/libs/src/main/python/dlpx/virtualization/libs/libs.py
@@ -468,7 +468,10 @@ def retrieve_credentials(credentials_supplier):
     response = internal_libs.retrieve_credentials(credentials_request)
     response_to_str(response)
     credentials_result = _handle_response(response)
-    if credentials_result.password != "":
+    if (
+        not credentials_result.key_pair.private_key and
+        not credentials_result.key_pair.public_key
+    ):
         return PasswordCredentials(
             credentials_result.username, credentials_result.password)
     return KeyPairCredentials(
diff --git a/platform/src/main/python/dlpx/virtualization/platform/VERSION b/platform/src/main/python/dlpx/virtualization/platform/VERSION
index 4d54dadd..c4e41f94 100644
--- a/platform/src/main/python/dlpx/virtualization/platform/VERSION
+++ b/platform/src/main/python/dlpx/virtualization/platform/VERSION
@@ -1 +1 @@
-4.0.2
+4.0.3
diff --git a/tools/src/main/python/dlpx/virtualization/_internal/VERSION b/tools/src/main/python/dlpx/virtualization/_internal/VERSION
index 4d54dadd..c4e41f94 100644
--- a/tools/src/main/python/dlpx/virtualization/_internal/VERSION
+++ b/tools/src/main/python/dlpx/virtualization/_internal/VERSION
@@ -1 +1 @@
-4.0.2
+4.0.3
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 81485f12..57a950b4 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,7 +10,7 @@
 class TestPackageUtil:
     @staticmethod
     def test_get_version():
-        assert package_util.get_version() == '4.0.2'
+        assert package_util.get_version() == '4.0.3'
 
     @staticmethod
     def test_get_virtualization_api_version():