cura-tools-devel February 2013

cura-tools-devel@lists.fedorahosted.org

1 participants
34 discussions

[cura-tools] master: fix _LmiClass::instances(), ::instance_names() namespace resolution (78e1986)
by phatina＠fedoraproject.org 20 Feb '13

20 Feb '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 78e1986147f951462738c78e30b56068ba919fc8 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Feb 20 14:53:25 2013 +0100 fix _LmiClass::instances(), ::instance_names() namespace resolution >--------------------------------------------------------------- cli-tools/lmi/lmi_client_base.py | 8 ++++---- cli-tools/lmi/lmi_client_shell.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli-tools/lmi/lmi_client_base.py b/cli-tools/lmi/lmi_client_base.py index ba7f3ab..4867d20 100644 --- a/cli-tools/lmi/lmi_client_base.py +++ b/cli-tools/lmi/lmi_client_base.py @@ -74,7 +74,7 @@ class LmiBaseClient(object): self._cliconn = pywbem.WBEMConnection(self._hostname, (self._username, password)) - def _get_instance_names(self, klass, **kwargs): + def _get_instance_names(self, class_name, namespace = None, **kwargs): filter_value = "" filter_key = "Name" if "key" in kwargs: @@ -90,7 +90,7 @@ class LmiBaseClient(object): filter_value = kwargs["Value"] kwargs.pop("Value") try: - inst_name_list = self._cliconn.EnumerateInstanceNames(klass, **kwargs) + inst_name_list = self._cliconn.EnumerateInstanceNames(class_name, namespace, **kwargs) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[1]) @@ -112,7 +112,7 @@ class LmiBaseClient(object): return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[0]) return LmiReturnValue(rval = inst, rparams = {}, errorstr = "") - def _get_instances(self, klass, **kwargs): + def _get_instances(self, class_name, namespace = None, **kwargs): filter_value = "" filter_key = "Name" if "key" in kwargs: @@ -128,7 +128,7 @@ class LmiBaseClient(object): filter_value = kwargs["Value"] kwargs.pop("Value") try: - inst_list_not_filtered = self._cliconn.EnumerateInstances(klass, **kwargs) + inst_list_not_filtered = self._cliconn.EnumerateInstances(class_name, namespace, **kwargs) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[1]) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 90174d9..a30da25 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -399,7 +399,7 @@ class _LmiClass(BaseObject): def instance_names(self, **kwargs): (inst_name_list, _, errorstr) = self._client._get_instance_names( - self._cim_class.classname, **kwargs) + self._cim_class.classname, namespace = self._namespace.name, **kwargs) if not inst_name_list: return [] result = [] @@ -415,7 +415,7 @@ class _LmiClass(BaseObject): def instances(self, **kwargs): (instance_list, _, errorstr) = self._client._get_instances( - self._cim_class.classname, **kwargs) + self._cim_class.classname, self._namespace.name, **kwargs) if not instance_list: return [] return map(lambda inst: _LmiInstance(self._client, self, inst), instance_list)

1 0

[cura-tools] master: bump release version to v0.5 (9a8612c)
by phatina＠fedoraproject.org 19 Feb '13

19 Feb '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 9a8612cf85e9d3ce774815a5c966967b9ddc6af6 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Feb 19 17:53:37 2013 +0100 bump release version to v0.5 >--------------------------------------------------------------- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 1ee4671..e6f1d1c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([OpenLMI-tools], [0.4], [phatina(a)redhat.com]) +AC_INIT([OpenLMI-tools], [0.5], [phatina(a)redhat.com]) AC_CONFIG_MACRO_DIR([m4]) m4_include([m4/python_module.m4])

1 0

[cura-tools] master: fix LmiUserClient computer system class name (c0c77f8)
by phatina＠fedoraproject.org 19 Feb '13

19 Feb '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit c0c77f8baed76820c9e49d3c7feba040f775a35b Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Feb 19 17:13:35 2013 +0100 fix LmiUserClient computer system class name >--------------------------------------------------------------- cli-tools/lmi/lmi_client_user.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cli-tools/lmi/lmi_client_user.py b/cli-tools/lmi/lmi_client_user.py index 8d139d3..600b4b2 100644 --- a/cli-tools/lmi/lmi_client_user.py +++ b/cli-tools/lmi/lmi_client_user.py @@ -24,7 +24,7 @@ class LmiUserClient(LmiBaseClient): MEMBER_OF_GROUP_CLASS_NAME = "LMI_MemberOfGroup" ASSIGNED_IDENTITY_CLASS_NAME = "LMI_AssignedAccountIdentity" ACCOUNT_MANAGEMENT_SERVICE_CLASS_NAME = "LMI_AccountManagementService" - COMPUTER_SYSTEM_CLASS_NAME = "CIM_ComputerSystem" + COMPUTER_SYSTEM_CLASS_NAME = "Linux_ComputerSystem" def __init__(self, hostname, username = "", password = ""): super(self.__class__, self).__init__(hostname, username, password)

1 0

[cura-tools] master: fix LmiUserClient::list_group_members() (653b554)
by phatina＠fedoraproject.org 19 Feb '13

19 Feb '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 653b554fed1f1a6d095c283a60830ffb1063b270 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Feb 19 17:13:09 2013 +0100 fix LmiUserClient::list_group_members() >--------------------------------------------------------------- cli-tools/lmi/lmi_client_user.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cli-tools/lmi/lmi_client_user.py b/cli-tools/lmi/lmi_client_user.py index 2fa2af1..8d139d3 100644 --- a/cli-tools/lmi/lmi_client_user.py +++ b/cli-tools/lmi/lmi_client_user.py @@ -95,7 +95,7 @@ class LmiUserClient(LmiBaseClient): def list_group_members(self, member): (inst_list, rparams, errorstr) = self._get_instances( - LmiUserClient.GROUP_CLASS_NAME, member) + LmiUserClient.GROUP_CLASS_NAME, value = member) if not inst_list: return LmiReturnValue(rval = False, rparams = {}, errorstr = "No such group '%s' found" % member) members = self.__get_group_members(inst_list)

1 0

[cura-tools] master: drop redundant LmiBaseClient::_delete_instance() (cde82fb)
by phatina＠fedoraproject.org 19 Feb '13

19 Feb '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit cde82fb00059ee444c7f86b9d959a4a97a1e9de3 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Feb 19 16:47:16 2013 +0100 drop redundant LmiBaseClient::_delete_instance() >--------------------------------------------------------------- cli-tools/lmi/lmi_client_base.py | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/cli-tools/lmi/lmi_client_base.py b/cli-tools/lmi/lmi_client_base.py index b04d11d..ba7f3ab 100644 --- a/cli-tools/lmi/lmi_client_base.py +++ b/cli-tools/lmi/lmi_client_base.py @@ -143,17 +143,6 @@ class LmiBaseClient(object): return LmiReturnValue(rval = None, rparams = {}, errorstr = "Not found" if not "ErrorMsg" in kwargs else kwargs["ErrorMsg"]) return LmiReturnValue(rval = inst_list, rparams = {}, errorstr = "") - def _delete_instance(self, inst): - try: - self._cliconn.DeleteInstance(inst.path) - except pywbem.cim_operations.CIMError, e: - raise_or_dump_exception(e) - return LmiReturnValue(rval = False, rparams = {}, errorstr = e.args[1]) - except pywbem.cim_http.AuthError, e: - raise_or_dump_exception(e) - return LmiReturnValue(rval = False, rparams = {}, errorstr = e.args[0]) - return LmiReturnValue(rval = True, rparams = {}, errorstr = "") - def _get_class_names(self, namespace = None, **kwargs): try: class_name_list = self._cliconn.EnumerateClassNames(namespace, **kwargs)

1 0

[cura-tools] master: fix LmiIpClient::__ip_remove_static_settings (3173791)
by phatina＠fedoraproject.org 19 Feb '13

19 Feb '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 3173791ce5c606fc1b23b37d94d3436f3434b125 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Feb 19 16:34:41 2013 +0100 fix LmiIpClient::__ip_remove_static_settings >--------------------------------------------------------------- cli-tools/lmi/lmi_client_ip.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli-tools/lmi/lmi_client_ip.py b/cli-tools/lmi/lmi_client_ip.py index ee1bc58..235f996 100644 --- a/cli-tools/lmi/lmi_client_ip.py +++ b/cli-tools/lmi/lmi_client_ip.py @@ -72,8 +72,8 @@ class LmiIpClient(LmiBaseClient): if not inst_list: return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) for inst in inst_list: - (rval, rparams, errorstr) = self._delete_instance(inst) - if not rval: + (rval, rparams, errorstr) = self._delete_instance(inst.path) + if rval != 0: return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) return LmiReturnValue(rval = True, rparams = rparams, errorstr = "")

1 0

[cura-tools] master: fix LmiIpClient.__ip_get_ethernet_port_instance() (7c2ab78)
by phatina＠fedoraproject.org 19 Feb '13

19 Feb '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 7c2ab788f8bbc732f422216eb441fbd30ddcf169 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Feb 19 16:33:12 2013 +0100 fix LmiIpClient.__ip_get_ethernet_port_instance() >--------------------------------------------------------------- cli-tools/lmi/lmi_client_ip.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cli-tools/lmi/lmi_client_ip.py b/cli-tools/lmi/lmi_client_ip.py index d80e3a0..ee1bc58 100644 --- a/cli-tools/lmi/lmi_client_ip.py +++ b/cli-tools/lmi/lmi_client_ip.py @@ -55,7 +55,7 @@ class LmiIpClient(LmiBaseClient): return prot_type def __ip_get_ethernet_port_instance(self, device): - return self._get_instances(LmiIpClient.LMI_ETHERNET_PORT_CLASS_NAME, device, Key = "DeviceID") + return self._get_instances(LmiIpClient.LMI_ETHERNET_PORT_CLASS_NAME, Key = "DeviceID", Value = device) def __ip_get_ip_assignment_setting_data(self, device): (inst_list, rparams, errorstr) = self._get_instances(LmiIpClient.LMI_IP_ASSIGNMENT_SETTING_DATA_CLASS_NAME)

1 0

[cura-tools] master: introduce simple authentication check (a4dfa43)
by phatina＠fedoraproject.org 19 Feb '13

19 Feb '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit a4dfa43c6bea040d78c3489bf2da2ed5f7eaa432 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Feb 19 16:28:16 2013 +0100 introduce simple authentication check >--------------------------------------------------------------- cli-tools/lmishell | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/cli-tools/lmishell b/cli-tools/lmishell index e56a800..aaa5c30 100755 --- a/cli-tools/lmishell +++ b/cli-tools/lmishell @@ -17,6 +17,7 @@ import os import sys import code +import pywbem import readline import rlcompleter import __builtin__ @@ -294,7 +295,23 @@ def _connect(hostname, username = "", password = "", interactive = False): return None sys.stdout.write("\n") readline.remove_history_item(readline.get_current_history_length() - 1) - return LmiConnection(hostname, username, password, interactive) + # Try to get some non-existing class as a login check + connection = LmiConnection(hostname, username, password, interactive) + use_exceptions = LmiBaseClient._get_use_exceptions() + try: + LmiBaseClient._set_use_exceptions(True) + connection.root.cimv2.NonExistingClass + except pywbem.cim_operations.CIMError, e: + if e.args[0] == pywbem.cim_constants.CIM_ERR_NOT_FOUND: + return connection + if use_exceptions: + raise + return None + except pywbem.cim_http.AuthError, e: + return None + finally: + LmiBaseClient._set_use_exceptions(use_exceptions) + return connection def _use_display_sugar(use = True): sys.displayhook = _lmi_displayhook if use else sys.__displayhook__

1 0

[cura-tools] master: optimize LmiShellClient::instances() (c3e36f2)
by phatina＠fedoraproject.org 19 Feb '13

19 Feb '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit c3e36f25e0446420f71b3cbc1e0c1e77b16356fa Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Feb 19 15:48:30 2013 +0100 optimize LmiShellClient::instances() >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index b1b2fc9..90174d9 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -418,10 +418,7 @@ class _LmiClass(BaseObject): self._cim_class.classname, **kwargs) if not instance_list: return [] - result = [] - for i in instance_list: - result.append(_LmiInstance(self._client, self, i)) - return result + return map(lambda inst: _LmiInstance(self._client, self, inst), instance_list) def first_instance(self, **kwargs): instance_list = self.instances(**kwargs)

1 0

[cura-tools] master: fix LmiServiceClient::__service_get_instance() (33d37f6)
by phatina＠fedoraproject.org 19 Feb '13

19 Feb '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 33d37f600c80bec9f00f07509a21b47f5bca95ae Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Feb 19 15:07:36 2013 +0100 fix LmiServiceClient::__service_get_instance() >--------------------------------------------------------------- cli-tools/lmi/lmi_client_service.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cli-tools/lmi/lmi_client_service.py b/cli-tools/lmi/lmi_client_service.py index 3fc964d..86de0c7 100644 --- a/cli-tools/lmi/lmi_client_service.py +++ b/cli-tools/lmi/lmi_client_service.py @@ -63,7 +63,7 @@ class LmiServiceClient(LmiBaseClient): def __service_get_instance(self, service): (inst, rparams, errorstr) = self._get_instances( - LmiServiceClient.SERVICE_CLASS_NAME, service) + LmiServiceClient.SERVICE_CLASS_NAME, value=service) if not inst: return LmiReturnValue(rval = None, rparams = {}, errorstr = errorstr) return LmiReturnValue(rval = inst[0], rparams = rparams, errorstr = "")

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

cura-tools-devel February 2013