Skip to content
Snippets Groups Projects
Commit c08d388f authored by jkerdreu's avatar jkerdreu
Browse files

snake_case in progress

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@2374 b32b6428-25c9-4566-ad07-03861ab6144f
parent 6d59b052
No related branches found
No related tags found
No related merge requests found
......@@ -134,10 +134,10 @@ class Engine(object):
msg = self.msg_factory.build_alive_for(dev, timeout)
self.queue_msg(msg)
def send_isAlive(self, dev, devtypes="any.any"):
def send_isAlive(self, dev, dev_types="any.any"):
"""Send a isAlive message, w/ devTypes filtering"""
body = {}
body['devTypes'] = devtypes
body['dev_types'] = dev_types
msg = self.msg_factory.build_msg(dev, [], MessageType.REQUEST, "isAlive", body)
self.queue_msg(msg)
......@@ -348,16 +348,16 @@ def filter_msg_for_devices(msg, devices):
"""
results = []
if msg.action == 'isAlive':
if 'devTypes' in msg.body.keys():
devtypes = msg.body['devTypes']
if 'any.any' in devtypes:
if 'dev_types' in msg.body.keys():
dev_types = msg.body['dev_types']
if 'any.any' in dev_types:
results = devices
else:
for dev in devices:
any_subtype = dev.devtype.split('.')[0] + '.any'
if dev.devtype in devtypes:
any_subtype = dev.dev_type.split('.')[0] + '.any'
if dev.dev_type in dev_types:
results.append(dev)
elif any_subtype in devtypes:
elif any_subtype in dev_types:
results.append(dev)
else:
if not msg.targets: # if target list is empty == broadcast
......
......@@ -107,7 +107,7 @@ class Device(object):
@dev_type.setter
def dev_type(self, value):
if not tools.is_valid_devtype(value):
if not tools.is_valid_dev_type(value):
raise DeviceError(f"The dev_type {value} is not valid")
self.__dev_type = value
......
......@@ -65,7 +65,7 @@ class MessageFactory(object):
buf = []
buf.append(msg.source.bytes)
buf.append(msg.dev_type)
buf.append(msg.msgtype.value)
buf.append(msg.msg_type.value)
buf.append(msg.action)
if msg.body:
buf.append(msg.body)
......@@ -134,7 +134,7 @@ class MessageFactory(object):
try:
msg.source = UUID(bytes=payload[0])
msg.dev_type = payload[1]
msg.msgtype = payload[2]
msg.msg_type = payload[2]
msg.action = payload[3]
except IndexError:
raise MessageParserError("Unable to parse payload headers")
......@@ -149,7 +149,7 @@ class MessageFactory(object):
#####################################################
# MSG builder
#####################################################
def build_msg(self,dev=None,targets=[], msgtype=None,action=None,body=None):
def build_msg(self,dev=None,targets=[], msg_type=None,action=None,body=None):
""" the build method takes in parameters :
-A device
-The list of targets of the message
......@@ -166,8 +166,8 @@ class MessageFactory(object):
message.targets = targets
message.timestamp = build_timestamp()
if msgtype:
message.msgtype = msgtype
if msg_type:
message.msg_type = msg_type
if action:
message.action = action
if body is not None and body != {}:
......@@ -182,7 +182,7 @@ class MessageFactory(object):
"""
body = {}
body['timeout'] = timeout
message = self.build_msg(dev=dev,targets=[],msgtype=MessageType.NOTIFY,action="alive",body=body)
message = self.build_msg(dev=dev,targets=[],msg_type=MessageType.NOTIFY,action="alive",body=body)
return message
def build_error_msg(self, dev, errcode, description=None):
......@@ -210,7 +210,7 @@ class Message(object):
self.timestamp = None # message timestamp
self.source = None # message source
self.dev_type = None # message dev_type
self.msgtype = None # message type
self.msg_type = None # message type
self.action = None # message action
self.body = {} # message body
......@@ -257,8 +257,8 @@ class Message(object):
logger.debug(f"targets | {self.targets_as_string()}")
logger.debug(f"timestamp | {self.timestamp}")
logger.debug(f"source | {self.source}")
logger.debug(f"dev_type | {self.dev_type}")
logger.debug(f"msgType | {MessageType(self.msgtype)}")
logger.debug(f"dev_type | {self.dev_type}")
logger.debug(f"msg_type | {MessageType(self.msg_type)}")
logger.debug(f"action | {self.action}")
if self.body:
......@@ -266,20 +266,20 @@ class Message(object):
logger.debug("%s \t" % self.body)
def __repr__(self):
return f"<xaal.Message {id(self):x} {self.source} {self.dev_type} {self.msgtype} {self.action}>"
return f"<xaal.Message {id(self):x} {self.source} {self.dev_type} {self.msg_type} {self.action}>"
def is_request(self):
if MessageType(self.msgtype) == MessageType.REQUEST:
if MessageType(self.msg_type) == MessageType.REQUEST:
return True
return False
def is_reply(self):
if MessageType(self.msgtype) == MessageType.REPLY:
if MessageType(self.msg_type) == MessageType.REPLY:
return True
return False
def is_notify(self):
if MessageType(self.msgtype) == MessageType.NOTIFY:
if MessageType(self.msg_type) == MessageType.NOTIFY:
return True
return False
......
......@@ -98,7 +98,7 @@ def is_valid_uuid(val):
def is_valid_address(val):
return is_valid_uuid(val)
def is_valid_devtype(val):
def is_valid_dev_type(val):
if re.match(XAAL_DEVTYPE_PATTERN,val):
return True
return False
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment