cura-tools-devel June 2013

cura-tools-devel@lists.fedorahosted.org

1 participants
13 discussions

[cura-tools] master: introduce _LmiInstance::properties_dict(), ::property_value() (dc65afb)
by phatina＠fedoraproject.org 18 Jun '13

18 Jun '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit dc65afb36649dad17360ee25d8da9b6084e14942 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Jun 18 15:11:19 2013 +0200 introduce _LmiInstance::properties_dict(), ::property_value() >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 54bd8b2..1886dd4 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -895,6 +895,19 @@ class _LmiInstance(BaseObject): sys.stdout.write("%s\n" % name) @possibly_deleted + def properties_dict(self): + """ + Returns dictionary containing property name and value pairs. + This method may consume significant memory amount when called. + """ + return dict(zip(self._cim_instance.properties.keys(), + map(lambda x: x.value, self._cim_instance.properties.values()))) + + @possibly_deleted + def property_value(self, prop_name): + return getattr(self, prop_name) + + @possibly_deleted def methods(self): return self._lmi_class.methods()

1 0

[cura-tools] master: fix cql query language prefix (8673978)
by phatina＠fedoraproject.org 18 Jun '13

18 Jun '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 86739784063d338644922f3f488101d56b4ed337 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Jun 18 13:54:45 2013 +0200 fix cql query language prefix >--------------------------------------------------------------- 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 a69cdfe..89e0206 100644 --- a/cli-tools/lmi/lmi_client_base.py +++ b/cli-tools/lmi/lmi_client_base.py @@ -76,7 +76,7 @@ class LmiReturnValue(_RValue): return rval class LmiBaseClient(object): - QUERY_LANG_CQL = "CQL" + QUERY_LANG_CQL = "DMTF:CQL" QUERY_LANG_WQL = "WQL" CONN_TYPE_WBEM, \ CONN_TYPE_PEGASUS_UDS = range(2)

1 0

[cura-tools] master: fix embedded instances class, namespace members (6e89b81)
by phatina＠fedoraproject.org 18 Jun '13

18 Jun '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 6e89b8106e2e823864a11d9d320866416121612a Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Apr 30 13:49:45 2013 +0200 fix embedded instances class, namespace members >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 67 ++++++++++++++++++++++++++++++++---- 1 files changed, 59 insertions(+), 8 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index fe17097..54bd8b2 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -357,6 +357,34 @@ class _LmiSubscription(BaseObject): if self._cim_handler_tpl[1]: self._client._delete_instance(self._cim_handler_tpl[0].path) +class lmi_return_val_if_fail(object): + def __init__(self, attr, rval): + self._attr = attr + self._rval = rval + self._ret = True + + def __call__(self, fn): + def wrapper(self_wr, *args, **kwargs): + attrs = self._attr.split(".") + obj = self_wr + for a in attrs: + try: + obj = getattr(obj, a) + except AttributeError, e: + obj = None + if not obj: + if self._ret: + return self._rval + else: + return + return fn(self_wr, *args, **kwargs) + return wrapper + +class lmi_return_if_fail(lmi_return_val_if_fail): + def __init__(self, attr): + super(self.__class__, self).__init__(attr, None) + self._ret = False + class _LmiNamespace(BaseObject): def __init__(self, client, name): self._client = client @@ -369,7 +397,7 @@ class _LmiNamespace(BaseObject): return _LmiClass(self._client, self, name) def __repr__(self): - return "%s(namespace='%s', ...)" % (self.__class__.__name__, self._name) + return "%s(namespace='%s', ...)" % (self.__class__.__name__, self.name) def classes(self, filter_key = "", exact_match = False): (class_name_list, _, errorstr) = self._client._get_class_names( @@ -454,8 +482,9 @@ def lmi_class_fetch_lazy(fn): def wrapped(self, *args, **kwargs): if not self._cim_class: # FIXME: this is wrong, throw an exception? - (self._cim_class, _, _) = self._client._get_class( - self._cim_classname, self._namespace.name, LocalOnly = False) + if self._namespace: + (self._cim_class, _, _) = self._client._get_class( + self._cim_classname, self._namespace.name, LocalOnly = False) return fn(self, *args, **kwargs) return wrapped @@ -470,6 +499,8 @@ class _LmiClass(BaseObject): def __repr__(self): return "%s(classname='%s', ...)" % (self.__class__.__name__, self.classname) + @lmi_class_fetch_lazy + @lmi_return_val_if_fail("_namespace", None) def create_instance(self, properties = {}, qualifiers = {}, property_list = None): self_properties = self._cim_class.properties for (key, value) in properties.iteritems(): @@ -486,9 +517,11 @@ class _LmiClass(BaseObject): return _LmiInstance(self._client, self, cim_instance) @lmi_class_fetch_lazy + @lmi_return_if_fail("_namespace") def doc(self): _LmiXmlFormatter(self._cim_class.tocimxml()).fancy_format(self._client.interactive) + @lmi_return_val_if_fail("_namespace", []) def instance_names(self, **kwargs): (inst_name_list, _, errorstr) = self._client._get_instance_names( self._cim_classname, namespace = self._namespace.name, **kwargs) @@ -505,6 +538,7 @@ class _LmiClass(BaseObject): return None return inst_name_list[0] + @lmi_return_val_if_fail("_namespace", []) def instances(self, **kwargs): (instance_list, _, errorstr) = self._client._get_instances( self._cim_classname, self._namespace.name, **kwargs) @@ -521,19 +555,23 @@ class _LmiClass(BaseObject): return inst_name.to_instance() @lmi_class_fetch_lazy + @lmi_return_val_if_fail("_namespace", []) def properties(self): return self._cim_class.properties.keys() @lmi_class_fetch_lazy + @lmi_return_if_fail("_namespace") def print_properties(self): for prop in self._cim_class.properties.keys(): sys.stdout.write("%s\n" % prop) @lmi_class_fetch_lazy + @lmi_return_val_if_fail("_namespace", []) def methods(self): return self._cim_class.methods.keys() @lmi_class_fetch_lazy + @lmi_return_if_fail("_namespace") def print_methods(self): for method in self._cim_class.methods.keys(): sys.stdout.write("%s\n" % method) @@ -594,10 +632,10 @@ class _LmiInstanceMethod(BaseObject): lmi_rparams = pywbem.NocaseDict() for (key, value) in rparams.iteritems(): if isinstance(value, pywbem.cim_obj.CIMInstance): - (lmi_class, _, errorstr) = self._client._get_class(value.classname, - value.namespace, LocalOnly = False) - if not lmi_class: - return None + lmi_namespace = None + if not value.path is None: + lmi_namespace = _LmiNamespace(self._client, value.path.namespace) + lmi_class = _LmiClass(self._client, lmi_namespace, value.classname) lmi_rparams[key] = _LmiInstance(self._client, lmi_class, value) elif isinstance(value, pywbem.cim_obj.CIMInstanceName): lmi_rparams[key] = _LmiInstanceName(self._client, value) @@ -729,6 +767,7 @@ class _LmiInstance(BaseObject): return self._cim_instance.path @possibly_deleted + @lmi_return_if_fail("_cim_instance.path") def doc(self): _LmiXmlFormatter(self._cim_instance.tocimxml()).fancy_format(self._client.interactive) @@ -737,6 +776,7 @@ class _LmiInstance(BaseObject): _LmiMofFormatter(self._cim_instance.tomof()).fancy_format(self._client.interactive) @possibly_deleted + @lmi_return_val_if_fail("_cim_instance.path", []) def associator_names(self, AssocClass = None, ResultClass = None, Role = None,\ ResultRole = None): result = [] @@ -761,10 +801,11 @@ class _LmiInstance(BaseObject): result = self.associator_names(AssocClass = AssocClass, ResultClass = ResultClass, Role = Role, ResultRole = ResultRole) if not result: - return [] + return None return result[0] @possibly_deleted + @lmi_return_val_if_fail("_cim_instance.path", []) def associators(self, AssocClass = None, ResultClass = None, Role = None,\ ResultRole = None, Props = None): result = [] @@ -797,6 +838,7 @@ class _LmiInstance(BaseObject): return result[0] @possibly_deleted + @lmi_return_val_if_fail("_cim_instance.path", []) def reference_names(self, ResultClass = None, Role = None): result = [] reference_names_args = {} @@ -818,6 +860,7 @@ class _LmiInstance(BaseObject): return result[0] @possibly_deleted + @lmi_return_val_if_fail("_cim_instance.path", []) def references(self, ResultClass = None, Role = None, Props = None): result = [] references_args = {} @@ -861,6 +904,13 @@ class _LmiInstance(BaseObject): @possibly_deleted def push(self): + if not self._lmi_class._namespace: + return LmiReturnValue( + hostname = self._client.hostname, + use_display_hook = True, + rval = False, + errorstr = "Can't push this instance" + ) return_value = self._client._modify_instance(self._cim_instance) return LmiReturnValue( hostname = self._client.hostname, @@ -871,6 +921,7 @@ class _LmiInstance(BaseObject): errorstr = return_value.errorstr) @possibly_deleted + @lmi_return_if_fail("_lmi_class._namespace") def delete(self): rval = self._client._delete_instance(self.path) self._deleted = rval.rval == 0

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

cura-tools-devel June 2013