cura-tools-devel December 2012

cura-tools-devel@lists.fedorahosted.org

2 participants
19 discussions

[cura-tools] master: introduce LmiReturnValue::__getattr__() and ::properties()" (3285aa6)
by phatina＠fedorahosted.org 10 Dec '12

10 Dec '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 3285aa62bd259d42f8b6f6e58c0019e14c3a33c2 Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Dec 6 11:01:52 2012 +0100 introduce LmiReturnValue::__getattr__() and ::properties()" >--------------------------------------------------------------- cli-tools/lmi/lmi_client_base.py | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/cli-tools/lmi/lmi_client_base.py b/cli-tools/lmi/lmi_client_base.py index b4791ab..0186fc2 100644 --- a/cli-tools/lmi/lmi_client_base.py +++ b/cli-tools/lmi/lmi_client_base.py @@ -19,27 +19,28 @@ import collections _RValue = collections.namedtuple('RValue', ["rval", "rparams", "errorstr"]) class LmiReturnValue(_RValue): - @property - def instance_classname(self): - return self._instance.classname if self._instance else "" + def __getattr__(self, key): + if not key in self._properties: + return None + return self._properties[key] - @property - def instance(self): - return self._instance + def properties(self): + return self._properties.keys() @property - def hostname(self): - return self._hostname + def instance_classname(self): + return self._properties["instance"].classname if self._properties["instance"] else "" def __new__(self, **kwargs): - self._hostname = "none" - self._instance = None - if "hostname" in kwargs: - self._hostname = kwargs["hostname"] - kwargs.pop("hostname") - if "instance" in kwargs: - self._instance = kwargs["instance"] - kwargs.pop("instance") + self._properties = {} + keys_to_pop = [] + for (key, value) in kwargs.iteritems(): + if key in ("rval", "rparams", "errorstr"): + continue + self._properties[key] = value + keys_to_pop.append(key) + for key in keys_to_pop: + kwargs.pop(key) return _RValue.__new__(self, **kwargs) class LmiBaseClient(object):

1 0

[cura-tools] master: pass kwargs to LmiBaseClient::_get_instance_names() (70a684c)
by phatina＠fedorahosted.org 10 Dec '12

10 Dec '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 70a684c0114066676bcf393261459c535758b0ce Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Dec 6 10:59:37 2012 +0100 pass kwargs to LmiBaseClient::_get_instance_names() >--------------------------------------------------------------- cli-tools/lmi/lmi_client_base.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cli-tools/lmi/lmi_client_base.py b/cli-tools/lmi/lmi_client_base.py index 1f1fb78..b4791ab 100644 --- a/cli-tools/lmi/lmi_client_base.py +++ b/cli-tools/lmi/lmi_client_base.py @@ -55,7 +55,7 @@ class LmiBaseClient(object): def _get_instance_names(self, klass, **kwargs): try: - inst_name_list = self._cliconn.EnumerateInstanceNames(klass) + inst_name_list = self._cliconn.EnumerateInstanceNames(klass, **kwargs) except pywbem.cim_operations.CIMError, e: return (None, e.args[1]) except pywbem.cim_http.AuthError, e:

1 0

[cura-tools] master: drop LocalOnly parameter from LmiBaseClient::_get_instance() (c16b658)
by phatina＠fedorahosted.org 10 Dec '12

10 Dec '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit c16b6589e96057b2da7194af88ad9148d8958520 Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Dec 6 10:22:13 2012 +0100 drop LocalOnly parameter from LmiBaseClient::_get_instance() >--------------------------------------------------------------- cli-tools/lmi/lmi_client_base.py | 2 +- cli-tools/lmi/lmi_client_shell.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli-tools/lmi/lmi_client_base.py b/cli-tools/lmi/lmi_client_base.py index c061637..1f1fb78 100644 --- a/cli-tools/lmi/lmi_client_base.py +++ b/cli-tools/lmi/lmi_client_base.py @@ -63,7 +63,7 @@ class LmiBaseClient(object): return (inst_name_list, "") def _get_instance(self, path, **kwargs): - inst = self._cliconn.GetInstance(path, LocalOnly = False, **kwargs) + inst = self._cliconn.GetInstance(path, **kwargs) if not inst: return (None, "No such class instance") return (inst, "") diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 8f1343e..b40b5df 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -519,7 +519,7 @@ class _LmiShellClient(LmiBaseClient): return self._get_class_names(namespace, DeepInheritance = True) def get_instance(self, path): - return self._get_instance(path) + return self._get_instance(path, LocalOnly = False) def get_instances(self, class_name, filter_key = "", **kwargs): (instance_list, _) = self._get_instances(class_name, filter_key, **kwargs)

1 0

[cura-tools] master: fix _LmiNamespaceRoot::print_namespaces() output (c2e893c)
by phatina＠fedorahosted.org 03 Dec '12

03 Dec '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit c2e893c8489457523d9d38567a1afef0baeb86f2 Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Dec 3 13:56:52 2012 +0100 fix _LmiNamespaceRoot::print_namespaces() output >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 722d426..8f1343e 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -269,8 +269,8 @@ class _LmiNamespaceRoot(_LmiNamespace): def print_namespaces(self): sys.stdout.write("cimv2\n") sys.stdout.write("interop\n") - sys.stdout.write("PG_InterOp") - sys.stdout.write("PG_Internal") + sys.stdout.write("PG_InterOp\n") + sys.stdout.write("PG_Internal\n") class _LmiClass(BaseObject): def __init__(self, client, namespace, klass):

1 0

[cura-tools] master: fix namespace handling in _LmiCompleter, _LmiNamespaceRoot, LmiConnection (7ffc65a)
by phatina＠fedorahosted.org 03 Dec '12

03 Dec '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 7ffc65a7c75b99e7638e3feeec8bd0fbabe6bbdf Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Dec 3 13:56:23 2012 +0100 fix namespace handling in _LmiCompleter, _LmiNamespaceRoot, LmiConnection >--------------------------------------------------------------- cli-tools/lmi-shell.py | 5 ++--- cli-tools/lmi/lmi_client_shell.py | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cli-tools/lmi-shell.py b/cli-tools/lmi-shell.py index 122bc34..db02813 100755 --- a/cli-tools/lmi-shell.py +++ b/cli-tools/lmi-shell.py @@ -118,11 +118,10 @@ class _LmiCompleter(rlcompleter.Completer): methods = self.__complete_object_methods(expr, to_complete) properties = self.__complete_object_properties(expr, to_complete) if isinstance(expr, (LmiConnection, _LmiNamespaceRoot)): - namespaces = expr.namespaces() - for n in namespaces: + for n in expr.namespaces: if n.lower().startswith(to_complete.lower()): self._last_complete.append(cmd + "." + n) - methods = [x for x in methods if x not in namespaces] + methods = [x for x in methods if x not in expr.namespaces] elif isinstance(expr, _LmiNamespace): for c in expr.classes(): if c.lower().startswith(to_complete.lower()): diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 5e8ed21..722d426 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -262,6 +262,7 @@ class _LmiNamespaceRoot(_LmiNamespace): def PG_Internal(self): return _LmiNamespace(self._client, "root/PG_Internal") + @property def namespaces(self): return ["cimv2", "interop", "PG_InterOp", "PG_Internal"] @@ -545,6 +546,7 @@ class LmiConnection(object): def __init__(self, hostname, username = "", password = "", interactive = False): self._shell_client = _LmiShellClient(hostname, username, password, interactive) + @property def namespaces(self): return ["root"]

1 0

[cura-tools] master: fix _LmiNamespace.name (bab3f9d)
by phatina＠fedorahosted.org 03 Dec '12

03 Dec '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit bab3f9d9ff7c968e58aa7936516febee538b2ffc Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Dec 3 13:52:08 2012 +0100 fix _LmiNamespace.name >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index d499b1b..5e8ed21 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -214,8 +214,6 @@ class _LmiNamespace(BaseObject): self._name = name def __getattr__(self, name): - if name == "name": - return self._name (klass, errorstr) = self._client.get_class(name, self._name, LocalOnly = False) if not klass: return None @@ -240,6 +238,10 @@ class _LmiNamespace(BaseObject): for c in self.classes(filter_key, exact_match): sys.stdout.write("%s\n" % c) + @property + def name(self): + return self._name + class _LmiNamespaceRoot(_LmiNamespace): def __init__(self, client): super(self.__class__, self).__init__(client, "root")

1 0

[cura-tools] master: drop _LmiErrorHandler (ba1d973)
by phatina＠fedorahosted.org 03 Dec '12

03 Dec '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit ba1d97300ec1d03a8b9719369fa42ef1d12a439d Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Dec 3 13:50:33 2012 +0100 drop _LmiErrorHandler >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 28 ++++------------------------ 1 files changed, 4 insertions(+), 24 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index d572603..d499b1b 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -24,26 +24,6 @@ from xml.dom.minicompat import NodeList from lmi_client_base import LmiBaseClient from lmi_client_base import LmiReturnValue -class _LmiErrorHandler(object): - def __init__(self, errormsg): - if errormsg: - sys.stderr.write("Error: %s\n" % errormsg) - - def __getattr__(self, name): - return _LmiErrorHandler("") - - def __call__(self, *args, **kwargs): - return _LmiErrorHandler("") - - def __iter__(self): - return _LmiErrorHandler("") - - def __getitem__(self, key): - return _LmiErrorHandler("") - - def __str__(self): - return "" - class _LmiTextFormatter(object): def __init__(self, text): self._text = text @@ -238,7 +218,7 @@ class _LmiNamespace(BaseObject): return self._name (klass, errorstr) = self._client.get_class(name, self._name, LocalOnly = False) if not klass: - return _LmiErrorHandler("Error: %s" % errorstr) + return None return _LmiClass(self._client, self, klass) def __repr__(self): @@ -305,7 +285,7 @@ class _LmiClass(BaseObject): def instances(self, filter_key = "", **kwargs): instance_list = self._client.get_instances(self._class.classname, filter_key, **kwargs) if not instance_list: - return _LmiErrorHandler("'%s' instance does not exist" % filter_key) + return [] result = [] for i in instance_list: result.append(_LmiInstance(self._client, self, i)) @@ -314,7 +294,7 @@ class _LmiClass(BaseObject): def first_instance(self, filter_key = "", **kwargs): instance_list = self.instances(filter_key, **kwargs) if not instance_list: - return _LmiErrorHandler("'%s' instance does not exist" % filter_key) + return None return instance_list[0] def properties(self): @@ -448,7 +428,7 @@ class _LmiInstance(BaseObject): if methods and name in methods: return _LmiInstance._LmiInstanceMethod(self._client, self, self.__method(name)) elif not name in self._inst.properties.keys(): - return _LmiErrorHandler("'%s' is not valid property of the class '%s'" % (name, self._class.classname)) + return None return self._inst.properties[name].value def __getitem__(self, key):

1 0

[cura-tools] master: use class members within hierarchy tree (3d396ba)
by phatina＠fedorahosted.org 03 Dec '12

03 Dec '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 3d396ba26459748d7b6cbc076a68eed5d53f6f41 Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Dec 3 13:38:16 2012 +0100 use class members within hierarchy tree >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 6b88d49..d572603 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -236,7 +236,7 @@ class _LmiNamespace(BaseObject): def __getattr__(self, name): if name == "name": return self._name - (klass, errorstr) = self._client.get_class(name, self._name) + (klass, errorstr) = self._client.get_class(name, self._name, LocalOnly = False) if not klass: return _LmiErrorHandler("Error: %s" % errorstr) return _LmiClass(self._client, self, klass) @@ -354,7 +354,8 @@ class _LmiInstanceName(BaseObject): lmi_namespace = _LmiNamespace(self._client, self._instance_name.namespace) (cim_class, errorstr) = self._client.get_class( self._instance_name.classname, - self._instance_name.namespace) + self._instance_name.namespace, + LocalOnly = False) lmi_class = _LmiClass(self._client, lmi_namespace, cim_class) if not lmi_class: return None @@ -377,7 +378,8 @@ class _LmiInstance(BaseObject): lmi_rparams = {} for (key, value) in rparams.iteritems(): if isinstance(value, pywbem.cim_obj.CIMInstance): - (lmi_class, errorstr) = self._client.get_class(value.classname, value.namespace) + (lmi_class, errorstr) = self._client.get_class(value.classname, + value.namespace, LocalOnly = False) if not lmi_class: return None lmi_rparams[key] = _LmiInstance(self._client, lmi_class, value) @@ -387,7 +389,8 @@ class _LmiInstance(BaseObject): result = [] for m in value: if isinstance(m, pywbem.cim_obj.CIMInstance): - (lmi_class, errorstr) = self._client.get_class(m.classname, m.namespace) + (lmi_class, errorstr) = self._client.get_class(m.classname, + m.namespace, LocalOnly = False) if not lmi_class: return None lmi_rparams[key] = _LmiInstance(self._client, lmi_class, m) @@ -455,7 +458,8 @@ class _LmiInstance(BaseObject): return "%s(classname='%s', ...)" % (self.__class__.__name__, self.classname) def __methods(self): - (klass, errorstr) = self._client.get_class(self._inst.classname, self._class.namespace) + (klass, errorstr) = self._client.get_class(self._inst.classname, self._class.namespace, + LocalOnly = False) if not klass: return [] return klass.methods @@ -500,7 +504,8 @@ class _LmiInstance(BaseObject): assoc_args["Props"] = Props associators_list = self._client.get_associators(self._inst, **assoc_args) for i in associators_list: - (cim_class, errorstr) = self._client.get_class(i.classname, i.path.namespace) + (cim_class, errorstr) = self._client.get_class(i.classname, i.path.namespace, + LocalOnly = False) if not cim_class: return [] lmi_namespace = _LmiNamespace(self._client, i.path.namespace) @@ -539,8 +544,8 @@ class _LmiShellClient(LmiBaseClient): return None return instance_list - def get_class(self, class_name, namespace = None): - return self._get_class(class_name, namespace) + def get_class(self, class_name, namespace = None, **kwargs): + return self._get_class(class_name, namespace, **kwargs) def get_associators(self, instance, **kwargs): return self._get_associators(instance, **kwargs)

1 0

[cura-tools] master: extend example usage by _LmiInstance::associators() (83b7fa5)
by phatina＠fedorahosted.org 03 Dec '12

03 Dec '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 83b7fa5d56471eb89f3ae92957e0fbe13fca45e4 Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Dec 3 13:36:47 2012 +0100 extend example usage by _LmiInstance::associators() >--------------------------------------------------------------- README | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/README b/README index 46f8b4b..260066b 100644 --- a/README +++ b/README @@ -160,3 +160,11 @@ Following examples show, how to use command-line tools: ... instance properties ... > <ctrl+d> $ + + - example how to get associated objects with an instance + $ lmi-shell.py + > c = connect("hostname", "username", "password") + > instance = c.cimv2.LMI_Group.first_instance() + > associated_objects = instance.associators() + > <ctrl+d> + $

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

cura-tools-devel December 2012