cura-tools-devel November 2012

cura-tools-devel@lists.fedorahosted.org

2 participants
39 discussions

[cura-tools] master: _LmiInstance passed by ref cast to CIM path (3c08d07)
by phatina＠fedorahosted.org 29 Nov '12

29 Nov '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 3c08d07d1515454da3f34343dc666014e668a3a7 Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Nov 29 11:11:05 2012 +0100 _LmiInstance passed by ref cast to CIM path >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index b727575..b92bc25 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -370,7 +370,8 @@ class _LmiInstance(BaseObject): "sint32" : lambda x: pywbem.Sint32(x), "uint32" : lambda x: pywbem.Uint32(x), "sint64" : lambda x: pywbem.Sint64(x), - "uint64" : lambda x: pywbem.Uint64(x) + "uint64" : lambda x: pywbem.Uint64(x), + "reference": lambda x: x._inst.path if isinstance(x, _LmiInstance) else x } if t in cast: cast_func = cast[t]

1 0

[cura-tools] master: fix == None to is None (cf88f0d)
by phatina＠fedorahosted.org 29 Nov '12

29 Nov '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit cf88f0d39661a41808fd97712a90d0d0a8b9f10c Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Nov 29 10:10:59 2012 +0100 fix == None to is None >--------------------------------------------------------------- cli-tools/lmi-shell.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli-tools/lmi-shell.py b/cli-tools/lmi-shell.py index 38aefae..a649b90 100755 --- a/cli-tools/lmi-shell.py +++ b/cli-tools/lmi-shell.py @@ -27,7 +27,7 @@ from lmi.lmi_client_shell import _LmiClass from lmi.lmi_client_shell import _LmiInstance def _lmi_displayhook(o): - if o == None: + if o is None: return __builtin__._ = None if isinstance(o, LmiReturnValue): @@ -153,7 +153,7 @@ class LmiInteractiveShell(code.InteractiveConsole): def __init__(self, prompt, more_prompt, locals = None): sys.ps1 = prompt sys.ps2 = more_prompt - if locals == None: + if locals is None: locals = {} locals["LmiConnection"] = LmiConnection locals["connect"] = _connect_interactive

1 0

[cura-tools] master: allow to use http or https for connections (d5d0726)
by phatina＠fedorahosted.org 29 Nov '12

29 Nov '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit d5d07266cddcaa2846352c02a8ef1591f5f29958 Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Nov 29 10:03:54 2012 +0100 allow to use http or https for connections >--------------------------------------------------------------- cli-tools/lmi/lmi_client_base.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/cli-tools/lmi/lmi_client_base.py b/cli-tools/lmi/lmi_client_base.py index f38205d..c061637 100644 --- a/cli-tools/lmi/lmi_client_base.py +++ b/cli-tools/lmi/lmi_client_base.py @@ -47,7 +47,10 @@ class LmiBaseClient(object): self._hostname = hostname self._username = username self._password = password - self._cliconn = pywbem.WBEMConnection("https://" + self._hostname, + if not self._hostname.startswith("http://") and \ + not self._hostname.startswith("https://"): + self._hostname = "https://" + self._hostname + self._cliconn = pywbem.WBEMConnection(self._hostname, (self._username, self._password)) def _get_instance_names(self, klass, **kwargs):

1 0

[cura-tools] master: drop _LmiCompleter::__fetch_classes() (ea47378)
by phatina＠fedorahosted.org 29 Nov '12

29 Nov '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit ea473787fc2a0c93c52555e5eca6c38d88b4a82c Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Nov 26 15:59:22 2012 +0100 drop _LmiCompleter::__fetch_classes() >--------------------------------------------------------------- cli-tools/lmi-shell.py | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/cli-tools/lmi-shell.py b/cli-tools/lmi-shell.py index 41f2768..38aefae 100755 --- a/cli-tools/lmi-shell.py +++ b/cli-tools/lmi-shell.py @@ -85,16 +85,6 @@ class _LmiCompleter(rlcompleter.Completer): rlcompleter.Completer.__init__(self, namespace) self._last_complete = [] - def __fetch_classes(self, client, expr): - namespace = expr.name.split("/")[-1] - if self._cache[client][namespace].classes: - return - result = {} - classes = expr.classes() - for c in classes: - result[c] = _LmiCompleterClassCache() - self._cache[client][namespace].classes = result - def __complete_object_methods(self, obj, text): result = filter(lambda m: not m.startswith("_") \ and callable(getattr(obj, m)) \

1 0

[cura-tools] master: global rename, change class member prefix to underscore (d97b4f6)
by phatina＠fedorahosted.org 29 Nov '12

29 Nov '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit d97b4f6b373d8fb2d0944941915ed0879d55555f Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Nov 26 15:57:54 2012 +0100 global rename, change class member prefix to underscore >--------------------------------------------------------------- Diff suppressed because of size. To see it, use: git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^d97b4f6b373d8fb2d0944941915ed0879d55555f~1 d97b4f6b373d8fb2d0944941915ed0879d55555f

1 0

[cura-tools] master: add LmiReturnValue::instance() (0670e2f)
by phatina＠fedorahosted.org 29 Nov '12

29 Nov '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 0670e2f131d869bbe85c93fd77cb53e60038b0ad Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Nov 26 15:26:11 2012 +0100 add LmiReturnValue::instance() >--------------------------------------------------------------- cli-tools/lmi/lmi_client_base.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli-tools/lmi/lmi_client_base.py b/cli-tools/lmi/lmi_client_base.py index e6abae7..954257c 100644 --- a/cli-tools/lmi/lmi_client_base.py +++ b/cli-tools/lmi/lmi_client_base.py @@ -24,13 +24,13 @@ class LmiReturnValue(_RValue): return self.m_instance.classname if self.m_instance else "" @property + def instance(self): + return self.m_instance + + @property def hostname(self): return self.m_hostname - @hostname.setter - def hostname(self, hostname): - self.m_hostname = hostname - def __new__(self, **kwargs): self.m_hostname = "none" self.m_instance = None

1 0

[cura-tools] master: fix _LmiInstanceMethod::__call__() return value (189c51e)
by phatina＠fedorahosted.org 29 Nov '12

29 Nov '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 189c51e36f6f1561fc40e663fe9c53147df81672 Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Nov 26 15:25:25 2012 +0100 fix _LmiInstanceMethod::__call__() return value >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 82fc23f..5f84e3d 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -375,18 +375,25 @@ class _LmiInstance(BaseObject): if t in cast: cast_func = cast[t] kwargs[param] = cast_func(value) - (rval, rparams, errorstr) = self.m_client.call_method_raw( + return_value = self.m_client.call_method_raw( self.m_instance, self.m_method.name, **kwargs) - lmi_rparams = self.__transform_return_values(rparams) - if not lmi_rparams: - # NOTE: this is wrong! What should we do? - return (rval, lmi_rparams, errorstr) + lmi_rparams = [] + if return_value.rparams: + lmi_rparams = self.__transform_return_values(return_value.rparams) + if not lmi_rparams: + # NOTE: this is wrong! What should we do? + return return_value (new_inst, errorstr) = self.m_client.get_instance(self.m_instance.path) - # NOTE: this is wrong! What should we do? if not new_inst: - return (rval, lmi_rparams, errorstr) + # NOTE: this is wrong! What should we do? + return return_value self.m_instance.m_inst = new_inst - return (rval, lmi_rparams, errorstr) + return LmiReturnValue( + hostname = return_value.hostname, + instance = return_value.instance, + rval = return_value.rval, + rparams = lmi_rparams, + errorstr = return_value.errorstr) def __init__(self, client, klass, inst): super(self.__class__, self).__init__()

1 0

[cura-tools] master: global rename to snake_case (3b19903)
by phatina＠fedorahosted.org 29 Nov '12

29 Nov '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 3b19903a44a514250cffd7f9e1d23881f10b0e25 Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Nov 26 14:59:12 2012 +0100 global rename to snake_case >--------------------------------------------------------------- Diff suppressed because of size. To see it, use: git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^3b19903a44a514250cffd7f9e1d23881f10b0e25~1 3b19903a44a514250cffd7f9e1d23881f10b0e25

1 0

[cura-tools] master: extend _LmiInstance::associators() params (d0d2cfa)
by phatina＠fedorahosted.org 29 Nov '12

29 Nov '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit d0d2cfa5cb9f07f9e080922c83c7cb4bdf001f58 Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Nov 26 13:11:15 2012 +0100 extend _LmiInstance::associators() params by AssocClass, ResultClass, Role, ResultRole and Props >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 8d2d6e3..b58c374 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -438,9 +438,21 @@ class _LmiInstance(BaseObject): def doc(self): _LmiXmlFormatter(self.m_inst.tocimxml()).fancyFormat(self.m_client.interactive) - def associators(self): + def associators(self, AssocClass = None, ResultClass = None, Role = None,\ + ResultRole = None, Props = None): result = [] - associators_list = self.m_client.getAssociators(self.m_inst) + assoc_args = {} + if assocClass: + assoc_args["AssocClass"] = AssocClass + if resultClass: + assoc_args["ResultClass"] = ResultClass + if role: + assoc_args["Role"] = Role + if resultRole: + assoc_args["ResultRole"] = ResultRole + if props: + assoc_args["Props"] = Props + associators_list = self.m_client.getAssociators(self.m_inst, **assoc_args) for i in associators_list: (cim_class, errorstr) = self.m_client.getClass(i.classname, i.path.namespace) if not cim_class: @@ -484,8 +496,8 @@ class _LmiShellClient(LmiBaseClient): def getClass(self, class_name, namespace = None): return self._getClass(class_name, namespace) - def getAssociators(self, instance): - return self._getAssociators(instance) + def getAssociators(self, instance, **kwargs): + return self._getAssociators(instance, **kwargs) def callMethodRaw(self, instance, method, **params): (rv, rp, err) = self._callMethodRaw(instance, method, **params)

1 0

[cura-tools] master: wrap method call results into _LmiInstance or _LmiInstanceName (b0d0051)
by phatina＠fedorahosted.org 29 Nov '12

29 Nov '12

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit b0d00510953583c727eb26b632275cd74959d137 Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Nov 26 12:18:20 2012 +0100 wrap method call results into _LmiInstance or _LmiInstanceName >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 53 ++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 4 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index bf626cd..8d2d6e3 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -309,6 +309,24 @@ class _LmiClass(BaseObject): def namespace(self): return self.m_namespace.name +class _LmiInstanceName(BaseObject): + def __init__(self, client, instance_name): + self.m_client = client + self.m_instance_name = instance_name + + def toInstance(self): + (cim_inst, errorstr) = self.m_client.getInstance(self.m_instance_name) + if not cim_inst: + return None + lmi_namespace = _LmiNamespace(self.m_client, self.m_instance_name.namespace) + (cim_class, errorstr) = self.m_client.getClass( + self.m_instance_name.classname, + self.m_instance_name.namespace) + lmi_class = _LmiClass(self.m_client, lmi_namespace, cim_class) + if not lmi_class: + return None + return _LmiInstance(self.m_client, lmi_class, cim_inst) + class _LmiInstance(BaseObject): class _LmiInstanceMethod(BaseObject): def __init__(self, client, instance, method): @@ -317,6 +335,29 @@ class _LmiInstance(BaseObject): self.m_instance = instance self.m_method = method + def __transformReturnValues(self, rparams): + lmi_rparams = {} + for (key, value) in rparams.iteritems(): + if isinstance(value, pywbem.cim_obj.CIMInstance): + (lmi_class, errorstr) = self.m_client.getClass(value.classname, value.namespace) + if not lmi_class: + return None + lmi_rparams[key] = _LmiInstance(self.m_client, lmi_class, value) + elif isinstance(value, pywbem.cim_obj.CIMInstanceName): + lmi_rparams[key] = _LmiInstanceName(self.m_client, value) + elif type(value) == list: + result = [] + for m in value: + if isinstance(m, pywbem.cim_obj.CIMInstance): + (lmi_class, errorstr) = self.m_client.getClass(m.classname, m.namespace) + if not lmi_class: + return None + lmi_rparams[key] = _LmiInstance(self.m_client, lmi_class, m) + elif isinstance(m, pywbem.cim_obj.CIMInstanceName): + result.append(_LmiInstanceName(self.m_client, m)) + lmi_rparams[key] = result + return lmi_rparams + def __call__(self, *args, **kwargs): for (param, value) in kwargs.iteritems(): if param in self.m_method.parameters: @@ -334,14 +375,18 @@ class _LmiInstance(BaseObject): if t in cast: cast_func = cast[t] kwargs[param] = cast_func(value) - rval = self.m_client.callMethodRaw( + (rval, rparams, errorstr) = self.m_client.callMethodRaw( self.m_instance, self.m_method.name, **kwargs) + lmi_rparams = self.__transformReturnValues(rparams) + if not lmi_rparams: + # NOTE: this is wrong! What should we do? + return (rval, lmi_rparams, errorstr) (new_inst, errorstr) = self.m_client.getInstance(self.m_instance.path) - # NOTE: this is wrong! What should be the corrent way? + # NOTE: this is wrong! What should we do? if not new_inst: - return rval + return (rval, lmi_rparams, errorstr) self.m_instance.m_inst = new_inst - return rval + return (rval, lmi_rparams, errorstr) def __init__(self, client, klass, inst): super(self.__class__, self).__init__()

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

cura-tools-devel November 2012