afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'rel/5.2' into core-rest-flask

Browse source
This commit is contained in:
Blake J. Harnden 2018-08-06 16:39:25 -07:00
commit 1a6d5d9605
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
daemon/core/corehandlers.py
View file

@ -22,7 +22,7 @@ from core.data import FileData
from core.emulator.emudata import InterfaceData from core.emulator.emudata import InterfaceData
from core.emulator.emudata import LinkOptions from core.emulator.emudata import LinkOptions
from core.emulator.emudata import NodeOptions from core.emulator.emudata import NodeOptions
from core.enumerations import ConfigDataTypes, ExceptionLevels from core.enumerations import ConfigDataTypes
from core.enumerations import ConfigFlags from core.enumerations import ConfigFlags
from core.enumerations import ConfigTlvs from core.enumerations import ConfigTlvs
from core.enumerations import EventTlvs from core.enumerations import EventTlvs
@ -645,11 +645,16 @@ class CoreHandler(SocketServer.BaseRequestHandler):
y=message.get_tlv(NodeTlvs.Y_POSITION.value) y=message.get_tlv(NodeTlvs.Y_POSITION.value)
) )
node_options.set_location( lat = message.get_tlv(NodeTlvs.LATITUDE.value)
lat=message.get_tlv(NodeTlvs.LATITUDE.value), if lat is not None:
lon=message.get_tlv(NodeTlvs.LONGITUDE.value), lat = float(lat)
lon = message.get_tlv(NodeTlvs.LONGITUDE.value)
if lon is not None:
lon = float(lon)
alt = message.get_tlv(NodeTlvs.ALTITUDE.value) alt = message.get_tlv(NodeTlvs.ALTITUDE.value)
) if alt is not None:
alt = float(alt)
node_options.set_location(lat=lat, lon=lon, alt=alt)
node_options.icon = message.get_tlv(NodeTlvs.ICON.value) node_options.icon = message.get_tlv(NodeTlvs.ICON.value)
node_options.canvas = message.get_tlv(NodeTlvs.CANVAS.value) node_options.canvas = message.get_tlv(NodeTlvs.CANVAS.value)

2
daemon/core/emulator/coreemu.py
View file

@ -543,7 +543,7 @@ class EmuSession(Session):
# set node as updated successfully # set node as updated successfully
result = True result = True
except KeyError: except KeyError:
logger.error("failure to update node that does not exist: %s", node_options.id) logger.error("failure to update node that does not exist: %s", node_id)
return result return result