cura-tools-devel November 2013

cura-tools-devel@lists.fedorahosted.org

4 participants
23 discussions

[cura-tools] master: Fix typo in LMIIndicationListener documentation (f12804e)
by Stephen Gallagher 26 Nov '13

26 Nov '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit f12804edd0017dc0b38794d13479a2be34a0676b Author: Stephen Gallagher <sgallagh(a)redhat.com> Date: Mon Nov 25 13:56:15 2013 -0500 Fix typo in LMIIndicationListener documentation >--------------------------------------------------------------- doc/src/indications.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/src/indications.rst b/doc/src/indications.rst index f0765ff..d29a77d 100644 --- a/doc/src/indications.rst +++ b/doc/src/indications.rst @@ -108,7 +108,7 @@ See the following example: > def handler(ind, arg1, arg2, **kwargs): ... exported_objects = ind.exported_objects() ... do_something_with(exported_objects) - > listener = LmiIndicationListener("0.0.0.0", listening_port) + > listener = LMIIndicationListener("0.0.0.0", listening_port) > listener.add_handler("indication-name-XXXXXXXX", handler, arg1, arg2, **kwargs) > listener.start() >

1 0

[cura-tools] 0.9-fixes: Fix typo in LMIIndicationListener documentation (1df5c6d)
by Stephen Gallagher 26 Nov '13

26 Nov '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : 0.9-fixes >--------------------------------------------------------------- commit 1df5c6dca357b948bf2573c254ad0ab2258b9a24 Author: Stephen Gallagher <sgallagh(a)redhat.com> Date: Mon Nov 25 13:56:15 2013 -0500 Fix typo in LMIIndicationListener documentation >--------------------------------------------------------------- doc/src/indications.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/src/indications.rst b/doc/src/indications.rst index 585f82e..096d807 100644 --- a/doc/src/indications.rst +++ b/doc/src/indications.rst @@ -84,7 +84,7 @@ See the following example: > def handler(ind, arg1, arg2, **kwargs): ... exported_objects = ind.exported_objects() ... do_something_with(exported_objects) - > listener = LmiIndicationListener("0.0.0.0", listening_port) + > listener = LMIIndicationListener("0.0.0.0", listening_port) > listener.add_handler("indication-name-XXXXXXXX", handler, arg1, arg2, **kwargs) > listener.start() >

1 0

[cura-tools] 0.9-fixes: fix passing parameters to method calls (e734c6d)
by phatina＠fedoraproject.org 18 Nov '13

18 Nov '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : 0.9-fixes >--------------------------------------------------------------- commit e734c6d3f8de9da7d453309c6bc7cdf105dfbaa3 Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Nov 18 10:02:59 2013 +0100 fix passing parameters to method calls >--------------------------------------------------------------- cli/lmi/shell/LMIMethod.py | 9 +++------ cli/lmi/shell/LMIUtil.py | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/cli/lmi/shell/LMIMethod.py b/cli/lmi/shell/LMIMethod.py index a658e8c..f6ea0da 100644 --- a/cli/lmi/shell/LMIMethod.py +++ b/cli/lmi/shell/LMIMethod.py @@ -41,7 +41,7 @@ from LMIJob import JOB_FINISH_EARLY from LMIUtil import LMIPassByRef from LMIUtil import lmi_raise_or_dump_exception -from LMIUtil import lmi_cast_to_cim +from LMIUtil import lmi_transform_to_cim_param from LMIUtil import lmi_transform_to_lmi from LMIExceptions import LMIIndicationListenerError @@ -476,12 +476,9 @@ class LMIMethod(LMIWrapperBaseObject): method_args.update(kwargs) for (param, value) in method_args.iteritems(): if param in self._method.parameters: - if isinstance(value, LMIObjectFactory().LMIInstanceName): - value = value.wrapped_object - elif isinstance(value, LMIObjectFactory().LMIInstance): - value = value.wrapped_object.path + # Cast input parameters into acceptable CIM types t = self._method.parameters[param].type - method_args[param] = lmi_cast_to_cim(t, value) + method_args[param] = lmi_transform_to_cim_param(t, value) else: # NOTE: maybe we could check for pywbem type and not to exit prematurely errorstr = "Unknown parameter '%s' supplied for method '%s'" % (param, self._method.name) diff --git a/cli/lmi/shell/LMIUtil.py b/cli/lmi/shell/LMIUtil.py index c117fca..69cbf75 100644 --- a/cli/lmi/shell/LMIUtil.py +++ b/cli/lmi/shell/LMIUtil.py @@ -276,6 +276,32 @@ def lmi_transform_to_lmi(conn, value): return tuple(map(lambda val: lmi_transform_to_lmi(conn, val), value)) return value +def lmi_transform_to_cim_param(t, value): + """ + Helper function for method calls, which transforms input object into + :py:class:`CIMInstanceName` object. Members if lists, dictionaries and tuples are + transformed as well. The function does not cast numeric types. + + :param string t: string of CIM type + :param value: object to be transformed to :py:mod:`pywbem` type. + :returns: transformed LMIShell's object into :py:mod:`pywbem` one + """ + if isinstance(value, LMIObjectFactory().LMIInstance): + return value.wrapped_object.path + elif isinstance(value, LMIObjectFactory().LMIInstanceName): + return value.wrapped_object + elif isinstance(value, (int, float)): + return lmi_cast_to_cim(t, value) + elif isinstance(value, (dict, pywbem.NocaseDict)): + return pywbem.NocaseDict({ + k: lmi_transform_to_cim_param(t, val) + for k, val in value.iteritems()}) + elif isinstance(value, list): + return map(lambda val: lmi_transform_to_cim_param(t, val), value) + elif isinstance(value, tuple): + return tuple(map(lambda val: lmi_transform_to_cim_param(t, val), value)) + return value + def lmi_isinstance(lmi_obj, lmi_class): """ Function returns True if :samp:`lmi_obj` is an instance of a :samp:`lmi_class`, False

1 0

[cura-tools] master: fix passing parameters to method calls (ce20b77)
by phatina＠fedoraproject.org 18 Nov '13

18 Nov '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit ce20b77f53646125433b31f2fc5981214537c7e5 Author: Peter Hatina <phatina(a)redhat.com> Date: Mon Nov 18 10:02:59 2013 +0100 fix passing parameters to method calls >--------------------------------------------------------------- cli/lmi/shell/LMIMethod.py | 9 +++------ cli/lmi/shell/LMIUtil.py | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/cli/lmi/shell/LMIMethod.py b/cli/lmi/shell/LMIMethod.py index a658e8c..f6ea0da 100644 --- a/cli/lmi/shell/LMIMethod.py +++ b/cli/lmi/shell/LMIMethod.py @@ -41,7 +41,7 @@ from LMIJob import JOB_FINISH_EARLY from LMIUtil import LMIPassByRef from LMIUtil import lmi_raise_or_dump_exception -from LMIUtil import lmi_cast_to_cim +from LMIUtil import lmi_transform_to_cim_param from LMIUtil import lmi_transform_to_lmi from LMIExceptions import LMIIndicationListenerError @@ -476,12 +476,9 @@ class LMIMethod(LMIWrapperBaseObject): method_args.update(kwargs) for (param, value) in method_args.iteritems(): if param in self._method.parameters: - if isinstance(value, LMIObjectFactory().LMIInstanceName): - value = value.wrapped_object - elif isinstance(value, LMIObjectFactory().LMIInstance): - value = value.wrapped_object.path + # Cast input parameters into acceptable CIM types t = self._method.parameters[param].type - method_args[param] = lmi_cast_to_cim(t, value) + method_args[param] = lmi_transform_to_cim_param(t, value) else: # NOTE: maybe we could check for pywbem type and not to exit prematurely errorstr = "Unknown parameter '%s' supplied for method '%s'" % (param, self._method.name) diff --git a/cli/lmi/shell/LMIUtil.py b/cli/lmi/shell/LMIUtil.py index c117fca..69cbf75 100644 --- a/cli/lmi/shell/LMIUtil.py +++ b/cli/lmi/shell/LMIUtil.py @@ -276,6 +276,32 @@ def lmi_transform_to_lmi(conn, value): return tuple(map(lambda val: lmi_transform_to_lmi(conn, val), value)) return value +def lmi_transform_to_cim_param(t, value): + """ + Helper function for method calls, which transforms input object into + :py:class:`CIMInstanceName` object. Members if lists, dictionaries and tuples are + transformed as well. The function does not cast numeric types. + + :param string t: string of CIM type + :param value: object to be transformed to :py:mod:`pywbem` type. + :returns: transformed LMIShell's object into :py:mod:`pywbem` one + """ + if isinstance(value, LMIObjectFactory().LMIInstance): + return value.wrapped_object.path + elif isinstance(value, LMIObjectFactory().LMIInstanceName): + return value.wrapped_object + elif isinstance(value, (int, float)): + return lmi_cast_to_cim(t, value) + elif isinstance(value, (dict, pywbem.NocaseDict)): + return pywbem.NocaseDict({ + k: lmi_transform_to_cim_param(t, val) + for k, val in value.iteritems()}) + elif isinstance(value, list): + return map(lambda val: lmi_transform_to_cim_param(t, val), value) + elif isinstance(value, tuple): + return tuple(map(lambda val: lmi_transform_to_cim_param(t, val), value)) + return value + def lmi_isinstance(lmi_obj, lmi_class): """ Function returns True if :samp:`lmi_obj` is an instance of a :samp:`lmi_class`, False

1 0

[cura-tools] master: LMIInstance(Name) is comparable to any other types (c3ebea3)
by phatina＠fedoraproject.org 18 Nov '13

18 Nov '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit c3ebea34db0caaca90cbb0fe144bc0f30deb8516 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Nov 13 08:59:07 2013 +0100 LMIInstance(Name) is comparable to any other types >--------------------------------------------------------------- cli/lmi/shell/LMIInstance.py | 2 ++ cli/lmi/shell/LMIInstanceName.py | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cli/lmi/shell/LMIInstance.py b/cli/lmi/shell/LMIInstance.py index 17ca570..eb00439 100644 --- a/cli/lmi/shell/LMIInstance.py +++ b/cli/lmi/shell/LMIInstance.py @@ -58,6 +58,8 @@ class LMIInstance(LMIWrapperBaseObject): instance is deleted, -1 or 1 is returned. :rtype: int """ + if not isinstance(other, LMIInstance): + return -1 if self._deleted and not other._deleted: return -1 elif not self._deleted and other._deleted: diff --git a/cli/lmi/shell/LMIInstanceName.py b/cli/lmi/shell/LMIInstanceName.py index 08f8eb7..51e0a13 100644 --- a/cli/lmi/shell/LMIInstanceName.py +++ b/cli/lmi/shell/LMIInstanceName.py @@ -40,6 +40,8 @@ class LMIInstanceName(LMIWrapperBaseObject): number, if self > other :rtype: int """ + if not isinstance(other, LMIInstanceName): + return -1 return cmp(self._cim_instance_name, other._cim_instance_name) def __contains__(self, key):

1 0

[cura-tools] 0.9-fixes: LMIInstance(Name) is comparable to any other types (d9dd28a)
by phatina＠fedoraproject.org 13 Nov '13

13 Nov '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : 0.9-fixes >--------------------------------------------------------------- commit d9dd28a3b5988c7d7036eb3b857e09f15ea13bb1 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Nov 13 08:59:07 2013 +0100 LMIInstance(Name) is comparable to any other types >--------------------------------------------------------------- cli/lmi/shell/LMIInstance.py | 2 ++ cli/lmi/shell/LMIInstanceName.py | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/cli/lmi/shell/LMIInstance.py b/cli/lmi/shell/LMIInstance.py index 17ca570..eb00439 100644 --- a/cli/lmi/shell/LMIInstance.py +++ b/cli/lmi/shell/LMIInstance.py @@ -58,6 +58,8 @@ class LMIInstance(LMIWrapperBaseObject): instance is deleted, -1 or 1 is returned. :rtype: int """ + if not isinstance(other, LMIInstance): + return -1 if self._deleted and not other._deleted: return -1 elif not self._deleted and other._deleted: diff --git a/cli/lmi/shell/LMIInstanceName.py b/cli/lmi/shell/LMIInstanceName.py index 08f8eb7..51e0a13 100644 --- a/cli/lmi/shell/LMIInstanceName.py +++ b/cli/lmi/shell/LMIInstanceName.py @@ -40,6 +40,8 @@ class LMIInstanceName(LMIWrapperBaseObject): number, if self > other :rtype: int """ + if not isinstance(other, LMIInstanceName): + return -1 return cmp(self._cim_instance_name, other._cim_instance_name) def __contains__(self, key):

1 0

[cura-tools] master: simplify indication subscription (7e24cf9)
by phatina＠fedoraproject.org 08 Nov '13

08 Nov '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 7e24cf9306b097f6d83d399e320af165f198a777 Author: Peter Hatina <phatina(a)redhat.com> Date: Fri Nov 8 12:08:41 2013 +0100 simplify indication subscription >--------------------------------------------------------------- cli/lmi/shell/LMIConnection.py | 64 +++++++++++++++++++++++++++------------ doc/src/indications.rst | 24 +++++++++++++++ 2 files changed, 68 insertions(+), 20 deletions(-) diff --git a/cli/lmi/shell/LMIConnection.py b/cli/lmi/shell/LMIConnection.py index 301fa52..52c9922 100644 --- a/cli/lmi/shell/LMIConnection.py +++ b/cli/lmi/shell/LMIConnection.py @@ -315,27 +315,32 @@ class LMIConnection(object): * **Filter** (*LMIInstance*) -- if provided, the :py:class:`LMIInstance` object will be used instead of creating a new one; - optional + **optional** * **Handler** (*LMIInstance*) -- if provided, the :py:class:`LMIInstance` - object will be used instead of creating a new one; optional + object will be used instead of creating a new one; **optional** * **Query** (*string*) -- string containing a query for the indications filtering - * **QueryLanguage** (*string*) -- query language; eg. `WQL`, or `DMTF:CQL` + * **QueryLanguage** (*string*) -- query language; eg. *WQL*, or *DMTF:CQL*. + This parameter is optional, default value is *DMTF:CQL*. * **Name** (*string*) -- indication name - * **CreationNamespace** (*string*) -- creation namespace + * **CreationNamespace** (*string*) -- creation namespace. This parameter is + optional, default value is *root/interop*. * **SubscriptionCreationClassName** (*string*) -- subscription object class - name + name. This parameter is optional, default value is *CIM_IndicationSubscription*. * **Permanent** (*bool*) -- whether to preserve the created subscription on LMIShell's quit. Default value is False. * **FilterCreationClassName** (*string*) -- creation class name of the filter - object + object. This parameter is options, default value is *CIM_IndicationFilter*. * **FilterSystemCreationClassName** (*string*) -- system creation class name - of the filter object + of the filter object. This parameter is optional, default value is + *CIM_ComputerSystem*. * **FilterSourceNamespace** (*string*) -- local namespace where the - indications originate + indications originate. This parameter is optional, default value is + *root/cimv2*. * **HandlerCreationClassName** (*string*) -- creation class name of the - handler object + handler object. This parameter is optional, default value is + *CIM_IndicationHandlerCIMXML*. * **HandlerSystemCreationClassName** (*string*) -- system creation name of the - handler object + handler object. This parameter is optional, default value is *CIM_ComputerSystem*. * **Destination** (*string*) -- destination URI, where the indications should be delivered @@ -344,6 +349,7 @@ class LMIConnection(object): set to appropriate error string. """ try: + indication_namespace = kwargs.get("CreationNamespace", "root/interop") cim_filter_provided = "Filter" in kwargs if cim_filter_provided: filt = kwargs["Filter"] @@ -358,17 +364,27 @@ class LMIConnection(object): return LMIReturnValue(rval=False, errorstr=errorstr) else: cim_filter_props = { - "CreationClassName" : kwargs["FilterCreationClassName"], - "SystemCreationClassName" : kwargs["FilterSystemCreationClassName"], - "SourceNamespace" : kwargs["FilterSourceNamespace"], + "CreationClassName" : kwargs.get( + "FilterCreationClassName", + "CIM_IndicationFilter"), + "SystemCreationClassName" : kwargs.get( + "FilterSystemCreationClassName", + "CIM_ComputerSystem"), + "SourceNamespace" : kwargs.get( + "FilterSourceNamespace", + "root/cimv2"), "SystemName" : self._client.uri, "Query" : kwargs["Query"], - "QueryLanguage" : kwargs["QueryLanguage"], + "QueryLanguage" : kwargs.get( + "QueryLanguage", + LMIBaseClient.QUERY_LANG_CQL), "Name" : kwargs["Name"] + "-filter" } (cim_filter, _, errorstr) = self._client._create_instance( - kwargs["FilterCreationClassName"], kwargs["CreationNamespace"], - cim_filter_props) + cim_filter_props["CreationClassName"], + indication_namespace, + cim_filter_props + ) if not cim_filter: lmi_raise_or_dump_exception(LMIIndicationError(errorstr)) return LMIReturnValue(rval=False, errorstr=errorstr) @@ -377,14 +393,19 @@ class LMIConnection(object): cim_handler = kwargs["Handler"]._cim_instance else: cim_handler_props = { - "CreationClassName" : kwargs["HandlerCreationClassName"], - "SystemCreationClassName" : kwargs["HandlerSystemCreationClassName"], + "CreationClassName" : kwargs.get( + "HandlerCreationClassName", + "CIM_IndicationHandlerCIMXML"), + "SystemCreationClassName" : kwargs.get( + "HandlerSystemCreationClassName", + "CIM_ComputerSystem"), "SystemName" : self._client.uri, "Destination" : kwargs["Destination"] + "/" + kwargs["Name"], "Name" : kwargs["Name"] + "-handler" } (cim_handler, _, errorstr) = self._client._create_instance( - kwargs["HandlerCreationClassName"], kwargs["CreationNamespace"], + cim_handler_props["CreationClassName"], + indication_namespace, cim_handler_props) if not cim_handler: if not "Filter" in kwargs: @@ -396,7 +417,10 @@ class LMIConnection(object): "Handler" : cim_handler.path } (cim_subscription, _, errorstr) = self._client._create_instance( - kwargs["SubscriptionCreationClassName"], kwargs["CreationNamespace"], + kwargs.get( + "SubscriptionCreationClassName", + "CIM_IndicationSubscription"), + indication_namespace, cim_subscription_props) if not cim_subscription: if not "Filter" in kwargs: diff --git a/doc/src/indications.rst b/doc/src/indications.rst index 585f82e..f0765ff 100644 --- a/doc/src/indications.rst +++ b/doc/src/indications.rst @@ -32,6 +32,30 @@ How to subscribe to an indication, please, follow the next example: LMIReturnValue(rval=True, rparams={}, errorstr="") > +The previous code can be simplified by omitting some optional parameters: + +* *QueryLanguage*: *DMTF:CQL* +* *CreationNamespace*: *root/interop* +* *SubscriptionCreationClassName*: *CIM_IndicationSubscription* +* *FilterCreationClassName*: *CIM_IndicationFilter* +* *FilterSystemCreationClassName*: *CIM_ComputerSystem* +* *FilterSourceNamespace*: *root/cimv2* +* *HandlerCreationClassName*: *CIM_IndicationHandlerCIMXML* +* *HandlerSystemCreationClassName*: *CIM_ComputerSystem* + +Simplified subscription: + +.. code-block:: python + + > c = connect("host", "privileged_user", "password") + > c.subscribe_indication( + ... Name="cpu", + ... Query='SELECT * FROM CIM_InstModification', + ... Destination="http://192.168.122.1:5988" + ... ) + LMIReturnValue(rval=True, rparams={}, errorstr="") + > + **NOTE:** Make sure, that you are logged-in with an account, which has write privileges in the *root/interop* namespace.

1 0

[cura-tools] 0.9-fixes: fix LMIInstance(Name) comparision logic (fdca8dd)
by phatina＠fedoraproject.org 07 Nov '13

07 Nov '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : 0.9-fixes >--------------------------------------------------------------- commit fdca8dddcfc022c02c1acae6332a14d5c8c53a24 Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Nov 7 10:48:34 2013 +0100 fix LMIInstance(Name) comparision logic >--------------------------------------------------------------- cli/lmi/shell/LMIInstance.py | 14 ++++++++++++++ cli/lmi/shell/LMIInstanceName.py | 9 +++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/cli/lmi/shell/LMIInstance.py b/cli/lmi/shell/LMIInstance.py index 126d438..17ca570 100644 --- a/cli/lmi/shell/LMIInstance.py +++ b/cli/lmi/shell/LMIInstance.py @@ -50,6 +50,20 @@ class LMIInstance(LMIWrapperBaseObject): self.__dict__["_lmi_class"] = lmi_class super(LMIInstance, self).__init__(conn) + def __cmp__(self, other): + """ + :param LMIInstance other: :py:class:`LMIInstance` object to compare + :returns: If both instances are (not) deleted: negative number, if self < other; 0 + if self == other or positive number, if self > other. If the first or second + instance is deleted, -1 or 1 is returned. + :rtype: int + """ + if self._deleted and not other._deleted: + return -1 + elif not self._deleted and other._deleted: + return 1 + return cmp(self._cim_instance, other._cim_instance) + @lmi_possibly_deleted(False) def __contains__(self, key): """ diff --git a/cli/lmi/shell/LMIInstanceName.py b/cli/lmi/shell/LMIInstanceName.py index 254ddc2..08f8eb7 100644 --- a/cli/lmi/shell/LMIInstanceName.py +++ b/cli/lmi/shell/LMIInstanceName.py @@ -33,6 +33,15 @@ class LMIInstanceName(LMIWrapperBaseObject): cim_instance_name = cim_instance_name.wrapped_object self._cim_instance_name = cim_instance_name + def __cmp__(self, other): + """ + :param LMIInstanceName other: :py:class:`LMIInstanceName` object to compare + :returns: negative number, if self < other; 0 if self == other or positive + number, if self > other + :rtype: int + """ + return cmp(self._cim_instance_name, other._cim_instance_name) + def __contains__(self, key): """ :param string key: key name, which will be tested for presence in keybindings

1 0

[cura-tools] master: introduce LMIInstance(Name) comparision logic (b3b0ba8)
by phatina＠fedoraproject.org 07 Nov '13

07 Nov '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit b3b0ba82790bc7805a4804037c57983c44faa629 Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Nov 7 10:53:56 2013 +0100 introduce LMIInstance(Name) comparision logic >--------------------------------------------------------------- cli/lmi/shell/LMIInstance.py | 14 ++++++++++++++ cli/lmi/shell/LMIInstanceName.py | 9 +++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/cli/lmi/shell/LMIInstance.py b/cli/lmi/shell/LMIInstance.py index 126d438..17ca570 100644 --- a/cli/lmi/shell/LMIInstance.py +++ b/cli/lmi/shell/LMIInstance.py @@ -50,6 +50,20 @@ class LMIInstance(LMIWrapperBaseObject): self.__dict__["_lmi_class"] = lmi_class super(LMIInstance, self).__init__(conn) + def __cmp__(self, other): + """ + :param LMIInstance other: :py:class:`LMIInstance` object to compare + :returns: If both instances are (not) deleted: negative number, if self < other; 0 + if self == other or positive number, if self > other. If the first or second + instance is deleted, -1 or 1 is returned. + :rtype: int + """ + if self._deleted and not other._deleted: + return -1 + elif not self._deleted and other._deleted: + return 1 + return cmp(self._cim_instance, other._cim_instance) + @lmi_possibly_deleted(False) def __contains__(self, key): """ diff --git a/cli/lmi/shell/LMIInstanceName.py b/cli/lmi/shell/LMIInstanceName.py index 254ddc2..08f8eb7 100644 --- a/cli/lmi/shell/LMIInstanceName.py +++ b/cli/lmi/shell/LMIInstanceName.py @@ -33,6 +33,15 @@ class LMIInstanceName(LMIWrapperBaseObject): cim_instance_name = cim_instance_name.wrapped_object self._cim_instance_name = cim_instance_name + def __cmp__(self, other): + """ + :param LMIInstanceName other: :py:class:`LMIInstanceName` object to compare + :returns: negative number, if self < other; 0 if self == other or positive + number, if self > other + :rtype: int + """ + return cmp(self._cim_instance_name, other._cim_instance_name) + def __contains__(self, key): """ :param string key: key name, which will be tested for presence in keybindings

1 0

[cura-tools] master: fix passing LMIInstance objects to method calls (f8a25b5)
by phatina＠fedoraproject.org 06 Nov '13

06 Nov '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit f8a25b56058171c21fa567e50b0e99558b89e6c7 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Nov 6 14:22:44 2013 +0100 fix passing LMIInstance objects to method calls >--------------------------------------------------------------- cli/lmi/shell/LMIMethod.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/cli/lmi/shell/LMIMethod.py b/cli/lmi/shell/LMIMethod.py index 5681b2f..a658e8c 100644 --- a/cli/lmi/shell/LMIMethod.py +++ b/cli/lmi/shell/LMIMethod.py @@ -478,6 +478,8 @@ class LMIMethod(LMIWrapperBaseObject): if param in self._method.parameters: if isinstance(value, LMIObjectFactory().LMIInstanceName): value = value.wrapped_object + elif isinstance(value, LMIObjectFactory().LMIInstance): + value = value.wrapped_object.path t = self._method.parameters[param].type method_args[param] = lmi_cast_to_cim(t, value) else:

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

cura-tools-devel November 2013