Sandro Bonazzola has uploaded a new change for review.

Change subject: vdsm: support latest VDSM API connection changes
......................................................................

vdsm: support latest VDSM API connection changes

vdsClient has changed the API for connecting to
the daemon with the following patch:
http://gerrit.ovirt.org/#/c/16225/2

Adding support for the new API
keeping compatibility with previous version.

Change-Id: I1f08dc344d8dd1c46de79fbd746b9d89d89b70d6
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M src/plugins/ovirt-hosted-engine-setup/system/vdsmenv.py
1 file changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup 
refs/changes/30/17530/1

diff --git a/src/plugins/ovirt-hosted-engine-setup/system/vdsmenv.py 
b/src/plugins/ovirt-hosted-engine-setup/system/vdsmenv.py
index 0ce29f6..d8c9ed9 100644
--- a/src/plugins/ovirt-hosted-engine-setup/system/vdsmenv.py
+++ b/src/plugins/ovirt-hosted-engine-setup/system/vdsmenv.py
@@ -60,10 +60,15 @@
         else:
             serv = vdsClient.service()
         serv.useSSL = self.environment[ohostedcons.VDSMEnv.USE_SSL]
-        server, serverPort = vdscli.cannonizeAddrPort(
-            'localhost'
-        ).split(':', 1)
-        serv.do_connect(server, serverPort)
+        if hasattr(vdscli, 'cannonizeAddrPort'):
+            server, serverPort = vdscli.cannonizeAddrPort(
+                'localhost'
+            ).split(':', 1)
+            serv.do_connect(server, serverPort)
+        else:
+            hostPort = vdscli.cannonizeHostPort('localhost')
+            serv.do_connect(hostPort)
+
         self.environment[ohostedcons.VDSMEnv.VDS_CLI] = serv
         vdsmReady = False
         retry = 0


-- 
To view, visit http://gerrit.ovirt.org/17530
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f08dc344d8dd1c46de79fbd746b9d89d89b70d6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-hosted-engine-setup
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to