cura-tools-devel July 2014

cura-tools-devel@lists.fedorahosted.org

3 participants
23 discussions

[cura-tools] master: drop debug statement (949d605)
by phatina＠fedoraproject.org 17 Jul '14

17 Jul '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 949d60549138cc80b5e2cea8f6c7e9702cbcdd18 Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Jul 17 12:14:12 2014 +0200 drop debug statement >--------------------------------------------------------------- cli/lmi/shell/LMIWSMANClient.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/cli/lmi/shell/LMIWSMANClient.py b/cli/lmi/shell/LMIWSMANClient.py index 1176083..c506dd2 100644 --- a/cli/lmi/shell/LMIWSMANClient.py +++ b/cli/lmi/shell/LMIWSMANClient.py @@ -482,9 +482,6 @@ class LMIWSMANClient(object): # Count the instances cnt += 1 - # TODO: remove print - print cnt, limit - # Do we have all the instance(names)? if context is not None and cnt == limit: # Release the enumeration context from CIMOM.

1 0

[cura-tools] master: fix LMIWSMANClient::connect() rval (461f449)
by phatina＠fedoraproject.org 17 Jul '14

17 Jul '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 461f449376a81501a3d95f574a2e10bd3a5584d2 Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Jul 17 12:11:49 2014 +0200 fix LMIWSMANClient::connect() rval >--------------------------------------------------------------- cli/lmi/shell/LMIWSMANClient.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cli/lmi/shell/LMIWSMANClient.py b/cli/lmi/shell/LMIWSMANClient.py index e05b0cf..1176083 100644 --- a/cli/lmi/shell/LMIWSMANClient.py +++ b/cli/lmi/shell/LMIWSMANClient.py @@ -402,7 +402,7 @@ class LMIWSMANClient(object): """ Compatibility method present due to :py:class:`.LMICIMXMLClient`. """ - pass + return LMIReturnValue(rval=True) def disconnect(self): """

1 0

[cura-tools] master: raise CIMError when synchronous method call fails (97e7188)
by phatina＠fedoraproject.org 16 Jul '14

16 Jul '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 97e7188e0beb78f455bc9df49c154af135b0f7e3 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Jul 15 15:01:18 2014 +0200 raise CIMError when synchronous method call fails >--------------------------------------------------------------- cli/lmi/shell/LMIMethod.py | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/cli/lmi/shell/LMIMethod.py b/cli/lmi/shell/LMIMethod.py index f82641f..3aea5d6 100644 --- a/cli/lmi/shell/LMIMethod.py +++ b/cli/lmi/shell/LMIMethod.py @@ -43,6 +43,7 @@ from lmi.shell.LMIJob import JOB_FINISH_DELAYED from lmi.shell.LMIJob import JOB_FINISH_EARLY from lmi.shell.LMIUtil import LMIPassByRef +from lmi.shell.LMIUtil import lmi_get_use_exceptions from lmi.shell.LMIUtil import lmi_raise_or_dump_exception from lmi.shell.LMIUtil import lmi_transform_to_cim_param from lmi.shell.LMIUtil import lmi_transform_to_lmi @@ -219,6 +220,16 @@ class LMIMethod(LMIWrapperBaseObject): :returns: :py:class:`.LMIReturnValue` object with ``rval`` set to Job output parameters """ + def get_rval_errorstr(err_list): + for err in err_list: + if err.CIMStatusCode is not None: + return err.CIMStatusCode, err.Message + # There is no CIM_Error instance with CIMStatusCode set. In such + # case, we set rval to CIM_ERR_FAILED and for error message we use + # the first instance from err_list. + message = err_list[0].Message if err_list else "Failed" + return wbem.CIM_ERR_FAILED, message + # Adjust return value from the job object. if job_refresh: job_inst.refresh() @@ -246,15 +257,19 @@ class LMIMethod(LMIWrapperBaseObject): "Sync%s: Job instance can not be refreshed; %s" % (self._method_name, errorstr)) raise LMISynchroMethodCallError(errorstr) - exc_rval, exc_rparams, exc_errorstr = job_inst.GetError() - error_inst = exc_rparams.get("error", None) - if not error_inst: + exc_rval, exc_rparams, exc_errorstr = job_inst.GetErrors() + err_list = exc_rparams.get("errors", None) + if not err_list: logger.debug( - "Sync%s: Can not retrieve Error instance; %s" % + "Sync%s: Can not retrieve Error instances; %s" % (self._method_name, exc_errorstr)) raise LMISynchroMethodCallError( "Could not get Job error message") - errorstr = error_inst.Message + + rval, errorstr = get_rval_errorstr(err_list) + if lmi_get_use_exceptions(): + raise CIMError(rval, errorstr) + return LMIReturnValue(rval=rval, rparams=rparams, errorstr=errorstr) def __handle_synchro_method_call_indication(self, job_inst):

1 0

[cura-tools] master: revert return type of LMICIMXMLClient::modify_instance() (3b73780)
by phatina＠fedoraproject.org 15 Jul '14

15 Jul '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 3b737805d9dc1203d603394de3f6e05e2601f598 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Jul 15 10:35:03 2014 +0200 revert return type of LMICIMXMLClient::modify_instance() bool -> int >--------------------------------------------------------------- cli/lmi/shell/LMICIMXMLClient.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/lmi/shell/LMICIMXMLClient.py b/cli/lmi/shell/LMICIMXMLClient.py index a7c24c0..4cd9d5a 100644 --- a/cli/lmi/shell/LMICIMXMLClient.py +++ b/cli/lmi/shell/LMICIMXMLClient.py @@ -741,7 +741,7 @@ class LMICIMXMLClient(object): cim_path = self._cliconn.CreateInstance(NewInstance=cim_instance) return self.get_instance(cim_path, LocalOnly=False) - @lmi_process_cim_exceptions(False) + @lmi_process_cim_exceptions(-1) def modify_instance(self, instance, IncludeQualifiers=True, PropertyList=None): """ @@ -758,8 +758,8 @@ class LMICIMXMLClient(object): PropertyList is None, the set of properties to be modified consists of those of *ModifiedInstance* with values different from the current values in the instance to be modified. - :returns: :py:class:`.LMIReturnValue` object with ``rval`` set to True, - if no error occurs; otherwise ``rval`` is set to False and + :returns: :py:class:`.LMIReturnValue` object with ``rval`` set to 0, + if no error occurs; otherwise ``rval`` is set to -1 and ``errorstr`` is set to corresponding error string. :raises: :py:exc:`.CIMError`, :py:exc:`.ConnectionError` """ @@ -768,7 +768,7 @@ class LMICIMXMLClient(object): **filter_kwargs( IncludeQualifiers=IncludeQualifiers, PropertyList=PropertyList)) - return LMIReturnValue(rval=True) + return LMIReturnValue(rval=0) @lmi_process_cim_exceptions(False) def delete_instance(self, instance):

1 0

[cura-tools] master's head updated: drop double doc-string in LMIClass::fetch() (c558013)
by phatina＠fedoraproject.org 14 Jul '14

14 Jul '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git Branch 'master' now includes: 77012fa lmiwbem rewrite 2fd71e4 python 2.6 compatibility backports 24ced30 drop forgotten parameters in LMINamespace::classes() fb92688 fix missing x509 authentication 3ac714d doc: fixed figure creation fbebbaf merged changes from openlmi-scripts upstream [1/3] (sources) a4363ef merged changes from openlmi-scripts upstream [2/3] (tests) f3bb2ef merged changes from openlmi-scripts upstream [3/3] (doc) b5b1d03 added pyparsing dependency to setup 52af091 fix broken documentation for lmishell 98c3de0 backport metacommand to python 2.6 fbefb0b rename lmiwbem.DEF_NAMESPACE to DEFAULT_NAMESPACE aed8d6b fix wrong doc string for lmi_class_fetch_lazy.__init__() fc991a8 create LMIClass without class name verification f6de3ec simplify LMIShellClient._get_class() interface f967572 fix path to html docs in setup.cfg 5fc6a56 fix LMIIndicationListener.__create_handler_name() ef6053e fix LMIMethod.__call__() missing lmiwbem module name in exception handling 2106eea introduce secure connection for indications using SSL 5d7d4ba introduce LMIConnection::connect(), ::disconnect() 3fd71c8 do not use direct imports to wrapper classes e36f273 fix sphinx broken documentation in LMIClass 13d0890 fix html links in documentation 5a3b37c prefer opened connection a534826 fix EnumerateClassNames in LMIClass::methods() 7201f4b reorder attribute retrieval in LMIInstance dfccbdc fix missing connection argument in LMIClass::instances() 4683345 fix unbound variables 0c7f323 fix missing documentation in LMIClass::instances(), ::first_instance() c3ab50c fix SSL certificate verification parameter for WBEMConnection d2168e9 cast lmiwbem types to python types in LMIInstance::__getattr__() 4ed3bcb fix refresh check in Synchro methods 879d177 fix missing indication destination prefix 57bf645 revert return types in LMIInstance::refresh() 521dc41 do not cast None in LMIUtil::_lmi_do_cast() 4a7e1bf introduce LMIBaseClient.__del__(), LMIConnection.__del__() for WBEMConnection cleanup 4cd404b scripts: allow for upload to PyPI a413f41 setup: fix license classifier feb0999 scripts: bumped version of deprecated openlmi-scripts 0b75326 setup: once more fix license classifiers 4dd6b72 generate setup files from template 7ced443 introduce compatibility module 0d76857 switch to absolute imports 53fa4f8 drop unused LMIBaseClient::_get_classes() 2a0a6b8 code cleanup f3ea06d pep8 cleanup df7dc58 drop autogenerated doc files 118b6d8 reorder API documentation links 212343e check for job presence in synchronous method calls ebd3047 introduce WS-MAN support 3af5510 doc: fixed typo 48b5941 lmi: extended manpage, improved help 05e7dea fix unintended version bump 7c1e4df conditional import of CIMError in scripts.common.errors 14bb082 polish WS-MAN client 2e1e2d0 unwrap assigned LMIInstance(Name) to LMIInstanceName keybinding 71b61ad make LMIClass::print_methods() more informative b96f3ac allow root and pegasus members to connect via Unix socket 8cdd87f fix missing lmiwbem bits in meta-command tests b8ceb12 bump release version to 1.0.0 7cabefe fix method name, when sync prefix is present 26c32d9 lmi.shell: register LMI_SELinuxJob with synchro method calls b920799 revert version to 0.9.2 2f63100 merge with openlmi-tools-lmiwbem branch c558013 drop double doc-string in LMIClass::fetch()

1 0

[cura-tools] master: drop double doc-string in LMIClass::fetch() (c558013)
by phatina＠fedoraproject.org 14 Jul '14

14 Jul '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit c5580132b078a317863d4059f58078fee8726708 Author: Peter Hatina <phatina(a)redhat.com> Date: Fri Jul 11 14:37:49 2014 +0200 drop double doc-string in LMIClass::fetch() >--------------------------------------------------------------- cli/lmi/shell/LMIClass.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/cli/lmi/shell/LMIClass.py b/cli/lmi/shell/LMIClass.py index 62b0d3a..4d800ee 100644 --- a/cli/lmi/shell/LMIClass.py +++ b/cli/lmi/shell/LMIClass.py @@ -168,10 +168,6 @@ class LMIClass(LMIWrapperBaseObject): include qualifiers and class origin. Default value is False. :raises: :py:exc:`.CIMError`, :py:exc:`.ConnectionError` - :param bool full_fetch: True, if :py:class:`CIMClass` should include qualifiers - and class origin. Default value is False. - :raises: :py:exc:`pywbem.CIMError`, :py:exc:`pywbem.AuthError` - **Usage:** See :ref:`class_fetching_a_class`. """ if self._conn.is_wsman():

1 0

[cura-tools] master: merge with openlmi-tools-lmiwbem branch (2f63100)
by phatina＠fedoraproject.org 14 Jul '14

14 Jul '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 2f6310083d56e6821952f190b6adfc5d5feb0b49 Merge: 68569e8 b920799 Author: Peter Hatina <phatina(a)redhat.com> Date: Fri Jul 11 14:31:40 2014 +0200 merge with openlmi-tools-lmiwbem branch >--------------------------------------------------------------- Diff suppressed because of size. To see it, use: git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^2f6310083d56e6821952f190b6adfc5d5feb0b49~1 2f6310083d56e6821952f190b6adfc5d5feb0b49

1 0

[cura-tools] openlmi-tools-lmiwbem: revert version to 0.9.2 (b920799)
by phatina＠fedoraproject.org 11 Jul '14

11 Jul '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : openlmi-tools-lmiwbem >--------------------------------------------------------------- commit b920799972c6077ee7f3d045b963fde1fa95cbeb Author: Peter Hatina <phatina(a)redhat.com> Date: Fri Jul 11 14:10:39 2014 +0200 revert version to 0.9.2 >--------------------------------------------------------------- cli/lmi/shell/LMIShellVersion.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cli/lmi/shell/LMIShellVersion.py b/cli/lmi/shell/LMIShellVersion.py index 02d4333..6df2b4e 100644 --- a/cli/lmi/shell/LMIShellVersion.py +++ b/cli/lmi/shell/LMIShellVersion.py @@ -13,4 +13,4 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. -__version__ = "1.0.0" +__version__ = "0.9.2"

1 0

[cura-tools] openlmi-tools-lmiwbem: lmi.shell: register LMI_SELinuxJob with synchro method calls (26c32d9)
by phatina＠fedoraproject.org 11 Jul '14

11 Jul '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : openlmi-tools-lmiwbem >--------------------------------------------------------------- commit 26c32d99dfcf9bfa2f0795446a99657c1d029033 Author: Jan Synacek <jsynacek(a)redhat.com> Date: Fri Jul 4 15:16:29 2014 +0200 lmi.shell: register LMI_SELinuxJob with synchro method calls >--------------------------------------------------------------- cli/lmi/shell/LMIMethod.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/cli/lmi/shell/LMIMethod.py b/cli/lmi/shell/LMIMethod.py index ddeb843..f82641f 100644 --- a/cli/lmi/shell/LMIMethod.py +++ b/cli/lmi/shell/LMIMethod.py @@ -159,6 +159,7 @@ class LMIMethod(LMIWrapperBaseObject): # Job classes, which can be used for synchro method calls # TODO: create a configuration option for the static filters' classnames _INDICATION_JOB_CLASSNAMES = ( + "LMI_SELinuxJob", "LMI_StorageJob", "LMI_SoftwareInstallationJob", "LMI_SoftwareVerificationJob",

1 0

[cura-tools] openlmi-tools-lmiwbem: fix method name, when sync prefix is present (7cabefe)
by phatina＠fedoraproject.org 11 Jul '14

11 Jul '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : openlmi-tools-lmiwbem >--------------------------------------------------------------- commit 7cabefea1fbaf38a087851a0fbb6d801502a3e2b Author: Peter Hatina <phatina(a)redhat.com> Date: Fri Jul 11 11:56:01 2014 +0200 fix method name, when sync prefix is present >--------------------------------------------------------------- cli/lmi/shell/LMIMethod.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/lmi/shell/LMIMethod.py b/cli/lmi/shell/LMIMethod.py index 9aabec2..ddeb843 100644 --- a/cli/lmi/shell/LMIMethod.py +++ b/cli/lmi/shell/LMIMethod.py @@ -185,12 +185,12 @@ class LMIMethod(LMIWrapperBaseObject): if is_sync: # Store the synchronous flag and trim the method name self._sync_method = True - method_name = method_name[4:] + self._method_name = method_name[4:] # We need to have CIMClass with qualifiers. Fetch full class. lmi_class = self._lmi_instance._lmi_class lmi_class.fetch(True) - self._method = lmi_class._cim_class.methods[method_name] + self._method = lmi_class._cim_class.methods[self._method_name] # Store the constant values as a list. This can consume some time, if # computed on demand.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

cura-tools-devel July 2014