[cura-tools] master: set ip information only for the first interface in list (f99621e)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit f99621eea6b92500682deac5d59c454448a2b514
Author: Peter Hatina <phatina(a)redhat.com>
Date: Fri Oct 5 14:45:42 2012 +0200
set ip information only for the first interface in list
>---------------------------------------------------------------
cli-tools/fmci/fmci_client_ip.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cli-tools/fmci/fmci_client_ip.py b/cli-tools/fmci/fmci_client_ip.py
index f233570..983f817 100644
--- a/cli-tools/fmci/fmci_client_ip.py
+++ b/cli-tools/fmci/fmci_client_ip.py
@@ -119,6 +119,8 @@ class FmciIpClient(FmciBaseClient):
if not configuration_inst:
return (False, errorstr)
(device_inst, errorstr) = self.__ipGetIpProtocolEndpointInstances(device)
+ if type(device_inst) == list:
+ device_inst = device_inst[0]
if not device_inst:
return (False, errorstr)
args = {
11 years, 7 months
[cura-tools] master: FmciIpClient::__ipPrintDeviceInfo prints both, one device/list of devices (8f1918a)
by phatina@fedoraproject.org
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):
11 years, 7 months
[cura-tools] master: remove static settings before assigning a new one to the interface in fmci-ip.py (74ad64d)
by phatina@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit 74ad64dadf498423f254bd3e01c50dcf493f9f65
Author: Peter Hatina <phatina(a)redhat.com>
Date: Fri Oct 5 14:00:08 2012 +0200
remove static settings before assigning a new one to the interface in fmci-ip.py
>---------------------------------------------------------------
cli-tools/fmci/fmci_client_ip.py | 40 ++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/cli-tools/fmci/fmci_client_ip.py b/cli-tools/fmci/fmci_client_ip.py
index 25b9c9a..ad4b248 100644
--- a/cli-tools/fmci/fmci_client_ip.py
+++ b/cli-tools/fmci/fmci_client_ip.py
@@ -54,7 +54,28 @@ class FmciIpClient(FmciBaseClient):
def __ipGetEthernetPortInstance(self, device):
return self._getInstances(FmciIpClient.LMI_ETHERNET_PORT_CLASS_NAME, device, Key = "DeviceID")
+ def __ipGetIpAssignmentSettingData(self, device):
+ (inst_list, errorstr) = self._getInstances(FmciIpClient.LMI_IP_ASSIGNMENT_SETTING_DATA_CLASS_NAME)
+ if not inst_list:
+ return (None, errorstr)
+ inst_list = inst_list if type(inst_list) == list else [inst_list]
+ rval_inst_list = filter(lambda x: x["Caption"] == "static-" + device, inst_list)
+ if not rval_inst_list:
+ return (None, "No IP setting for device %s found" % device)
+ return (rval_inst_list, "")
+
+ def __ipRemoveStaticSettings(self, device):
+ (inst_list, errorstr) = self.__ipGetIpAssignmentSettingData(device)
+ if not inst_list:
+ return (False, errorstr)
+ for inst in inst_list:
+ (rval, errorstr) = self._deleteInstance(inst)
+ if not rval:
+ return (False, errorstr)
+ return (True, "")
+
def __ipCreateStaticSetting(self, device, address, **kwargs):
+ self.__ipRemoveStaticSettings(device)
(device_inst, errorstr) = self.__ipGetEthernetPortInstance(device)
if not device_inst:
return (False, {}, errorstr)
@@ -105,16 +126,6 @@ class FmciIpClient(FmciBaseClient):
(rval, rparam, errorstr) = self._callMethod(configuration_inst, "ApplySettingToIPProtocolEndpoint", **args)
return (rval, errorstr)
- def __ipGetIpAssignmentSettingData(self, device):
- (inst_list, errorstr) = self._getInstances(FmciIpClient.LMI_IP_ASSIGNMENT_SETTING_DATA_CLASS_NAME)
- if not inst_list:
- return (None, errorstr)
- inst_list = inst_list if type(inst_list) == list else [inst_list]
- rval_inst_list = filter(lambda x: x["Caption"] == "static-" + device, inst_list)
- if not rval_inst_list:
- return (None, "No IP setting for device %s found" % device)
- return (rval_inst_list, "")
-
def ipListDevices(self, device = ""):
(inst_list, errorstr) = self.__ipGetIpProtocolEndpointInstances(device)
if not inst_list:
@@ -134,11 +145,4 @@ class FmciIpClient(FmciBaseClient):
return self.__ipApplyStaticSetting(device, setting_inst)
def ipDelAddress(self, device):
- (inst_list, errorstr) = self.__ipGetIpAssignmentSettingData(device)
- if not inst_list:
- return (False, errorstr)
- for inst in inst_list:
- (rval, errorstr) = self._deleteInstance(inst)
- if not rval:
- return (False, errorstr)
- return (True, "")
+ return self.__ipRemoveStaticSettings(device)
11 years, 7 months
[cura-tools] master: fix return param count when FmciBaseClient::_callMethod() fails (61b3f2d)
by phatina@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit 61b3f2d8f64119a047d3cd719a530f7abc206f11
Author: Peter Hatina <phatina(a)redhat.com>
Date: Fri Oct 5 13:44:56 2012 +0200
fix return param count when FmciBaseClient::_callMethod() fails
>---------------------------------------------------------------
cli-tools/fmci/fmci_client_base.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cli-tools/fmci/fmci_client_base.py b/cli-tools/fmci/fmci_client_base.py
index bf59965..8c54b29 100644
--- a/cli-tools/fmci/fmci_client_base.py
+++ b/cli-tools/fmci/fmci_client_base.py
@@ -53,5 +53,5 @@ class FmciBaseClient(object):
try:
(rval, rparams) = self.m_cliconn.InvokeMethod(method, instance.path, **params)
except pywbem.cim_operations.CIMError, e:
- return (False, e.args[1] + ": '" + method + "'")
+ return (False, {}, e.args[1] + ": '" + method + "'")
return (rval == 0, rparams, "")
11 years, 7 months
[cura-tools] master: remove address dependency when deleting interface configuration (15c9334)
by phatina@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit 15c93344d6257ef2ec5143143714ba204a12b984
Author: Peter Hatina <phatina(a)redhat.com>
Date: Fri Oct 5 13:26:19 2012 +0200
remove address dependency when deleting interface configuration
>---------------------------------------------------------------
cli-tools/fmci-ip.py | 2 +-
cli-tools/fmci/fmci_client_ip.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cli-tools/fmci-ip.py b/cli-tools/fmci-ip.py
index c207981..2c4986e 100755
--- a/cli-tools/fmci-ip.py
+++ b/cli-tools/fmci-ip.py
@@ -147,7 +147,7 @@ if __name__ == "__main__":
elif options.operation == FmciIpOptions.OP_SET:
(rval, errorstr) = client.ipSetAddress(options.device, options.ifaddr)
elif options.operation == FmciIpOptions.OP_DEL:
- (rval, errorstr) = client.ipDelAddress(options.device, options.ifaddr)
+ (rval, errorstr) = client.ipDelAddress(options.device)
elif options.object == FmciIpOptions.OBJ_ROUTE:
# TODO: implement
sys.stderr.write("Route operation not implemented yet!\n")
diff --git a/cli-tools/fmci/fmci_client_ip.py b/cli-tools/fmci/fmci_client_ip.py
index 5341699..25b9c9a 100644
--- a/cli-tools/fmci/fmci_client_ip.py
+++ b/cli-tools/fmci/fmci_client_ip.py
@@ -133,7 +133,7 @@ class FmciIpClient(FmciBaseClient):
setting_inst = self.m_cliconn.GetInstance(rparam["SettingData"], LocalOnly = False)
return self.__ipApplyStaticSetting(device, setting_inst)
- def ipDelAddress(self, device, address):
+ def ipDelAddress(self, device):
(inst_list, errorstr) = self.__ipGetIpAssignmentSettingData(device)
if not inst_list:
return (False, errorstr)
11 years, 7 months