[NEW PATCH] BZ#731598 Use the correct port in waitRouteRestore (via gerrit-bot)

Dan Kenigsberg danken at redhat.com
Wed Sep 7 09:39:22 UTC 2011


New patch submitted by Dan Kenigsberg (danken at redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/830

commit 854149d28c18bc76067e649ac4442a6a58612a39
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Thu Aug 18 12:29:59 2011 +0000

    BZ#731598 Use the correct port in waitRouteRestore
    
    Change-Id: Iaef8d5305a6c4eeab53a622a7693261e9b9cb8e1

diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index d1fd760..1f68e8e 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -567,15 +567,17 @@ gpgcheck=0
         self._xmlOutput('CreateConf', self.status, None, None, self.message)
         return self.rc
 
-    def _addNetwork(self, vdcName):
+    def _addNetwork(self, vdcName, vdcPort):
         fReturn = True
 
         #add rhevm bridge
         try:
             fReturn = deployUtil.makeBridge(vdcName, VDSM_DIR)
             if fReturn: #save current config by removing the undo files:
+                vdcUrl = "http://%s:%s" % (
+                            vdcName, str(vdcPort) if vdcPort else "80")
                 try:
-                    if not deployUtil.waitRouteRestore(60, vdcName):
+                    if not deployUtil.waitRouteRestore(60, vdcUrl)
                         fReturn = False
                         self.message = "No route to %s. Check switch/router " \
                             "settings and try registering again." % vdcName
@@ -620,7 +622,7 @@ gpgcheck=0
                 logging.error(self.message)
                 #Do not set rc to allow changes from rhev-m.
             else:
-                self._addNetwork(url)
+                self._addNetwork(url, port)
 
         self._xmlOutput('SetNetworking', self.status, None, None, self.message)
         return self.rc




More information about the vdsm-patches mailing list