Repository :
http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
---------------------------------------------------------------
commit 8f1918a2829b1becfe9af1fa392ed006cd5b0c07
Author: Peter Hatina <phatina(a)redhat.com>
Date: Fri Oct 5 14:44:04 2012 +0200
FmciIpClient::__ipPrintDeviceInfo prints both, one device/list of devices
---------------------------------------------------------------
cli-tools/fmci/fmci_client_ip.py | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/cli-tools/fmci/fmci_client_ip.py b/cli-tools/fmci/fmci_client_ip.py
index ad4b248..f233570 100644
--- a/cli-tools/fmci/fmci_client_ip.py
+++ b/cli-tools/fmci/fmci_client_ip.py
@@ -40,9 +40,11 @@ class FmciIpClient(FmciBaseClient):
return (rval_inst_list if len(rval_inst_list) > 1 else rval_inst_list[0],
"")
def __ipPrintDeviceInfo(self, device):
- sys.stdout.write("%s:\n" % device["Name"])
- sys.stdout.write(" inet: %s\n" % device["IPv4Address"])
- sys.stdout.write(" inet6: %s\n" % device["IPv6Address"])
+ device_list = device if type(device) == list else [device]
+ for d in device_list:
+ sys.stdout.write("%s:\n" % d["Name"])
+ sys.stdout.write(" inet: %s\n" % d["IPv4Address"])
+ sys.stdout.write(" inet6: %s\n" % d["IPv6Address"])
def __ipGetAddressType(self, address):
# blind ipv4 check
@@ -130,11 +132,7 @@ class FmciIpClient(FmciBaseClient):
(inst_list, errorstr) = self.__ipGetIpProtocolEndpointInstances(device)
if not inst_list:
return (False, errorstr)
- if not device:
- for inst in inst_list:
- self.__ipPrintDeviceInfo(inst)
- else:
- self.__ipPrintDeviceInfo(inst_list)
+ self.__ipPrintDeviceInfo(inst_list)
return (True, "")
def ipSetAddress(self, device, address, **kwargs):