[cura-tools] master: rename genrate_man_page to generate-man-page (4f73e00)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit 4f73e00fc0233e2bff7670eb4b3eb1ce37be917c
Author: Peter Hatina <phatina(a)redhat.com>
Date: Tue Jul 30 11:58:00 2013 +0200
rename genrate_man_page to generate-man-page
>---------------------------------------------------------------
.../{generate_man_page => generate-man-page} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/util/man-page-generator/generate_man_page b/util/man-page-generator/generate-man-page
similarity index 100%
rename from util/man-page-generator/generate_man_page
rename to util/man-page-generator/generate-man-page
10 years, 10 months
[cura-tools] master: rename cli-tools to cli (acb7030)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit acb703069475798ed4db6f337e8d5d7094a2cd67
Author: Peter Hatina <phatina(a)redhat.com>
Date: Tue Jul 30 11:57:12 2013 +0200
rename cli-tools to cli
>---------------------------------------------------------------
{cli-tools => cli}/lmi/__init__.py | 0
{cli-tools => cli}/lmi/shell/LMIBaseClient.py | 0
{cli-tools => cli}/lmi/shell/LMIBaseObject.py | 0
{cli-tools => cli}/lmi/shell/LMIClass.py | 0
{cli-tools => cli}/lmi/shell/LMICompleter.py | 0
{cli-tools => cli}/lmi/shell/LMIConnection.py | 0
{cli-tools => cli}/lmi/shell/LMIConsole.py | 0
{cli-tools => cli}/lmi/shell/LMIConstantValues.py | 0
{cli-tools => cli}/lmi/shell/LMIDecorators.py | 0
{cli-tools => cli}/lmi/shell/LMIExceptions.py | 0
{cli-tools => cli}/lmi/shell/LMIFormatter.py | 0
{cli-tools => cli}/lmi/shell/LMIIndication.py | 0
.../lmi/shell/LMIIndicationListener.py | 0
{cli-tools => cli}/lmi/shell/LMIInstance.py | 0
{cli-tools => cli}/lmi/shell/LMIInstanceName.py | 0
{cli-tools => cli}/lmi/shell/LMIMethod.py | 0
{cli-tools => cli}/lmi/shell/LMINamespace.py | 0
{cli-tools => cli}/lmi/shell/LMIObjectFactory.py | 0
{cli-tools => cli}/lmi/shell/LMIReturnValue.py | 0
{cli-tools => cli}/lmi/shell/LMIShellCache.py | 0
{cli-tools => cli}/lmi/shell/LMIShellClient.py | 0
{cli-tools => cli}/lmi/shell/LMIShellConfig.py | 0
{cli-tools => cli}/lmi/shell/LMIShellOptions.py | 0
{cli-tools => cli}/lmi/shell/LMISubscription.py | 0
{cli-tools => cli}/lmi/shell/LMIUtil.py | 0
{cli-tools => cli}/lmi/shell/__init__.py | 0
{cli-tools => cli}/lmishell | 0
{cli-tools => cli}/setup.py | 0
28 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/cli-tools/lmi/__init__.py b/cli/lmi/__init__.py
similarity index 100%
rename from cli-tools/lmi/__init__.py
rename to cli/lmi/__init__.py
diff --git a/cli-tools/lmi/shell/LMIBaseClient.py b/cli/lmi/shell/LMIBaseClient.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIBaseClient.py
rename to cli/lmi/shell/LMIBaseClient.py
diff --git a/cli-tools/lmi/shell/LMIBaseObject.py b/cli/lmi/shell/LMIBaseObject.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIBaseObject.py
rename to cli/lmi/shell/LMIBaseObject.py
diff --git a/cli-tools/lmi/shell/LMIClass.py b/cli/lmi/shell/LMIClass.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIClass.py
rename to cli/lmi/shell/LMIClass.py
diff --git a/cli-tools/lmi/shell/LMICompleter.py b/cli/lmi/shell/LMICompleter.py
similarity index 100%
rename from cli-tools/lmi/shell/LMICompleter.py
rename to cli/lmi/shell/LMICompleter.py
diff --git a/cli-tools/lmi/shell/LMIConnection.py b/cli/lmi/shell/LMIConnection.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIConnection.py
rename to cli/lmi/shell/LMIConnection.py
diff --git a/cli-tools/lmi/shell/LMIConsole.py b/cli/lmi/shell/LMIConsole.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIConsole.py
rename to cli/lmi/shell/LMIConsole.py
diff --git a/cli-tools/lmi/shell/LMIConstantValues.py b/cli/lmi/shell/LMIConstantValues.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIConstantValues.py
rename to cli/lmi/shell/LMIConstantValues.py
diff --git a/cli-tools/lmi/shell/LMIDecorators.py b/cli/lmi/shell/LMIDecorators.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIDecorators.py
rename to cli/lmi/shell/LMIDecorators.py
diff --git a/cli-tools/lmi/shell/LMIExceptions.py b/cli/lmi/shell/LMIExceptions.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIExceptions.py
rename to cli/lmi/shell/LMIExceptions.py
diff --git a/cli-tools/lmi/shell/LMIFormatter.py b/cli/lmi/shell/LMIFormatter.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIFormatter.py
rename to cli/lmi/shell/LMIFormatter.py
diff --git a/cli-tools/lmi/shell/LMIIndication.py b/cli/lmi/shell/LMIIndication.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIIndication.py
rename to cli/lmi/shell/LMIIndication.py
diff --git a/cli-tools/lmi/shell/LMIIndicationListener.py b/cli/lmi/shell/LMIIndicationListener.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIIndicationListener.py
rename to cli/lmi/shell/LMIIndicationListener.py
diff --git a/cli-tools/lmi/shell/LMIInstance.py b/cli/lmi/shell/LMIInstance.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIInstance.py
rename to cli/lmi/shell/LMIInstance.py
diff --git a/cli-tools/lmi/shell/LMIInstanceName.py b/cli/lmi/shell/LMIInstanceName.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIInstanceName.py
rename to cli/lmi/shell/LMIInstanceName.py
diff --git a/cli-tools/lmi/shell/LMIMethod.py b/cli/lmi/shell/LMIMethod.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIMethod.py
rename to cli/lmi/shell/LMIMethod.py
diff --git a/cli-tools/lmi/shell/LMINamespace.py b/cli/lmi/shell/LMINamespace.py
similarity index 100%
rename from cli-tools/lmi/shell/LMINamespace.py
rename to cli/lmi/shell/LMINamespace.py
diff --git a/cli-tools/lmi/shell/LMIObjectFactory.py b/cli/lmi/shell/LMIObjectFactory.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIObjectFactory.py
rename to cli/lmi/shell/LMIObjectFactory.py
diff --git a/cli-tools/lmi/shell/LMIReturnValue.py b/cli/lmi/shell/LMIReturnValue.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIReturnValue.py
rename to cli/lmi/shell/LMIReturnValue.py
diff --git a/cli-tools/lmi/shell/LMIShellCache.py b/cli/lmi/shell/LMIShellCache.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIShellCache.py
rename to cli/lmi/shell/LMIShellCache.py
diff --git a/cli-tools/lmi/shell/LMIShellClient.py b/cli/lmi/shell/LMIShellClient.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIShellClient.py
rename to cli/lmi/shell/LMIShellClient.py
diff --git a/cli-tools/lmi/shell/LMIShellConfig.py b/cli/lmi/shell/LMIShellConfig.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIShellConfig.py
rename to cli/lmi/shell/LMIShellConfig.py
diff --git a/cli-tools/lmi/shell/LMIShellOptions.py b/cli/lmi/shell/LMIShellOptions.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIShellOptions.py
rename to cli/lmi/shell/LMIShellOptions.py
diff --git a/cli-tools/lmi/shell/LMISubscription.py b/cli/lmi/shell/LMISubscription.py
similarity index 100%
rename from cli-tools/lmi/shell/LMISubscription.py
rename to cli/lmi/shell/LMISubscription.py
diff --git a/cli-tools/lmi/shell/LMIUtil.py b/cli/lmi/shell/LMIUtil.py
similarity index 100%
rename from cli-tools/lmi/shell/LMIUtil.py
rename to cli/lmi/shell/LMIUtil.py
diff --git a/cli-tools/lmi/shell/__init__.py b/cli/lmi/shell/__init__.py
similarity index 100%
rename from cli-tools/lmi/shell/__init__.py
rename to cli/lmi/shell/__init__.py
diff --git a/cli-tools/lmishell b/cli/lmishell
similarity index 100%
rename from cli-tools/lmishell
rename to cli/lmishell
diff --git a/cli-tools/setup.py b/cli/setup.py
similarity index 100%
rename from cli-tools/setup.py
rename to cli/setup.py
10 years, 10 months
[cura-tools] master: drop man page installation from setup() (31797c9)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit 31797c90caa5dcc2ee391e94d2913cebfd5c5c2a
Author: Peter Hatina <phatina(a)redhat.com>
Date: Tue Jul 30 11:48:23 2013 +0200
drop man page installation from setup()
>---------------------------------------------------------------
cli-tools/setup.py | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/cli-tools/setup.py b/cli-tools/setup.py
index fc4bd64..6f0b103 100644
--- a/cli-tools/setup.py
+++ b/cli-tools/setup.py
@@ -25,6 +25,5 @@ setup(
author_email="phatina(a)redhat.com",
packages=["lmi.shell"],
install_requires=["lmi"],
- data_files=[("/usr/share/man/man1/", ["../man/lmishell.1"])],
scripts=["lmishell"]
)
10 years, 10 months
[cura-tools] master: drop LMIShellOptions::config_file for now (2e5ff4e)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit 2e5ff4e54c8bff0b6106ccfaf9aaf767356f6d0c
Author: Peter Hatina <phatina(a)redhat.com>
Date: Tue Jul 30 10:47:25 2013 +0200
drop LMIShellOptions::config_file for now
>---------------------------------------------------------------
cli-tools/lmi/shell/LMIShellOptions.py | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/cli-tools/lmi/shell/LMIShellOptions.py b/cli-tools/lmi/shell/LMIShellOptions.py
index bde881b..b308d98 100644
--- a/cli-tools/lmi/shell/LMIShellOptions.py
+++ b/cli-tools/lmi/shell/LMIShellOptions.py
@@ -33,7 +33,6 @@ class LMIShellOptions(object):
self._argv = argv
self._script_name = ""
self._script_argv = []
- self._config_file = ""
self._good = True
self._inspect = False
self._help = False
@@ -50,12 +49,6 @@ class LMIShellOptions(object):
else:
self._good = False
break
- @property
- def config_file(self):
- """
- Property returning a string of configuration file.
- """
- return self._config_file
@property
def good(self):
10 years, 10 months
[cura-tools] master: code cleanup in LMISubscription (e3c146f)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit e3c146f24d64ac9350f3ee2604f7da2e9d35fd20
Author: Peter Hatina <phatina(a)redhat.com>
Date: Tue Jul 30 10:45:45 2013 +0200
code cleanup in LMISubscription
>---------------------------------------------------------------
cli-tools/lmi/shell/LMISubscription.py | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/cli-tools/lmi/shell/LMISubscription.py b/cli-tools/lmi/shell/LMISubscription.py
index b8bd241..1656344 100644
--- a/cli-tools/lmi/shell/LMISubscription.py
+++ b/cli-tools/lmi/shell/LMISubscription.py
@@ -39,16 +39,6 @@ class LMISubscription(LMIBaseObject):
self._cim_subscription = cim_subscription
self._permanent = permanent
- # TODO: delete?
- def __lt__(self, other):
- """
- Compares 2 indication objects by subscription name.
-
- Arguments:
- other -- seconds subscription object
- """
- return name < other._name
-
def delete(self):
"""
Cleans up the indication subscription.
10 years, 10 months
[cura-tools] master: switch to lmi_wrap_* in all the wrapper classes (62cca59)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit 62cca598f04d801e6ba684f30f27ea57545c49a2
Author: Peter Hatina <phatina(a)redhat.com>
Date: Tue Jul 30 09:41:53 2013 +0200
switch to lmi_wrap_* in all the wrapper classes
>---------------------------------------------------------------
cli-tools/lmi/shell/LMIClass.py | 1 -
cli-tools/lmi/shell/LMIInstance.py | 4 ++--
cli-tools/lmi/shell/LMINamespace.py | 13 +++++++------
cli-tools/lmi/shell/LMIUtil.py | 13 +++++++++++++
4 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/cli-tools/lmi/shell/LMIClass.py b/cli-tools/lmi/shell/LMIClass.py
index 8884765..f13df4b 100644
--- a/cli-tools/lmi/shell/LMIClass.py
+++ b/cli-tools/lmi/shell/LMIClass.py
@@ -18,7 +18,6 @@ from LMIBaseClient import LMIBaseClient
from LMIFormatter import LMIXmlFormatter
from LMIReturnValue import LMIReturnValue
from LMIConstantValues import LMIConstantValuesParamProp
-from LMIObjectFactory import LMIObjectFactory
from LMIExceptions import LMIUnknownPropertyError
diff --git a/cli-tools/lmi/shell/LMIInstance.py b/cli-tools/lmi/shell/LMIInstance.py
index e57f322..a58a0d8 100644
--- a/cli-tools/lmi/shell/LMIInstance.py
+++ b/cli-tools/lmi/shell/LMIInstance.py
@@ -20,7 +20,6 @@ from LMIBaseObject import LMIBaseObject
from LMIFormatter import LMIXmlFormatter
from LMIFormatter import LMIMofFormatter
from LMIReturnValue import LMIReturnValue
-from LMIObjectFactory import LMIObjectFactory
from LMIDecorators import lmi_possibly_deleted
from LMIDecorators import lmi_return_expr_if_fail
@@ -30,6 +29,7 @@ from LMIDecorators import lmi_return_if_fail
from LMIUtil import lmi_cast_to_cim
from LMIUtil import lmi_wrap_cim_instance
from LMIUtil import lmi_wrap_cim_instance_name
+from LMIUtil import lmi_wrap_cim_method
class LMIInstance(LMIBaseObject):
"""
@@ -72,7 +72,7 @@ class LMIInstance(LMIBaseObject):
name = name[4:]
methods = self.methods()
if methods and name in methods:
- return LMIObjectFactory().LMIMethod(self._client, self, name, sync_method)
+ return lmi_wrap_cim_method(self._client, name, self, sync_method)
elif name in self._cim_instance:
member = self._cim_instance[name]
if isinstance(member, pywbem.CIMInstanceName):
diff --git a/cli-tools/lmi/shell/LMINamespace.py b/cli-tools/lmi/shell/LMINamespace.py
index 3e816ed..3bcdfe0 100644
--- a/cli-tools/lmi/shell/LMINamespace.py
+++ b/cli-tools/lmi/shell/LMINamespace.py
@@ -17,8 +17,9 @@ import sys
import pywbem
from LMIBaseObject import LMIBaseObject
from LMIBaseClient import LMIBaseClient
-from LMIObjectFactory import LMIObjectFactory
+from LMIUtil import lmi_wrap_cim_namespace
+from LMIUtil import lmi_wrap_cim_class
from LMIUtil import lmi_transform_to_lmi
class LMINamespace(LMIBaseObject):
@@ -47,7 +48,7 @@ class LMINamespace(LMIBaseObject):
return self.__dict__[name]
(class_list, _, _) = self._client._get_class_names(self._name, DeepInheritance=True)
if name in class_list:
- return LMIObjectFactory().LMIClass(self._client, self, name)
+ return lmi_wrap_cim_class(self._client, name, self.name)
raise AttributeError(name)
def __repr__(self):
@@ -143,28 +144,28 @@ class LMINamespaceRoot(LMINamespace):
"""
Property, which returns a LMINamespace object for the namespace "root/cimv2".
"""
- return LMIObjectFactory().LMINamespace(self._client, "root/cimv2")
+ return lmi_wrap_cim_namespace(self._client, "root/cimv2")
@property
def interop(self):
"""
Property, which returns a LMINamespace object for the namespace "root/interop".
"""
- return LMIObjectFactory().LMINamespace(self._client, "root/interop")
+ return lmi_wrap_cim_namespace(self._client, "root/interop")
@property
def PG_InterOp(self):
"""
Property, which returns a LMINamespace object for the namespace "root/PG_InterOp".
"""
- return LMIObjectFactory().LMINamespace(self._client, "root/PG_InterOp")
+ return lmi_wrap_cim_namespace(self._client, "root/PG_InterOp")
@property
def PG_Internal(self):
"""
Property, which returns a LMINamespace object for the namespace "root/PG_Internal".
"""
- return LMIObjectFactory().LMINamespace(self._client, "root/PG_Internal")
+ return lmi_wrap_cim_namespace(self._client, "root/PG_Internal")
@property
def namespaces(self):
diff --git a/cli-tools/lmi/shell/LMIUtil.py b/cli-tools/lmi/shell/LMIUtil.py
index 5453bd1..235d07d 100644
--- a/cli-tools/lmi/shell/LMIUtil.py
+++ b/cli-tools/lmi/shell/LMIUtil.py
@@ -201,6 +201,19 @@ def lmi_wrap_cim_instance_name(client, cim_instance_name):
"""
return LMIObjectFactory().LMIInstanceName(client, cim_instance_name)
+def lmi_wrap_cim_method(client, cim_method_name, lmi_instance, sync_method):
+ """
+ Helper function, which returns wrapped CIMMethod imto LMIMethod.
+
+ Arguments:
+ client -- LMIShellClient object used for CIMOM communication
+ cim_method_name -- string containing a method name
+ lmi_instance -- LMIInstance object, on which the method call will be issued
+ sync_method -- bool flag indicating, if we are trying to perform
+ a synchronous method call
+ """
+ return LMIObjectFactory().LMIMethod(client, lmi_instance, cim_method_name, sync_method)
+
def lmi_transform_to_lmi(client, value):
"""
Transforms returned values from a method call into LMI wrapped objects. Returns
10 years, 10 months
[cura-tools] master: update README to match current openlmi-tools content (d52d44d)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit d52d44d0484c56f0fce088be5f025891f8aec345
Author: Peter Hatina <phatina(a)redhat.com>
Date: Mon Jul 29 21:26:47 2013 +0200
update README to match current openlmi-tools content
>---------------------------------------------------------------
README | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/README b/README
index cb688ad..4c879b7 100644
--- a/README
+++ b/README
@@ -13,28 +13,23 @@ bindings, standard APIs, and standard scripting interfaces.
* OpenLMI-tools *
*******************************************************************************
-OpenLMI-tools currently contains lmishell (non)interactive command interpreter.
-
-* lmishell
- This tool provides interactive shell for CIM objects management.
+OpenLMI-tools currently contains lmishell, a (non)interactive command
+interpreter for CIM objects access.
*******************************************************************************
-* Build Dependencies *
+* Dependencies *
*******************************************************************************
-For proper usage of the tools, the python environment is required. Tools also
-require pywbem module.
+OpenLMI tools require python2.7, python setuptools and pywbem module installed.
*******************************************************************************
* Installation *
*******************************************************************************
-Following steps will install cli-tools and python modules, that contain
-python clients for each OpenLMI provider.
+Following steps will install the OpenLMI tools into desired directory.
-$ mkdir build && cd build
-$ ../configure --prefix=/usr
-# make install
+$ cd cli-tools
+# python setup.py install --root=/path/to/install/directory
*******************************************************************************
* Example usage *
10 years, 10 months
[cura-tools] master: fix missing module imports in LMIShellOptions (9100e31)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit 9100e315eef049b2d4f1c034f45b8e86592f7e8f
Author: Peter Hatina <phatina(a)redhat.com>
Date: Mon Jul 29 20:35:23 2013 +0200
fix missing module imports in LMIShellOptions
>---------------------------------------------------------------
cli-tools/lmi/shell/LMIShellOptions.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/cli-tools/lmi/shell/LMIShellOptions.py b/cli-tools/lmi/shell/LMIShellOptions.py
index f96499d..bde881b 100644
--- a/cli-tools/lmi/shell/LMIShellOptions.py
+++ b/cli-tools/lmi/shell/LMIShellOptions.py
@@ -13,6 +13,9 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
+import os
+import sys
+
class LMIShellOptions(object):
"""
Class representing a LMIShell command line options.
10 years, 10 months
[cura-tools] master: rename LMIUtil::lmi_transform_to_cim() to lmi_transform_to_lmi() (4425699)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit 44256994add7273ba62938c685f5b7a4128280e4
Author: Peter Hatina <phatina(a)redhat.com>
Date: Mon Jul 29 20:31:36 2013 +0200
rename LMIUtil::lmi_transform_to_cim() to lmi_transform_to_lmi()
>---------------------------------------------------------------
cli-tools/lmi/shell/LMIMethod.py | 8 ++++----
cli-tools/lmi/shell/LMINamespace.py | 6 +++---
cli-tools/lmi/shell/LMIUtil.py | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/cli-tools/lmi/shell/LMIMethod.py b/cli-tools/lmi/shell/LMIMethod.py
index ff1451e..7ef1879 100644
--- a/cli-tools/lmi/shell/LMIMethod.py
+++ b/cli-tools/lmi/shell/LMIMethod.py
@@ -33,7 +33,7 @@ from LMIIndicationListener import LMIIndicationListener
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
+from LMIUtil import lmi_transform_to_lmi
from LMIExceptions import LMIIndicationListenerError
from LMIExceptions import LMIMethodCallError
@@ -340,9 +340,9 @@ class LMIMethod(LMIBaseObject):
)
(rval, call_rparams, call_errorstr) = self._client._call_method_raw(self._lmi_instance,
self._method.name, **kwargs)
- rval = lmi_transform_to_cim(self._client, rval)
+ rval = lmi_transform_to_lmi(self._client, rval)
if call_rparams:
- call_rparams = lmi_transform_to_cim(self._client, call_rparams)
+ call_rparams = lmi_transform_to_lmi(self._client, call_rparams)
if not call_rparams:
# NOTE: this is wrong! What should we do?
errorstr = "Could not perform CIM -> LMI object transformation"
@@ -400,7 +400,7 @@ class LMIMethod(LMIBaseObject):
hostname=self._client.hostname,
use_display_hook=True
)
- call_rparams = lmi_transform_to_cim(self._client, call_rparams)
+ call_rparams = lmi_transform_to_lmi(self._client, call_rparams)
if not self._lmi_instance.refresh():
# NOTE: this is wrong! What should we do?
errorstr = "Could not update an LMI object after a method call"
diff --git a/cli-tools/lmi/shell/LMINamespace.py b/cli-tools/lmi/shell/LMINamespace.py
index 4ea786e..3e816ed 100644
--- a/cli-tools/lmi/shell/LMINamespace.py
+++ b/cli-tools/lmi/shell/LMINamespace.py
@@ -19,7 +19,7 @@ from LMIBaseObject import LMIBaseObject
from LMIBaseClient import LMIBaseClient
from LMIObjectFactory import LMIObjectFactory
-from LMIUtil import lmi_transform_to_cim
+from LMIUtil import lmi_transform_to_lmi
class LMINamespace(LMIBaseObject):
"""
@@ -102,7 +102,7 @@ class LMINamespace(LMIBaseObject):
(inst_list, _, errorstr) = self._client._exec_query(LMIBaseClient.QUERY_LANG_CQL, query, self._name)
if not inst_list:
return []
- return lmi_transform_to_cim(self._client, inst_list)
+ return lmi_transform_to_lmi(self._client, inst_list)
def wql(self, query):
"""
@@ -115,7 +115,7 @@ class LMINamespace(LMIBaseObject):
(inst_list, _, errorstr) = self._client._exec_query(LMIBaseClient.QUERY_LANG_WQL, query, self._name)
if not inst_list:
return []
- return lmi_transform_to_cim(self._client, inst_list)
+ return lmi_transform_to_lmi(self._client, inst_list)
@property
def name(self):
diff --git a/cli-tools/lmi/shell/LMIUtil.py b/cli-tools/lmi/shell/LMIUtil.py
index c123363..5453bd1 100644
--- a/cli-tools/lmi/shell/LMIUtil.py
+++ b/cli-tools/lmi/shell/LMIUtil.py
@@ -201,7 +201,7 @@ def lmi_wrap_cim_instance_name(client, cim_instance_name):
"""
return LMIObjectFactory().LMIInstanceName(client, cim_instance_name)
-def lmi_transform_to_cim(client, value):
+def lmi_transform_to_lmi(client, value):
"""
Transforms returned values from a method call into LMI wrapped objects. Returns
transformed input, where CIMInstance and CIMInstanceName are wrapped into LMI
@@ -223,15 +223,15 @@ def lmi_transform_to_cim(client, value):
elif isinstance(value, dict):
return dict(
zip(value.keys(),
- map(lambda val: lmi_transform_to_cim(client, val), value.values()))
+ map(lambda val: lmi_transform_to_lmi(client, val), value.values()))
)
elif isinstance(value, pywbem.NocaseDict):
return pywbem.NocaseDict(
zip(value.keys(),
- map(lambda val: lmi_transform_to_cim(client, val), value.values()))
+ map(lambda val: lmi_transform_to_lmi(client, val), value.values()))
)
elif isinstance(value, list):
- return map(lambda val: lmi_transform_to_cim(client, val), value)
+ return map(lambda val: lmi_transform_to_lmi(client, val), value)
elif isinstance(value, tuple):
- return tuple(map(lambda val: lmi_transform_to_cim(client, val), value))
+ return tuple(map(lambda val: lmi_transform_to_lmi(client, val), value))
return value
10 years, 10 months
[cura-tools] master: code cleanup wrt pep8 (d85c63d)
by phatina@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
>---------------------------------------------------------------
commit d85c63de5941f78c84543ef143094762c3045f82
Author: Peter Hatina <phatina(a)redhat.com>
Date: Mon Jul 29 20:27:07 2013 +0200
code cleanup wrt pep8
>---------------------------------------------------------------
Diff suppressed because of size. To see it, use:
git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^d85c63de5941f78c84543ef143094762c3045f82~1 d85c63de5941f78c84543ef143094762c3045f82
10 years, 10 months