Improving error message incase of version mismatch between client and…

… server(vmware-archive#1103)
shuklanirdesh82 · Aug 4, 2017 · cd4b6cc · cd4b6cc
1 parent 0adb1aa
commit cd4b6cc
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/esx_service/vmdk_ops.py b/esx_service/vmdk_ops.py
@@ -1628,12 +1628,8 @@ def execRequestThread(client_socket, cartel, request):
             client_protocol_version = int(req["version"]) if "version" in req else SERVER_PROTOCOL_VERSION
             logging.debug("execRequestThread: client protocol version=%d", client_protocol_version)
             if client_protocol_version != SERVER_PROTOCOL_VERSION:
-                if client_protocol_version < SERVER_PROTOCOL_VERSION:
-                    reply_string = err("vSphere Docker Volume Service client version ({}) is older than server version ({}), "
-                                    "please update the client.".format(client_protocol_version, SERVER_PROTOCOL_VERSION))
-                else:
-                    reply_string = err("vSphere Docker Volume Service client version ({}) is newer than server version ({}), "
-                                    "please update the server.".format(client_protocol_version, SERVER_PROTOCOL_VERSION))
+                reply_string = err("There is a mismatch between vDVS client version ({}) and server version ({}), "
+                                    "please make sure vDVS plugin and driver are from the same release version.".format(client_protocol_version, SERVER_PROTOCOL_VERSION))
                 send_vmci_reply(client_socket, reply_string)
                 logging.warning("executeRequest '%s' failed: %s", req["cmd"], reply_string)
                 return