]> www.infradead.org Git - users/dhowells/kafs-utils.git/commitdiff
Fix some places IP addresses are output as strings
authorDavid Howells <dhowells@redhat.com>
Wed, 13 Aug 2014 17:50:06 +0000 (18:50 +0100)
committerDavid Howells <dhowells@redhat.com>
Wed, 13 Aug 2014 17:50:06 +0000 (18:50 +0100)
Fix some places IP addresses are supposed to be output as strings but instead
try to output a non-string type.

Signed-off-by: David Howells <dhowells@redhat.com>
suite/lib/cell.py
suite/lib/voldisplay.py

index e38c4ad1da4f43e512f498e93c610e09b3853d5f..ada0d68927fef350733a4074b14d6bf4c6d94629 100644 (file)
@@ -196,7 +196,7 @@ class cell:
     def open_volume_server(self, server, params=None):
         key, security = self.determine_security(params)
 
-        verbose("Trying volserver ", server, "\n")
+        verbose("Trying volserver ", server.addr(), "\n")
         vol_conn = kafs.rx_new_connection(str(server.addr()),
                                           kafs.VOLSERVICE_PORT,
                                           kafs.VOLSERVICE_ID,
@@ -207,7 +207,7 @@ class cell:
     def open_bos_server(self, server, params=None):
         key, security = self.determine_security(params)
 
-        verbose("Trying bosserver ", server, "\n")
+        verbose("Trying bosserver ", server.addr(), "\n")
         bos_conn = kafs.rx_new_connection(str(server.addr()),
                                           kafs.BOSSERVICE_PORT,
                                           kafs.BOSSERVICE_ID,
index eed0c42e4d363226fecd06dc805c83a0a8fcaccc..741fd2781926ffa5a363fbbbb5ff80c05f0bc5c7 100644 (file)
@@ -147,7 +147,7 @@ def display_vol_oneline_summary(params, vol):
 ###############################################################################
 def display_vol_information(params, vol):
     display_vol_oneline_summary(params, vol)
-    output ("    ", params["server"], " ", params["_partname"], "\n")
+    output ("    ", params["server"].addr(), " ", params["_partname"], "\n")
     outputf("    RWrite {:10d} ROnly {:10d} Backup {:10d}\n",
             vol.parentID, vol.cloneID, vol.backupID)
     outputf("    MaxQuota {:10d} K\n", vol.maxquota)