cura-tools-devel March 2013

cura-tools-devel@lists.fedorahosted.org

1 participants
17 discussions

[cura-tools] master: separate indication listener creation/deletion, introduce list/print indications, indication listeners (08d10a6)
by phatina＠fedoraproject.org 06 Mar '13

06 Mar '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 08d10a6c3ed75d18ae58e4a8d96be1e70a65c576 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Mar 6 13:16:35 2013 +0100 separate indication listener creation/deletion, introduce list/print indications, indication listeners >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 85 +++++++++++++++++++++++++++++-------- cli-tools/lmishell | 33 +++++++++----- 2 files changed, 88 insertions(+), 30 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 63a9dc2..7113c6e 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -29,6 +29,7 @@ from lmi_client_base import LmiReturnValue from lmi_listener import LmiIndicationListener _lmi_indications = {} +_lmi_indication_listeners = {} class LmiDeletedObjectError(Exception): """Raised, when there is an attempt to access properties @@ -51,6 +52,9 @@ class LmiNoPagerError(Exception): class LmiIndicationError(Exception): """Raised, if an error occurs while subscribing to/removing an indication""" +class LmiIndicationListenerError(Exception): + """Raised, if there is an error while starting/stopping indication listener""" + def cast_lmi_to_cim(t, value): cast = { "sint8" : lambda x: pywbem.Sint8(x), @@ -78,6 +82,15 @@ def _lmi_indications_cleanup(): subscription.delete() _lmi_indications = {} +def _lmi_indication_listeners_cleanup(): + global _lmi_indication_listeners + for listener in _lmi_indication_listeners.values(): + listener.stop() + _lmi_indication_listeners = {} + +atexit.register(_lmi_indications_cleanup) +atexit.register(_lmi_indication_listeners_cleanup) + def _lmi_delete_indication(indication_name): if not indication_name in _lmi_indications: errorstr = "No such indication subscribed" @@ -97,7 +110,58 @@ def _lmi_delete_indication(indication_name): rparams = {}, errorstr = "") -atexit.register(_lmi_indications_cleanup) +def _lmi_start_indication_listener(hostname, port, handler, certfile = None, keyfile = None): + global _lmi_indication_listeners + listener = LmiIndicationListener( hostname, port, handler, certfile, keyfile) + try: + listener.start() + except socket.error, e: + if LmiBaseClient._get_use_exceptions(): + raise + return LmiReturnValue( + use_display_hook = True, + rval = False, + errorstr = e.args[1]) + _lmi_indication_listeners[hostname + ":" + str(port)] = listener + return LmiReturnValue( + use_display_hook = True, + rval = True) + +def _lmi_stop_indication_listener(hostname, port): + global _lmi_indication_listeners + listener_id = hostname + ":" + str(port) + if not listener_id in _lmi_indication_listeners: + errorstr = "No such listener running" + if LmiBaseClient._get_use_exceptions(): + raise LmiIndicationListenerError(errorstr) + return LmiReturnValue( + use_display_hook = True, + rval = False, + errorstr = errorstr) + listener = _lmi_indication_listeners[listener_id] + listener.stop() + _lmi_indication_listeners.pop(listener_id) + return LmiReturnValue( + use_display_hook = True, + rval = True) + +def _lmi_indications_list(): + global _lmi_indications + return _lmi_indications.keys() + +def _lmi_indication_listeners_list(): + global _lmi_indication_listeners + return _lmi_indication_listeners.keys() + +def _lmi_print_indications(): + global _lmi_indications + for i in _lmi_indications.keys(): + sys.stdout.write("%s\n" % i) + +def _lmi_print_indication_listeners(): + global _lmi_indication_listeners + for i in _lmi_indication_listeners: + sys.stdout.write("%s\n" % i) class _LmiTextFormatter(object): def __init__(self, text): @@ -314,12 +378,11 @@ class BaseObject(object): pass class _LmiSubscription(BaseObject): - def __init__(self, client, cim_filter, cim_handler, cim_subscription, listener): + def __init__(self, client, cim_filter, cim_handler, cim_subscription): self._client = client self._cim_filter = cim_filter self._cim_handler = cim_handler self._cim_subscription = cim_subscription - self._listener = listener def __lt__(self, other): name < other._name @@ -328,7 +391,6 @@ class _LmiSubscription(BaseObject): self._client._delete_instance(self._cim_subscription.path) self._client._delete_instance(self._cim_filter.path) self._client._delete_instance(self._cim_handler.path) - self._listener.stop() class _LmiNamespace(BaseObject): def __init__(self, client, name): @@ -414,19 +476,6 @@ class _LmiNamespace(BaseObject): "Destination" : kwargs["Destination"], "Name" : kwargs["Name"] + "-handler" } - dest_parse_result = urlparse(kwargs["Destination"]) - listener = LmiIndicationListener( - dest_parse_result.hostname, - dest_parse_result.port, - kwargs["Handler"], - certfile = kwargs["CertFile"] if "CertFile" in kwargs else None, - keyfile = kwargs["KeyFile"] if "KeyFile" in kwargs else None) - try: - listener.start() - except socket.error, e: - if LmiBaseClient._get_use_exceptions(): - raise - return _return_value(False, e.args[1]) (cim_filter, _, errorstr) = self._client._create_instance( "CIM_IndicationFilter", self._name, filter_props) if not cim_filter: @@ -453,7 +502,7 @@ class _LmiNamespace(BaseObject): raise LmiIndicationError(errorstr) return _return_value(False, errorstr) _lmi_indications[kwargs["Name"]] = _LmiSubscription(self._client, - cim_filter, cim_handler, cim_subscription, listener) + cim_filter, cim_handler, cim_subscription) except KeyError, e: errorstr = "Not all necessary parameters supported" if LmiBaseClient._get_use_exceptions(): diff --git a/cli-tools/lmishell b/cli-tools/lmishell index 0ff58ca..6ae4755 100755 --- a/cli-tools/lmishell +++ b/cli-tools/lmishell @@ -17,6 +17,7 @@ import os import sys import code +import copy import pywbem import readline import rlcompleter @@ -30,6 +31,12 @@ from lmi.lmi_client_shell import _LmiClass from lmi.lmi_client_shell import _LmiInstance from lmi.lmi_client_shell import _LmiInstanceName from lmi.lmi_client_shell import _lmi_delete_indication +from lmi.lmi_client_shell import _lmi_start_indication_listener +from lmi.lmi_client_shell import _lmi_stop_indication_listener +from lmi.lmi_client_shell import _lmi_print_indications +from lmi.lmi_client_shell import _lmi_print_indication_listeners +from lmi.lmi_client_shell import _lmi_indications_list +from lmi.lmi_client_shell import _lmi_indication_listeners_list def get_item_or_default(dic, item, default): return dic[item] if item in dic else default @@ -176,18 +183,27 @@ class LmiInteractiveShell(code.InteractiveConsole): DEFAULT_CONFIG_FILE = "~/.lmishellrc" DEFAULT_HISTORY_FILE = "~/.lmi_shell_history" DEFAULT_HISTORY_LENGTH = -1 + DEFAULT_LOCALS = { + "LmiConnection" : LmiConnection, + "use_exceptions" : LmiBaseClient._set_use_exceptions, + "delete_indication" : _lmi_delete_indication, + "start_indication_listener" : _lmi_start_indication_listener, + "stop_indication_listener" : _lmi_stop_indication_listener, + "print_indications" : _lmi_print_indications, + "print_indication_listeners" : _lmi_print_indication_listeners, + "indications" : _lmi_indications_list, + "indication_listeners" : _lmi_indication_listeners_list + } def __init__(self, prompt, more_prompt, locals = None, **kwargs): sys.ps1 = prompt sys.ps2 = more_prompt if locals is None: locals = {} - locals["LmiConnection"] = LmiConnection + locals = dict(locals.items() + LmiInteractiveShell.DEFAULT_LOCALS.items()) locals["connect"] = _connect_interactive locals["clear_history"] = self.clear_history locals["use_display_sugar"] = _use_display_sugar - locals["use_exceptions"] = _use_exceptions - locals["delete_indication"] = _lmi_delete_indication code.InteractiveConsole.__init__(self, locals) self._completer = _LmiCompleter(self.locals) self.load_config(get_item_or_default(kwargs, "config", LmiInteractiveShell.DEFAULT_CONFIG_FILE)) @@ -319,9 +335,6 @@ def _connect(hostname, username = "", password = "", interactive = False): def _use_display_sugar(use = True): sys.displayhook = _lmi_displayhook if use else sys.__displayhook__ -def _use_exceptions(use = True): - LmiBaseClient._set_use_exceptions(use) - if __name__ == "__main__": options = _LmiShellOptions(sys.argv) if not options.good: @@ -336,12 +349,8 @@ if __name__ == "__main__": if options.interactive: _lmi_interact() else: - locals = { - "LmiConnection" : LmiConnection, - "connect" : _connect_noninteractive, - "use_exceptions" : _use_exceptions, - "delete_indication" : _lmi_delete_indication - } + locals = copy.deepcopy(LmiInteractiveShell.DEFAULT_LOCALS) + locals["connect"] = _connect_noninteractive sys.argv = options.script_args try: execfile(options.script_name, locals)

1 0

[cura-tools] master: add hostname parameter for LmiReturnValue (231bf64)
by phatina＠fedoraproject.org 06 Mar '13

06 Mar '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 231bf6407ea1a38c5b8e1960dd4c6c5239828d64 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Mar 6 10:25:23 2013 +0100 add hostname parameter for LmiReturnValue >--------------------------------------------------------------- cli-tools/lmi/lmi_client_base.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/cli-tools/lmi/lmi_client_base.py b/cli-tools/lmi/lmi_client_base.py index 4f4ab50..267d55b 100644 --- a/cli-tools/lmi/lmi_client_base.py +++ b/cli-tools/lmi/lmi_client_base.py @@ -46,13 +46,20 @@ class LmiReturnValue(_RValue): self._properties["use_display_hook"] = value @property + def hostname(self): + return self._properties["hostname"] + + @property def instance_classname(self): return self._properties["instance"].classname if self._properties["instance"] else "" def __new__(self, **kwargs): if not "rval" in kwargs: raise LmiReturnValueError("rval argument missing while instancing LmiReturnValue object") - properties = { "use_display_hook" : False } + properties = { + "hostname" : "This Machine", + "use_display_hook" : False + } keys_to_pop = [] for (key, value) in kwargs.iteritems(): if key in ("rval", "rparams", "errorstr"):

1 0

[cura-tools] master: move certfile and keyfile as named params in LmiIndicationListener ctor (f38f7b5)
by phatina＠fedoraproject.org 06 Mar '13

06 Mar '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit f38f7b5873c98ef6de8ad1c91d97e9d27f09e9b4 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Mar 6 13:14:31 2013 +0100 move certfile and keyfile as named params in LmiIndicationListener ctor >--------------------------------------------------------------- cli-tools/lmi/lmi_listener.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli-tools/lmi/lmi_listener.py b/cli-tools/lmi/lmi_listener.py index d9cdcb9..6670b20 100644 --- a/cli-tools/lmi/lmi_listener.py +++ b/cli-tools/lmi/lmi_listener.py @@ -33,12 +33,12 @@ class LmiIndicationServer(ThreadingMixIn, HTTPServer): pass class LmiIndicationListener(object): - def __init__(self, hostname, port, handler, **kwargs): + def __init__(self, hostname, port, handler, certfile = None, keyfile = None): self._handler = handler self._hostname = hostname self._port = port - self._certfile = kwargs["certfile"] if "certfile" in kwargs else None - self._keyfile = kwargs["keyfile"] if "keyfile" in kwargs else None + self._certfile = certfile + self._keyfile = keyfile def start(self): self._server = LmiIndicationServer((self._hostname, self._port), LmiIndicationHandler)

1 0

[cura-tools] master: fix _lmi_indications type in cleanup (85618b1)
by phatina＠fedoraproject.org 06 Mar '13

06 Mar '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 85618b15426c5392300141841a3c667b9ff4e33f Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Mar 6 10:47:53 2013 +0100 fix _lmi_indications type in cleanup >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 98740c0..63a9dc2 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -73,11 +73,10 @@ def cast_lmi_to_cim(t, value): # Register _lmi_indications_cleanup at script exit, # so we drop all the indication subscriptions for now def _lmi_indications_cleanup(): - "cleaning subscriptions" global _lmi_indications for subscription in _lmi_indications.values(): subscription.delete() - _lmi_indications = [] + _lmi_indications = {} def _lmi_delete_indication(indication_name): if not indication_name in _lmi_indications:

1 0

[cura-tools] master: fall to default values in LmiReturnValue ctor, if not all the arguments provided (ffe02e6)
by phatina＠fedoraproject.org 06 Mar '13

06 Mar '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit ffe02e67b0dbf12ad3958943775a2ca13d4c23b5 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Mar 6 10:23:10 2013 +0100 fall to default values in LmiReturnValue ctor, if not all the arguments provided >--------------------------------------------------------------- cli-tools/lmi/lmi_client_base.py | 74 +++++++++++++++++++--------------- cli-tools/lmi/lmi_client_ip.py | 22 +++++----- cli-tools/lmi/lmi_client_power.py | 2 +- cli-tools/lmi/lmi_client_service.py | 8 ++-- cli-tools/lmi/lmi_client_shell.py | 16 +++---- cli-tools/lmi/lmi_client_user.py | 18 ++++---- 6 files changed, 73 insertions(+), 67 deletions(-) diff --git a/cli-tools/lmi/lmi_client_base.py b/cli-tools/lmi/lmi_client_base.py index 4867d20..4f4ab50 100644 --- a/cli-tools/lmi/lmi_client_base.py +++ b/cli-tools/lmi/lmi_client_base.py @@ -19,6 +19,9 @@ import collections _RValue = collections.namedtuple('RValue', ["rval", "rparams", "errorstr"]) +class LmiReturnValueError(Exception): + """Raised, when there is a mandatory argument missing""" + def raise_or_dump_exception(e): if not LmiBaseClient._get_use_exceptions(): return @@ -47,6 +50,8 @@ class LmiReturnValue(_RValue): return self._properties["instance"].classname if self._properties["instance"] else "" def __new__(self, **kwargs): + if not "rval" in kwargs: + raise LmiReturnValueError("rval argument missing while instancing LmiReturnValue object") properties = { "use_display_hook" : False } keys_to_pop = [] for (key, value) in kwargs.iteritems(): @@ -56,7 +61,10 @@ class LmiReturnValue(_RValue): keys_to_pop.append(key) for key in keys_to_pop: kwargs.pop(key) - rval = _RValue.__new__(self, **kwargs) + rval = _RValue.__new__(self, + rval = kwargs["rval"], + rparams = kwargs["rparams"] if "rparams" in kwargs else {}, + errorstr = kwargs["errorstr"] if "errorstr" in kwargs else "") rval._properties = properties return rval @@ -93,24 +101,24 @@ class LmiBaseClient(object): inst_name_list = self._cliconn.EnumerateInstanceNames(class_name, namespace, **kwargs) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = None, errorstr = e.args[1]) except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[0]) + return LmiReturnValue(rval = None, errorstr = e.args[0]) if filter_value: inst_name_list = filter(lambda n: not filter_key in n or n[filter_key] == filter_value, inst_name_list) - return LmiReturnValue(rval = inst_name_list, rparams = {}, errorstr = "") + return LmiReturnValue(rval = inst_name_list, errorstr = "") def _get_instance(self, path, **kwargs): try: inst = self._cliconn.GetInstance(path, **kwargs) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = None, errorstr = e.args[1]) except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[0]) - return LmiReturnValue(rval = inst, rparams = {}, errorstr = "") + return LmiReturnValue(rval = None, errorstr = e.args[0]) + return LmiReturnValue(rval = inst, errorstr = "") def _get_instances(self, class_name, namespace = None, **kwargs): filter_value = "" @@ -131,60 +139,60 @@ class LmiBaseClient(object): inst_list_not_filtered = self._cliconn.EnumerateInstances(class_name, namespace, **kwargs) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = None, errorstr = e.args[1]) except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[0]) + return LmiReturnValue(rval = None, errorstr = e.args[0]) inst_list = [] for inst in inst_list_not_filtered: if not filter_value or filter_key in inst and inst[filter_key] == filter_value: inst_list.append(inst) if not inst_list: - return LmiReturnValue(rval = None, rparams = {}, errorstr = "Not found" if not "ErrorMsg" in kwargs else kwargs["ErrorMsg"]) - return LmiReturnValue(rval = inst_list, rparams = {}, errorstr = "") + return LmiReturnValue(rval = None, errorstr = "Not found" if not "ErrorMsg" in kwargs else kwargs["ErrorMsg"]) + return LmiReturnValue(rval = inst_list, errorstr = "") def _get_class_names(self, namespace = None, **kwargs): try: class_name_list = self._cliconn.EnumerateClassNames(namespace, **kwargs) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = None, errorstr = e.args[1]) except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[0]) - return LmiReturnValue(rval = class_name_list, rparams = {}, errorstr = "") + return LmiReturnValue(rval = None, errorstr = e.args[0]) + return LmiReturnValue(rval = class_name_list, errorstr = "") def _get_classes(self, namespace = None, **kwargs): try: class_list = self._cliconn.EnumerateClasses(namespace, **kwargs) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = None, errorstr = e.args[1]) except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[0]) - return LmiReturnValue(rval = class_list, rparams = {}, errorstr = "") + return LmiReturnValue(rval = None, errorstr = e.args[0]) + return LmiReturnValue(rval = class_list, errorstr = "") def _get_class(self, class_name, namespace = None, **kwargs): try: klass = self._cliconn.GetClass(class_name, namespace, **kwargs) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = None, errorstr = e.args[1]) except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[0]) - return LmiReturnValue(rval = klass, rparams = {}, errorstr = "") + return LmiReturnValue(rval = None, errorstr = e.args[0]) + return LmiReturnValue(rval = klass, errorstr = "") def _call_method_raw(self, instance, method, **params): try: (rval, rparams) = self._cliconn.InvokeMethod(method, instance.path, **params) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = -1, rparams = {}, errorstr = e.args[1] + ": '" + method + "'") + return LmiReturnValue(rval = -1, errorstr = e.args[1] + ": '" + method + "'") except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = -1, rparams = {}, errorstr = e.args[0] + ": '" + method + "'") + return LmiReturnValue(rval = -1, errorstr = e.args[0] + ": '" + method + "'") return LmiReturnValue(rval = rval, rparams = rparams, errorstr = "") def _call_method(self, instance, method, **params): @@ -226,10 +234,10 @@ class LmiBaseClient(object): cim_path = self._cliconn.CreateInstance(NewInstance = cim_instance) except pywbem.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = None, errorstr = e.args[1]) except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = None, rparams = {}, errorstr = e.args[0]) + return LmiReturnValue(rval = None, errorstr = e.args[0]) return self._get_instance(cim_path, LocalOnly = False) def _modify_instance(self, instance, **params): @@ -237,33 +245,33 @@ class LmiBaseClient(object): self._cliconn.ModifyInstance(instance, **params) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = e.args[0], rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = e.args[0], errorstr = e.args[1]) except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = -1, rparams = {}, errorstr = e.args[0]) - return LmiReturnValue(rval = 0, rparams = {}, errorstr = "") + return LmiReturnValue(rval = -1, errorstr = e.args[0]) + return LmiReturnValue(rval = 0, errorstr = "") def _delete_instance(self, instance, **params): try: self._cliconn.DeleteInstance(instance, **params) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = e.args[0], rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = e.args[0], errorstr = e.args[1]) except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = -1, rparams = {}, errorstr = e.args[0]) - return LmiReturnValue(rval = 0, rparams = {}, errorstr = "") + return LmiReturnValue(rval = -1, errorstr = e.args[0]) + return LmiReturnValue(rval = 0, errorstr = "") def _exec_query(self, query_lang, query, namespace = None): try: inst_list = self._cliconn.ExecQuery(query_lang, query, namespace) except pywbem.cim_operations.CIMError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = [], rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = [], errorstr = e.args[1]) except pywbem.cim_http.AuthError, e: raise_or_dump_exception(e) - return LmiReturnValue(rval = [], rparams = {}, errorstr = e.args[0]) - return LmiReturnValue(rval = inst_list, rparams = {}, errorstr = "") + return LmiReturnValue(rval = [], errorstr = e.args[0]) + return LmiReturnValue(rval = inst_list, errorstr = "") @staticmethod def _set_use_exceptions(use = True): diff --git a/cli-tools/lmi/lmi_client_ip.py b/cli-tools/lmi/lmi_client_ip.py index 235f996..c5bbaf7 100644 --- a/cli-tools/lmi/lmi_client_ip.py +++ b/cli-tools/lmi/lmi_client_ip.py @@ -33,10 +33,10 @@ class LmiIpClient(LmiBaseClient): def __ip_get_ip_protocol_endpoint_instances(self, device = ""): (inst_list, rparams, errorstr) = self._get_instances(LmiIpClient.IP_PROTOCOL_ENDPOINT_CLASS_NAME) if not inst_list: - return LmiReturnValue(rval = None, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = None, errorstr = errorstr) rval_inst_list = filter(lambda n: device == n["Name"].split("_")[0], inst_list) if device else inst_list if not rval_inst_list: - return LmiReturnValue(rval = None, rparams = {}, errorstr = "No such device '%s' found" % device) + return LmiReturnValue(rval = None, errorstr = "No such device '%s' found" % device) return LmiReturnValue(rval = rval_inst_list if len(rval_inst_list) > 1 else rval_inst_list[0], rparams = rparams, errorstr = "") @@ -60,28 +60,28 @@ class LmiIpClient(LmiBaseClient): def __ip_get_ip_assignment_setting_data(self, device): (inst_list, rparams, errorstr) = self._get_instances(LmiIpClient.LMI_IP_ASSIGNMENT_SETTING_DATA_CLASS_NAME) if not inst_list: - return LmiReturnValue(rval = None, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = None, errorstr = errorstr) inst_list = inst_list if type(inst_list) == list else [inst_list] rval_inst_list = filter(lambda x: x["Caption"] == "static-" + device, inst_list) if not rval_inst_list: - return LmiReturnValue(rval = None, rparams = {}, errorstr = "No IP setting for device %s found" % device) + return LmiReturnValue(rval = None, errorstr = "No IP setting for device %s found" % device) return LmiReturnValue(rval = rval_inst_list, rparams = rparams, errorstr = "") def __ip_remove_static_settings(self, device): (inst_list, rparams, errorstr) = self.__ip_get_ip_assignment_setting_data(device) if not inst_list: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) for inst in inst_list: (rval, rparams, errorstr) = self._delete_instance(inst.path) if rval != 0: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) return LmiReturnValue(rval = True, rparams = rparams, errorstr = "") def __ip_create_static_setting(self, device, address, **kwargs): self.__ip_remove_static_settings(device) (device_inst, rparams, errorstr) = self.__ip_get_ethernet_port_instance(device) if not device_inst: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) if type(device_inst) is list: device_inst = device_inst[0] prot_type = self.__ip_get_address_type(address) @@ -114,7 +114,7 @@ class LmiIpClient(LmiBaseClient): args["IPv6PrefixLength"] = pywbem.Uint8(kwargs["PrefixLength"]) (configuration_inst, rparams, errorstr) = self._get_instances(LmiIpClient.IP_CONFIGURATION_SERVICE_CLASS_NAME) if not configuration_inst: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) if type(configuration_inst) is list: configuration_inst = configuration_inst[0] return self._call_method(configuration_inst, "CreateStaticSetting", **args) @@ -122,14 +122,14 @@ class LmiIpClient(LmiBaseClient): def __ip_apply_static_setting(self, device, setting_inst): (configuration_inst, rparams, errorstr) = self._get_instances(LmiIpClient.IP_CONFIGURATION_SERVICE_CLASS_NAME) if not configuration_inst: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) if type(configuration_inst) is list: configuration_inst = configuration_inst[0] (device_inst, rparams, errorstr) = self.__ip_get_ip_protocol_endpoint_instances(device) if type(device_inst) is list: device_inst = device_inst[0] if not device_inst: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) args = { "Configuration": setting_inst.path, "Endpoint" : device_inst.path @@ -139,7 +139,7 @@ class LmiIpClient(LmiBaseClient): def ip_list_devices(self, device = ""): (inst_list, rparams, errorstr) = self.__ip_get_ip_protocol_endpoint_instances(device) if not inst_list: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) self.__ip_print_device_info(inst_list) return LmiReturnValue(rval = True, rparams = rparams, errorstr = "") diff --git a/cli-tools/lmi/lmi_client_power.py b/cli-tools/lmi/lmi_client_power.py index 232a6f4..6f625cb 100644 --- a/cli-tools/lmi/lmi_client_power.py +++ b/cli-tools/lmi/lmi_client_power.py @@ -32,7 +32,7 @@ class LmiPowerClient(LmiBaseClient): def __power_call_method(self, method, **params): (inst, rparams, errorstr) = self._get_instances(LmiPowerClient.POWER_CLASS_NAME) if not inst: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) (rval, rparams, errorstr) = self._call_method_raw(inst[0], method, **params) return LmiReturnValue(rval = rval in (0, 4096), rparams = rparams, errorstr = "") diff --git a/cli-tools/lmi/lmi_client_service.py b/cli-tools/lmi/lmi_client_service.py index 86de0c7..d112a87 100644 --- a/cli-tools/lmi/lmi_client_service.py +++ b/cli-tools/lmi/lmi_client_service.py @@ -65,25 +65,25 @@ class LmiServiceClient(LmiBaseClient): (inst, rparams, errorstr) = self._get_instances( LmiServiceClient.SERVICE_CLASS_NAME, value=service) if not inst: - return LmiReturnValue(rval = None, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = None, errorstr = errorstr) return LmiReturnValue(rval = inst[0], rparams = rparams, errorstr = "") def __service_call_method(self, service, method): (inst, rparams, errorstr) = self.__service_get_instance(service) if type(service) == str else (service, {}, "") if not inst: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) return self._call_method(inst, method) def __service_get_property(self, service, prop): (inst, _, errorstr) = self.__service_get_instance(service) if type(service) == str else (service, {}, "") if not inst or not prop in inst: - return LmiReturnValue(rval = None, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = None, errorstr = errorstr) return LmiReturnValue(rval = True, rparams = { "Message" : inst[prop] }, errorstr = "") def service_find(self, service): (inst, rparams, errorstr) = self.__service_get_instance(service) if not inst: - return LmiReturnValue(rval = None, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = None, errorstr = errorstr) return LmiReturnValue(rval = LmiService(self, inst), rparams = rparams, errorstr = "") def service_start(self, service): diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index e626d11..98740c0 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -85,10 +85,8 @@ def _lmi_delete_indication(indication_name): if LmiBaseClient._get_use_exceptions(): raise LmiIndicationError(errorstr) return LmiReturnValue( - hostname = "No Hostname", use_display_hook = True, rval = False, - rparams = {}, errorstr = errorstr) indication = _lmi_indications[indication_name] indication.delete() @@ -393,11 +391,10 @@ class _LmiNamespace(BaseObject): return self.__transform_cim_to_lmi(inst_list) def create_indication(self, **kwargs): - _return_value = lambda rval, errorstr: LmiReturnValue( + _return_value = lambda rval, errorstr = "": LmiReturnValue( hostname = self._client.hostname, use_display_hook = True, rval = rval, - rparams = {}, errorstr = errorstr) try: global _lmi_indications @@ -619,7 +616,6 @@ def possibly_deleted(fn): instance = self, use_display_hook = True, rval = None, - rparams = {}, errorstr = errorstr) return wrapped @@ -672,8 +668,10 @@ class _LmiInstanceMethod(BaseObject): errorstr = "Unknown parameter '%s' supplied for method '%s'" % (param, self._method.name) if LmiBaseClient._get_use_exceptions(): raise LmiUnknownParameterError(errorstr) - return LmiReturnValue(rval = -1, rparams = {}, - errorstr = errorstr, hostname = self._client.hostname, + return LmiReturnValue( + rval = -1, + errorstr = errorstr, + hostname = self._client.hostname, use_display_hook = True) (rval, call_rparams, call_errorstr) = self._client._call_method_raw(self._lmi_instance, self._method.name, **kwargs) @@ -687,7 +685,7 @@ class _LmiInstanceMethod(BaseObject): # NOTE: this is wrong! What should we do? if LmiBaseClient._get_use_exceptions(): raise LmiMethodCallError("Could not perform CIM -> LMI object transformation") - return LmiReturnValue(rval = rval, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = rval, errorstr = errorstr) (new_inst, _, _) = self._client._get_instance( self._lmi_instance.path, LocalOnly = False) if not new_inst: @@ -695,7 +693,7 @@ class _LmiInstanceMethod(BaseObject): errorstr = "Could not update an LMI object after a method call" if LmiBaseClient._get_use_exceptions(): raise LmiMethodCallError(errorstr) - return LmiReturnValue(rval = rval, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = rval, errorstr = errorstr) self._lmi_instance._cim_instance = new_inst return LmiReturnValue( hostname = self._client.hostname, diff --git a/cli-tools/lmi/lmi_client_user.py b/cli-tools/lmi/lmi_client_user.py index 600b4b2..aca205b 100644 --- a/cli-tools/lmi/lmi_client_user.py +++ b/cli-tools/lmi/lmi_client_user.py @@ -38,13 +38,13 @@ class LmiUserClient(LmiBaseClient): def __get_account_management_instance(self): (inst, rparams, errorstr) = self._get_instances(LmiUserClient.ACCOUNT_MANAGEMENT_SERVICE_CLASS_NAME) if not inst: - return LmiReturnValue(rval = None, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = None, errorstr = errorstr) return LmiReturnValue(rval = inst[0], rparams = rparams, errorstr = "") def __get_computer_system_instance(self): (inst, rparams, errorstr) = self._get_instances(LmiUserClient.COMPUTER_SYSTEM_CLASS_NAME) if not inst: - return LmiReturnValue(rval = None, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = None, errorstr = errorstr) return LmiReturnValue(rval = inst[0], rparams = rparams, errorstr = "") def __get_member_groups(self, inst): @@ -72,7 +72,7 @@ class LmiUserClient(LmiBaseClient): def list_users(self): (inst_list, rparams, errorstr) = self.__get_user_instances() if not inst_list: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) try: for i in inst_list: groups = self.__get_member_groups(i) @@ -81,13 +81,13 @@ class LmiUserClient(LmiBaseClient): (i["Name"], i["UserID"], gid, i["ElementName"], i["HomeDirectory"], i["LoginShell"])) except pywbem.cim_operations.CIMError, e: - return LmiReturnValue(rval = False, rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = False, errorstr = e.args[1]) return LmiReturnValue(rval = True, rparams = rparams, errorstr = "") def list_groups(self): (inst_list, rparams, errorstr) = self.__get_group_instances() if not inst_list: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) for i in inst_list: sys.stdout.write("%s:%s\n" % (i["Name"], i["InstanceID"].split(":")[-1])) @@ -97,7 +97,7 @@ class LmiUserClient(LmiBaseClient): (inst_list, rparams, errorstr) = self._get_instances( LmiUserClient.GROUP_CLASS_NAME, value = member) if not inst_list: - return LmiReturnValue(rval = False, rparams = {}, errorstr = "No such group '%s' found" % member) + return LmiReturnValue(rval = False, errorstr = "No such group '%s' found" % member) members = self.__get_group_members(inst_list) for m in members: sys.stdout.write("%s\n" % m) @@ -106,12 +106,12 @@ class LmiUserClient(LmiBaseClient): def user_add(self, user_name, **params): (inst_management, rparams, errorstr) = self.__get_account_management_instance() if not inst_management: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) # We are using the first and only instance present. # For KVM_ComputerSystem, there has be some CLI option added. (inst_computer_system, rparams, errorstr) = self.__get_computer_system_instance() if not inst_computer_system: - return LmiReturnValue(rval = False, rparams = {}, errorstr = errorstr) + return LmiReturnValue(rval = False, errorstr = errorstr) user_params = { "Name" : user_name } user_params["DontCreateHome"] = not params["createHome"] user_params["System"] = inst_computer_system.path @@ -134,5 +134,5 @@ class LmiUserClient(LmiBaseClient): (account, identity) = self._cliconn.InvokeMethod( "CreateAccount", inst_management.path, **user_params) except pywbem.CIMError, e: - return LmiReturnValue(rval = False, rparams = {}, errorstr = e.args[1]) + return LmiReturnValue(rval = False, errorstr = e.args[1]) return LmiReturnValue(rval = not account is None, rparams = rparams, errorstr = "")

1 0

[cura-tools] master: move listener creation upwards in _LmiNamespace::create_indication() (c778f67)
by phatina＠fedoraproject.org 06 Mar '13

06 Mar '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit c778f670ce6cf6d2a04bb81bc89f54057d317a72 Author: Peter Hatina <phatina(a)redhat.com> Date: Wed Mar 6 09:06:09 2013 +0100 move listener creation upwards in _LmiNamespace::create_indication() >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index 731cdea..e626d11 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -418,7 +418,19 @@ class _LmiNamespace(BaseObject): "Destination" : kwargs["Destination"], "Name" : kwargs["Name"] + "-handler" } - handler = kwargs["Handler"] + dest_parse_result = urlparse(kwargs["Destination"]) + listener = LmiIndicationListener( + dest_parse_result.hostname, + dest_parse_result.port, + kwargs["Handler"], + certfile = kwargs["CertFile"] if "CertFile" in kwargs else None, + keyfile = kwargs["KeyFile"] if "KeyFile" in kwargs else None) + try: + listener.start() + except socket.error, e: + if LmiBaseClient._get_use_exceptions(): + raise + return _return_value(False, e.args[1]) (cim_filter, _, errorstr) = self._client._create_instance( "CIM_IndicationFilter", self._name, filter_props) if not cim_filter: @@ -444,19 +456,6 @@ class _LmiNamespace(BaseObject): if LmiBaseClient._get_use_exceptions(): raise LmiIndicationError(errorstr) return _return_value(False, errorstr) - dest_parse_result = urlparse(kwargs["Destination"]) - listener = LmiIndicationListener( - dest_parse_result.hostname, - dest_parse_result.port, - handler, - certfile = kwargs["CertFile"] if "CertFile" in kwargs else None, - keyfile = kwargs["KeyFile"] if "KeyFile" in kwargs else None) - try: - listener.start() - except socket.error, e: - if LmiBaseClient._get_use_exceptions(): - raise - return _return_value(False, e.args[1]) _lmi_indications[kwargs["Name"]] = _LmiSubscription(self._client, cim_filter, cim_handler, cim_subscription, listener) except KeyError, e:

1 0

[cura-tools] master: introduce indications handling (8c77c75)
by phatina＠fedoraproject.org 05 Mar '13

05 Mar '13

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 8c77c75459c31c5a0383b9d1053d3ec62d26f714 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Mar 5 16:18:14 2013 +0100 introduce indications handling >--------------------------------------------------------------- cli-tools/lmi/lmi_client_shell.py | 131 +++++++++++++++++++++++++++++++++++++ cli-tools/lmi/lmi_listener.py | 57 ++++++++++++++++ cli-tools/lmi/makefile.am | 1 + cli-tools/lmishell | 8 ++- 4 files changed, 195 insertions(+), 2 deletions(-) diff --git a/cli-tools/lmi/lmi_client_shell.py b/cli-tools/lmi/lmi_client_shell.py index a30da25..731cdea 100644 --- a/cli-tools/lmi/lmi_client_shell.py +++ b/cli-tools/lmi/lmi_client_shell.py @@ -17,13 +17,18 @@ import os import abc import new import sys +import atexit import pywbem import textwrap import tempfile import subprocess from xml.dom.minicompat import NodeList +from urlparse import urlparse from lmi_client_base import LmiBaseClient from lmi_client_base import LmiReturnValue +from lmi_listener import LmiIndicationListener + +_lmi_indications = {} class LmiDeletedObjectError(Exception): """Raised, when there is an attempt to access properties @@ -43,6 +48,9 @@ class LmiMethodCallError(Exception): class LmiNoPagerError(Exception): """Raised, when tere is no default pager like less or more""" +class LmiIndicationError(Exception): + """Raised, if an error occurs while subscribing to/removing an indication""" + def cast_lmi_to_cim(t, value): cast = { "sint8" : lambda x: pywbem.Sint8(x), @@ -62,6 +70,38 @@ def cast_lmi_to_cim(t, value): return tuple(map(cast_func, value)) return cast_func(value) +# Register _lmi_indications_cleanup at script exit, +# so we drop all the indication subscriptions for now +def _lmi_indications_cleanup(): + "cleaning subscriptions" + global _lmi_indications + for subscription in _lmi_indications.values(): + subscription.delete() + _lmi_indications = [] + +def _lmi_delete_indication(indication_name): + if not indication_name in _lmi_indications: + errorstr = "No such indication subscribed" + if LmiBaseClient._get_use_exceptions(): + raise LmiIndicationError(errorstr) + return LmiReturnValue( + hostname = "No Hostname", + use_display_hook = True, + rval = False, + rparams = {}, + errorstr = errorstr) + indication = _lmi_indications[indication_name] + indication.delete() + _lmi_indications.pop(indication_name) + return LmiReturnValue( + hostname = indication._client.hostname, + use_display_hook = True, + rval = True, + rparams = {}, + errorstr = "") + +atexit.register(_lmi_indications_cleanup) + class _LmiTextFormatter(object): def __init__(self, text): self._text = text @@ -276,6 +316,23 @@ class BaseObject(object): def __call__(self): pass +class _LmiSubscription(BaseObject): + def __init__(self, client, cim_filter, cim_handler, cim_subscription, listener): + self._client = client + self._cim_filter = cim_filter + self._cim_handler = cim_handler + self._cim_subscription = cim_subscription + self._listener = listener + + def __lt__(self, other): + name < other._name + + def delete(self): + self._client._delete_instance(self._cim_subscription.path) + self._client._delete_instance(self._cim_filter.path) + self._client._delete_instance(self._cim_handler.path) + self._listener.stop() + class _LmiNamespace(BaseObject): def __init__(self, client, name): self._client = client @@ -335,6 +392,80 @@ class _LmiNamespace(BaseObject): return [] return self.__transform_cim_to_lmi(inst_list) + def create_indication(self, **kwargs): + _return_value = lambda rval, errorstr: LmiReturnValue( + hostname = self._client.hostname, + use_display_hook = True, + rval = rval, + rparams = {}, + errorstr = errorstr) + try: + global _lmi_indications + system_name = self._client.hostname + filter_props = { + "CreationClassName" : kwargs["FilterCreationClassName"], + "SystemCreationClassName" : kwargs["FilterSystemCreationClassName"], + "SourceNamespace" : kwargs["FilterSourceNamespace"], + "SystemName" : system_name, + "Query" : kwargs["Query"], + "QueryLanguage" : kwargs["QueryLanguage"], + "Name" : kwargs["Name"] + "-filter" + } + handler_props = { + "CreationClassName" : kwargs["HandlerCreationClassName"], + "SystemCreationClassName" : kwargs["HandlerSystemCreationClassName"], + "SystemName" : system_name, + "Destination" : kwargs["Destination"], + "Name" : kwargs["Name"] + "-handler" + } + handler = kwargs["Handler"] + (cim_filter, _, errorstr) = self._client._create_instance( + "CIM_IndicationFilter", self._name, filter_props) + if not cim_filter: + if LmiBaseClient._get_use_exceptions(): + raise LmiIndicationError(errorstr) + return _return_value(False, errorstr) + (cim_handler, _, errorstr) = self._client._create_instance( + "CIM_IndicationHandlerCIMXML", self._name, handler_props) + if not cim_handler: + self._client._delete_instance(cim_filter.path) + if LmiBaseClient._get_use_exceptions(): + raise LmiIndicationError(errorstr) + return _return_value(False, errorstr) + subscription_props = { + "Filter" : cim_filter.path, + "Handler" : cim_handler.path + } + (cim_subscription, _, errorstr) = self._client._create_instance( + "CIM_IndicationSubscription", self._name, subscription_props) + if not cim_subscription: + self._client._delete_instance(cim_filter.path) + self._client._delete_instance(cim_handler.path) + if LmiBaseClient._get_use_exceptions(): + raise LmiIndicationError(errorstr) + return _return_value(False, errorstr) + dest_parse_result = urlparse(kwargs["Destination"]) + listener = LmiIndicationListener( + dest_parse_result.hostname, + dest_parse_result.port, + handler, + certfile = kwargs["CertFile"] if "CertFile" in kwargs else None, + keyfile = kwargs["KeyFile"] if "KeyFile" in kwargs else None) + try: + listener.start() + except socket.error, e: + if LmiBaseClient._get_use_exceptions(): + raise + return _return_value(False, e.args[1]) + _lmi_indications[kwargs["Name"]] = _LmiSubscription(self._client, + cim_filter, cim_handler, cim_subscription, listener) + except KeyError, e: + errorstr = "Not all necessary parameters supported" + if LmiBaseClient._get_use_exceptions(): + raise LmiIndicationError(errorstr) + return _return_value(False, errorstr) + return _return_value(True, "") + @property def name(self): return self._name diff --git a/cli-tools/lmi/lmi_listener.py b/cli-tools/lmi/lmi_listener.py new file mode 100644 index 0000000..d9cdcb9 --- /dev/null +++ b/cli-tools/lmi/lmi_listener.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# Copyright (C) 2012-2013 Peter Hatina <phatina(a)redhat.com> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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 sys +import ssl +import time +import pywbem +import socket +import threading +from SocketServer import BaseRequestHandler +from SocketServer import ThreadingMixIn +from BaseHTTPServer import HTTPServer +from BaseHTTPServer import BaseHTTPRequestHandler + +class LmiIndicationHandler(BaseHTTPRequestHandler): + def do_POST(self): + self.server._handler(self.rfile.read()) + +class LmiIndicationServer(ThreadingMixIn, HTTPServer): + pass + +class LmiIndicationListener(object): + def __init__(self, hostname, port, handler, **kwargs): + self._handler = handler + self._hostname = hostname + self._port = port + self._certfile = kwargs["certfile"] if "certfile" in kwargs else None + self._keyfile = kwargs["keyfile"] if "keyfile" in kwargs else None + + def start(self): + self._server = LmiIndicationServer((self._hostname, self._port), LmiIndicationHandler) + self._server._handler = self._handler + self._server_thread = threading.Thread(target = self._server.serve_forever) + self._server_thread.daemon = True + if self._certfile: + self._server.socket = ssl.wrap_socket( + self._server.socket, + certfile = self._certfile, + keyfile = self._keyfile, + server_side = True) + self._server_thread.start() + + def stop(self): + self._server.shutdown() diff --git a/cli-tools/lmi/makefile.am b/cli-tools/lmi/makefile.am index ecc2e2c..9b92504 100644 --- a/cli-tools/lmi/makefile.am +++ b/cli-tools/lmi/makefile.am @@ -6,6 +6,7 @@ lmi_PYTHON = \ lmi_client_service.py \ lmi_client_shell.py \ lmi_client_user.py \ + lmi_listener.py \ lmi_options.py \ __init__.py diff --git a/cli-tools/lmishell b/cli-tools/lmishell index aaa5c30..0ff58ca 100755 --- a/cli-tools/lmishell +++ b/cli-tools/lmishell @@ -29,6 +29,7 @@ from lmi.lmi_client_shell import _LmiNamespaceRoot from lmi.lmi_client_shell import _LmiClass from lmi.lmi_client_shell import _LmiInstance from lmi.lmi_client_shell import _LmiInstanceName +from lmi.lmi_client_shell import _lmi_delete_indication def get_item_or_default(dic, item, default): return dic[item] if item in dic else default @@ -39,7 +40,8 @@ def _lmi_displayhook(o): __builtin__._ = None if isinstance(o, LmiReturnValue) and o.use_display_hook: o.use_display_hook = False - if o.rval == 0 or (o.rval == 4096 and o.instance_classname == "LMI_PowerManagementService"): + if (type(o.rval) == int and o.rval == 0) or (type(o.rval) == bool and o.rval == True) \ + or (o.rval == 4096 and o.instance_classname == "LMI_PowerManagementService"): result_str = "ok" else: result_str = "fail" @@ -185,6 +187,7 @@ class LmiInteractiveShell(code.InteractiveConsole): locals["clear_history"] = self.clear_history locals["use_display_sugar"] = _use_display_sugar locals["use_exceptions"] = _use_exceptions + locals["delete_indication"] = _lmi_delete_indication code.InteractiveConsole.__init__(self, locals) self._completer = _LmiCompleter(self.locals) self.load_config(get_item_or_default(kwargs, "config", LmiInteractiveShell.DEFAULT_CONFIG_FILE)) @@ -336,7 +339,8 @@ if __name__ == "__main__": locals = { "LmiConnection" : LmiConnection, "connect" : _connect_noninteractive, - "use_exceptions" : _use_exceptions + "use_exceptions" : _use_exceptions, + "delete_indication" : _lmi_delete_indication } sys.argv = options.script_args try:

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

cura-tools-devel March 2013