Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
commit e885171e128201f5a1c292bcf72b467f41c3f92a Author: Peter Hatina phatina@redhat.com Date: Wed Jan 30 11:45:25 2013 +0100
some naming changes in lmi_client_shell
cli-tools/lmi/lmi_client_shell.py | 90 ++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index eba4da5..38bbc82 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -317,17 +317,17 @@ class _LmiClass(BaseObject): super(self.__class__, self).__init__() self._client = client self._namespace = namespace - self._class = klass + self._cim_class = klass
def __repr__(self): return "%s(classname='%s', ...)" % (self.__class__.__name__, self.classname)
def doc(self): - _LmiXmlFormatter(self._class.tocimxml()).fancy_format(self._client.interactive) + _LmiXmlFormatter(self._cim_class.tocimxml()).fancy_format(self._client.interactive)
def instances(self, **kwargs): (instance_list, _, errorstr) = self._client._get_instances( - self._class.classname, **kwargs) + self._cim_class.classname, **kwargs) if not instance_list: return [] result = [] @@ -342,55 +342,55 @@ class _LmiClass(BaseObject): return instance_list[0]
def properties(self): - return self._class.properties.keys() + return self._cim_class.properties.keys()
def print_properties(self): - for (name, prop) in self._class.properties.iteritems(): + for (name, prop) in self._cim_class.properties.iteritems(): sys.stdout.write("%s\n" % name)
def methods(self): - return self._class.methods.keys() + return self._cim_class.methods.keys()
def print_methods(self): - for (name, method) in self._class.methods.iteritems(): + for (name, method) in self._cim_class.methods.iteritems(): sys.stdout.write("%s\n" % name)
@property def classname(self): - return self._class.classname + return self._cim_class.classname
@property def namespace(self): return self._namespace.name
class _LmiInstanceName(BaseObject): - def __init__(self, client, instance_name): + def __init__(self, client, cim_instance_name): self._client = client - self._instance_name = instance_name + self._cim_instance_name = cim_instance_name
def __repr__(self): return "%s(...)" % self.__class__.__name__
def to_instance(self): - (cim_inst, _, errorstr) = self._client._get_instance( - self._instance_name, LocalOnly = False) - if not cim_inst: + (cim_instance, _, errorstr) = self._client._get_instance( + self._cim_instance_name, LocalOnly = False) + if not cim_instance: return None - lmi_namespace = _LmiNamespace(self._client, self._instance_name.namespace) + lmi_namespace = _LmiNamespace(self._client, self._cim_instance_name.namespace) (cim_class, _, errorstr) = self._client._get_class( - self._instance_name.classname, - self._instance_name.namespace, + self._cim_instance_name.classname, + self._cim_instance_name.namespace, LocalOnly = False) if not cim_class: return None lmi_class = _LmiClass(self._client, lmi_namespace, cim_class) if not lmi_class: return None - return _LmiInstance(self._client, lmi_class, cim_inst) + return _LmiInstance(self._client, lmi_class, cim_instance)
@property def path(self): - return str(self._instance_name) + return str(self._cim_instance_name)
def possibly_deleted(fn): def wrapped(self = None, *args, **kwargs): @@ -410,11 +410,11 @@ def possibly_deleted(fn):
class _LmiInstance(BaseObject): class _LmiInstanceMethod(BaseObject): - def __init__(self, client, instance, method): + def __init__(self, client, lmi_instance, method): super(self.__class__, self).__init__() self._client = client - self._instance = instance - self._method = instance._class._class.methods[method] + self._lmi_instance = lmi_instance + self._method = lmi_instance._lmi_class._cim_class.methods[method]
def __transform_return_values(self, rparams): lmi_rparams = pywbem.NocaseDict() @@ -457,7 +457,7 @@ class _LmiInstance(BaseObject): "uint32" : lambda x: pywbem.Uint32(x), "sint64" : lambda x: pywbem.Sint64(x), "uint64" : lambda x: pywbem.Uint64(x), - "reference": lambda x: x._inst.path if isinstance(x, _LmiInstance) else x + "reference": lambda x: x._cim_instance.path if isinstance(x, _LmiInstance) else x } for (param, value) in kwargs.iteritems(): if param in self._method.parameters: @@ -474,7 +474,7 @@ class _LmiInstance(BaseObject): return LmiReturnValue(rval = -1, rparams = {}, errorstr = errorstr, hostname = self._client.hostname, use_display_hook = True) - (rval, rparams, errorstr) = self._client._call_method_raw(self._instance, + (rval, rparams, errorstr) = self._client._call_method_raw(self._lmi_instance, self._method.name, **kwargs) if isinstance(rval, pywbem.CIMInt): rval = int(rval) @@ -488,29 +488,29 @@ class _LmiInstance(BaseObject): raise LmiMethodCallError("Could not perform CIM -> LMI object transformation") return LmiReturnValue(rval = rval, rparams = {}, errorstr = errorstr) (new_inst, _, errorstr) = self._client._get_instance( - self._instance.path, LocalOnly = False) + self._lmi_instance.path, LocalOnly = False) if not new_inst: # NOTE: this is wrong! What should we do? if LmiBaseClient._get_use_exceptions(): raise LmiMethodCallError("Could not update an LMI object after a method call") return LmiReturnValue(rval = rval, rparams = {}, errorstr = errorstr) - self._instance._inst = new_inst + self._lmi_instance._cim_instance = new_inst return LmiReturnValue( hostname = self._client.hostname, - instance = self._instance, + instance = self._lmi_instance, use_display_hook = True, rval = rval, rparams = rparams, errorstr = errorstr)
- def __init__(self, client, klass, inst): + def __init__(self, client, lmi_class, cim_instance): super(self.__class__, self).__init__() # We use __dict__ to avoid recursion potentially caused by # combo __setattr__ and __getattr__ self.__dict__["_deleted"] = False - self.__dict__["_inst"] = inst + self.__dict__["_cim_instance"] = cim_instance self.__dict__["_client"] = client - self.__dict__["_class"] = klass + self.__dict__["_lmi_class"] = lmi_class
@possibly_deleted def __getattr__(self, name): @@ -519,14 +519,14 @@ class _LmiInstance(BaseObject): methods = self.methods() if methods and name in methods: return _LmiInstance._LmiInstanceMethod(self._client, self, name) - elif name in self._inst: - return self._inst[name] + elif name in self._cim_instance: + return self._cim_instance[name] raise AttributeError(name)
@possibly_deleted def __setattr__(self, name, value): - if name in self._inst: - self._inst[name] = value + if name in self._cim_instance: + self._cim_instance[name] = value else: self.__dict__[name] = value
@@ -537,21 +537,21 @@ class _LmiInstance(BaseObject): @property @possibly_deleted def classname(self): - return self._class.classname + return self._lmi_class.classname
@property @possibly_deleted def namespace(self): - return self._class.namespace + return self._lmi_class.namespace
@property @possibly_deleted def path(self): - return self._inst.path + return self._cim_instance.path
@possibly_deleted def doc(self): - _LmiXmlFormatter(self._inst.tocimxml()).fancy_format(self._client.interactive) + _LmiXmlFormatter(self._cim_instance.tocimxml()).fancy_format(self._client.interactive)
@possibly_deleted def associators(self, AssocClass = None, ResultClass = None, Role = None,\ @@ -568,7 +568,7 @@ class _LmiInstance(BaseObject): assoc_args["ResultRole"] = ResultRole if Props: assoc_args["Props"] = Props - associators_list = self._client._get_associators(self._inst, **assoc_args) + associators_list = self._client._get_associators(self._cim_instance, **assoc_args) for i in associators_list: (cim_class, _, errorstr) = self._client._get_class(i.classname, i.path.namespace, LocalOnly = False) @@ -590,7 +590,7 @@ class _LmiInstance(BaseObject): references_args["Role"] = Role if Props: references_args["Props"] = Props - references_list = self._client._get_references(self._inst, **references_args) + references_list = self._client._get_references(self._cim_instance, **references_args) for i in references_list: (cim_class, _, errorstr) = self._client._get_class(i.classname, i.path.namespace, LocalOnly = False) @@ -604,27 +604,27 @@ class _LmiInstance(BaseObject):
@possibly_deleted def properties(self): - return self._inst.properties.keys() + return self._cim_instance.properties.keys()
@possibly_deleted def print_properties(self): - for (name, prop) in self._inst.properties.iteritems(): + for (name, prop) in self._cim_instance.properties.iteritems(): sys.stdout.write("%s\n" % name)
@possibly_deleted def methods(self): - return self._class.methods() + return self._lmi_class.methods()
@possibly_deleted def print_methods(self): - self._class.print_methods() + self._lmi_class.print_methods()
@possibly_deleted def push(self): - return_value = self._client._modify_instance(self._inst) + return_value = self._client._modify_instance(self._cim_instance) return LmiReturnValue( hostname = self._client.hostname, - instance = self._inst, + instance = self._cim_instance, use_display_hook = True, rval = return_value.rval, rparams = return_value.rparams,
cura-tools-devel@lists.fedorahosted.org