From: David Howells Date: Wed, 13 Aug 2014 17:50:06 +0000 (+0100) Subject: Fix some places IP addresses are output as strings X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e5ae03de7471575f091793b7c2b99d0f131523e7;p=users%2Fdhowells%2Fkafs-utils.git Fix some places IP addresses are output as strings 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 --- diff --git a/suite/lib/cell.py b/suite/lib/cell.py index e38c4ad..ada0d68 100644 --- a/suite/lib/cell.py +++ b/suite/lib/cell.py @@ -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, diff --git a/suite/lib/voldisplay.py b/suite/lib/voldisplay.py index eed0c42..741fd27 100644 --- a/suite/lib/voldisplay.py +++ b/suite/lib/voldisplay.py @@ -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)