Revert "cleanup semicolons, whitespace and mutable default arguments"
This reverts commit 7265682a4d.
This commit is contained in:
Robin Gloster
parent
7265682a4d
commit
3dd379cdf1
@ -52,7 +52,7 @@ The latest source code for SleekXMPP may be found on `Github
|
||||
|
||||
|
||||
Installing DNSPython
|
||||
--------------------
|
||||
---------------------
|
||||
If you are using Python3 and wish to use dnspython, you will have to checkout and
|
||||
install the ``python3`` branch::
|
||||
|
||||
|
||||
@ -179,13 +179,13 @@ if __name__ == '__main__':
|
||||
# node=opts.nodeid,
|
||||
# jid=xmpp.boundjid.full)
|
||||
|
||||
myDevice = TheDevice(opts.nodeid)
|
||||
myDevice = TheDevice(opts.nodeid);
|
||||
# myDevice._add_field(name="Relay", typename="numeric", unit="Bool");
|
||||
myDevice._add_field(name="Temperature", typename="numeric", unit="C")
|
||||
myDevice._add_field(name="Temperature", typename="numeric", unit="C");
|
||||
myDevice._set_momentary_timestamp("2013-03-07T16:24:30")
|
||||
myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"})
|
||||
myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"});
|
||||
|
||||
xmpp['xep_0323'].register_node(nodeId=opts.nodeid, device=myDevice, commTimeout=10)
|
||||
xmpp['xep_0323'].register_node(nodeId=opts.nodeid, device=myDevice, commTimeout=10);
|
||||
xmpp.beClientOrServer(server=True)
|
||||
while not(xmpp.testForRelease()):
|
||||
xmpp.connect()
|
||||
|
||||
@ -68,7 +68,7 @@ class RosterBrowser(sleekxmpp.ClientXMPP):
|
||||
try:
|
||||
self.get_roster()
|
||||
except IqError as err:
|
||||
print('Error: %s' % err.iq['error']['condition'])
|
||||
print('Error: %' % err.iq['error']['condition'])
|
||||
except IqTimeout:
|
||||
print('Error: Request timed out')
|
||||
self.send_presence()
|
||||
|
||||
@ -25,6 +25,7 @@ from sleekxmpp.exceptions import IqError, IqTimeout
|
||||
from sleekxmpp.stanza import Message, Presence, Iq, StreamError
|
||||
from sleekxmpp.stanza.roster import Roster
|
||||
from sleekxmpp.stanza.nick import Nick
|
||||
from sleekxmpp.stanza.htmlim import HTMLIM
|
||||
|
||||
from sleekxmpp.xmlstream import XMLStream, JID
|
||||
from sleekxmpp.xmlstream import ET, register_stanza_plugin
|
||||
@ -244,7 +245,7 @@ class BaseXMPP(XMLStream):
|
||||
self.plugin[name].post_inited = True
|
||||
return XMLStream.process(self, *args, **kwargs)
|
||||
|
||||
def register_plugin(self, plugin, pconfig=None, module=None):
|
||||
def register_plugin(self, plugin, pconfig={}, module=None):
|
||||
"""Register and configure a plugin for use in this stream.
|
||||
|
||||
:param plugin: The name of the plugin class. Plugin names must
|
||||
|
||||
@ -49,13 +49,8 @@ class ComponentXMPP(BaseXMPP):
|
||||
Defaults to ``False``.
|
||||
"""
|
||||
|
||||
def __init__(self, jid, secret, host=None, port=None, plugin_config=None, plugin_whitelist=None, use_jc_ns=False):
|
||||
|
||||
if not plugin_whitelist:
|
||||
plugin_whitelist = []
|
||||
if not plugin_config:
|
||||
plugin_config = {}
|
||||
|
||||
def __init__(self, jid, secret, host=None, port=None,
|
||||
plugin_config={}, plugin_whitelist=[], use_jc_ns=False):
|
||||
if use_jc_ns:
|
||||
default_ns = 'jabber:client'
|
||||
else:
|
||||
|
||||
@ -187,14 +187,14 @@ class FeatureMechanisms(BasePlugin):
|
||||
except sasl.SASLCancelled:
|
||||
self.attempted_mechs.add(self.mech.name)
|
||||
self._send_auth()
|
||||
except sasl.SASLFailed:
|
||||
self.attempted_mechs.add(self.mech.name)
|
||||
self._send_auth()
|
||||
except sasl.SASLMutualAuthFailed:
|
||||
log.error("Mutual authentication failed! " + \
|
||||
"A security breach is possible.")
|
||||
self.attempted_mechs.add(self.mech.name)
|
||||
self.xmpp.disconnect()
|
||||
except sasl.SASLFailed:
|
||||
self.attempted_mechs.add(self.mech.name)
|
||||
self._send_auth()
|
||||
else:
|
||||
resp.send(now=True)
|
||||
|
||||
@ -207,13 +207,13 @@ class FeatureMechanisms(BasePlugin):
|
||||
resp['value'] = self.mech.process(stanza['value'])
|
||||
except sasl.SASLCancelled:
|
||||
self.stanza.Abort(self.xmpp).send()
|
||||
except sasl.SASLFailed:
|
||||
self.stanza.Abort(self.xmpp).send()
|
||||
except sasl.SASLMutualAuthFailed:
|
||||
log.error("Mutual authentication failed! " + \
|
||||
"A security breach is possible.")
|
||||
self.attempted_mechs.add(self.mech.name)
|
||||
self.xmpp.disconnect()
|
||||
except sasl.SASLFailed:
|
||||
self.stanza.Abort(self.xmpp).send()
|
||||
else:
|
||||
if resp.get_value() == '':
|
||||
resp.del_value()
|
||||
|
||||
@ -24,7 +24,7 @@ class GoogleAuth(ElementBase):
|
||||
print('setting up google extension')
|
||||
|
||||
def get_client_uses_full_bind_result(self):
|
||||
return self.parent()._get_attr(self.discovery_attr) == 'true'
|
||||
return self.parent()._get_attr(self.disovery_attr) == 'true'
|
||||
|
||||
def set_client_uses_full_bind_result(self, value):
|
||||
print('>>>', value)
|
||||
|
||||
@ -52,7 +52,7 @@ class Item(ElementBase):
|
||||
def get_source(self):
|
||||
return JID(self._get_attr('source', ''))
|
||||
|
||||
def set_source(self, value):
|
||||
def set_source(self):
|
||||
self._set_attr('source', str(value))
|
||||
|
||||
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
See the file LICENSE for copying permission.
|
||||
"""
|
||||
|
||||
import logging
|
||||
|
||||
from sleekxmpp.stanza import Iq
|
||||
from sleekxmpp.xmlstream.handler import Callback
|
||||
from sleekxmpp.xmlstream.matcher import StanzaPath
|
||||
|
||||
@ -151,6 +151,7 @@ class Form(ElementBase):
|
||||
return fields
|
||||
|
||||
def get_instructions(self):
|
||||
instructions = ''
|
||||
instsXML = self.xml.findall('{%s}instructions' % self.namespace)
|
||||
return "\n".join([instXML.text for instXML in instsXML])
|
||||
|
||||
|
||||
@ -697,8 +697,7 @@ class Remote(object):
|
||||
if(client.boundjid.bare in cls._sessions):
|
||||
raise RemoteException("There already is a session associated with these credentials!")
|
||||
else:
|
||||
cls._sessions[client.boundjid.bare] = client
|
||||
|
||||
cls._sessions[client.boundjid.bare] = client;
|
||||
def _session_close_callback():
|
||||
with Remote._lock:
|
||||
del cls._sessions[client.boundjid.bare]
|
||||
|
||||
@ -61,7 +61,7 @@ class XEP_0009(BasePlugin):
|
||||
iq.enable('rpc_query')
|
||||
iq['rpc_query']['method_call']['method_name'] = pmethod
|
||||
iq['rpc_query']['method_call']['params'] = params
|
||||
return iq
|
||||
return iq;
|
||||
|
||||
def make_iq_method_response(self, pid, pto, params):
|
||||
iq = self.xmpp.makeIqResult(pid)
|
||||
@ -93,7 +93,7 @@ class XEP_0009(BasePlugin):
|
||||
|
||||
def _item_not_found(self, iq):
|
||||
payload = iq.get_payload()
|
||||
iq.reply().error().set_payload(payload)
|
||||
iq.reply().error().set_payload(payload);
|
||||
iq['error']['code'] = '404'
|
||||
iq['error']['type'] = 'cancel'
|
||||
iq['error']['condition'] = 'item-not-found'
|
||||
|
||||
@ -604,7 +604,7 @@ class XEP_0030(BasePlugin):
|
||||
"""
|
||||
self.api['del_features'](jid, node, None, kwargs)
|
||||
|
||||
def _run_node_handler(self, htype, jid, node=None, ifrom=None, data=None):
|
||||
def _run_node_handler(self, htype, jid, node=None, ifrom=None, data={}):
|
||||
"""
|
||||
Execute the most specific node handler for the given
|
||||
JID/node combination.
|
||||
@ -615,9 +615,6 @@ class XEP_0030(BasePlugin):
|
||||
node -- The node requested.
|
||||
data -- Optional, custom data to pass to the handler.
|
||||
"""
|
||||
if not data:
|
||||
data = {}
|
||||
|
||||
return self.api[htype](jid, node, ifrom, data)
|
||||
|
||||
def _handle_disco_info(self, iq):
|
||||
|
||||
@ -21,10 +21,7 @@ class Device(object):
|
||||
request_fields
|
||||
"""
|
||||
|
||||
def __init__(self, nodeId, fields=None):
|
||||
if not fields:
|
||||
fields = {}
|
||||
|
||||
def __init__(self, nodeId, fields={}):
|
||||
self.nodeId = nodeId
|
||||
self.fields = fields # see fields described below
|
||||
# {'type':'numeric',
|
||||
@ -44,8 +41,8 @@ class Device(object):
|
||||
field -- The field name
|
||||
"""
|
||||
if field in self.fields.keys():
|
||||
return True
|
||||
return False
|
||||
return True;
|
||||
return False;
|
||||
|
||||
def refresh(self, fields):
|
||||
"""
|
||||
@ -104,10 +101,10 @@ class Device(object):
|
||||
for f in fields:
|
||||
if f not in self.fields.keys():
|
||||
self._send_reject(session, callback)
|
||||
return False
|
||||
return False;
|
||||
else:
|
||||
# Request all fields
|
||||
fields = self.fields.keys()
|
||||
fields = self.fields.keys();
|
||||
|
||||
|
||||
# Refresh data from device
|
||||
@ -117,15 +114,15 @@ class Device(object):
|
||||
|
||||
if "momentary" in flags and flags['momentary'] == "true" or \
|
||||
"all" in flags and flags['all'] == "true":
|
||||
ts_block = {}
|
||||
timestamp = ""
|
||||
ts_block = {};
|
||||
timestamp = "";
|
||||
|
||||
if len(self.momentary_timestamp) > 0:
|
||||
timestamp = self.momentary_timestamp
|
||||
timestamp = self.momentary_timestamp;
|
||||
else:
|
||||
timestamp = self._get_timestamp()
|
||||
timestamp = self._get_timestamp();
|
||||
|
||||
field_block = []
|
||||
field_block = [];
|
||||
for f in self.momentary_data:
|
||||
if f in fields:
|
||||
field_block.append({"name": f,
|
||||
@ -133,11 +130,11 @@ class Device(object):
|
||||
"unit": self.fields[f]["unit"],
|
||||
"dataType": self.fields[f]["dataType"],
|
||||
"value": self.momentary_data[f]["value"],
|
||||
"flags": self.momentary_data[f]["flags"]})
|
||||
ts_block["timestamp"] = timestamp
|
||||
ts_block["fields"] = field_block
|
||||
"flags": self.momentary_data[f]["flags"]});
|
||||
ts_block["timestamp"] = timestamp;
|
||||
ts_block["fields"] = field_block;
|
||||
|
||||
callback(session, result="done", nodeId=self.nodeId, timestamp_block=ts_block)
|
||||
callback(session, result="done", nodeId=self.nodeId, timestamp_block=ts_block);
|
||||
return
|
||||
|
||||
from_flag = self._datetime_flag_parser(flags, 'from')
|
||||
@ -154,8 +151,8 @@ class Device(object):
|
||||
#print (str(tsdt) + " > " + str(to_flag))
|
||||
continue
|
||||
|
||||
ts_block = {}
|
||||
field_block = []
|
||||
ts_block = {};
|
||||
field_block = [];
|
||||
|
||||
for f in self.timestamp_data[ts]:
|
||||
if f in fields:
|
||||
@ -164,12 +161,12 @@ class Device(object):
|
||||
"unit": self.fields[f]["unit"],
|
||||
"dataType": self.fields[f]["dataType"],
|
||||
"value": self.timestamp_data[ts][f]["value"],
|
||||
"flags": self.timestamp_data[ts][f]["flags"]})
|
||||
"flags": self.timestamp_data[ts][f]["flags"]});
|
||||
|
||||
ts_block["timestamp"] = ts
|
||||
ts_block["fields"] = field_block
|
||||
callback(session, result="fields", nodeId=self.nodeId, timestamp_block=ts_block)
|
||||
callback(session, result="done", nodeId=self.nodeId, timestamp_block=None)
|
||||
ts_block["timestamp"] = ts;
|
||||
ts_block["fields"] = field_block;
|
||||
callback(session, result="fields", nodeId=self.nodeId, timestamp_block=ts_block);
|
||||
callback(session, result="done", nodeId=self.nodeId, timestamp_block=None);
|
||||
|
||||
def _datetime_flag_parser(self, flags, flagname):
|
||||
if not flagname in flags:
|
||||
@ -198,7 +195,7 @@ class Device(object):
|
||||
session -- Session id, see definition in request_fields function
|
||||
callback -- Callback function, see definition in request_fields function
|
||||
"""
|
||||
callback(session, result="error", nodeId=self.nodeId, timestamp_block=None, error_msg="Reject")
|
||||
callback(session, result="error", nodeId=self.nodeId, timestamp_block=None, error_msg="Reject");
|
||||
|
||||
def _add_field(self, name, typename, unit=None, dataType=None):
|
||||
"""
|
||||
@ -210,7 +207,7 @@ class Device(object):
|
||||
unit -- [optional] only applies to "numeric". Unit for the field.
|
||||
dataType -- [optional] only applies to "enum". Datatype for the field.
|
||||
"""
|
||||
self.fields[name] = {"type": typename, "unit": unit, "dataType": dataType}
|
||||
self.fields[name] = {"type": typename, "unit": unit, "dataType": dataType};
|
||||
|
||||
def _add_field_timestamp_data(self, name, timestamp, value, flags=None):
|
||||
"""
|
||||
@ -224,12 +221,12 @@ class Device(object):
|
||||
Formatted as a dictionary like { "flag name": "flag value" ... }
|
||||
"""
|
||||
if not name in self.fields.keys():
|
||||
return False
|
||||
return False;
|
||||
if not timestamp in self.timestamp_data:
|
||||
self.timestamp_data[timestamp] = {}
|
||||
self.timestamp_data[timestamp] = {};
|
||||
|
||||
self.timestamp_data[timestamp][name] = {"value": value, "flags": flags}
|
||||
return True
|
||||
self.timestamp_data[timestamp][name] = {"value": value, "flags": flags};
|
||||
return True;
|
||||
|
||||
def _add_field_momentary_data(self, name, value, flags=None):
|
||||
"""
|
||||
@ -242,17 +239,17 @@ class Device(object):
|
||||
Formatted as a dictionary like { "flag name": "flag value" ... }
|
||||
"""
|
||||
if name not in self.fields:
|
||||
return False
|
||||
return False;
|
||||
if flags is None:
|
||||
flags = {}
|
||||
flags = {};
|
||||
|
||||
flags["momentary"] = "true"
|
||||
self.momentary_data[name] = {"value": value, "flags": flags}
|
||||
return True
|
||||
self.momentary_data[name] = {"value": value, "flags": flags};
|
||||
return True;
|
||||
|
||||
def _set_momentary_timestamp(self, timestamp):
|
||||
"""
|
||||
This function is only for unit testing to produce predictable results.
|
||||
"""
|
||||
self.momentary_timestamp = timestamp
|
||||
self.momentary_timestamp = timestamp;
|
||||
|
||||
|
||||
@ -155,11 +155,11 @@ class XEP_0323(BasePlugin):
|
||||
self._handle_event_started))
|
||||
|
||||
# Server side dicts
|
||||
self.nodes = {}
|
||||
self.sessions = {}
|
||||
self.nodes = {};
|
||||
self.sessions = {};
|
||||
|
||||
self.last_seqnr = 0
|
||||
self.seqnr_lock = Lock()
|
||||
self.last_seqnr = 0;
|
||||
self.seqnr_lock = Lock();
|
||||
|
||||
## For testning only
|
||||
self.test_authenticated_from = ""
|
||||
@ -182,7 +182,7 @@ class XEP_0323(BasePlugin):
|
||||
|
||||
def plugin_end(self):
|
||||
""" Stop the XEP-0323 plugin """
|
||||
self.sessions.clear()
|
||||
self.sessions.clear();
|
||||
self.xmpp.remove_handler('Sensordata Event:Req')
|
||||
self.xmpp.remove_handler('Sensordata Event:Accepted')
|
||||
self.xmpp.remove_handler('Sensordata Event:Rejected')
|
||||
@ -217,11 +217,11 @@ class XEP_0323(BasePlugin):
|
||||
self.nodes[nodeId] = {"device": device,
|
||||
"commTimeout": commTimeout,
|
||||
"sourceId": sourceId,
|
||||
"cacheType": cacheType}
|
||||
"cacheType": cacheType};
|
||||
|
||||
def _set_authenticated(self, auth=''):
|
||||
""" Internal testing function """
|
||||
self.test_authenticated_from = auth
|
||||
self.test_authenticated_from = auth;
|
||||
|
||||
|
||||
def _handle_event_req(self, iq):
|
||||
@ -238,42 +238,42 @@ class XEP_0323(BasePlugin):
|
||||
If the verification fails, a reject message is sent.
|
||||
"""
|
||||
|
||||
seqnr = iq['req']['seqnr']
|
||||
error_msg = ''
|
||||
req_ok = True
|
||||
seqnr = iq['req']['seqnr'];
|
||||
error_msg = '';
|
||||
req_ok = True;
|
||||
|
||||
# Authentication
|
||||
if len(self.test_authenticated_from) > 0 and not iq['from'] == self.test_authenticated_from:
|
||||
# Invalid authentication
|
||||
req_ok = False
|
||||
error_msg = "Access denied"
|
||||
req_ok = False;
|
||||
error_msg = "Access denied";
|
||||
|
||||
# Nodes
|
||||
process_nodes = []
|
||||
process_nodes = [];
|
||||
if len(iq['req']['nodes']) > 0:
|
||||
for n in iq['req']['nodes']:
|
||||
if not n['nodeId'] in self.nodes:
|
||||
req_ok = False
|
||||
error_msg = "Invalid nodeId " + n['nodeId']
|
||||
process_nodes = [n['nodeId'] for n in iq['req']['nodes']]
|
||||
req_ok = False;
|
||||
error_msg = "Invalid nodeId " + n['nodeId'];
|
||||
process_nodes = [n['nodeId'] for n in iq['req']['nodes']];
|
||||
else:
|
||||
process_nodes = self.nodes.keys()
|
||||
process_nodes = self.nodes.keys();
|
||||
|
||||
# Fields - if we just find one we are happy, otherwise we reject
|
||||
process_fields = []
|
||||
process_fields = [];
|
||||
if len(iq['req']['fields']) > 0:
|
||||
found = False
|
||||
for f in iq['req']['fields']:
|
||||
for node in self.nodes:
|
||||
if self.nodes[node]["device"].has_field(f['name']):
|
||||
found = True
|
||||
break
|
||||
found = True;
|
||||
break;
|
||||
if not found:
|
||||
req_ok = False
|
||||
error_msg = "Invalid field " + f['name']
|
||||
process_fields = [f['name'] for n in iq['req']['fields']]
|
||||
req_ok = False;
|
||||
error_msg = "Invalid field " + f['name'];
|
||||
process_fields = [f['name'] for n in iq['req']['fields']];
|
||||
|
||||
req_flags = iq['req']._get_flags()
|
||||
req_flags = iq['req']._get_flags();
|
||||
|
||||
request_delay_sec = None
|
||||
if 'when' in req_flags:
|
||||
@ -283,7 +283,7 @@ class XEP_0323(BasePlugin):
|
||||
try:
|
||||
dt = datetime.datetime.strptime(req_flags['when'], "%Y-%m-%dT%H:%M:%S")
|
||||
except ValueError:
|
||||
req_ok = False
|
||||
req_ok = False;
|
||||
error_msg = "Invalid datetime in 'when' flag, please use ISO format (i.e. 2013-04-05T15:00:03)."
|
||||
|
||||
if not dt is None:
|
||||
@ -292,30 +292,30 @@ class XEP_0323(BasePlugin):
|
||||
dtdiff = dt - dtnow
|
||||
request_delay_sec = dtdiff.seconds + dtdiff.days * 24 * 3600
|
||||
if request_delay_sec <= 0:
|
||||
req_ok = False
|
||||
error_msg = "Invalid datetime in 'when' flag, cannot set a time in the past. Current time: " + dtnow.isoformat()
|
||||
req_ok = False;
|
||||
error_msg = "Invalid datetime in 'when' flag, cannot set a time in the past. Current time: " + dtnow.isoformat();
|
||||
|
||||
if req_ok:
|
||||
session = self._new_session()
|
||||
self.sessions[session] = {"from": iq['from'], "to": iq['to'], "seqnr": seqnr}
|
||||
self.sessions[session]["commTimers"] = {}
|
||||
self.sessions[session]["nodeDone"] = {}
|
||||
session = self._new_session();
|
||||
self.sessions[session] = {"from": iq['from'], "to": iq['to'], "seqnr": seqnr};
|
||||
self.sessions[session]["commTimers"] = {};
|
||||
self.sessions[session]["nodeDone"] = {};
|
||||
|
||||
#print("added session: " + str(self.sessions))
|
||||
|
||||
iq.reply()
|
||||
iq['accepted']['seqnr'] = seqnr
|
||||
iq.reply();
|
||||
iq['accepted']['seqnr'] = seqnr;
|
||||
if not request_delay_sec is None:
|
||||
iq['accepted']['queued'] = "true"
|
||||
iq.send(block=False)
|
||||
iq.send(block=False);
|
||||
|
||||
self.sessions[session]["node_list"] = process_nodes
|
||||
self.sessions[session]["node_list"] = process_nodes;
|
||||
|
||||
if not request_delay_sec is None:
|
||||
# Delay request to requested time
|
||||
timer = Timer(request_delay_sec, self._event_delayed_req, args=(session, process_fields, req_flags))
|
||||
self.sessions[session]["commTimers"]["delaytimer"] = timer
|
||||
timer.start()
|
||||
self.sessions[session]["commTimers"]["delaytimer"] = timer;
|
||||
timer.start();
|
||||
return
|
||||
|
||||
if self.threaded:
|
||||
@ -324,14 +324,14 @@ class XEP_0323(BasePlugin):
|
||||
tr_req.start()
|
||||
#print("started thread")
|
||||
else:
|
||||
self._threaded_node_request(session, process_fields, req_flags)
|
||||
self._threaded_node_request(session, process_fields, req_flags);
|
||||
|
||||
else:
|
||||
iq.reply()
|
||||
iq['type'] = 'error'
|
||||
iq['rejected']['seqnr'] = seqnr
|
||||
iq['rejected']['error'] = error_msg
|
||||
iq.send(block=False)
|
||||
iq.reply();
|
||||
iq['type'] = 'error';
|
||||
iq['rejected']['seqnr'] = seqnr;
|
||||
iq['rejected']['error'] = error_msg;
|
||||
iq.send(block=False);
|
||||
|
||||
def _threaded_node_request(self, session, process_fields, flags):
|
||||
"""
|
||||
@ -344,14 +344,14 @@ class XEP_0323(BasePlugin):
|
||||
Formatted as a dictionary like { "flag name": "flag value" ... }
|
||||
"""
|
||||
for node in self.sessions[session]["node_list"]:
|
||||
self.sessions[session]["nodeDone"][node] = False
|
||||
self.sessions[session]["nodeDone"][node] = False;
|
||||
|
||||
for node in self.sessions[session]["node_list"]:
|
||||
timer = TimerReset(self.nodes[node]['commTimeout'], self._event_comm_timeout, args=(session, node))
|
||||
self.sessions[session]["commTimers"][node] = timer
|
||||
timer = TimerReset(self.nodes[node]['commTimeout'], self._event_comm_timeout, args=(session, node));
|
||||
self.sessions[session]["commTimers"][node] = timer;
|
||||
#print("Starting timer " + str(timer) + ", timeout: " + str(self.nodes[node]['commTimeout']))
|
||||
timer.start()
|
||||
self.nodes[node]['device'].request_fields(process_fields, flags=flags, session=session, callback=self._device_field_request_callback)
|
||||
timer.start();
|
||||
self.nodes[node]['device'].request_fields(process_fields, flags=flags, session=session, callback=self._device_field_request_callback);
|
||||
|
||||
def _event_comm_timeout(self, session, nodeId):
|
||||
"""
|
||||
@ -363,22 +363,22 @@ class XEP_0323(BasePlugin):
|
||||
session -- The request session id
|
||||
nodeId -- The id of the device which timed out
|
||||
"""
|
||||
msg = self.xmpp.Message()
|
||||
msg['from'] = self.sessions[session]['to']
|
||||
msg['to'] = self.sessions[session]['from']
|
||||
msg['failure']['seqnr'] = self.sessions[session]['seqnr']
|
||||
msg['failure']['error']['text'] = "Timeout"
|
||||
msg['failure']['error']['nodeId'] = nodeId
|
||||
msg['failure']['error']['timestamp'] = datetime.datetime.now().replace(microsecond=0).isoformat()
|
||||
msg = self.xmpp.Message();
|
||||
msg['from'] = self.sessions[session]['to'];
|
||||
msg['to'] = self.sessions[session]['from'];
|
||||
msg['failure']['seqnr'] = self.sessions[session]['seqnr'];
|
||||
msg['failure']['error']['text'] = "Timeout";
|
||||
msg['failure']['error']['nodeId'] = nodeId;
|
||||
msg['failure']['error']['timestamp'] = datetime.datetime.now().replace(microsecond=0).isoformat();
|
||||
|
||||
# Drop communication with this device and check if we are done
|
||||
self.sessions[session]["nodeDone"][nodeId] = True
|
||||
self.sessions[session]["nodeDone"][nodeId] = True;
|
||||
if (self._all_nodes_done(session)):
|
||||
msg['failure']['done'] = 'true'
|
||||
msg.send()
|
||||
msg['failure']['done'] = 'true';
|
||||
msg.send();
|
||||
# The session is complete, delete it
|
||||
#print("del session " + session + " due to timeout")
|
||||
del self.sessions[session]
|
||||
del self.sessions[session];
|
||||
|
||||
def _event_delayed_req(self, session, process_fields, req_flags):
|
||||
"""
|
||||
@ -390,17 +390,17 @@ class XEP_0323(BasePlugin):
|
||||
flags -- [optional] flags to pass to the devices, e.g. momentary
|
||||
Formatted as a dictionary like { "flag name": "flag value" ... }
|
||||
"""
|
||||
msg = self.xmpp.Message()
|
||||
msg['from'] = self.sessions[session]['to']
|
||||
msg['to'] = self.sessions[session]['from']
|
||||
msg['started']['seqnr'] = self.sessions[session]['seqnr']
|
||||
msg.send()
|
||||
msg = self.xmpp.Message();
|
||||
msg['from'] = self.sessions[session]['to'];
|
||||
msg['to'] = self.sessions[session]['from'];
|
||||
msg['started']['seqnr'] = self.sessions[session]['seqnr'];
|
||||
msg.send();
|
||||
|
||||
if self.threaded:
|
||||
tr_req = Thread(target=self._threaded_node_request, args=(session, process_fields, req_flags))
|
||||
tr_req.start()
|
||||
else:
|
||||
self._threaded_node_request(session, process_fields, req_flags)
|
||||
self._threaded_node_request(session, process_fields, req_flags);
|
||||
|
||||
def _all_nodes_done(self, session):
|
||||
"""
|
||||
@ -411,8 +411,8 @@ class XEP_0323(BasePlugin):
|
||||
"""
|
||||
for n in self.sessions[session]["nodeDone"]:
|
||||
if not self.sessions[session]["nodeDone"][n]:
|
||||
return False
|
||||
return True
|
||||
return False;
|
||||
return True;
|
||||
|
||||
def _device_field_request_callback(self, session, nodeId, result, timestamp_block, error_msg=None):
|
||||
"""
|
||||
@ -452,33 +452,33 @@ class XEP_0323(BasePlugin):
|
||||
return
|
||||
|
||||
if result == "error":
|
||||
self.sessions[session]["commTimers"][nodeId].cancel()
|
||||
self.sessions[session]["commTimers"][nodeId].cancel();
|
||||
|
||||
msg = self.xmpp.Message()
|
||||
msg['from'] = self.sessions[session]['to']
|
||||
msg['to'] = self.sessions[session]['from']
|
||||
msg['failure']['seqnr'] = self.sessions[session]['seqnr']
|
||||
msg['failure']['error']['text'] = error_msg
|
||||
msg['failure']['error']['nodeId'] = nodeId
|
||||
msg['failure']['error']['timestamp'] = datetime.datetime.now().replace(microsecond=0).isoformat()
|
||||
msg = self.xmpp.Message();
|
||||
msg['from'] = self.sessions[session]['to'];
|
||||
msg['to'] = self.sessions[session]['from'];
|
||||
msg['failure']['seqnr'] = self.sessions[session]['seqnr'];
|
||||
msg['failure']['error']['text'] = error_msg;
|
||||
msg['failure']['error']['nodeId'] = nodeId;
|
||||
msg['failure']['error']['timestamp'] = datetime.datetime.now().replace(microsecond=0).isoformat();
|
||||
|
||||
# Drop communication with this device and check if we are done
|
||||
self.sessions[session]["nodeDone"][nodeId] = True
|
||||
self.sessions[session]["nodeDone"][nodeId] = True;
|
||||
if (self._all_nodes_done(session)):
|
||||
msg['failure']['done'] = 'true'
|
||||
msg['failure']['done'] = 'true';
|
||||
# The session is complete, delete it
|
||||
# print("del session " + session + " due to error")
|
||||
del self.sessions[session]
|
||||
msg.send()
|
||||
del self.sessions[session];
|
||||
msg.send();
|
||||
else:
|
||||
msg = self.xmpp.Message()
|
||||
msg['from'] = self.sessions[session]['to']
|
||||
msg['to'] = self.sessions[session]['from']
|
||||
msg['fields']['seqnr'] = self.sessions[session]['seqnr']
|
||||
msg = self.xmpp.Message();
|
||||
msg['from'] = self.sessions[session]['to'];
|
||||
msg['to'] = self.sessions[session]['from'];
|
||||
msg['fields']['seqnr'] = self.sessions[session]['seqnr'];
|
||||
|
||||
if timestamp_block is not None and len(timestamp_block) > 0:
|
||||
node = msg['fields'].add_node(nodeId)
|
||||
ts = node.add_timestamp(timestamp_block["timestamp"])
|
||||
node = msg['fields'].add_node(nodeId);
|
||||
ts = node.add_timestamp(timestamp_block["timestamp"]);
|
||||
|
||||
for f in timestamp_block["fields"]:
|
||||
data = ts.add_data( typename=f['type'],
|
||||
@ -486,50 +486,50 @@ class XEP_0323(BasePlugin):
|
||||
value=f['value'],
|
||||
unit=f['unit'],
|
||||
dataType=f['dataType'],
|
||||
flags=f['flags'])
|
||||
flags=f['flags']);
|
||||
|
||||
if result == "done":
|
||||
self.sessions[session]["commTimers"][nodeId].cancel()
|
||||
self.sessions[session]["nodeDone"][nodeId] = True
|
||||
msg['fields']['done'] = 'true'
|
||||
self.sessions[session]["commTimers"][nodeId].cancel();
|
||||
self.sessions[session]["nodeDone"][nodeId] = True;
|
||||
msg['fields']['done'] = 'true';
|
||||
if (self._all_nodes_done(session)):
|
||||
# The session is complete, delete it
|
||||
# print("del session " + session + " due to complete")
|
||||
del self.sessions[session]
|
||||
del self.sessions[session];
|
||||
else:
|
||||
# Restart comm timer
|
||||
self.sessions[session]["commTimers"][nodeId].reset()
|
||||
self.sessions[session]["commTimers"][nodeId].reset();
|
||||
|
||||
msg.send()
|
||||
msg.send();
|
||||
|
||||
def _handle_event_cancel(self, iq):
|
||||
""" Received Iq with cancel - this is a cancel request.
|
||||
Delete the session and confirm. """
|
||||
|
||||
seqnr = iq['cancel']['seqnr']
|
||||
seqnr = iq['cancel']['seqnr'];
|
||||
# Find the session
|
||||
for s in self.sessions:
|
||||
if self.sessions[s]['from'] == iq['from'] and self.sessions[s]['to'] == iq['to'] and self.sessions[s]['seqnr'] == seqnr:
|
||||
# found it. Cancel all timers
|
||||
for n in self.sessions[s]["commTimers"]:
|
||||
self.sessions[s]["commTimers"][n].cancel()
|
||||
self.sessions[s]["commTimers"][n].cancel();
|
||||
|
||||
# Confirm
|
||||
iq.reply()
|
||||
iq['type'] = 'result'
|
||||
iq['cancelled']['seqnr'] = seqnr
|
||||
iq.send(block=False)
|
||||
iq.reply();
|
||||
iq['type'] = 'result';
|
||||
iq['cancelled']['seqnr'] = seqnr;
|
||||
iq.send(block=False);
|
||||
|
||||
# Delete session
|
||||
del self.sessions[s]
|
||||
return
|
||||
|
||||
# Could not find session, send reject
|
||||
iq.reply()
|
||||
iq['type'] = 'error'
|
||||
iq['rejected']['seqnr'] = seqnr
|
||||
iq['rejected']['error'] = "Cancel request received, no matching request is active."
|
||||
iq.send(block=False)
|
||||
iq.reply();
|
||||
iq['type'] = 'error';
|
||||
iq['rejected']['seqnr'] = seqnr;
|
||||
iq['rejected']['error'] = "Cancel request received, no matching request is active.";
|
||||
iq.send(block=False);
|
||||
|
||||
# =================================================================
|
||||
# Client side (data retriever) API
|
||||
@ -593,26 +593,26 @@ class XEP_0323(BasePlugin):
|
||||
session -- Session identifier. Client can use this as a reference to cancel
|
||||
the request.
|
||||
"""
|
||||
iq = self.xmpp.Iq()
|
||||
iq['from'] = from_jid
|
||||
iq['to'] = to_jid
|
||||
iq['type'] = "get"
|
||||
seqnr = self._get_new_seqnr()
|
||||
iq['id'] = seqnr
|
||||
iq['req']['seqnr'] = seqnr
|
||||
iq = self.xmpp.Iq();
|
||||
iq['from'] = from_jid;
|
||||
iq['to'] = to_jid;
|
||||
iq['type'] = "get";
|
||||
seqnr = self._get_new_seqnr();
|
||||
iq['id'] = seqnr;
|
||||
iq['req']['seqnr'] = seqnr;
|
||||
if nodeIds is not None:
|
||||
for nodeId in nodeIds:
|
||||
iq['req'].add_node(nodeId)
|
||||
iq['req'].add_node(nodeId);
|
||||
if fields is not None:
|
||||
for field in fields:
|
||||
iq['req'].add_field(field)
|
||||
iq['req'].add_field(field);
|
||||
|
||||
iq['req']._set_flags(flags)
|
||||
iq['req']._set_flags(flags);
|
||||
|
||||
self.sessions[seqnr] = {"from": iq['from'], "to": iq['to'], "seqnr": seqnr, "callback": callback}
|
||||
iq.send(block=False)
|
||||
self.sessions[seqnr] = {"from": iq['from'], "to": iq['to'], "seqnr": seqnr, "callback": callback};
|
||||
iq.send(block=False);
|
||||
|
||||
return seqnr
|
||||
return seqnr;
|
||||
|
||||
def cancel_request(self, session):
|
||||
"""
|
||||
@ -625,39 +625,39 @@ class XEP_0323(BasePlugin):
|
||||
session -- The session id of the request to cancel
|
||||
"""
|
||||
seqnr = session
|
||||
iq = self.xmpp.Iq()
|
||||
iq = self.xmpp.Iq();
|
||||
iq['from'] = self.sessions[seqnr]['from']
|
||||
iq['to'] = self.sessions[seqnr]['to']
|
||||
iq['type'] = "get"
|
||||
iq['id'] = seqnr
|
||||
iq['cancel']['seqnr'] = seqnr
|
||||
iq.send(block=False)
|
||||
iq['to'] = self.sessions[seqnr]['to'];
|
||||
iq['type'] = "get";
|
||||
iq['id'] = seqnr;
|
||||
iq['cancel']['seqnr'] = seqnr;
|
||||
iq.send(block=False);
|
||||
|
||||
def _get_new_seqnr(self):
|
||||
""" Returns a unique sequence number (unique across threads) """
|
||||
self.seqnr_lock.acquire()
|
||||
self.last_seqnr += 1
|
||||
self.seqnr_lock.release()
|
||||
return str(self.last_seqnr)
|
||||
self.seqnr_lock.acquire();
|
||||
self.last_seqnr = self.last_seqnr + 1;
|
||||
self.seqnr_lock.release();
|
||||
return str(self.last_seqnr);
|
||||
|
||||
def _handle_event_accepted(self, iq):
|
||||
""" Received Iq with accepted - request was accepted """
|
||||
seqnr = iq['accepted']['seqnr']
|
||||
seqnr = iq['accepted']['seqnr'];
|
||||
result = "accepted"
|
||||
if iq['accepted']['queued'] == 'true':
|
||||
result = "queued"
|
||||
|
||||
callback = self.sessions[seqnr]["callback"]
|
||||
callback(from_jid=iq['from'], result=result)
|
||||
callback = self.sessions[seqnr]["callback"];
|
||||
callback(from_jid=iq['from'], result=result);
|
||||
|
||||
def _handle_event_rejected(self, iq):
|
||||
""" Received Iq with rejected - this is a reject.
|
||||
Delete the session. """
|
||||
seqnr = iq['rejected']['seqnr']
|
||||
callback = self.sessions[seqnr]["callback"]
|
||||
callback(from_jid=iq['from'], result="rejected", error_msg=iq['rejected']['error'])
|
||||
seqnr = iq['rejected']['seqnr'];
|
||||
callback = self.sessions[seqnr]["callback"];
|
||||
callback(from_jid=iq['from'], result="rejected", error_msg=iq['rejected']['error']);
|
||||
# Session terminated
|
||||
del self.sessions[seqnr]
|
||||
del self.sessions[seqnr];
|
||||
|
||||
def _handle_event_cancelled(self, iq):
|
||||
"""
|
||||
@ -665,59 +665,59 @@ class XEP_0323(BasePlugin):
|
||||
Delete the session.
|
||||
"""
|
||||
#print("Got cancelled")
|
||||
seqnr = iq['cancelled']['seqnr']
|
||||
callback = self.sessions[seqnr]["callback"]
|
||||
callback(from_jid=iq['from'], result="cancelled")
|
||||
seqnr = iq['cancelled']['seqnr'];
|
||||
callback = self.sessions[seqnr]["callback"];
|
||||
callback(from_jid=iq['from'], result="cancelled");
|
||||
# Session cancelled
|
||||
del self.sessions[seqnr]
|
||||
del self.sessions[seqnr];
|
||||
|
||||
def _handle_event_fields(self, msg):
|
||||
"""
|
||||
Received Msg with fields - this is a data reponse to a request.
|
||||
If this is the last data block, issue a "done" callback.
|
||||
"""
|
||||
seqnr = msg['fields']['seqnr']
|
||||
callback = self.sessions[seqnr]["callback"]
|
||||
seqnr = msg['fields']['seqnr'];
|
||||
callback = self.sessions[seqnr]["callback"];
|
||||
for node in msg['fields']['nodes']:
|
||||
for ts in node['timestamps']:
|
||||
fields = []
|
||||
fields = [];
|
||||
for d in ts['datas']:
|
||||
field_block = {}
|
||||
field_block["name"] = d['name']
|
||||
field_block["typename"] = d._get_typename()
|
||||
field_block["value"] = d['value']
|
||||
field_block = {};
|
||||
field_block["name"] = d['name'];
|
||||
field_block["typename"] = d._get_typename();
|
||||
field_block["value"] = d['value'];
|
||||
if not d['unit'] == "": field_block["unit"] = d['unit'];
|
||||
if not d['dataType'] == "": field_block["dataType"] = d['dataType'];
|
||||
flags = d._get_flags()
|
||||
flags = d._get_flags();
|
||||
if not len(flags) == 0:
|
||||
field_block["flags"] = flags
|
||||
fields.append(field_block)
|
||||
field_block["flags"] = flags;
|
||||
fields.append(field_block);
|
||||
|
||||
callback(from_jid=msg['from'], result="fields", nodeId=node['nodeId'], timestamp=ts['value'], fields=fields)
|
||||
callback(from_jid=msg['from'], result="fields", nodeId=node['nodeId'], timestamp=ts['value'], fields=fields);
|
||||
|
||||
if msg['fields']['done'] == "true":
|
||||
callback(from_jid=msg['from'], result="done")
|
||||
callback(from_jid=msg['from'], result="done");
|
||||
# Session done
|
||||
del self.sessions[seqnr]
|
||||
del self.sessions[seqnr];
|
||||
|
||||
def _handle_event_failure(self, msg):
|
||||
"""
|
||||
Received Msg with failure - our request failed
|
||||
Delete the session.
|
||||
"""
|
||||
seqnr = msg['failure']['seqnr']
|
||||
callback = self.sessions[seqnr]["callback"]
|
||||
callback(from_jid=msg['from'], result="failure", nodeId=msg['failure']['error']['nodeId'], timestamp=msg['failure']['error']['timestamp'], error_msg=msg['failure']['error']['text'])
|
||||
seqnr = msg['failure']['seqnr'];
|
||||
callback = self.sessions[seqnr]["callback"];
|
||||
callback(from_jid=msg['from'], result="failure", nodeId=msg['failure']['error']['nodeId'], timestamp=msg['failure']['error']['timestamp'], error_msg=msg['failure']['error']['text']);
|
||||
|
||||
# Session failed
|
||||
del self.sessions[seqnr]
|
||||
del self.sessions[seqnr];
|
||||
|
||||
def _handle_event_started(self, msg):
|
||||
"""
|
||||
Received Msg with started - our request was queued and is now started.
|
||||
"""
|
||||
seqnr = msg['started']['seqnr']
|
||||
callback = self.sessions[seqnr]["callback"]
|
||||
callback(from_jid=msg['from'], result="started")
|
||||
seqnr = msg['started']['seqnr'];
|
||||
callback = self.sessions[seqnr]["callback"];
|
||||
callback(from_jid=msg['from'], result="started");
|
||||
|
||||
|
||||
|
||||
@ -38,12 +38,12 @@ class Request(ElementBase):
|
||||
name = 'req'
|
||||
plugin_attrib = name
|
||||
interfaces = set(['seqnr','nodes','fields','serviceToken','deviceToken','userToken','from','to','when','historical','all'])
|
||||
interfaces.update(FieldTypes.field_types)
|
||||
_flags = set(['serviceToken','deviceToken','userToken','from','to','when','historical','all'])
|
||||
_flags.update(FieldTypes.field_types)
|
||||
interfaces.update(FieldTypes.field_types);
|
||||
_flags = set(['serviceToken','deviceToken','userToken','from','to','when','historical','all']);
|
||||
_flags.update(FieldTypes.field_types);
|
||||
|
||||
def __init__(self, xml=None, parent=None):
|
||||
ElementBase.__init__(self, xml, parent)
|
||||
ElementBase.__init__(self, xml, parent);
|
||||
self._nodes = set()
|
||||
self._fields = set()
|
||||
|
||||
@ -67,11 +67,11 @@ class Request(ElementBase):
|
||||
Helper function for getting of flags. Returns all flags in
|
||||
dictionary format: { "flag name": "flag value" ... }
|
||||
"""
|
||||
flags = {}
|
||||
flags = {};
|
||||
for f in self._flags:
|
||||
if not self[f] == "":
|
||||
flags[f] = self[f]
|
||||
return flags
|
||||
flags[f] = self[f];
|
||||
return flags;
|
||||
|
||||
def _set_flags(self, flags):
|
||||
"""
|
||||
@ -82,9 +82,9 @@ class Request(ElementBase):
|
||||
"""
|
||||
for f in self._flags:
|
||||
if flags is not None and f in flags:
|
||||
self[f] = flags[f]
|
||||
self[f] = flags[f];
|
||||
else:
|
||||
self[f] = None
|
||||
self[f] = None;
|
||||
|
||||
def add_node(self, nodeId, sourceId=None, cacheType=None):
|
||||
"""
|
||||
@ -269,7 +269,7 @@ class Error(ElementBase):
|
||||
:param value: string
|
||||
"""
|
||||
|
||||
self.xml.text = value
|
||||
self.xml.text = value;
|
||||
return self
|
||||
|
||||
def del_text(self):
|
||||
@ -292,7 +292,7 @@ class Fields(ElementBase):
|
||||
interfaces = set(['seqnr','done','nodes'])
|
||||
|
||||
def __init__(self, xml=None, parent=None):
|
||||
ElementBase.__init__(self, xml, parent)
|
||||
ElementBase.__init__(self, xml, parent);
|
||||
self._nodes = set()
|
||||
|
||||
def setup(self, xml=None):
|
||||
@ -392,7 +392,7 @@ class FieldsNode(ElementBase):
|
||||
interfaces = set(['nodeId','sourceId','cacheType','timestamps'])
|
||||
|
||||
def __init__(self, xml=None, parent=None):
|
||||
ElementBase.__init__(self, xml, parent)
|
||||
ElementBase.__init__(self, xml, parent);
|
||||
self._timestamps = set()
|
||||
|
||||
def setup(self, xml=None):
|
||||
@ -423,7 +423,7 @@ class FieldsNode(ElementBase):
|
||||
ts = Timestamp(parent=self)
|
||||
ts['value'] = timestamp
|
||||
if not substanzas is None:
|
||||
ts.set_datas(substanzas)
|
||||
ts.set_datas(substanzas);
|
||||
#print("add_timestamp with substanzas: " + str(substanzas))
|
||||
self.iterables.append(ts)
|
||||
#print(str(id(self)) + " added_timestamp: " + str(id(ts)))
|
||||
@ -498,13 +498,13 @@ class Field(ElementBase):
|
||||
namespace = 'urn:xmpp:iot:sensordata'
|
||||
name = 'field'
|
||||
plugin_attrib = name
|
||||
interfaces = set(['name','module','stringIds'])
|
||||
interfaces.update(FieldTypes.field_types)
|
||||
interfaces.update(FieldStatus.field_status)
|
||||
interfaces = set(['name','module','stringIds']);
|
||||
interfaces.update(FieldTypes.field_types);
|
||||
interfaces.update(FieldStatus.field_status);
|
||||
|
||||
_flags = set()
|
||||
_flags.update(FieldTypes.field_types)
|
||||
_flags.update(FieldStatus.field_status)
|
||||
_flags = set();
|
||||
_flags.update(FieldTypes.field_types);
|
||||
_flags.update(FieldStatus.field_status);
|
||||
|
||||
def set_stringIds(self, value):
|
||||
"""Verifies stringIds according to regexp from specification XMPP-0323.
|
||||
@ -514,7 +514,7 @@ class Field(ElementBase):
|
||||
|
||||
pattern = re.compile("^\d+([|]\w+([.]\w+)*([|][^,]*)?)?(,\d+([|]\w+([.]\w+)*([|][^,]*)?)?)*$")
|
||||
if pattern.match(value) is not None:
|
||||
self.xml.stringIds = value
|
||||
self.xml.stringIds = value;
|
||||
else:
|
||||
# Bad content, add nothing
|
||||
pass
|
||||
@ -526,11 +526,11 @@ class Field(ElementBase):
|
||||
Helper function for getting of flags. Returns all flags in
|
||||
dictionary format: { "flag name": "flag value" ... }
|
||||
"""
|
||||
flags = {}
|
||||
flags = {};
|
||||
for f in self._flags:
|
||||
if not self[f] == "":
|
||||
flags[f] = self[f]
|
||||
return flags
|
||||
flags[f] = self[f];
|
||||
return flags;
|
||||
|
||||
def _set_flags(self, flags):
|
||||
"""
|
||||
@ -541,12 +541,12 @@ class Field(ElementBase):
|
||||
"""
|
||||
for f in self._flags:
|
||||
if flags is not None and f in flags:
|
||||
self[f] = flags[f]
|
||||
self[f] = flags[f];
|
||||
else:
|
||||
self[f] = None
|
||||
self[f] = None;
|
||||
|
||||
def _get_typename(self):
|
||||
return "invalid type, use subclasses!"
|
||||
return "invalid type, use subclasses!";
|
||||
|
||||
|
||||
class Timestamp(ElementBase):
|
||||
@ -557,7 +557,7 @@ class Timestamp(ElementBase):
|
||||
interfaces = set(['value','datas'])
|
||||
|
||||
def __init__(self, xml=None, parent=None):
|
||||
ElementBase.__init__(self, xml, parent)
|
||||
ElementBase.__init__(self, xml, parent);
|
||||
self._datas = set()
|
||||
|
||||
def setup(self, xml=None):
|
||||
@ -587,29 +587,29 @@ class Timestamp(ElementBase):
|
||||
dataType -- [optional] The dataType. Only applicable for type enum
|
||||
"""
|
||||
if name not in self._datas:
|
||||
dataObj = None
|
||||
dataObj = None;
|
||||
if typename == "numeric":
|
||||
dataObj = DataNumeric(parent=self)
|
||||
dataObj['unit'] = unit
|
||||
dataObj = DataNumeric(parent=self);
|
||||
dataObj['unit'] = unit;
|
||||
elif typename == "string":
|
||||
dataObj = DataString(parent=self)
|
||||
dataObj = DataString(parent=self);
|
||||
elif typename == "boolean":
|
||||
dataObj = DataBoolean(parent=self)
|
||||
dataObj = DataBoolean(parent=self);
|
||||
elif typename == "dateTime":
|
||||
dataObj = DataDateTime(parent=self)
|
||||
dataObj = DataDateTime(parent=self);
|
||||
elif typename == "timeSpan":
|
||||
dataObj = DataTimeSpan(parent=self)
|
||||
dataObj = DataTimeSpan(parent=self);
|
||||
elif typename == "enum":
|
||||
dataObj = DataEnum(parent=self)
|
||||
dataObj['dataType'] = dataType
|
||||
dataObj = DataEnum(parent=self);
|
||||
dataObj['dataType'] = dataType;
|
||||
|
||||
dataObj['name'] = name
|
||||
dataObj['value'] = value
|
||||
dataObj['module'] = module
|
||||
dataObj['stringIds'] = stringIds
|
||||
dataObj['name'] = name;
|
||||
dataObj['value'] = value;
|
||||
dataObj['module'] = module;
|
||||
dataObj['stringIds'] = stringIds;
|
||||
|
||||
if flags is not None:
|
||||
dataObj._set_flags(flags)
|
||||
dataObj._set_flags(flags);
|
||||
|
||||
self._datas.add(name)
|
||||
self.iterables.append(dataObj)
|
||||
@ -668,8 +668,8 @@ class DataNumeric(Field):
|
||||
namespace = 'urn:xmpp:iot:sensordata'
|
||||
name = 'numeric'
|
||||
plugin_attrib = name
|
||||
interfaces = set(['value', 'unit'])
|
||||
interfaces.update(Field.interfaces)
|
||||
interfaces = set(['value', 'unit']);
|
||||
interfaces.update(Field.interfaces);
|
||||
|
||||
def _get_typename(self):
|
||||
return "numeric"
|
||||
@ -681,8 +681,8 @@ class DataString(Field):
|
||||
namespace = 'urn:xmpp:iot:sensordata'
|
||||
name = 'string'
|
||||
plugin_attrib = name
|
||||
interfaces = set(['value'])
|
||||
interfaces.update(Field.interfaces)
|
||||
interfaces = set(['value']);
|
||||
interfaces.update(Field.interfaces);
|
||||
|
||||
def _get_typename(self):
|
||||
return "string"
|
||||
@ -695,8 +695,8 @@ class DataBoolean(Field):
|
||||
namespace = 'urn:xmpp:iot:sensordata'
|
||||
name = 'boolean'
|
||||
plugin_attrib = name
|
||||
interfaces = set(['value'])
|
||||
interfaces.update(Field.interfaces)
|
||||
interfaces = set(['value']);
|
||||
interfaces.update(Field.interfaces);
|
||||
|
||||
def _get_typename(self):
|
||||
return "boolean"
|
||||
@ -709,8 +709,8 @@ class DataDateTime(Field):
|
||||
namespace = 'urn:xmpp:iot:sensordata'
|
||||
name = 'dateTime'
|
||||
plugin_attrib = name
|
||||
interfaces = set(['value'])
|
||||
interfaces.update(Field.interfaces)
|
||||
interfaces = set(['value']);
|
||||
interfaces.update(Field.interfaces);
|
||||
|
||||
def _get_typename(self):
|
||||
return "dateTime"
|
||||
@ -723,8 +723,8 @@ class DataTimeSpan(Field):
|
||||
namespace = 'urn:xmpp:iot:sensordata'
|
||||
name = 'timeSpan'
|
||||
plugin_attrib = name
|
||||
interfaces = set(['value'])
|
||||
interfaces.update(Field.interfaces)
|
||||
interfaces = set(['value']);
|
||||
interfaces.update(Field.interfaces);
|
||||
|
||||
def _get_typename(self):
|
||||
return "timeSpan"
|
||||
@ -737,8 +737,8 @@ class DataEnum(Field):
|
||||
namespace = 'urn:xmpp:iot:sensordata'
|
||||
name = 'enum'
|
||||
plugin_attrib = name
|
||||
interfaces = set(['value', 'dataType'])
|
||||
interfaces.update(Field.interfaces)
|
||||
interfaces = set(['value', 'dataType']);
|
||||
interfaces.update(Field.interfaces);
|
||||
|
||||
def _get_typename(self):
|
||||
return "enum"
|
||||
|
||||
@ -23,7 +23,7 @@ class _TimerReset(Thread):
|
||||
t.cancel() # stop the timer's action if it's still waiting
|
||||
"""
|
||||
|
||||
def __init__(self, interval, function, *args, **kwargs):
|
||||
def __init__(self, interval, function, args=[], kwargs={}):
|
||||
Thread.__init__(self)
|
||||
self.interval = interval
|
||||
self.function = function
|
||||
|
||||
@ -12,6 +12,7 @@ import logging
|
||||
import time
|
||||
from threading import Thread, Timer, Lock
|
||||
|
||||
from sleekxmpp.xmlstream import JID
|
||||
from sleekxmpp.xmlstream.handler import Callback
|
||||
from sleekxmpp.xmlstream.matcher import StanzaPath
|
||||
from sleekxmpp.plugins.base import BasePlugin
|
||||
@ -134,11 +135,11 @@ class XEP_0325(BasePlugin):
|
||||
self._handle_set_response))
|
||||
|
||||
# Server side dicts
|
||||
self.nodes = {}
|
||||
self.sessions = {}
|
||||
self.nodes = {};
|
||||
self.sessions = {};
|
||||
|
||||
self.last_seqnr = 0
|
||||
self.seqnr_lock = Lock()
|
||||
self.last_seqnr = 0;
|
||||
self.seqnr_lock = Lock();
|
||||
|
||||
## For testning only
|
||||
self.test_authenticated_from = ""
|
||||
@ -155,13 +156,13 @@ class XEP_0325(BasePlugin):
|
||||
|
||||
def plugin_end(self):
|
||||
""" Stop the XEP-0325 plugin """
|
||||
self.sessions.clear()
|
||||
self.sessions.clear();
|
||||
self.xmpp.remove_handler('Control Event:DirectSet')
|
||||
self.xmpp.remove_handler('Control Event:SetReq')
|
||||
self.xmpp.remove_handler('Control Event:SetResponse')
|
||||
self.xmpp.remove_handler('Control Event:SetResponseError')
|
||||
self.xmpp['xep_0030'].del_feature(feature=Control.namespace)
|
||||
self.xmpp['xep_0030'].set_items(node=Control.namespace, items=tuple())
|
||||
self.xmpp['xep_0030'].set_items(node=Control.namespace, items=tuple());
|
||||
|
||||
|
||||
# =================================================================
|
||||
@ -189,18 +190,18 @@ class XEP_0325(BasePlugin):
|
||||
self.nodes[nodeId] = {"device": device,
|
||||
"commTimeout": commTimeout,
|
||||
"sourceId": sourceId,
|
||||
"cacheType": cacheType}
|
||||
"cacheType": cacheType};
|
||||
|
||||
def _set_authenticated(self, auth=''):
|
||||
""" Internal testing function """
|
||||
self.test_authenticated_from = auth
|
||||
self.test_authenticated_from = auth;
|
||||
|
||||
def _get_new_seqnr(self):
|
||||
""" Returns a unique sequence number (unique across threads) """
|
||||
self.seqnr_lock.acquire()
|
||||
self.last_seqnr += 1
|
||||
self.seqnr_lock.release()
|
||||
return str(self.last_seqnr)
|
||||
self.seqnr_lock.acquire();
|
||||
self.last_seqnr = self.last_seqnr + 1;
|
||||
self.seqnr_lock.release();
|
||||
return str(self.last_seqnr);
|
||||
|
||||
def _handle_set_req(self, iq):
|
||||
"""
|
||||
@ -219,68 +220,69 @@ class XEP_0325(BasePlugin):
|
||||
is sent.
|
||||
"""
|
||||
|
||||
error_msg = ''
|
||||
req_ok = True
|
||||
missing_node = None
|
||||
missing_field = None
|
||||
error_msg = '';
|
||||
req_ok = True;
|
||||
missing_node = None;
|
||||
missing_field = None;
|
||||
|
||||
# Authentication
|
||||
if len(self.test_authenticated_from) > 0 and not iq['from'] == self.test_authenticated_from:
|
||||
# Invalid authentication
|
||||
req_ok = False
|
||||
error_msg = "Access denied"
|
||||
req_ok = False;
|
||||
error_msg = "Access denied";
|
||||
|
||||
# Nodes
|
||||
process_nodes = [];
|
||||
if len(iq['set']['nodes']) > 0:
|
||||
for n in iq['set']['nodes']:
|
||||
if not n['nodeId'] in self.nodes:
|
||||
req_ok = False
|
||||
missing_node = n['nodeId']
|
||||
error_msg = "Invalid nodeId " + n['nodeId']
|
||||
process_nodes = [n['nodeId'] for n in iq['set']['nodes']]
|
||||
req_ok = False;
|
||||
missing_node = n['nodeId'];
|
||||
error_msg = "Invalid nodeId " + n['nodeId'];
|
||||
process_nodes = [n['nodeId'] for n in iq['set']['nodes']];
|
||||
else:
|
||||
process_nodes = self.nodes.keys()
|
||||
process_nodes = self.nodes.keys();
|
||||
|
||||
# Fields - for control we need to find all in all devices, otherwise we reject
|
||||
process_fields = []
|
||||
process_fields = [];
|
||||
if len(iq['set']['datas']) > 0:
|
||||
for f in iq['set']['datas']:
|
||||
for node in self.nodes:
|
||||
if not self.nodes[node]["device"].has_control_field(f['name'], f._get_typename()):
|
||||
req_ok = False
|
||||
missing_field = f['name']
|
||||
error_msg = "Invalid field " + f['name']
|
||||
break
|
||||
process_fields = [(f['name'], f._get_typename(), f['value']) for f in iq['set']['datas']]
|
||||
req_ok = False;
|
||||
missing_field = f['name'];
|
||||
error_msg = "Invalid field " + f['name'];
|
||||
break;
|
||||
process_fields = [(f['name'], f._get_typename(), f['value']) for f in iq['set']['datas']];
|
||||
|
||||
if req_ok:
|
||||
session = self._new_session()
|
||||
self.sessions[session] = {"from": iq['from'], "to": iq['to'], "seqnr": iq['id']}
|
||||
self.sessions[session]["commTimers"] = {}
|
||||
self.sessions[session]["nodeDone"] = {}
|
||||
session = self._new_session();
|
||||
self.sessions[session] = {"from": iq['from'], "to": iq['to'], "seqnr": iq['id']};
|
||||
self.sessions[session]["commTimers"] = {};
|
||||
self.sessions[session]["nodeDone"] = {};
|
||||
# Flag that a reply is exected when we are done
|
||||
self.sessions[session]["reply"] = True
|
||||
self.sessions[session]["reply"] = True;
|
||||
|
||||
self.sessions[session]["node_list"] = process_nodes
|
||||
self.sessions[session]["node_list"] = process_nodes;
|
||||
if self.threaded:
|
||||
#print("starting thread")
|
||||
tr_req = Thread(target=self._threaded_node_request, args=(session, process_fields))
|
||||
tr_req.start()
|
||||
#print("started thread")
|
||||
else:
|
||||
self._threaded_node_request(session, process_fields)
|
||||
self._threaded_node_request(session, process_fields);
|
||||
|
||||
else:
|
||||
iq.reply()
|
||||
iq['type'] = 'error'
|
||||
iq['setResponse']['responseCode'] = "NotFound"
|
||||
iq.reply();
|
||||
iq['type'] = 'error';
|
||||
iq['setResponse']['responseCode'] = "NotFound";
|
||||
if missing_node is not None:
|
||||
iq['setResponse'].add_node(missing_node)
|
||||
iq['setResponse'].add_node(missing_node);
|
||||
if missing_field is not None:
|
||||
iq['setResponse'].add_data(missing_field)
|
||||
iq['setResponse']['error']['var'] = "Output"
|
||||
iq['setResponse']['error']['text'] = error_msg
|
||||
iq.send(block=False)
|
||||
iq['setResponse'].add_data(missing_field);
|
||||
iq['setResponse']['error']['var'] = "Output";
|
||||
iq['setResponse']['error']['text'] = error_msg;
|
||||
iq.send(block=False);
|
||||
|
||||
def _handle_direct_set(self, msg):
|
||||
"""
|
||||
@ -297,45 +299,46 @@ class XEP_0325(BasePlugin):
|
||||
to the devices (in a separate thread).
|
||||
If the verification fails, do nothing.
|
||||
"""
|
||||
req_ok = True
|
||||
req_ok = True;
|
||||
|
||||
# Nodes
|
||||
process_nodes = [];
|
||||
if len(msg['set']['nodes']) > 0:
|
||||
for n in msg['set']['nodes']:
|
||||
if not n['nodeId'] in self.nodes:
|
||||
req_ok = False
|
||||
error_msg = "Invalid nodeId " + n['nodeId']
|
||||
process_nodes = [n['nodeId'] for n in msg['set']['nodes']]
|
||||
req_ok = False;
|
||||
error_msg = "Invalid nodeId " + n['nodeId'];
|
||||
process_nodes = [n['nodeId'] for n in msg['set']['nodes']];
|
||||
else:
|
||||
process_nodes = self.nodes.keys()
|
||||
process_nodes = self.nodes.keys();
|
||||
|
||||
# Fields - for control we need to find all in all devices, otherwise we reject
|
||||
process_fields = []
|
||||
process_fields = [];
|
||||
if len(msg['set']['datas']) > 0:
|
||||
for f in msg['set']['datas']:
|
||||
for node in self.nodes:
|
||||
if not self.nodes[node]["device"].has_control_field(f['name'], f._get_typename()):
|
||||
req_ok = False
|
||||
missing_field = f['name']
|
||||
error_msg = "Invalid field " + f['name']
|
||||
break
|
||||
process_fields = [(f['name'], f._get_typename(), f['value']) for f in msg['set']['datas']]
|
||||
req_ok = False;
|
||||
missing_field = f['name'];
|
||||
error_msg = "Invalid field " + f['name'];
|
||||
break;
|
||||
process_fields = [(f['name'], f._get_typename(), f['value']) for f in msg['set']['datas']];
|
||||
|
||||
if req_ok:
|
||||
session = self._new_session()
|
||||
self.sessions[session] = {"from": msg['from'], "to": msg['to']}
|
||||
self.sessions[session]["commTimers"] = {}
|
||||
self.sessions[session]["nodeDone"] = {}
|
||||
self.sessions[session]["reply"] = False
|
||||
session = self._new_session();
|
||||
self.sessions[session] = {"from": msg['from'], "to": msg['to']};
|
||||
self.sessions[session]["commTimers"] = {};
|
||||
self.sessions[session]["nodeDone"] = {};
|
||||
self.sessions[session]["reply"] = False;
|
||||
|
||||
self.sessions[session]["node_list"] = process_nodes
|
||||
self.sessions[session]["node_list"] = process_nodes;
|
||||
if self.threaded:
|
||||
#print("starting thread")
|
||||
tr_req = Thread(target=self._threaded_node_request, args=(session, process_fields))
|
||||
tr_req.start()
|
||||
#print("started thread")
|
||||
else:
|
||||
self._threaded_node_request(session, process_fields)
|
||||
self._threaded_node_request(session, process_fields);
|
||||
|
||||
|
||||
def _threaded_node_request(self, session, process_fields):
|
||||
@ -348,13 +351,13 @@ class XEP_0325(BasePlugin):
|
||||
(name, datatype, value)
|
||||
"""
|
||||
for node in self.sessions[session]["node_list"]:
|
||||
self.sessions[session]["nodeDone"][node] = False
|
||||
self.sessions[session]["nodeDone"][node] = False;
|
||||
|
||||
for node in self.sessions[session]["node_list"]:
|
||||
timer = Timer(self.nodes[node]['commTimeout'], self._event_comm_timeout, args=(session, node))
|
||||
self.sessions[session]["commTimers"][node] = timer
|
||||
timer.start()
|
||||
self.nodes[node]['device'].set_control_fields(process_fields, session=session, callback=self._device_set_command_callback)
|
||||
timer = Timer(self.nodes[node]['commTimeout'], self._event_comm_timeout, args=(session, node));
|
||||
self.sessions[session]["commTimers"][node] = timer;
|
||||
timer.start();
|
||||
self.nodes[node]['device'].set_control_fields(process_fields, session=session, callback=self._device_set_command_callback);
|
||||
|
||||
def _event_comm_timeout(self, session, nodeId):
|
||||
"""
|
||||
@ -370,24 +373,24 @@ class XEP_0325(BasePlugin):
|
||||
|
||||
if self.sessions[session]["reply"]:
|
||||
# Reply is exected when we are done
|
||||
iq = self.xmpp.Iq()
|
||||
iq['from'] = self.sessions[session]['to']
|
||||
iq['to'] = self.sessions[session]['from']
|
||||
iq['type'] = "error"
|
||||
iq['id'] = self.sessions[session]['seqnr']
|
||||
iq['setResponse']['responseCode'] = "OtherError"
|
||||
iq['setResponse'].add_node(nodeId)
|
||||
iq['setResponse']['error']['var'] = "Output"
|
||||
iq['setResponse']['error']['text'] = "Timeout."
|
||||
iq.send(block=False)
|
||||
iq = self.xmpp.Iq();
|
||||
iq['from'] = self.sessions[session]['to'];
|
||||
iq['to'] = self.sessions[session]['from'];
|
||||
iq['type'] = "error";
|
||||
iq['id'] = self.sessions[session]['seqnr'];
|
||||
iq['setResponse']['responseCode'] = "OtherError";
|
||||
iq['setResponse'].add_node(nodeId);
|
||||
iq['setResponse']['error']['var'] = "Output";
|
||||
iq['setResponse']['error']['text'] = "Timeout.";
|
||||
iq.send(block=False);
|
||||
|
||||
## TODO - should we send one timeout per node??
|
||||
|
||||
# Drop communication with this device and check if we are done
|
||||
self.sessions[session]["nodeDone"][nodeId] = True
|
||||
self.sessions[session]["nodeDone"][nodeId] = True;
|
||||
if (self._all_nodes_done(session)):
|
||||
# The session is complete, delete it
|
||||
del self.sessions[session]
|
||||
del self.sessions[session];
|
||||
|
||||
def _all_nodes_done(self, session):
|
||||
"""
|
||||
@ -398,8 +401,8 @@ class XEP_0325(BasePlugin):
|
||||
"""
|
||||
for n in self.sessions[session]["nodeDone"]:
|
||||
if not self.sessions[session]["nodeDone"][n]:
|
||||
return False
|
||||
return True
|
||||
return False;
|
||||
return True;
|
||||
|
||||
def _device_set_command_callback(self, session, nodeId, result, error_field=None, error_msg=None):
|
||||
"""
|
||||
@ -425,45 +428,45 @@ class XEP_0325(BasePlugin):
|
||||
return
|
||||
|
||||
if result == "error":
|
||||
self.sessions[session]["commTimers"][nodeId].cancel()
|
||||
self.sessions[session]["commTimers"][nodeId].cancel();
|
||||
|
||||
if self.sessions[session]["reply"]:
|
||||
# Reply is exected when we are done
|
||||
iq = self.xmpp.Iq()
|
||||
iq['from'] = self.sessions[session]['to']
|
||||
iq['to'] = self.sessions[session]['from']
|
||||
iq['type'] = "error"
|
||||
iq['id'] = self.sessions[session]['seqnr']
|
||||
iq['setResponse']['responseCode'] = "OtherError"
|
||||
iq['setResponse'].add_node(nodeId)
|
||||
iq = self.xmpp.Iq();
|
||||
iq['from'] = self.sessions[session]['to'];
|
||||
iq['to'] = self.sessions[session]['from'];
|
||||
iq['type'] = "error";
|
||||
iq['id'] = self.sessions[session]['seqnr'];
|
||||
iq['setResponse']['responseCode'] = "OtherError";
|
||||
iq['setResponse'].add_node(nodeId);
|
||||
if error_field is not None:
|
||||
iq['setResponse'].add_data(error_field)
|
||||
iq['setResponse']['error']['var'] = error_field
|
||||
iq['setResponse']['error']['text'] = error_msg
|
||||
iq.send(block=False)
|
||||
iq['setResponse'].add_data(error_field);
|
||||
iq['setResponse']['error']['var'] = error_field;
|
||||
iq['setResponse']['error']['text'] = error_msg;
|
||||
iq.send(block=False);
|
||||
|
||||
# Drop communication with this device and check if we are done
|
||||
self.sessions[session]["nodeDone"][nodeId] = True
|
||||
self.sessions[session]["nodeDone"][nodeId] = True;
|
||||
if (self._all_nodes_done(session)):
|
||||
# The session is complete, delete it
|
||||
del self.sessions[session]
|
||||
del self.sessions[session];
|
||||
else:
|
||||
self.sessions[session]["commTimers"][nodeId].cancel()
|
||||
self.sessions[session]["commTimers"][nodeId].cancel();
|
||||
|
||||
self.sessions[session]["nodeDone"][nodeId] = True
|
||||
self.sessions[session]["nodeDone"][nodeId] = True;
|
||||
if (self._all_nodes_done(session)):
|
||||
if self.sessions[session]["reply"]:
|
||||
# Reply is exected when we are done
|
||||
iq = self.xmpp.Iq()
|
||||
iq['from'] = self.sessions[session]['to']
|
||||
iq['to'] = self.sessions[session]['from']
|
||||
iq['type'] = "result"
|
||||
iq['id'] = self.sessions[session]['seqnr']
|
||||
iq['setResponse']['responseCode'] = "OK"
|
||||
iq.send(block=False)
|
||||
iq = self.xmpp.Iq();
|
||||
iq['from'] = self.sessions[session]['to'];
|
||||
iq['to'] = self.sessions[session]['from'];
|
||||
iq['type'] = "result";
|
||||
iq['id'] = self.sessions[session]['seqnr'];
|
||||
iq['setResponse']['responseCode'] = "OK";
|
||||
iq.send(block=False);
|
||||
|
||||
# The session is complete, delete it
|
||||
del self.sessions[session]
|
||||
del self.sessions[session];
|
||||
|
||||
|
||||
# =================================================================
|
||||
@ -509,21 +512,21 @@ class XEP_0325(BasePlugin):
|
||||
fields -- Fields to set. List of tuple format: (name, typename, value).
|
||||
nodeIds -- [optional] Limits the request to the node Ids in this list.
|
||||
"""
|
||||
iq = self.xmpp.Iq()
|
||||
iq['from'] = from_jid
|
||||
iq['to'] = to_jid
|
||||
seqnr = self._get_new_seqnr()
|
||||
iq['id'] = seqnr
|
||||
iq['type'] = "set"
|
||||
iq = self.xmpp.Iq();
|
||||
iq['from'] = from_jid;
|
||||
iq['to'] = to_jid;
|
||||
seqnr = self._get_new_seqnr();
|
||||
iq['id'] = seqnr;
|
||||
iq['type'] = "set";
|
||||
if nodeIds is not None:
|
||||
for nodeId in nodeIds:
|
||||
iq['set'].add_node(nodeId)
|
||||
iq['set'].add_node(nodeId);
|
||||
if fields is not None:
|
||||
for name, typename, value in fields:
|
||||
iq['set'].add_data(name=name, typename=typename, value=value)
|
||||
iq['set'].add_data(name=name, typename=typename, value=value);
|
||||
|
||||
self.sessions[seqnr] = {"from": iq['from'], "to": iq['to'], "callback": callback}
|
||||
iq.send(block=False)
|
||||
self.sessions[seqnr] = {"from": iq['from'], "to": iq['to'], "callback": callback};
|
||||
iq.send(block=False);
|
||||
|
||||
def set_command(self, from_jid, to_jid, fields, nodeIds=None):
|
||||
"""
|
||||
@ -538,32 +541,34 @@ class XEP_0325(BasePlugin):
|
||||
fields -- Fields to set. List of tuple format: (name, typename, value).
|
||||
nodeIds -- [optional] Limits the request to the node Ids in this list.
|
||||
"""
|
||||
msg = self.xmpp.Message()
|
||||
msg['from'] = from_jid
|
||||
msg['to'] = to_jid
|
||||
msg['type'] = "set"
|
||||
msg = self.xmpp.Message();
|
||||
msg['from'] = from_jid;
|
||||
msg['to'] = to_jid;
|
||||
msg['type'] = "set";
|
||||
if nodeIds is not None:
|
||||
for nodeId in nodeIds:
|
||||
msg['set'].add_node(nodeId)
|
||||
msg['set'].add_node(nodeId);
|
||||
if fields is not None:
|
||||
for name, typename, value in fields:
|
||||
msg['set'].add_data(name, typename, value)
|
||||
msg['set'].add_data(name, typename, value);
|
||||
|
||||
# We won't get any reply, so don't create a session
|
||||
msg.send()
|
||||
msg.send();
|
||||
|
||||
def _handle_set_response(self, iq):
|
||||
""" Received response from device(s) """
|
||||
#print("ooh")
|
||||
seqnr = iq['id']
|
||||
from_jid = str(iq['from'])
|
||||
result = iq['setResponse']['responseCode']
|
||||
nodeIds = [n['name'] for n in iq['setResponse']['nodes']]
|
||||
fields = [f['name'] for f in iq['setResponse']['datas']]
|
||||
error_msg = None
|
||||
seqnr = iq['id'];
|
||||
from_jid = str(iq['from']);
|
||||
result = iq['setResponse']['responseCode'];
|
||||
nodeIds = [n['name'] for n in iq['setResponse']['nodes']];
|
||||
fields = [f['name'] for f in iq['setResponse']['datas']];
|
||||
error_msg = None;
|
||||
|
||||
if not iq['setResponse'].find('error') is None and not iq['setResponse']['error']['text'] == "":
|
||||
error_msg = iq['setResponse']['error']['text']
|
||||
error_msg = iq['setResponse']['error']['text'];
|
||||
|
||||
callback = self.sessions[seqnr]["callback"];
|
||||
callback(from_jid=from_jid, result=result, nodeIds=nodeIds, fields=fields, error_msg=error_msg);
|
||||
|
||||
|
||||
callback = self.sessions[seqnr]["callback"]
|
||||
callback(from_jid=from_jid, result=result, nodeIds=nodeIds, fields=fields, error_msg=error_msg)
|
||||
|
||||
@ -21,8 +21,8 @@ class Device(object):
|
||||
"""
|
||||
|
||||
def __init__(self, nodeId):
|
||||
self.nodeId = nodeId
|
||||
self.control_fields = {}
|
||||
self.nodeId = nodeId;
|
||||
self.control_fields = {};
|
||||
|
||||
def has_control_field(self, field, typename):
|
||||
"""
|
||||
@ -34,8 +34,8 @@ class Device(object):
|
||||
typename -- The expected type
|
||||
"""
|
||||
if field in self.control_fields and self.control_fields[field]["type"] == typename:
|
||||
return True
|
||||
return False
|
||||
return True;
|
||||
return False;
|
||||
|
||||
def set_control_fields(self, fields, session, callback):
|
||||
"""
|
||||
@ -69,12 +69,12 @@ class Device(object):
|
||||
for name, typename, value in fields:
|
||||
if not self.has_control_field(name, typename):
|
||||
self._send_control_reject(session, name, "NotFound", callback)
|
||||
return False
|
||||
return False;
|
||||
|
||||
for name, typename, value in fields:
|
||||
self._set_field_value(name, value)
|
||||
|
||||
callback(session, result="ok", nodeId=self.nodeId)
|
||||
callback(session, result="ok", nodeId=self.nodeId);
|
||||
return True
|
||||
|
||||
def _send_control_reject(self, session, field, message, callback):
|
||||
@ -87,7 +87,7 @@ class Device(object):
|
||||
callback -- Callback function, see definition in
|
||||
set_control_fields function
|
||||
"""
|
||||
callback(session, result="error", nodeId=self.nodeId, error_field=field, error_msg=message)
|
||||
callback(session, result="error", nodeId=self.nodeId, error_field=field, error_msg=message);
|
||||
|
||||
def _add_control_field(self, name, typename, value):
|
||||
"""
|
||||
@ -100,7 +100,7 @@ class Device(object):
|
||||
double, duration, int, long, time)
|
||||
value -- Field value
|
||||
"""
|
||||
self.control_fields[name] = {"type": typename, "value": value}
|
||||
self.control_fields[name] = {"type": typename, "value": value};
|
||||
|
||||
def _set_field_value(self, name, value):
|
||||
"""
|
||||
@ -111,7 +111,7 @@ class Device(object):
|
||||
value -- New value for the field
|
||||
"""
|
||||
if name in self.control_fields:
|
||||
self.control_fields[name]["value"] = value
|
||||
self.control_fields[name]["value"] = value;
|
||||
|
||||
def _get_field_value(self, name):
|
||||
"""
|
||||
@ -121,5 +121,5 @@ class Device(object):
|
||||
name -- Name of the field
|
||||
"""
|
||||
if name in self.control_fields:
|
||||
return self.control_fields[name]["value"]
|
||||
return None
|
||||
return self.control_fields[name]["value"];
|
||||
return None;
|
||||
|
||||
@ -26,7 +26,7 @@ class ControlSet(ElementBase):
|
||||
interfaces = set(['nodes','datas'])
|
||||
|
||||
def __init__(self, xml=None, parent=None):
|
||||
ElementBase.__init__(self, xml, parent)
|
||||
ElementBase.__init__(self, xml, parent);
|
||||
self._nodes = set()
|
||||
self._datas = set()
|
||||
|
||||
@ -127,30 +127,30 @@ class ControlSet(ElementBase):
|
||||
value -- The value of the data element
|
||||
"""
|
||||
if name not in self._datas:
|
||||
dataObj = None
|
||||
dataObj = None;
|
||||
if typename == "boolean":
|
||||
dataObj = BooleanParameter(parent=self)
|
||||
dataObj = BooleanParameter(parent=self);
|
||||
elif typename == "color":
|
||||
dataObj = ColorParameter(parent=self)
|
||||
dataObj = ColorParameter(parent=self);
|
||||
elif typename == "string":
|
||||
dataObj = StringParameter(parent=self)
|
||||
dataObj = StringParameter(parent=self);
|
||||
elif typename == "date":
|
||||
dataObj = DateParameter(parent=self)
|
||||
dataObj = DateParameter(parent=self);
|
||||
elif typename == "dateTime":
|
||||
dataObj = DateTimeParameter(parent=self)
|
||||
dataObj = DateTimeParameter(parent=self);
|
||||
elif typename == "double":
|
||||
dataObj = DoubleParameter(parent=self)
|
||||
dataObj = DoubleParameter(parent=self);
|
||||
elif typename == "duration":
|
||||
dataObj = DurationParameter(parent=self)
|
||||
dataObj = DurationParameter(parent=self);
|
||||
elif typename == "int":
|
||||
dataObj = IntParameter(parent=self)
|
||||
dataObj = IntParameter(parent=self);
|
||||
elif typename == "long":
|
||||
dataObj = LongParameter(parent=self)
|
||||
dataObj = LongParameter(parent=self);
|
||||
elif typename == "time":
|
||||
dataObj = TimeParameter(parent=self)
|
||||
dataObj = TimeParameter(parent=self);
|
||||
|
||||
dataObj['name'] = name
|
||||
dataObj['value'] = value
|
||||
dataObj['name'] = name;
|
||||
dataObj['value'] = value;
|
||||
|
||||
self._datas.add(name)
|
||||
self.iterables.append(dataObj)
|
||||
@ -217,7 +217,7 @@ class ControlSetResponse(ElementBase):
|
||||
interfaces = set(['responseCode'])
|
||||
|
||||
def __init__(self, xml=None, parent=None):
|
||||
ElementBase.__init__(self, xml, parent)
|
||||
ElementBase.__init__(self, xml, parent);
|
||||
self._nodes = set()
|
||||
self._datas = set()
|
||||
|
||||
@ -316,7 +316,7 @@ class ControlSetResponse(ElementBase):
|
||||
if name not in self._datas:
|
||||
self._datas.add(name)
|
||||
data = ResponseParameter(parent=self)
|
||||
data['name'] = name
|
||||
data['name'] = name;
|
||||
self.iterables.append(data)
|
||||
return data
|
||||
return None
|
||||
@ -383,7 +383,7 @@ class Error(ElementBase):
|
||||
value -- string
|
||||
"""
|
||||
|
||||
self.xml.text = value
|
||||
self.xml.text = value;
|
||||
return self
|
||||
|
||||
def del_text(self):
|
||||
@ -398,7 +398,7 @@ class ResponseParameter(ElementBase):
|
||||
namespace = 'urn:xmpp:iot:control'
|
||||
name = 'parameter'
|
||||
plugin_attrib = name
|
||||
interfaces = set(['name'])
|
||||
interfaces = set(['name']);
|
||||
|
||||
|
||||
class BaseParameter(ElementBase):
|
||||
@ -419,11 +419,10 @@ class BaseParameter(ElementBase):
|
||||
namespace = 'urn:xmpp:iot:control'
|
||||
name = 'baseParameter'
|
||||
plugin_attrib = name
|
||||
interfaces = set(['name','value'])
|
||||
interfaces = set(['name','value']);
|
||||
|
||||
def _get_typename(self):
|
||||
return self.name
|
||||
|
||||
return self.name;
|
||||
|
||||
class BooleanParameter(BaseParameter):
|
||||
"""
|
||||
|
||||
@ -237,7 +237,8 @@ class RosterNode(object):
|
||||
if not self.xmpp.is_component:
|
||||
return self.update(jid, subscription='remove')
|
||||
|
||||
def update(self, jid, name=None, subscription=None, groups=None, block=True, timeout=None, callback=None):
|
||||
def update(self, jid, name=None, subscription=None, groups=[],
|
||||
block=True, timeout=None, callback=None):
|
||||
"""
|
||||
Update a JID's subscription information.
|
||||
|
||||
@ -257,9 +258,6 @@ class RosterNode(object):
|
||||
Will be executed when the roster is received.
|
||||
Implies block=False.
|
||||
"""
|
||||
if not groups:
|
||||
groups = []
|
||||
|
||||
self[jid]['name'] = name
|
||||
self[jid]['groups'] = groups
|
||||
self[jid].save()
|
||||
|
||||
@ -288,8 +288,11 @@ class SleekTest(unittest.TestCase):
|
||||
if self.xmpp:
|
||||
self.xmpp.socket.disconnect_error()
|
||||
|
||||
def stream_start(self, mode='client', skip=True, header=None, socket='mock', jid='tester@localhost',
|
||||
password='test', server='localhost', port=5222, sasl_mech=None, plugins=None, plugin_config=None):
|
||||
def stream_start(self, mode='client', skip=True, header=None,
|
||||
socket='mock', jid='tester@localhost',
|
||||
password='test', server='localhost',
|
||||
port=5222, sasl_mech=None,
|
||||
plugins=None, plugin_config={}):
|
||||
"""
|
||||
Initialize an XMPP client or component using a dummy XML stream.
|
||||
|
||||
@ -312,9 +315,6 @@ class SleekTest(unittest.TestCase):
|
||||
plugins -- List of plugins to register. By default, all plugins
|
||||
are loaded.
|
||||
"""
|
||||
if not plugin_config:
|
||||
plugin_config = {}
|
||||
|
||||
if mode == 'client':
|
||||
self.xmpp = ClientXMPP(jid, password,
|
||||
sasl_mech=sasl_mech,
|
||||
@ -425,7 +425,8 @@ class SleekTest(unittest.TestCase):
|
||||
parts.append('xmlns="%s"' % default_ns)
|
||||
return header % ' '.join(parts)
|
||||
|
||||
def recv(self, data, defaults=None, method='exact', use_values=True, timeout=1):
|
||||
def recv(self, data, defaults=[], method='exact',
|
||||
use_values=True, timeout=1):
|
||||
"""
|
||||
Pass data to the dummy XMPP client as if it came from an XMPP server.
|
||||
|
||||
@ -446,9 +447,6 @@ class SleekTest(unittest.TestCase):
|
||||
timeout -- Time to wait in seconds for data to be received by
|
||||
a live connection.
|
||||
"""
|
||||
if not defaults:
|
||||
defaults = []
|
||||
|
||||
if self.xmpp.socket.is_live:
|
||||
# we are working with a live connection, so we should
|
||||
# verify what has been received instead of simulating
|
||||
|
||||
4
sleekxmpp/thirdparty/socks.py
vendored
4
sleekxmpp/thirdparty/socks.py
vendored
@ -213,7 +213,7 @@ class socksocket(socket.socket):
|
||||
# Resolve locally
|
||||
ipaddr = socket.inet_aton(socket.gethostbyname(destaddr))
|
||||
req = req + chr(0x01).encode() + ipaddr
|
||||
req += struct.pack(">H", destport)
|
||||
req = req + struct.pack(">H", destport)
|
||||
self.sendall(req)
|
||||
# Get the response
|
||||
resp = self.__recvall(4)
|
||||
@ -282,7 +282,7 @@ class socksocket(socket.socket):
|
||||
# The username parameter is considered userid for SOCKS4
|
||||
if self.__proxy[4] != None:
|
||||
req = req + self.__proxy[4]
|
||||
req += chr(0x00).encode()
|
||||
req = req + chr(0x00).encode()
|
||||
# DNS name if remote resolving is required
|
||||
# NOTE: This is actually an extension to the SOCKS4 protocol
|
||||
# called SOCKS4A and may not be supported in all cases.
|
||||
|
||||
4
sleekxmpp/thirdparty/statemachine.py
vendored
4
sleekxmpp/thirdparty/statemachine.py
vendored
@ -34,7 +34,7 @@ class StateMachine(object):
|
||||
self.lock.release()
|
||||
|
||||
|
||||
def transition(self, from_state, to_state, wait=0.0, func=None, *args, **kwargs):
|
||||
def transition(self, from_state, to_state, wait=0.0, func=None, args=[], kwargs={}):
|
||||
'''
|
||||
Transition from the given `from_state` to the given `to_state`.
|
||||
This method will return `True` if the state machine is now in `to_state`. It
|
||||
@ -70,7 +70,7 @@ class StateMachine(object):
|
||||
func=func, args=args, kwargs=kwargs)
|
||||
|
||||
|
||||
def transition_any(self, from_states, to_state, wait=0.0, func=None, *args, **kwargs):
|
||||
def transition_any(self, from_states, to_state, wait=0.0, func=None, args=[], kwargs={}):
|
||||
'''
|
||||
Transition from any of the given `from_states` to the given `to_state`.
|
||||
'''
|
||||
|
||||
@ -853,7 +853,7 @@ class XMLStream(object):
|
||||
if sys.version_info >= (2, 7):
|
||||
ssl_args['ciphers'] = self.ciphers
|
||||
|
||||
ssl_socket = ssl.wrap_socket(self.socket, **ssl_args)
|
||||
ssl_socket = ssl.wrap_socket(self.socket, **ssl_args);
|
||||
|
||||
if hasattr(self.socket, 'socket'):
|
||||
# We are using a testing socket, so preserve the top
|
||||
@ -1149,7 +1149,7 @@ class XMLStream(object):
|
||||
"""
|
||||
return len(self.__event_handlers.get(name, []))
|
||||
|
||||
def event(self, name, data=None, direct=False):
|
||||
def event(self, name, data={}, direct=False):
|
||||
"""Manually trigger a custom event.
|
||||
|
||||
:param name: The name of the event to trigger.
|
||||
@ -1160,9 +1160,6 @@ class XMLStream(object):
|
||||
event queue. All event handlers will run in the
|
||||
same thread.
|
||||
"""
|
||||
if not data:
|
||||
data = {}
|
||||
|
||||
log.debug("Event triggered: " + name)
|
||||
|
||||
handlers = self.__event_handlers.get(name, [])
|
||||
@ -1322,6 +1319,9 @@ class XMLStream(object):
|
||||
try:
|
||||
sent += self.socket.send(data[sent:])
|
||||
count += 1
|
||||
except Socket.error as serr:
|
||||
if serr.errno != errno.EINTR:
|
||||
raise
|
||||
except ssl.SSLError as serr:
|
||||
if tries >= self.ssl_retry_max:
|
||||
log.debug('SSL error: max retries reached')
|
||||
@ -1336,9 +1336,6 @@ class XMLStream(object):
|
||||
if not self.stop.is_set():
|
||||
time.sleep(self.ssl_retry_delay)
|
||||
tries += 1
|
||||
except Socket.error as serr:
|
||||
if serr.errno != errno.EINTR:
|
||||
raise
|
||||
if count > 1:
|
||||
log.debug('SENT: %d chunks', count)
|
||||
except (Socket.error, ssl.SSLError) as serr:
|
||||
@ -1748,6 +1745,9 @@ class XMLStream(object):
|
||||
try:
|
||||
sent += self.socket.send(enc_data[sent:])
|
||||
count += 1
|
||||
except Socket.error as serr:
|
||||
if serr.errno != errno.EINTR:
|
||||
raise
|
||||
except ssl.SSLError as serr:
|
||||
if tries >= self.ssl_retry_max:
|
||||
log.debug('SSL error: max retries reached')
|
||||
@ -1760,9 +1760,6 @@ class XMLStream(object):
|
||||
if not self.stop.is_set():
|
||||
time.sleep(self.ssl_retry_delay)
|
||||
tries += 1
|
||||
except Socket.error as serr:
|
||||
if serr.errno != errno.EINTR:
|
||||
raise
|
||||
if count > 1:
|
||||
log.debug('SENT: %d chunks', count)
|
||||
self.send_queue.task_done()
|
||||
|
||||
@ -385,7 +385,7 @@ class TestElementBase(SleekTest):
|
||||
interfaces = set(('bar', 'baz'))
|
||||
|
||||
def setBar(self, value):
|
||||
self._set_sub_text("path/to/only/bar", value)
|
||||
self._set_sub_text("path/to/only/bar", value);
|
||||
|
||||
def getBar(self):
|
||||
return self._get_sub_text("path/to/only/bar")
|
||||
@ -394,7 +394,7 @@ class TestElementBase(SleekTest):
|
||||
self._del_sub("path/to/only/bar")
|
||||
|
||||
def setBaz(self, value):
|
||||
self._set_sub_text("path/to/just/baz", value)
|
||||
self._set_sub_text("path/to/just/baz", value);
|
||||
|
||||
def getBaz(self):
|
||||
return self._get_sub_text("path/to/just/baz")
|
||||
|
||||
@ -59,8 +59,8 @@ class TestSensorDataStanzas(SleekTest):
|
||||
iq['req']['momentary'] = 'true'
|
||||
|
||||
|
||||
iq['req'].add_node("Device02", "Source02", "CacheType")
|
||||
iq['req'].add_node("Device44")
|
||||
iq['req'].add_node("Device02", "Source02", "CacheType");
|
||||
iq['req'].add_node("Device44");
|
||||
|
||||
self.check(iq,"""
|
||||
<iq type='get'
|
||||
@ -75,7 +75,7 @@ class TestSensorDataStanzas(SleekTest):
|
||||
"""
|
||||
)
|
||||
|
||||
iq['req'].del_node("Device02")
|
||||
iq['req'].del_node("Device02");
|
||||
|
||||
self.check(iq,"""
|
||||
<iq type='get'
|
||||
@ -89,7 +89,7 @@ class TestSensorDataStanzas(SleekTest):
|
||||
"""
|
||||
)
|
||||
|
||||
iq['req'].del_nodes()
|
||||
iq['req'].del_nodes();
|
||||
|
||||
self.check(iq,"""
|
||||
<iq type='get'
|
||||
@ -115,8 +115,8 @@ class TestSensorDataStanzas(SleekTest):
|
||||
iq['req']['momentary'] = 'true'
|
||||
|
||||
|
||||
iq['req'].add_field("Top temperature")
|
||||
iq['req'].add_field("Bottom temperature")
|
||||
iq['req'].add_field("Top temperature");
|
||||
iq['req'].add_field("Bottom temperature");
|
||||
|
||||
self.check(iq,"""
|
||||
<iq type='get'
|
||||
@ -237,12 +237,12 @@ class TestSensorDataStanzas(SleekTest):
|
||||
msg['to'] = 'master@clayster.com/amr'
|
||||
msg['fields']['seqnr'] = '1'
|
||||
|
||||
node = msg['fields'].add_node("Device02")
|
||||
ts = node.add_timestamp("2013-03-07T16:24:30")
|
||||
node = msg['fields'].add_node("Device02");
|
||||
ts = node.add_timestamp("2013-03-07T16:24:30");
|
||||
|
||||
data = ts.add_data(typename="numeric", name="Temperature", value="-12.42", unit='K')
|
||||
data['momentary'] = 'true'
|
||||
data['automaticReadout'] = 'true'
|
||||
data = ts.add_data(typename="numeric", name="Temperature", value="-12.42", unit='K');
|
||||
data['momentary'] = 'true';
|
||||
data['automaticReadout'] = 'true';
|
||||
|
||||
self.check(msg,"""
|
||||
<message from='device@clayster.com'
|
||||
@ -258,9 +258,10 @@ class TestSensorDataStanzas(SleekTest):
|
||||
"""
|
||||
)
|
||||
|
||||
node = msg['fields'].add_node("EmptyDevice")
|
||||
node = msg['fields'].add_node("Device04")
|
||||
ts = node.add_timestamp("EmptyTimestamp")
|
||||
node = msg['fields'].add_node("EmptyDevice");
|
||||
node = msg['fields'].add_node("Device04");
|
||||
ts = node.add_timestamp("EmptyTimestamp");
|
||||
|
||||
|
||||
self.check(msg,"""
|
||||
<message from='device@clayster.com'
|
||||
@ -280,32 +281,32 @@ class TestSensorDataStanzas(SleekTest):
|
||||
"""
|
||||
)
|
||||
|
||||
node = msg['fields'].add_node("Device77")
|
||||
ts = node.add_timestamp("2013-05-03T12:00:01")
|
||||
data = ts.add_data(typename="numeric", name="Temperature", value="-12.42", unit='K')
|
||||
data['historicalDay'] = 'true'
|
||||
data = ts.add_data(typename="numeric", name="Speed", value="312.42", unit='km/h')
|
||||
data['historicalWeek'] = 'false'
|
||||
data = ts.add_data(typename="string", name="Temperature name", value="Bottom oil")
|
||||
data['historicalMonth'] = 'true'
|
||||
data = ts.add_data(typename="string", name="Speed name", value="Top speed")
|
||||
data['historicalQuarter'] = 'false'
|
||||
data = ts.add_data(typename="dateTime", name="T1", value="1979-01-01T00:00:00")
|
||||
data['historicalYear'] = 'true'
|
||||
data = ts.add_data(typename="dateTime", name="T2", value="2000-01-01T01:02:03")
|
||||
data['historicalOther'] = 'false'
|
||||
data = ts.add_data(typename="timeSpan", name="TS1", value="P5Y")
|
||||
data['missing'] = 'true'
|
||||
data = ts.add_data(typename="timeSpan", name="TS2", value="PT2M1S")
|
||||
data['manualEstimate'] = 'false'
|
||||
data = ts.add_data(typename="enum", name="top color", value="red", dataType="string")
|
||||
data['invoiced'] = 'true'
|
||||
data = ts.add_data(typename="enum", name="bottom color", value="black", dataType="string")
|
||||
data['powerFailure'] = 'false'
|
||||
data = ts.add_data(typename="boolean", name="Temperature real", value="false")
|
||||
data['historicalDay'] = 'true'
|
||||
data = ts.add_data(typename="boolean", name="Speed real", value="true")
|
||||
data['historicalWeek'] = 'false'
|
||||
node = msg['fields'].add_node("Device77");
|
||||
ts = node.add_timestamp("2013-05-03T12:00:01");
|
||||
data = ts.add_data(typename="numeric", name="Temperature", value="-12.42", unit='K');
|
||||
data['historicalDay'] = 'true';
|
||||
data = ts.add_data(typename="numeric", name="Speed", value="312.42", unit='km/h');
|
||||
data['historicalWeek'] = 'false';
|
||||
data = ts.add_data(typename="string", name="Temperature name", value="Bottom oil");
|
||||
data['historicalMonth'] = 'true';
|
||||
data = ts.add_data(typename="string", name="Speed name", value="Top speed");
|
||||
data['historicalQuarter'] = 'false';
|
||||
data = ts.add_data(typename="dateTime", name="T1", value="1979-01-01T00:00:00");
|
||||
data['historicalYear'] = 'true';
|
||||
data = ts.add_data(typename="dateTime", name="T2", value="2000-01-01T01:02:03");
|
||||
data['historicalOther'] = 'false';
|
||||
data = ts.add_data(typename="timeSpan", name="TS1", value="P5Y");
|
||||
data['missing'] = 'true';
|
||||
data = ts.add_data(typename="timeSpan", name="TS2", value="PT2M1S");
|
||||
data['manualEstimate'] = 'false';
|
||||
data = ts.add_data(typename="enum", name="top color", value="red", dataType="string");
|
||||
data['invoiced'] = 'true';
|
||||
data = ts.add_data(typename="enum", name="bottom color", value="black", dataType="string");
|
||||
data['powerFailure'] = 'false';
|
||||
data = ts.add_data(typename="boolean", name="Temperature real", value="false");
|
||||
data['historicalDay'] = 'true';
|
||||
data = ts.add_data(typename="boolean", name="Speed real", value="true");
|
||||
data['historicalWeek'] = 'false';
|
||||
|
||||
self.check(msg,"""
|
||||
<message from='device@clayster.com'
|
||||
@ -343,17 +344,19 @@ class TestSensorDataStanzas(SleekTest):
|
||||
|
||||
|
||||
def testTimestamp(self):
|
||||
msg = self.Message()
|
||||
msg = self.Message();
|
||||
|
||||
msg['from'] = 'device@clayster.com'
|
||||
msg['to'] = 'master@clayster.com/amr'
|
||||
msg['fields']['seqnr'] = '1'
|
||||
|
||||
node = msg['fields'].add_node("Device02")
|
||||
node = msg['fields'].add_node("Device03")
|
||||
node = msg['fields'].add_node("Device02");
|
||||
node = msg['fields'].add_node("Device03");
|
||||
|
||||
ts = node.add_timestamp("2013-03-07T16:24:30");
|
||||
ts = node.add_timestamp("2013-03-07T16:24:31");
|
||||
|
||||
|
||||
ts = node.add_timestamp("2013-03-07T16:24:30")
|
||||
ts = node.add_timestamp("2013-03-07T16:24:31")
|
||||
|
||||
self.check(msg,"""
|
||||
<message from='device@clayster.com'
|
||||
|
||||
@ -29,8 +29,8 @@ class TestControlStanzas(SleekTest):
|
||||
iq['from'] = 'master@clayster.com/amr'
|
||||
iq['to'] = 'device@clayster.com'
|
||||
iq['id'] = '1'
|
||||
iq['set'].add_node("Device02", "Source02", "MyCacheType")
|
||||
iq['set'].add_node("Device15")
|
||||
iq['set'].add_node("Device02", "Source02", "MyCacheType");
|
||||
iq['set'].add_node("Device15");
|
||||
iq['set'].add_data("Tjohej", "boolean", "true")
|
||||
|
||||
self.check(iq,"""
|
||||
@ -47,7 +47,7 @@ class TestControlStanzas(SleekTest):
|
||||
"""
|
||||
)
|
||||
|
||||
iq['set'].del_node("Device02")
|
||||
iq['set'].del_node("Device02");
|
||||
|
||||
self.check(iq,"""
|
||||
<iq type='set'
|
||||
@ -62,7 +62,7 @@ class TestControlStanzas(SleekTest):
|
||||
"""
|
||||
)
|
||||
|
||||
iq['set'].del_nodes()
|
||||
iq['set'].del_nodes();
|
||||
|
||||
self.check(iq,"""
|
||||
<iq type='set'
|
||||
@ -84,8 +84,8 @@ class TestControlStanzas(SleekTest):
|
||||
msg = self.Message()
|
||||
msg['from'] = 'master@clayster.com/amr'
|
||||
msg['to'] = 'device@clayster.com'
|
||||
msg['set'].add_node("Device02")
|
||||
msg['set'].add_node("Device15")
|
||||
msg['set'].add_node("Device02");
|
||||
msg['set'].add_node("Device15");
|
||||
msg['set'].add_data("Tjohej", "boolean", "true")
|
||||
|
||||
self.check(msg,"""
|
||||
@ -111,7 +111,7 @@ class TestControlStanzas(SleekTest):
|
||||
iq['from'] = 'master@clayster.com/amr'
|
||||
iq['to'] = 'device@clayster.com'
|
||||
iq['id'] = '8'
|
||||
iq['setResponse']['responseCode'] = "OK"
|
||||
iq['setResponse']['responseCode'] = "OK";
|
||||
|
||||
self.check(iq,"""
|
||||
<iq type='result'
|
||||
@ -128,9 +128,10 @@ class TestControlStanzas(SleekTest):
|
||||
iq['from'] = 'master@clayster.com/amr'
|
||||
iq['to'] = 'device@clayster.com'
|
||||
iq['id'] = '9'
|
||||
iq['setResponse']['responseCode'] = "OtherError"
|
||||
iq['setResponse']['error']['var'] = "Output"
|
||||
iq['setResponse']['error']['text'] = "Test of other error.!"
|
||||
iq['setResponse']['responseCode'] = "OtherError";
|
||||
iq['setResponse']['error']['var'] = "Output";
|
||||
iq['setResponse']['error']['text'] = "Test of other error.!";
|
||||
|
||||
|
||||
self.check(iq,"""
|
||||
<iq type='error'
|
||||
@ -149,10 +150,11 @@ class TestControlStanzas(SleekTest):
|
||||
iq['from'] = 'master@clayster.com/amr'
|
||||
iq['to'] = 'device@clayster.com'
|
||||
iq['id'] = '9'
|
||||
iq['setResponse']['responseCode'] = "NotFound"
|
||||
iq['setResponse'].add_node("Device17", "Source09")
|
||||
iq['setResponse'].add_node("Device18", "Source09")
|
||||
iq['setResponse'].add_data("Tjohopp")
|
||||
iq['setResponse']['responseCode'] = "NotFound";
|
||||
iq['setResponse'].add_node("Device17", "Source09");
|
||||
iq['setResponse'].add_node("Device18", "Source09");
|
||||
iq['setResponse'].add_data("Tjohopp");
|
||||
|
||||
|
||||
self.check(iq,"""
|
||||
<iq type='error'
|
||||
@ -177,38 +179,38 @@ class TestControlStanzas(SleekTest):
|
||||
iq['from'] = 'master@clayster.com/amr'
|
||||
iq['to'] = 'device@clayster.com'
|
||||
iq['id'] = '1'
|
||||
iq['set'].add_node("Device02", "Source02", "MyCacheType")
|
||||
iq['set'].add_node("Device15")
|
||||
iq['set'].add_node("Device02", "Source02", "MyCacheType");
|
||||
iq['set'].add_node("Device15");
|
||||
|
||||
iq['set'].add_data("Tjohej", "boolean", "true")
|
||||
iq['set'].add_data("Tjohej2", "boolean", "false")
|
||||
iq['set'].add_data("Tjohej", "boolean", "true");
|
||||
iq['set'].add_data("Tjohej2", "boolean", "false");
|
||||
|
||||
iq['set'].add_data("TjohejC", "color", "FF00FF")
|
||||
iq['set'].add_data("TjohejC2", "color", "00FF00")
|
||||
iq['set'].add_data("TjohejC", "color", "FF00FF");
|
||||
iq['set'].add_data("TjohejC2", "color", "00FF00");
|
||||
|
||||
iq['set'].add_data("TjohejS", "string", "String1")
|
||||
iq['set'].add_data("TjohejS2", "string", "String2")
|
||||
iq['set'].add_data("TjohejS", "string", "String1");
|
||||
iq['set'].add_data("TjohejS2", "string", "String2");
|
||||
|
||||
iq['set'].add_data("TjohejDate", "date", "2012-01-01")
|
||||
iq['set'].add_data("TjohejDate2", "date", "1900-12-03")
|
||||
iq['set'].add_data("TjohejDate", "date", "2012-01-01");
|
||||
iq['set'].add_data("TjohejDate2", "date", "1900-12-03");
|
||||
|
||||
iq['set'].add_data("TjohejDateT4", "dateTime", "1900-12-03 12:30")
|
||||
iq['set'].add_data("TjohejDateT2", "dateTime", "1900-12-03 11:22")
|
||||
iq['set'].add_data("TjohejDateT4", "dateTime", "1900-12-03 12:30");
|
||||
iq['set'].add_data("TjohejDateT2", "dateTime", "1900-12-03 11:22");
|
||||
|
||||
iq['set'].add_data("TjohejDouble2", "double", "200.22")
|
||||
iq['set'].add_data("TjohejDouble3", "double", "-12232131.3333")
|
||||
iq['set'].add_data("TjohejDouble2", "double", "200.22");
|
||||
iq['set'].add_data("TjohejDouble3", "double", "-12232131.3333");
|
||||
|
||||
iq['set'].add_data("TjohejDur", "duration", "P5Y")
|
||||
iq['set'].add_data("TjohejDur2", "duration", "PT2M1S")
|
||||
iq['set'].add_data("TjohejDur", "duration", "P5Y");
|
||||
iq['set'].add_data("TjohejDur2", "duration", "PT2M1S");
|
||||
|
||||
iq['set'].add_data("TjohejInt", "int", "1")
|
||||
iq['set'].add_data("TjohejInt2", "int", "-42")
|
||||
iq['set'].add_data("TjohejInt", "int", "1");
|
||||
iq['set'].add_data("TjohejInt2", "int", "-42");
|
||||
|
||||
iq['set'].add_data("TjohejLong", "long", "123456789098")
|
||||
iq['set'].add_data("TjohejLong2", "long", "-90983243827489374")
|
||||
iq['set'].add_data("TjohejLong", "long", "123456789098");
|
||||
iq['set'].add_data("TjohejLong2", "long", "-90983243827489374");
|
||||
|
||||
iq['set'].add_data("TjohejTime", "time", "23:59")
|
||||
iq['set'].add_data("TjohejTime2", "time", "12:00")
|
||||
iq['set'].add_data("TjohejTime", "time", "23:59");
|
||||
iq['set'].add_data("TjohejTime2", "time", "12:00");
|
||||
|
||||
self.check(iq,"""
|
||||
<iq type='set'
|
||||
|
||||
@ -19,7 +19,7 @@ class TestStreamSensorData(SleekTest):
|
||||
pass
|
||||
|
||||
def _time_now(self):
|
||||
return datetime.datetime.now().replace(microsecond=0).isoformat()
|
||||
return datetime.datetime.now().replace(microsecond=0).isoformat();
|
||||
|
||||
def tearDown(self):
|
||||
self.stream_close()
|
||||
@ -29,12 +29,12 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device22")
|
||||
myDevice._add_field(name="Temperature", typename="numeric", unit="°C")
|
||||
myDevice = Device("Device22");
|
||||
myDevice._add_field(name="Temperature", typename="numeric", unit="°C");
|
||||
myDevice._set_momentary_timestamp("2013-03-07T16:24:30")
|
||||
myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"})
|
||||
myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"});
|
||||
|
||||
self.xmpp['xep_0323'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0323'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5);
|
||||
|
||||
self.recv("""
|
||||
<iq type='get'
|
||||
@ -73,7 +73,7 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
self.xmpp['xep_0323']._set_authenticated("darth@deathstar.com")
|
||||
self.xmpp['xep_0323']._set_authenticated("darth@deathstar.com");
|
||||
|
||||
self.recv("""
|
||||
<iq type='get'
|
||||
@ -101,8 +101,8 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device44")
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5)
|
||||
myDevice = Device("Device44");
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5);
|
||||
|
||||
print("."),
|
||||
|
||||
@ -157,11 +157,11 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device44")
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V")
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.4", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice = Device("Device44");
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V");
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.4", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"});
|
||||
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5);
|
||||
|
||||
print("."),
|
||||
|
||||
@ -236,15 +236,15 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device44")
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V")
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.4", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice._add_field(name='Current', typename="numeric", unit="A")
|
||||
myDevice._add_field(name='Height', typename="string")
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.6", timestamp="2000-01-01T01:01:02")
|
||||
myDevice._add_field_timestamp_data(name="Height", value="115 m", timestamp="2000-01-01T01:01:02", flags={"invoiced": "true"})
|
||||
myDevice = Device("Device44");
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V");
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.4", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"});
|
||||
myDevice._add_field(name='Current', typename="numeric", unit="A");
|
||||
myDevice._add_field(name='Height', typename="string");
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.6", timestamp="2000-01-01T01:01:02");
|
||||
myDevice._add_field_timestamp_data(name="Height", value="115 m", timestamp="2000-01-01T01:01:02", flags={"invoiced": "true"});
|
||||
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5);
|
||||
|
||||
print("."),
|
||||
|
||||
@ -308,15 +308,15 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device44")
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V")
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.4", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice._add_field(name='Current', typename="numeric", unit="A")
|
||||
myDevice._add_field(name='Height', typename="string")
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.6", timestamp="2000-01-01T01:01:02")
|
||||
myDevice._add_field_timestamp_data(name="Height", value="115 m", timestamp="2000-01-01T01:01:02", flags={"invoiced": "true"})
|
||||
myDevice = Device("Device44");
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V");
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.4", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"});
|
||||
myDevice._add_field(name='Current', typename="numeric", unit="A");
|
||||
myDevice._add_field(name='Height', typename="string");
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.6", timestamp="2000-01-01T01:01:02");
|
||||
myDevice._add_field_timestamp_data(name="Height", value="115 m", timestamp="2000-01-01T01:01:02", flags={"invoiced": "true"});
|
||||
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5);
|
||||
|
||||
print("."),
|
||||
|
||||
@ -379,7 +379,7 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", callback=None)
|
||||
self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", callback=None);
|
||||
|
||||
self.send("""
|
||||
<iq type='get'
|
||||
@ -390,7 +390,7 @@ class TestStreamSensorData(SleekTest):
|
||||
</iq>
|
||||
""")
|
||||
|
||||
self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", nodeIds=['Device33', 'Device22'], callback=None)
|
||||
self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", nodeIds=['Device33', 'Device22'], callback=None);
|
||||
|
||||
self.send("""
|
||||
<iq type='get'
|
||||
@ -404,7 +404,7 @@ class TestStreamSensorData(SleekTest):
|
||||
</iq>
|
||||
""")
|
||||
|
||||
self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", fields=['Temperature', 'Voltage'], callback=None)
|
||||
self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", fields=['Temperature', 'Voltage'], callback=None);
|
||||
|
||||
self.send("""
|
||||
<iq type='get'
|
||||
@ -424,13 +424,13 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
results = []
|
||||
results = [];
|
||||
|
||||
def my_callback(from_jid, result, nodeId=None, timestamp=None, fields=None, error_msg=None):
|
||||
if (result == "rejected") and (error_msg == "Invalid device Device22"):
|
||||
results.append("rejected")
|
||||
results.append("rejected");
|
||||
|
||||
self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", nodeIds=['Device33', 'Device22'], callback=my_callback)
|
||||
self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", nodeIds=['Device33', 'Device22'], callback=my_callback);
|
||||
|
||||
self.send("""
|
||||
<iq type='get'
|
||||
@ -458,7 +458,7 @@ class TestStreamSensorData(SleekTest):
|
||||
time.sleep(.1)
|
||||
|
||||
self.failUnless(results == ["rejected"],
|
||||
"Rejected callback was not properly executed")
|
||||
"Rejected callback was not properly executed");
|
||||
|
||||
def testRequestAcceptedAPI(self):
|
||||
|
||||
@ -466,12 +466,12 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
results = []
|
||||
results = [];
|
||||
|
||||
def my_callback(from_jid, result, nodeId=None, timestamp=None, fields=None, error_msg=None):
|
||||
results.append(result)
|
||||
results.append(result);
|
||||
|
||||
self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", nodeIds=['Device33', 'Device22'], callback=my_callback)
|
||||
self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", nodeIds=['Device33', 'Device22'], callback=my_callback);
|
||||
|
||||
self.send("""
|
||||
<iq type='get'
|
||||
@ -497,7 +497,7 @@ class TestStreamSensorData(SleekTest):
|
||||
time.sleep(.1)
|
||||
|
||||
self.failUnless(results == ["accepted"],
|
||||
"Accepted callback was not properly executed")
|
||||
"Accepted callback was not properly executed");
|
||||
|
||||
def testRequestFieldsAPI(self):
|
||||
|
||||
@ -505,25 +505,25 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
results = []
|
||||
callback_data = {}
|
||||
results = [];
|
||||
callback_data = {};
|
||||
|
||||
def my_callback(from_jid, result, nodeId=None, timestamp=None, fields=None, error_msg=None):
|
||||
results.append(result)
|
||||
results.append(result);
|
||||
if result == "fields":
|
||||
callback_data["nodeId"] = nodeId
|
||||
callback_data["timestamp"] = timestamp
|
||||
callback_data["error_msg"] = error_msg
|
||||
callback_data["nodeId"] = nodeId;
|
||||
callback_data["timestamp"] = timestamp;
|
||||
callback_data["error_msg"] = error_msg;
|
||||
for f in fields:
|
||||
callback_data["field_" + f['name']] = f
|
||||
callback_data["field_" + f['name']] = f;
|
||||
|
||||
t1= threading.Thread(name="request_data",
|
||||
target=self.xmpp['xep_0323'].request_data,
|
||||
kwargs={"from_jid": "tester@localhost",
|
||||
"to_jid": "you@google.com",
|
||||
"nodeIds": ['Device33'],
|
||||
"callback": my_callback})
|
||||
t1.start()
|
||||
"callback": my_callback});
|
||||
t1.start();
|
||||
#self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", nodeIds=['Device33'], callback=my_callback);
|
||||
|
||||
self.send("""
|
||||
@ -567,27 +567,27 @@ class TestStreamSensorData(SleekTest):
|
||||
</message>
|
||||
""")
|
||||
|
||||
t1.join()
|
||||
t1.join();
|
||||
time.sleep(.5)
|
||||
|
||||
self.failUnlessEqual(results, ["accepted","fields","done"])
|
||||
self.failUnlessEqual(results, ["accepted","fields","done"]);
|
||||
# self.assertIn("nodeId", callback_data);
|
||||
self.assertTrue("nodeId" in callback_data)
|
||||
self.failUnlessEqual(callback_data["nodeId"], "Device33")
|
||||
self.failUnlessEqual(callback_data["nodeId"], "Device33");
|
||||
# self.assertIn("timestamp", callback_data);
|
||||
self.assertTrue("timestamp" in callback_data)
|
||||
self.failUnlessEqual(callback_data["timestamp"], "2000-01-01T00:01:02")
|
||||
self.assertTrue("timestamp" in callback_data);
|
||||
self.failUnlessEqual(callback_data["timestamp"], "2000-01-01T00:01:02");
|
||||
#self.assertIn("field_Voltage", callback_data);
|
||||
self.assertTrue("field_Voltage" in callback_data)
|
||||
self.failUnlessEqual(callback_data["field_Voltage"], {"name": "Voltage", "value": "230.4", "typename": "numeric", "unit": "V", "flags": {"invoiced": "true"}})
|
||||
self.assertTrue("field_Voltage" in callback_data);
|
||||
self.failUnlessEqual(callback_data["field_Voltage"], {"name": "Voltage", "value": "230.4", "typename": "numeric", "unit": "V", "flags": {"invoiced": "true"}});
|
||||
#self.assertIn("field_TestBool", callback_data);
|
||||
self.assertTrue("field_TestBool" in callback_data)
|
||||
self.failUnlessEqual(callback_data["field_TestBool"], {"name": "TestBool", "value": "true", "typename": "boolean" })
|
||||
self.assertTrue("field_TestBool" in callback_data);
|
||||
self.failUnlessEqual(callback_data["field_TestBool"], {"name": "TestBool", "value": "true", "typename": "boolean" });
|
||||
|
||||
def testServiceDiscoveryClient(self):
|
||||
self.stream_start(mode='client',
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
'xep_0323']);
|
||||
|
||||
self.recv("""
|
||||
<iq type='get'
|
||||
@ -612,7 +612,7 @@ class TestStreamSensorData(SleekTest):
|
||||
def testServiceDiscoveryComponent(self):
|
||||
self.stream_start(mode='component',
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
'xep_0323']);
|
||||
|
||||
self.recv("""
|
||||
<iq type='get'
|
||||
@ -641,23 +641,23 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
results = []
|
||||
callback_data = {}
|
||||
results = [];
|
||||
callback_data = {};
|
||||
|
||||
def my_callback(from_jid, result, nodeId=None, timestamp=None, error_msg=None):
|
||||
results.append(result)
|
||||
results.append(result);
|
||||
if result == "failure":
|
||||
callback_data["nodeId"] = nodeId
|
||||
callback_data["timestamp"] = timestamp
|
||||
callback_data["error_msg"] = error_msg
|
||||
callback_data["nodeId"] = nodeId;
|
||||
callback_data["timestamp"] = timestamp;
|
||||
callback_data["error_msg"] = error_msg;
|
||||
|
||||
t1= threading.Thread(name="request_data",
|
||||
target=self.xmpp['xep_0323'].request_data,
|
||||
kwargs={"from_jid": "tester@localhost",
|
||||
"to_jid": "you@google.com",
|
||||
"nodeIds": ['Device33'],
|
||||
"callback": my_callback})
|
||||
t1.start()
|
||||
"callback": my_callback});
|
||||
t1.start();
|
||||
|
||||
self.send("""
|
||||
<iq type='get'
|
||||
@ -688,31 +688,31 @@ class TestStreamSensorData(SleekTest):
|
||||
</message>
|
||||
""")
|
||||
|
||||
t1.join()
|
||||
t1.join();
|
||||
time.sleep(.5)
|
||||
|
||||
self.failUnlessEqual(results, ["accepted","failure"])
|
||||
self.failUnlessEqual(results, ["accepted","failure"]);
|
||||
# self.assertIn("nodeId", callback_data);
|
||||
self.assertTrue("nodeId" in callback_data)
|
||||
self.failUnlessEqual(callback_data["nodeId"], "Device33")
|
||||
self.assertTrue("nodeId" in callback_data);
|
||||
self.failUnlessEqual(callback_data["nodeId"], "Device33");
|
||||
# self.assertIn("timestamp", callback_data);
|
||||
self.assertTrue("timestamp" in callback_data)
|
||||
self.failUnlessEqual(callback_data["timestamp"], "2013-03-07T17:13:30")
|
||||
self.assertTrue("timestamp" in callback_data);
|
||||
self.failUnlessEqual(callback_data["timestamp"], "2013-03-07T17:13:30");
|
||||
# self.assertIn("error_msg", callback_data);
|
||||
self.assertTrue("error_msg" in callback_data)
|
||||
self.failUnlessEqual(callback_data["error_msg"], "Timeout.")
|
||||
self.assertTrue("error_msg" in callback_data);
|
||||
self.failUnlessEqual(callback_data["error_msg"], "Timeout.");
|
||||
|
||||
def testDelayedRequest(self):
|
||||
self.stream_start(mode='component',
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device22")
|
||||
myDevice._add_field(name="Temperature", typename="numeric", unit="°C")
|
||||
myDevice = Device("Device22");
|
||||
myDevice._add_field(name="Temperature", typename="numeric", unit="°C");
|
||||
myDevice._set_momentary_timestamp("2013-03-07T16:24:30")
|
||||
myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"})
|
||||
myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"});
|
||||
|
||||
self.xmpp['xep_0323'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0323'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5);
|
||||
|
||||
dtnow = datetime.datetime.now()
|
||||
ts_2sec = datetime.timedelta(0,2)
|
||||
@ -764,12 +764,12 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device22")
|
||||
myDevice._add_field(name="Temperature", typename="numeric", unit="°C")
|
||||
myDevice = Device("Device22");
|
||||
myDevice._add_field(name="Temperature", typename="numeric", unit="°C");
|
||||
myDevice._set_momentary_timestamp("2013-03-07T16:24:30")
|
||||
myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"})
|
||||
myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"});
|
||||
|
||||
self.xmpp['xep_0323'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0323'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5);
|
||||
|
||||
dtnow = datetime.datetime.now()
|
||||
ts_2sec = datetime.timedelta(0,2)
|
||||
@ -825,13 +825,13 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device44")
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V")
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.1", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.2", timestamp="2000-02-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.3", timestamp="2000-03-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice = Device("Device44");
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V");
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.1", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"});
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.2", timestamp="2000-02-01T00:01:02", flags={"invoiced": "true"});
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.3", timestamp="2000-03-01T00:01:02", flags={"invoiced": "true"});
|
||||
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5);
|
||||
|
||||
print("."),
|
||||
|
||||
@ -895,13 +895,13 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device44")
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V")
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.1", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.2", timestamp="2000-02-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.3", timestamp="2000-03-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice = Device("Device44");
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V");
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.1", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"});
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.2", timestamp="2000-02-01T00:01:02", flags={"invoiced": "true"});
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.3", timestamp="2000-03-01T00:01:02", flags={"invoiced": "true"});
|
||||
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5);
|
||||
|
||||
print("."),
|
||||
|
||||
@ -965,13 +965,13 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device44")
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V")
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.1", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.2", timestamp="2000-02-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.3", timestamp="2000-03-01T00:01:02", flags={"invoiced": "true"})
|
||||
myDevice = Device("Device44");
|
||||
myDevice._add_field(name='Voltage', typename="numeric", unit="V");
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.1", timestamp="2000-01-01T00:01:02", flags={"invoiced": "true"});
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.2", timestamp="2000-02-01T00:01:02", flags={"invoiced": "true"});
|
||||
myDevice._add_field_timestamp_data(name="Voltage", value="230.3", timestamp="2000-03-01T00:01:02", flags={"invoiced": "true"});
|
||||
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0323'].register_node('Device44', myDevice, commTimeout=0.5);
|
||||
|
||||
print("."),
|
||||
|
||||
@ -1021,25 +1021,25 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
results = []
|
||||
callback_data = {}
|
||||
results = [];
|
||||
callback_data = {};
|
||||
|
||||
def my_callback(from_jid, result, nodeId=None, timestamp=None, fields=None, error_msg=None):
|
||||
results.append(result)
|
||||
results.append(result);
|
||||
if result == "fields":
|
||||
callback_data["nodeId"] = nodeId
|
||||
callback_data["timestamp"] = timestamp
|
||||
callback_data["error_msg"] = error_msg
|
||||
callback_data["nodeId"] = nodeId;
|
||||
callback_data["timestamp"] = timestamp;
|
||||
callback_data["error_msg"] = error_msg;
|
||||
for f in fields:
|
||||
callback_data["field_" + f['name']] = f
|
||||
callback_data["field_" + f['name']] = f;
|
||||
|
||||
t1= threading.Thread(name="request_data",
|
||||
target=self.xmpp['xep_0323'].request_data,
|
||||
kwargs={"from_jid": "tester@localhost",
|
||||
"to_jid": "you@google.com",
|
||||
"nodeIds": ['Device33'],
|
||||
"callback": my_callback})
|
||||
t1.start()
|
||||
"callback": my_callback});
|
||||
t1.start();
|
||||
#self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", nodeIds=['Device33'], callback=my_callback);
|
||||
|
||||
self.send("""
|
||||
@ -1090,22 +1090,22 @@ class TestStreamSensorData(SleekTest):
|
||||
</message>
|
||||
""")
|
||||
|
||||
t1.join()
|
||||
t1.join();
|
||||
time.sleep(.5)
|
||||
|
||||
self.failUnlessEqual(results, ["queued","started","fields","done"])
|
||||
self.failUnlessEqual(results, ["queued","started","fields","done"]);
|
||||
# self.assertIn("nodeId", callback_data);
|
||||
self.assertTrue("nodeId" in callback_data)
|
||||
self.failUnlessEqual(callback_data["nodeId"], "Device33")
|
||||
self.assertTrue("nodeId" in callback_data);
|
||||
self.failUnlessEqual(callback_data["nodeId"], "Device33");
|
||||
# self.assertIn("timestamp", callback_data);
|
||||
self.assertTrue("timestamp" in callback_data)
|
||||
self.failUnlessEqual(callback_data["timestamp"], "2000-01-01T00:01:02")
|
||||
self.assertTrue("timestamp" in callback_data);
|
||||
self.failUnlessEqual(callback_data["timestamp"], "2000-01-01T00:01:02");
|
||||
# self.assertIn("field_Voltage", callback_data);
|
||||
self.assertTrue("field_Voltage" in callback_data)
|
||||
self.failUnlessEqual(callback_data["field_Voltage"], {"name": "Voltage", "value": "230.4", "typename": "numeric", "unit": "V", "flags": {"invoiced": "true"}})
|
||||
self.assertTrue("field_Voltage" in callback_data);
|
||||
self.failUnlessEqual(callback_data["field_Voltage"], {"name": "Voltage", "value": "230.4", "typename": "numeric", "unit": "V", "flags": {"invoiced": "true"}});
|
||||
# self.assertIn("field_TestBool", callback_data);
|
||||
self.assertTrue("field_TestBool" in callback_data)
|
||||
self.failUnlessEqual(callback_data["field_TestBool"], {"name": "TestBool", "value": "true", "typename": "boolean" })
|
||||
self.assertTrue("field_TestBool" in callback_data);
|
||||
self.failUnlessEqual(callback_data["field_TestBool"], {"name": "TestBool", "value": "true", "typename": "boolean" });
|
||||
|
||||
|
||||
def testRequestFieldsCancelAPI(self):
|
||||
@ -1114,12 +1114,12 @@ class TestStreamSensorData(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
results = []
|
||||
results = [];
|
||||
|
||||
def my_callback(from_jid, result, nodeId=None, timestamp=None, fields=None, error_msg=None):
|
||||
results.append(result)
|
||||
results.append(result);
|
||||
|
||||
session = self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", nodeIds=['Device33'], callback=my_callback)
|
||||
session = self.xmpp['xep_0323'].request_data(from_jid="tester@localhost", to_jid="you@google.com", nodeIds=['Device33'], callback=my_callback);
|
||||
|
||||
self.send("""
|
||||
<iq type='get'
|
||||
@ -1141,7 +1141,7 @@ class TestStreamSensorData(SleekTest):
|
||||
</iq>
|
||||
""")
|
||||
|
||||
self.xmpp['xep_0323'].cancel_request(session=session)
|
||||
self.xmpp['xep_0323'].cancel_request(session=session);
|
||||
|
||||
self.send("""
|
||||
<iq type='get'
|
||||
@ -1163,19 +1163,19 @@ class TestStreamSensorData(SleekTest):
|
||||
|
||||
time.sleep(.5)
|
||||
|
||||
self.failUnlessEqual(results, ["accepted","cancelled"])
|
||||
self.failUnlessEqual(results, ["accepted","cancelled"]);
|
||||
|
||||
def testDelayedRequestCancel(self):
|
||||
self.stream_start(mode='component',
|
||||
plugins=['xep_0030',
|
||||
'xep_0323'])
|
||||
|
||||
myDevice = Device("Device22")
|
||||
myDevice._add_field(name="Temperature", typename="numeric", unit="°C")
|
||||
myDevice = Device("Device22");
|
||||
myDevice._add_field(name="Temperature", typename="numeric", unit="°C");
|
||||
myDevice._set_momentary_timestamp("2013-03-07T16:24:30")
|
||||
myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"})
|
||||
myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"});
|
||||
|
||||
self.xmpp['xep_0323'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0323'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5);
|
||||
|
||||
dtnow = datetime.datetime.now()
|
||||
ts_2sec = datetime.timedelta(0,2)
|
||||
|
||||
@ -28,7 +28,7 @@ class TestStreamControl(SleekTest):
|
||||
pass
|
||||
|
||||
def _time_now(self):
|
||||
return datetime.datetime.now().replace(microsecond=0).isoformat()
|
||||
return datetime.datetime.now().replace(microsecond=0).isoformat();
|
||||
|
||||
def tearDown(self):
|
||||
self.stream_close()
|
||||
@ -38,10 +38,10 @@ class TestStreamControl(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0325'])
|
||||
|
||||
myDevice = Device("Device22")
|
||||
myDevice._add_control_field(name="Temperature", typename="int", value="15")
|
||||
myDevice = Device("Device22");
|
||||
myDevice._add_control_field(name="Temperature", typename="int", value="15");
|
||||
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5);
|
||||
|
||||
self.recv("""
|
||||
<iq type='set'
|
||||
@ -63,23 +63,23 @@ class TestStreamControl(SleekTest):
|
||||
</iq>
|
||||
""")
|
||||
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "17")
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "17");
|
||||
|
||||
def testRequestSetMulti(self):
|
||||
self.stream_start(mode='component',
|
||||
plugins=['xep_0030',
|
||||
'xep_0325'])
|
||||
|
||||
myDevice = Device("Device22")
|
||||
myDevice._add_control_field(name="Temperature", typename="int", value="15")
|
||||
myDevice._add_control_field(name="Startup", typename="date", value="2013-01-03")
|
||||
myDevice = Device("Device22");
|
||||
myDevice._add_control_field(name="Temperature", typename="int", value="15");
|
||||
myDevice._add_control_field(name="Startup", typename="date", value="2013-01-03");
|
||||
|
||||
myDevice2 = Device("Device23")
|
||||
myDevice2._add_control_field(name="Temperature", typename="int", value="19")
|
||||
myDevice2._add_control_field(name="Startup", typename="date", value="2013-01-09")
|
||||
myDevice2 = Device("Device23");
|
||||
myDevice2._add_control_field(name="Temperature", typename="int", value="19");
|
||||
myDevice2._add_control_field(name="Startup", typename="date", value="2013-01-09");
|
||||
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device23", device=myDevice2, commTimeout=0.5)
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5);
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device23", device=myDevice2, commTimeout=0.5);
|
||||
|
||||
self.recv("""
|
||||
<iq type='set'
|
||||
@ -102,8 +102,8 @@ class TestStreamControl(SleekTest):
|
||||
</iq>
|
||||
""")
|
||||
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "17")
|
||||
self.assertEqual(myDevice2._get_field_value("Temperature"), "19")
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "17");
|
||||
self.assertEqual(myDevice2._get_field_value("Temperature"), "19");
|
||||
|
||||
self.recv("""
|
||||
<iq type='set'
|
||||
@ -128,20 +128,20 @@ class TestStreamControl(SleekTest):
|
||||
</iq>
|
||||
""")
|
||||
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "20")
|
||||
self.assertEqual(myDevice2._get_field_value("Temperature"), "20")
|
||||
self.assertEqual(myDevice._get_field_value("Startup"), "2013-02-01")
|
||||
self.assertEqual(myDevice2._get_field_value("Startup"), "2013-02-01")
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "20");
|
||||
self.assertEqual(myDevice2._get_field_value("Temperature"), "20");
|
||||
self.assertEqual(myDevice._get_field_value("Startup"), "2013-02-01");
|
||||
self.assertEqual(myDevice2._get_field_value("Startup"), "2013-02-01");
|
||||
|
||||
def testRequestSetFail(self):
|
||||
self.stream_start(mode='component',
|
||||
plugins=['xep_0030',
|
||||
'xep_0325'])
|
||||
|
||||
myDevice = Device("Device23")
|
||||
myDevice._add_control_field(name="Temperature", typename="int", value="15")
|
||||
myDevice = Device("Device23");
|
||||
myDevice._add_control_field(name="Temperature", typename="int", value="15");
|
||||
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device23", device=myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device23", device=myDevice, commTimeout=0.5);
|
||||
|
||||
self.recv("""
|
||||
<iq type='set'
|
||||
@ -166,18 +166,18 @@ class TestStreamControl(SleekTest):
|
||||
</iq>
|
||||
""")
|
||||
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "15")
|
||||
self.assertFalse(myDevice.has_control_field("Voltage", "int"))
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "15");
|
||||
self.assertFalse(myDevice.has_control_field("Voltage", "int"));
|
||||
|
||||
def testDirectSetOk(self):
|
||||
self.stream_start(mode='component',
|
||||
plugins=['xep_0030',
|
||||
'xep_0325'])
|
||||
|
||||
myDevice = Device("Device22")
|
||||
myDevice._add_control_field(name="Temperature", typename="int", value="15")
|
||||
myDevice = Device("Device22");
|
||||
myDevice._add_control_field(name="Temperature", typename="int", value="15");
|
||||
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5);
|
||||
|
||||
self.recv("""
|
||||
<message
|
||||
@ -191,17 +191,17 @@ class TestStreamControl(SleekTest):
|
||||
|
||||
time.sleep(.5)
|
||||
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "17")
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "17");
|
||||
|
||||
def testDirectSetFail(self):
|
||||
self.stream_start(mode='component',
|
||||
plugins=['xep_0030',
|
||||
'xep_0325'])
|
||||
|
||||
myDevice = Device("Device22")
|
||||
myDevice._add_control_field(name="Temperature", typename="int", value="15")
|
||||
myDevice = Device("Device22");
|
||||
myDevice._add_control_field(name="Temperature", typename="int", value="15");
|
||||
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5)
|
||||
self.xmpp['xep_0325'].register_node(nodeId="Device22", device=myDevice, commTimeout=0.5);
|
||||
|
||||
self.recv("""
|
||||
<message
|
||||
@ -215,8 +215,8 @@ class TestStreamControl(SleekTest):
|
||||
|
||||
time.sleep(.5)
|
||||
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "15")
|
||||
self.assertFalse(myDevice.has_control_field("Voltage", "int"))
|
||||
self.assertEqual(myDevice._get_field_value("Temperature"), "15");
|
||||
self.assertFalse(myDevice.has_control_field("Voltage", "int"));
|
||||
|
||||
|
||||
def testRequestSetOkAPI(self):
|
||||
@ -225,16 +225,16 @@ class TestStreamControl(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0325'])
|
||||
|
||||
results = []
|
||||
results = [];
|
||||
|
||||
def my_callback(from_jid, result, nodeIds=None, fields=None, error_msg=None):
|
||||
results.append(result)
|
||||
results.append(result);
|
||||
|
||||
fields = []
|
||||
fields.append(("Temperature", "double", "20.5"))
|
||||
fields.append(("TemperatureAlarmSetting", "string", "High"))
|
||||
|
||||
self.xmpp['xep_0325'].set_request(from_jid="tester@localhost", to_jid="you@google.com", fields=fields, nodeIds=['Device33', 'Device22'], callback=my_callback)
|
||||
self.xmpp['xep_0325'].set_request(from_jid="tester@localhost", to_jid="you@google.com", fields=fields, nodeIds=['Device33', 'Device22'], callback=my_callback);
|
||||
|
||||
self.send("""
|
||||
<iq type='set'
|
||||
@ -261,7 +261,7 @@ class TestStreamControl(SleekTest):
|
||||
|
||||
time.sleep(.5)
|
||||
|
||||
self.assertEqual(results, ["OK"])
|
||||
self.assertEqual(results, ["OK"]);
|
||||
|
||||
def testRequestSetErrorAPI(self):
|
||||
|
||||
@ -269,16 +269,16 @@ class TestStreamControl(SleekTest):
|
||||
plugins=['xep_0030',
|
||||
'xep_0325'])
|
||||
|
||||
results = []
|
||||
results = [];
|
||||
|
||||
def my_callback(from_jid, result, nodeIds=None, fields=None, error_msg=None):
|
||||
results.append(result)
|
||||
results.append(result);
|
||||
|
||||
fields = []
|
||||
fields.append(("Temperature", "double", "20.5"))
|
||||
fields.append(("TemperatureAlarmSetting", "string", "High"))
|
||||
|
||||
self.xmpp['xep_0325'].set_request(from_jid="tester@localhost", to_jid="you@google.com", fields=fields, nodeIds=['Device33', 'Device22'], callback=my_callback)
|
||||
self.xmpp['xep_0325'].set_request(from_jid="tester@localhost", to_jid="you@google.com", fields=fields, nodeIds=['Device33', 'Device22'], callback=my_callback);
|
||||
|
||||
self.send("""
|
||||
<iq type='set'
|
||||
@ -307,12 +307,12 @@ class TestStreamControl(SleekTest):
|
||||
|
||||
time.sleep(.5)
|
||||
|
||||
self.assertEqual(results, ["OtherError"])
|
||||
self.assertEqual(results, ["OtherError"]);
|
||||
|
||||
def testServiceDiscoveryClient(self):
|
||||
self.stream_start(mode='client',
|
||||
plugins=['xep_0030',
|
||||
'xep_0325'])
|
||||
'xep_0325']);
|
||||
|
||||
self.recv("""
|
||||
<iq type='get'
|
||||
@ -337,7 +337,7 @@ class TestStreamControl(SleekTest):
|
||||
def testServiceDiscoveryComponent(self):
|
||||
self.stream_start(mode='component',
|
||||
plugins=['xep_0030',
|
||||
'xep_0325'])
|
||||
'xep_0325']);
|
||||
|
||||
self.recv("""
|
||||
<iq type='get'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user