[NEW PATCH] Remove all the references to VDC from logging (via gerrit-bot)

Federico Simoncelli fsimonce at redhat.com
Mon Aug 22 16:00:18 UTC 2011


New patch submitted by Federico Simoncelli (fsimonce at redhat.com)

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

commit 6e9895bd6a451a5679dab35723e70106ba8d4b32
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Fri Aug 19 12:59:57 2011 +0000

    Remove all the references to VDC from logging
    
    Change-Id: Ia7579934bc000e0cbd7891fd8104d178f9d155e6

diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index ccf901d..c7a29f4 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -585,7 +585,8 @@ gpgcheck=0
                 try:
                     if not deployUtil.waitRouteRestore(60, vdcName):
                         fReturn = False
-                        self.message = "No route to VDC. Check switch/router settings and try registration again"
+                        self.message = "No route to %s. Check switch/router " \
+                            "settings and try registering again." % vdcName
                         logging.error(self.message)
                 except:
                     logging.error(traceback.format_exc())
@@ -622,7 +623,7 @@ gpgcheck=0
         else:
             url, port = deployUtil.getAddress(iurl)
             if url is None:
-                self.message = "Faild to parse VDC URL!"
+                self.message = "Failed to parse manager URL!"
                 self.status = "FAIL"
                 logging.error(self.message)
                 #Do not set rc to allow changes from rhev-m.
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index c0ea413..f6bec9b 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -288,20 +288,20 @@ def _getMGTIface(vdcHostName):
 
     try:
         if vdcHostName != "None":
-            logging.debug("_getMGTIface: read vdc_host_name: " + strVDCName)
+            logging.debug("_getMGTIface: read host name: " + strVDCName)
             #Now find the IP. Note that gethostbyname(IP) == IP
             strVDCIP = socket.gethostbyname(strVDCName)
     except:
             strVDCIP = "None"
-            logging.debug("_getMGTIface: error trying to figure out VDC's IP")
+            logging.debug("_getMGTIface: error trying to figure out IP")
 
-    logging.debug("_getMGTIface: using vdc_host_name " + strVDCName + " strVDCIP= " + strVDCIP)
+    logging.debug("_getMGTIface: using host name " + strVDCName + " strIP= " + strVDCIP)
 
     # Find the interface of the management IP
     if strVDCIP != "None":
         strReturn = _getIfaceByIP(strVDCIP)
 
-    logging.debug("_getMGTIface VDC IP=" + str(strVDCIP) + " strIface=" + str(strReturn))
+    logging.debug("_getMGTIface IP=" + str(strVDCIP) + " strIface=" + str(strReturn))
     return strReturn
 
 def getMGTIP(vdsmDir, vdcHostName):




More information about the vdsm-patches mailing list