Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
commit 78e1986147f951462738c78e30b56068ba919fc8 Author: Peter Hatina phatina@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)