Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
commit 720d6f730370758b806d81d6a1a355394ecba45c Author: Peter Hatina phatina@redhat.com Date: Thu Dec 13 14:11:36 2012 +0100
drop wrapper methods in _LmiShellClient
cli-tools/lmi/lmi_client_shell.py | 54 +++++++++++------------------------- 1 files changed, 17 insertions(+), 37 deletions(-)
diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 24ff59c..fbc7cda 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -214,7 +214,7 @@ class _LmiNamespace(BaseObject): self._name = name
def __getattr__(self, name): - (klass, _, errorstr) = self._client.get_class(name, self._name, LocalOnly = False) + (klass, _, errorstr) = self._client._get_class(name, self._name, LocalOnly = False) if not klass: return None return _LmiClass(self._client, self, klass) @@ -223,7 +223,8 @@ class _LmiNamespace(BaseObject): 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(self._name) + (class_name_list, _, errorstr) = self._client._get_class_names( + self._name, DeepInheritance = True) if not class_name_list: return [] if filter_key: @@ -286,7 +287,8 @@ class _LmiClass(BaseObject): _LmiXmlFormatter(self._class.tocimxml()).fancy_format(self._client.interactive)
def instances(self, filter_key = "", **kwargs): - (instance_list, _, errorstr) = self._client.get_instances(self._class.classname, filter_key, **kwargs) + (instance_list, _, errorstr) = self._client._get_instances( + self._class.classname, filter_key, **kwargs) if not instance_list: return [] result = [] @@ -331,11 +333,12 @@ class _LmiInstanceName(BaseObject): return "%s(...)" % self.__class__.__name__
def to_instance(self): - (cim_inst, _, errorstr) = self._client.get_instance(self._instance_name) + (cim_inst, _, errorstr) = self._client._get_instance( + self._instance_name, LocalOnly = False) if not cim_inst: return None lmi_namespace = _LmiNamespace(self._client, self._instance_name.namespace) - (cim_class, _, errorstr) = self._client.get_class( + (cim_class, _, errorstr) = self._client._get_class( self._instance_name.classname, self._instance_name.namespace, LocalOnly = False) @@ -375,7 +378,7 @@ class _LmiInstance(BaseObject): lmi_rparams = {} for (key, value) in rparams.iteritems(): if isinstance(value, pywbem.cim_obj.CIMInstance): - (lmi_class, _, errorstr) = self._client.get_class(value.classname, + (lmi_class, _, errorstr) = self._client._get_class(value.classname, value.namespace, LocalOnly = False) if not lmi_class: return None @@ -386,7 +389,7 @@ class _LmiInstance(BaseObject): result = [] for m in value: if isinstance(m, pywbem.cim_obj.CIMInstance): - (lmi_class, _, errorstr) = self._client.get_class(m.classname, + (lmi_class, _, errorstr) = self._client._get_class(m.classname, m.namespace, LocalOnly = False) if not lmi_class: return None @@ -414,7 +417,7 @@ class _LmiInstance(BaseObject): if t in cast: cast_func = cast[t] kwargs[param] = cast_func(value) - return_value = self._client.call_method_raw( + return_value = self._client._call_method_raw( self._instance, self._method, **kwargs) lmi_rparams = [] if return_value.rparams: @@ -422,7 +425,8 @@ class _LmiInstance(BaseObject): if not lmi_rparams: # NOTE: this is wrong! What should we do? return return_value - (new_inst, _, errorstr) = self._client.get_instance(self._instance.path) + (new_inst, _, errorstr) = self._client._get_instance( + self._instance.path, LocalOnly = False) if not new_inst: # NOTE: this is wrong! What should we do? return return_value @@ -500,9 +504,9 @@ 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._inst, **assoc_args) for i in associators_list: - (cim_class, _, errorstr) = self._client.get_class(i.classname, i.path.namespace, + (cim_class, _, errorstr) = self._client._get_class(i.classname, i.path.namespace, LocalOnly = False) if not cim_class: return [] @@ -531,7 +535,7 @@ class _LmiInstance(BaseObject):
@possibly_deleted def push(self): - return_value = self._client.push(self._inst) + return_value = self._client._modify_instance(self._inst) return LmiReturnValue( hostname = self._client.hostname, instance = self._inst, @@ -542,7 +546,7 @@ class _LmiInstance(BaseObject):
@possibly_deleted def delete(self): - rval = self._client.delete(self.path) + rval = self._client._delete_instance(self.path) self._deleted = rval.rval == 0
class _LmiShellClient(LmiBaseClient): @@ -550,30 +554,6 @@ class _LmiShellClient(LmiBaseClient): super(self.__class__, self).__init__(hostname, username, password) self._interactive = interactive
- def get_class_names(self, namespace = None): - return self._get_class_names(namespace, DeepInheritance = True) - - def get_instance(self, path): - return self._get_instance(path, LocalOnly = False) - - def get_instances(self, class_name, filter_key = "", **kwargs): - return self._get_instances(class_name, filter_key, **kwargs) - - def get_class(self, class_name, namespace = None, **kwargs): - return self._get_class(class_name, namespace, **kwargs) - - def get_associators(self, instance, **kwargs): - return self._get_associators(instance, **kwargs) - - def call_method_raw(self, instance, method, **params): - return self._call_method_raw(instance, method, **params) - - def push(self, instance, **params): - return self._modify_instance(instance, **params) - - def delete(self, instance, **params): - return self._delete_instance(instance, **params) - @property def interactive(self): return self._interactive
cura-tools-devel@lists.fedorahosted.org