moved servers and request handlers to separate module. added support for auxiliary server with configurable request handlers
This commit is contained in:
Rod A Santiago
parent
5934b23b18
commit
3ea417b855
5 changed files with 1624 additions and 2490 deletions
|
|
@ -1,103 +0,0 @@
|
||||||
#
|
|
||||||
# CORE
|
|
||||||
# Copyright (c)2016 the Boeing Company.
|
|
||||||
# See the LICENSE file included in this distribution.
|
|
||||||
#
|
|
||||||
# authors: Rod Santiago
|
|
||||||
# John Kharouta
|
|
||||||
#
|
|
||||||
|
|
||||||
"""
|
|
||||||
This is a convenience module that imports the python module generated
|
|
||||||
from the core.proto IDL
|
|
||||||
"""
|
|
||||||
|
|
||||||
from core_pb2 import *
|
|
||||||
import struct
|
|
||||||
|
|
||||||
|
|
||||||
API2HDRFMT = "H"
|
|
||||||
API2HDRSIZ = struct.calcsize(API2HDRFMT)
|
|
||||||
|
|
||||||
def pack(message):
|
|
||||||
''' Pack an API2 message for transmission
|
|
||||||
'''
|
|
||||||
data = message.SerializeToString()
|
|
||||||
return struct.pack(API2HDRFMT, len(data)) + data
|
|
||||||
|
|
||||||
|
|
||||||
def recvAndUnpack(recv):
|
|
||||||
''' Receive and unpack from coreapi2
|
|
||||||
'''
|
|
||||||
|
|
||||||
try:
|
|
||||||
hdr = recv(API2HDRSIZ)
|
|
||||||
except Exception, e:
|
|
||||||
raise IOError, "error receiving API 2 header (%s)" % e
|
|
||||||
|
|
||||||
if len(hdr) != API2HDRSIZ:
|
|
||||||
if len(hdr) == 0:
|
|
||||||
raise EOFError, "client disconnected"
|
|
||||||
else:
|
|
||||||
raise IOError, "invalid message header size"
|
|
||||||
|
|
||||||
dataToRead = struct.unpack(API2HDRFMT, hdr)[0]
|
|
||||||
data = ""
|
|
||||||
while len(data) < dataToRead:
|
|
||||||
data += recv(dataToRead - len(data))
|
|
||||||
return data
|
|
||||||
|
|
||||||
|
|
||||||
def findNodeByIdx(exp, idx):
|
|
||||||
''' Find a node with the given index in the given Experiment
|
|
||||||
'''
|
|
||||||
for a_node in exp.nodes:
|
|
||||||
if a_node.idx == idx:
|
|
||||||
return a_node
|
|
||||||
return None
|
|
||||||
|
|
||||||
def findDeviceByIdx(exp, idx):
|
|
||||||
''' Find a device with the given index in the given Experiment
|
|
||||||
'''
|
|
||||||
for a_dev in exp.devices:
|
|
||||||
if a_dev.idx == idx:
|
|
||||||
return a_dev
|
|
||||||
return None
|
|
||||||
|
|
||||||
def getNodeByIdx(exp, idx):
|
|
||||||
node = findNodeByIdx(exp, idx)
|
|
||||||
if not node:
|
|
||||||
node = exp.nodes.add()
|
|
||||||
return node
|
|
||||||
|
|
||||||
def getDeviceByIdx(exp, idx):
|
|
||||||
device = findDeviceByIdx(exp, idx)
|
|
||||||
if not device:
|
|
||||||
device = exp.devices.add()
|
|
||||||
return device
|
|
||||||
|
|
||||||
|
|
||||||
def getDeviceInterfaceByIdx(exp, devIdx, intfIdx):
|
|
||||||
device = findDeviceByIdx(exp, devIdx)
|
|
||||||
if device:
|
|
||||||
for intf in device.interfaces:
|
|
||||||
if intf.idx == intfIdx:
|
|
||||||
return intf
|
|
||||||
intf = device.interfaces.add()
|
|
||||||
intf.idx = intfIdx
|
|
||||||
return intf
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def getNodeInterfaceByIdx(exp, nodeIdx, intfIdx):
|
|
||||||
node = findNodeByIdx(exp, nodeIdx)
|
|
||||||
if node:
|
|
||||||
for intf in node.interfaces:
|
|
||||||
if intf.idx == intfIdx:
|
|
||||||
return intf
|
|
||||||
intf = node.interfaces.add()
|
|
||||||
intf.idx = intfIdx
|
|
||||||
return intf
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
1577
daemon/core/coreserver.py
Normal file
1577
daemon/core/coreserver.py
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,713 +0,0 @@
|
||||||
#
|
|
||||||
# CORE
|
|
||||||
# Copyright (c)2016 the Boeing Company.
|
|
||||||
# See the LICENSE file included in this distribution.
|
|
||||||
#
|
|
||||||
# authors: Rod Santiago
|
|
||||||
# John Kharouta
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import threading, traceback, sys
|
|
||||||
from core.api import coreapi, corewrapper, coreapi2
|
|
||||||
from core.experiments import ExperimentStore
|
|
||||||
|
|
||||||
# Aliases
|
|
||||||
wrapper = corewrapper
|
|
||||||
legacy = coreapi
|
|
||||||
|
|
||||||
# Legacy node types that are Devices in API2
|
|
||||||
deviceTypesSet = set([
|
|
||||||
coreapi.CORE_NODE_SWITCH,
|
|
||||||
coreapi.CORE_NODE_HUB,
|
|
||||||
coreapi.CORE_NODE_WLAN,
|
|
||||||
coreapi.CORE_NODE_RJ45,
|
|
||||||
coreapi.CORE_NODE_TUNNEL,
|
|
||||||
coreapi.CORE_NODE_KTUNNEL,
|
|
||||||
coreapi.CORE_NODE_EMANE])
|
|
||||||
|
|
||||||
# Legacy node types that are Devices in API2
|
|
||||||
nodeTypesSet = set([
|
|
||||||
coreapi.CORE_NODE_DEF,
|
|
||||||
coreapi.CORE_NODE_XEN])
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Legacy node types to API2 device type field mapping
|
|
||||||
devtypeDict = {
|
|
||||||
coreapi.CORE_NODE_SWITCH: coreapi2.Device.SWITCH,
|
|
||||||
coreapi.CORE_NODE_HUB: coreapi2.Device.HUB,
|
|
||||||
coreapi.CORE_NODE_WLAN: coreapi2.Device.WLAN,
|
|
||||||
coreapi.CORE_NODE_RJ45: coreapi2.Device.RJ45,
|
|
||||||
coreapi.CORE_NODE_TUNNEL: coreapi2.Device.TUNNEL,
|
|
||||||
coreapi.CORE_NODE_KTUNNEL: coreapi2.Device.KTUNNEL
|
|
||||||
}
|
|
||||||
|
|
||||||
# Legacy node types to API2 emulator field mapping
|
|
||||||
emulationDict = {
|
|
||||||
coreapi.CORE_NODE_DEF: coreapi2.Node.DEFAULT,
|
|
||||||
coreapi.CORE_NODE_XEN: coreapi2.Node.XEN,
|
|
||||||
coreapi.CORE_NODE_EMANE: coreapi2.Device.EMANE
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class CoreApiBridge(object):
|
|
||||||
|
|
||||||
def __init__(self, handler):
|
|
||||||
# The collector is used for gathering node messages sent by the core session,
|
|
||||||
# for example, during INSTANTIATION as nodes are started until RUNTIME.
|
|
||||||
self.collector = None
|
|
||||||
|
|
||||||
# The currently associated (client added) experiment.
|
|
||||||
# This will be use to get contextual information for partial messages as nodes
|
|
||||||
# in the experiments are instantiated by the daemon.
|
|
||||||
self.assocExperiment = None
|
|
||||||
|
|
||||||
# Mutex
|
|
||||||
self.lock = threading.Lock()
|
|
||||||
|
|
||||||
# Reference to the owning handler in the core-daemon
|
|
||||||
self.handler = handler
|
|
||||||
|
|
||||||
def info(self, msg):
|
|
||||||
''' Utility method for writing output to stdout.
|
|
||||||
'''
|
|
||||||
print msg
|
|
||||||
sys.stdout.flush()
|
|
||||||
|
|
||||||
def warn(self, msg):
|
|
||||||
''' Utility method for writing output to stderr.
|
|
||||||
'''
|
|
||||||
print >> sys.stderr, msg
|
|
||||||
sys.stderr.flush()
|
|
||||||
|
|
||||||
def recvmsg(self):
|
|
||||||
''' Receive data, parse a CoreMessage and queue it onto an existing
|
|
||||||
session handler's queue, if available.
|
|
||||||
'''
|
|
||||||
|
|
||||||
data = coreapi2.recvAndUnpack(self.handler.request.recv)
|
|
||||||
msgs = self.processApi2Message(data)
|
|
||||||
|
|
||||||
return msgs
|
|
||||||
|
|
||||||
def dispatchreplies(self, replies):
|
|
||||||
''' Dispatch a reply to a previously received message.
|
|
||||||
'''
|
|
||||||
api2Replies = self.processLegacyCoreMessage(replies)
|
|
||||||
if api2Replies:
|
|
||||||
for reply in api2Replies:
|
|
||||||
try:
|
|
||||||
# send to API2 client
|
|
||||||
self.handler.request.sendall(reply)
|
|
||||||
except Exception, e:
|
|
||||||
if self.handler.debug:
|
|
||||||
self.info("-"*60)
|
|
||||||
traceback.print_exc(file=sys.stdout)
|
|
||||||
self.info("-"*60)
|
|
||||||
raise e
|
|
||||||
|
|
||||||
|
|
||||||
def sendall(self, data):
|
|
||||||
''' The daemon calls this method with legacy API data. Convert first
|
|
||||||
API2 then send.
|
|
||||||
'''
|
|
||||||
|
|
||||||
try:
|
|
||||||
msgs = self.processLegacyCoreMessage((data,))
|
|
||||||
if msgs:
|
|
||||||
for msg in msgs:
|
|
||||||
self.handler.request.sendall(msg)
|
|
||||||
except Exception, e:
|
|
||||||
if self.handler.debug:
|
|
||||||
self.info("-"*60)
|
|
||||||
traceback.print_exc(file=sys.stdout)
|
|
||||||
self.info("-"*60)
|
|
||||||
raise e
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def processApi2Message(self, data):
|
|
||||||
message = coreapi2.CoreMessage()
|
|
||||||
message.ParseFromString(data)
|
|
||||||
if message.HasField('session'):
|
|
||||||
return self.processApi2SessionMsg(message.session,
|
|
||||||
message.purpose)
|
|
||||||
if message.HasField('experiment'):
|
|
||||||
return self.processApi2ExperimentMsg(message.experiment,
|
|
||||||
message.purpose)
|
|
||||||
if message.HasField('event'):
|
|
||||||
return self.processApi2Event(message.event,
|
|
||||||
message.purpose)
|
|
||||||
|
|
||||||
|
|
||||||
def processLegacyCoreMessage(self, messages):
|
|
||||||
api2msgs = []
|
|
||||||
for msgstr in messages:
|
|
||||||
# Unpack the message
|
|
||||||
parser = wrapper.CoreMessageParser(msgstr)
|
|
||||||
if parser.getType() == legacy.CORE_API_REG_MSG:
|
|
||||||
self.processLegacyRegMsg(parser.createWrapper(), api2msgs)
|
|
||||||
|
|
||||||
elif parser.getType() == legacy.CORE_API_SESS_MSG:
|
|
||||||
self.processLegacySessionMsg(parser.createWrapper(), api2msgs)
|
|
||||||
|
|
||||||
elif parser.getType() == legacy.CORE_API_EVENT_MSG:
|
|
||||||
self.processLegacyEventMsg(parser.createWrapper(), api2msgs)
|
|
||||||
|
|
||||||
elif parser.getType() == legacy.CORE_API_NODE_MSG:
|
|
||||||
self.processLegacyNodeMsg(parser.createWrapper(), api2msgs)
|
|
||||||
|
|
||||||
elif parser.getType() == legacy.CORE_API_CONF_MSG:
|
|
||||||
self.processLegacyConfigMsg(parser.createWrapper(), api2msgs)
|
|
||||||
|
|
||||||
else:
|
|
||||||
self.warn("received message type %s" % (parser.getType()))
|
|
||||||
return api2msgs
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def processLegacyRegMsg(self, regMsg, api2msgs):
|
|
||||||
'''
|
|
||||||
Intercept an outgoing register message from the CORE daemon and generate
|
|
||||||
equivalent API2 message to send to the client
|
|
||||||
'''
|
|
||||||
|
|
||||||
if self.handler.debug:
|
|
||||||
print "RegisterMessage"
|
|
||||||
print "\twireless=", regMsg.getWireless()
|
|
||||||
print "\tmobility=", regMsg.getMobility()
|
|
||||||
print "\tutility=", regMsg.getUtility()
|
|
||||||
print "\texec=", regMsg.getExecsrv()
|
|
||||||
print "\tgui=", regMsg.getGui()
|
|
||||||
print "\temul=", regMsg.getEmulsrv()
|
|
||||||
print "\tsess=", regMsg.getSession()
|
|
||||||
|
|
||||||
pass
|
|
||||||
|
|
||||||
def processLegacySessionMsg(self, sessMsg, api2msgs):
|
|
||||||
'''
|
|
||||||
Intercept an outgoing session message from the CORE daemon and generate the equivalent
|
|
||||||
API2 messages to send to the client
|
|
||||||
'''
|
|
||||||
|
|
||||||
if self.handler.debug:
|
|
||||||
print "SessionMessage"
|
|
||||||
print "\tnumber=", sessMsg.getNumber()
|
|
||||||
print "\tname=", sessMsg.getName()
|
|
||||||
print "\tfile=", sessMsg.getFile()
|
|
||||||
print "\tnodecount=", sessMsg.getNodecount()
|
|
||||||
print "\tdate=", sessMsg.getDate()
|
|
||||||
print "\tthumb=", sessMsg.getThumb()
|
|
||||||
print "\tuser=", sessMsg.getUser()
|
|
||||||
print "\topaque=", sessMsg.getOpaque()
|
|
||||||
|
|
||||||
sessions = sessMsg.getNumber().split("|")
|
|
||||||
port_num = int(sessions[-1])
|
|
||||||
newMsg = coreapi2.CoreMessage()
|
|
||||||
newMsg.session.clientId = 'client' + sessions[-1]
|
|
||||||
newMsg.session.port_num = port_num
|
|
||||||
|
|
||||||
# List active experiments in the server
|
|
||||||
for sid in sessions:
|
|
||||||
sid = int(sid)
|
|
||||||
if sid == 0:
|
|
||||||
continue
|
|
||||||
session = self.handler.session.server.getsession(sessionid=sid, useexisting=True)
|
|
||||||
if session is None:
|
|
||||||
self.warn("Invalid session ID received from daemon")
|
|
||||||
continue
|
|
||||||
if session == self.handler.session:
|
|
||||||
continue
|
|
||||||
expId = session.metadata.getitem('experimentId')
|
|
||||||
if expId:
|
|
||||||
newMsg.session.all_exps.append(expId)
|
|
||||||
else:
|
|
||||||
newMsg.session.all_exps.append('_%s' % (str(sid)))
|
|
||||||
|
|
||||||
newMsg.purpose = coreapi2.ADD
|
|
||||||
api2msgs.append(coreapi2.pack(newMsg))
|
|
||||||
|
|
||||||
def processLegacyEventMsg(self, event, api2msgs):
|
|
||||||
'''
|
|
||||||
Intercept an outgoing event generated by the CORE daemon and generate the equivalent
|
|
||||||
API2 messages to send to the client
|
|
||||||
'''
|
|
||||||
|
|
||||||
if self.handler.debug:
|
|
||||||
print "Event:"
|
|
||||||
print "\tnode=", event.getNode()
|
|
||||||
print "\ttype=", event.getType()
|
|
||||||
print "\tname=", event.getName()
|
|
||||||
print "\tdata=", event.getData()
|
|
||||||
print "\ttime=", event.getTime()
|
|
||||||
print "\tsessions=", event.getSession()
|
|
||||||
|
|
||||||
|
|
||||||
if event.getType() == legacy.CORE_EVENT_RUNTIME_STATE:
|
|
||||||
newMsg = coreapi2.CoreMessage()
|
|
||||||
newMsg.purpose = coreapi2.STATE_CHANGE
|
|
||||||
newMsg.event.state = coreapi2.RUNTIME
|
|
||||||
api2msgs.append(coreapi2.pack(newMsg))
|
|
||||||
with self.lock:
|
|
||||||
if self.collector:
|
|
||||||
self.collector.experiment.running = True
|
|
||||||
self.collector.purpose = coreapi2.MODIFY
|
|
||||||
else:
|
|
||||||
raise RuntimeError, "runtime entered without an instantiated experiment"
|
|
||||||
api2msgs.append(coreapi2.pack(self.collector))
|
|
||||||
self.collector = None
|
|
||||||
|
|
||||||
def processLegacyConfigMsg(self, confMsg, api2msgs):
|
|
||||||
'''
|
|
||||||
Intercept an outgoing config message generated by the CORE daemon and generate the equivalent
|
|
||||||
API2 messages to send to the client
|
|
||||||
'''
|
|
||||||
|
|
||||||
if self.handler.debug:
|
|
||||||
print "Config:"
|
|
||||||
print "\tobj=", confMsg.getObj()
|
|
||||||
print "\tnode=", confMsg.getNode()
|
|
||||||
print "\ttype=", confMsg.getType()
|
|
||||||
print "\tdata=", confMsg.getData()
|
|
||||||
print "\tvalues=", confMsg.getValues()
|
|
||||||
print "\tcaptions=", confMsg.getCaptions()
|
|
||||||
print "\tbitmap=", confMsg.getBitmap()
|
|
||||||
print "\tposs values=", confMsg.getPossible()
|
|
||||||
print "\tgroups=", confMsg.getGroups()
|
|
||||||
print "\tsession=", confMsg.getSession()
|
|
||||||
print "\tnetid=", confMsg.getNetid()
|
|
||||||
print "\topaque=", confMsg.getOpaque()
|
|
||||||
|
|
||||||
|
|
||||||
# The CONFIG message will have its 'object' field set to the string literal
|
|
||||||
# "session" if it is ending a stream of node and link messages sent to a
|
|
||||||
# client that has joined a running experiment (legacy:session).
|
|
||||||
if confMsg.getObj() == "session":
|
|
||||||
# TODO: Process the values field
|
|
||||||
|
|
||||||
# Send what has been collected to the client
|
|
||||||
with self.lock:
|
|
||||||
if self.collector:
|
|
||||||
self.collector.experiment.running = True
|
|
||||||
self.collector.purpose = coreapi2.MODIFY
|
|
||||||
else:
|
|
||||||
raise RuntimeError, "runtime entered without an instantiated experiment"
|
|
||||||
api2msgs.append(coreapi2.pack(self.collector))
|
|
||||||
self.assocExperiment = self.collector.experiment
|
|
||||||
self.collector = None
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def processLegacyNodeMsg(self, nodeMsg, api2msgs):
|
|
||||||
'''
|
|
||||||
Intercept an outgoing legacy node message generated by the CORE daemon and generate the equivalent
|
|
||||||
API2 messages to send to the client
|
|
||||||
'''
|
|
||||||
|
|
||||||
if self.handler.debug:
|
|
||||||
print "Node:"
|
|
||||||
print "\tnumber=", nodeMsg.getNumber()
|
|
||||||
print "\ttype=", nodeMsg.getType()
|
|
||||||
print "\tname=", nodeMsg.getName()
|
|
||||||
print "\tipaddr=", nodeMsg.getIpaddr()
|
|
||||||
print "\tmacaddr=", nodeMsg.getMacaddr()
|
|
||||||
print "\tip6addr=", nodeMsg.getIp6addr()
|
|
||||||
print "\tmodel=", nodeMsg.getModel()
|
|
||||||
print "\temusrv=", nodeMsg.getEmusrv()
|
|
||||||
print "\tsession=", nodeMsg.getSession()
|
|
||||||
print "\txpos=", nodeMsg.getXpos()
|
|
||||||
print "\typos=", nodeMsg.getYpos()
|
|
||||||
print "\tcanvas=", nodeMsg.getCanvas()
|
|
||||||
print "\temuid=", nodeMsg.getEmuid()
|
|
||||||
print "\tnetid=", nodeMsg.getNetid()
|
|
||||||
print "\tservices=", nodeMsg.getServices()
|
|
||||||
print "\tlat=", nodeMsg.getLat()
|
|
||||||
print "\tlon=", nodeMsg.getLong()
|
|
||||||
print "\talt=", nodeMsg.getAlt()
|
|
||||||
print "\ticon=", nodeMsg.getIcon()
|
|
||||||
print "\topaque=", nodeMsg.getOpaque()
|
|
||||||
|
|
||||||
api2_node=None
|
|
||||||
api2_dev=None
|
|
||||||
with self.lock:
|
|
||||||
|
|
||||||
# If collection is active (i.e. joining a session is in progress) collect node
|
|
||||||
# information into an experiment message. Otherise, send as an independent Node or
|
|
||||||
# Device message.
|
|
||||||
newMsg = None
|
|
||||||
if not self.collector:
|
|
||||||
newMsg = coreapi2.CoreMessage()
|
|
||||||
|
|
||||||
# The legacy API uses a Node message to convey everything from hubs to hosts.
|
|
||||||
# But it does always have type information in it. Get context information
|
|
||||||
# from assocExperiment for the newly instantiated node or device being conveyed
|
|
||||||
# by the Node message.
|
|
||||||
# Determine if the legacy message if for a node or a device
|
|
||||||
nodeOrDev = None
|
|
||||||
isNode = self.assocExperiment and coreapi2.findNodeByIdx(self.assocExperiment,
|
|
||||||
nodeMsg.getNumber())
|
|
||||||
isDev = self.assocExperiment and coreapi2.findDeviceByIdx(self.assocExperiment,
|
|
||||||
nodeMsg.getNumber())
|
|
||||||
|
|
||||||
# If the node number in the message maps to a node or a device in the associated experiment,
|
|
||||||
# check if the message indicates a consistent type
|
|
||||||
if isNode and nodeMsg.getType() is not None and nodeMsg.getType() not in nodeTypesSet:
|
|
||||||
raise RuntimeError, "Inconsistent node types."
|
|
||||||
if isDev and nodeMsg.getType() is not None and nodeMsg.getType() not in deviceTypesSet:
|
|
||||||
raise RuntimeError, "Inconsistent device types."
|
|
||||||
|
|
||||||
if not isNode and not isDev and nodeMsg.getType() is not None:
|
|
||||||
isNode = nodeMsg.getType() in nodeTypesSet
|
|
||||||
isDev = nodeMsg.getType() in deviceTypesSet
|
|
||||||
|
|
||||||
# Add the node/device to either the experiment object in the collector for transmission as
|
|
||||||
# part of a API2 session/experiment, or to a new message for independent API2 Node or
|
|
||||||
# Device message transmission
|
|
||||||
if isNode:
|
|
||||||
# add or update an node
|
|
||||||
if self.collector:
|
|
||||||
nodeOrDev = coreapi2.getNodeByIdx(self.collector.experiment, nodeMsg.getNumber())
|
|
||||||
else:
|
|
||||||
nodeOrDev = newMsg.node
|
|
||||||
elif isDev:
|
|
||||||
# add or update a device
|
|
||||||
if self.collector:
|
|
||||||
nodeOrDev = coreapi2.getDeviceByIdx(self.collector.experiment, nodeMsg.getNumber())
|
|
||||||
else:
|
|
||||||
nodeOrDev = newMsg.device
|
|
||||||
else:
|
|
||||||
raise RuntimeError, "Unrecognized node number without type information"
|
|
||||||
|
|
||||||
if nodeOrDev:
|
|
||||||
nodeOrDev.idx = nodeMsg.getNumber()
|
|
||||||
if nodeMsg.getEmuid() is not None: nodeOrDev.emu_id=nodeMsg.getEmuid()
|
|
||||||
if nodeMsg.getName() is not None: nodeOrDev.name=nodeMsg.getName()
|
|
||||||
if nodeMsg.getXpos() is not None: nodeOrDev.location.x_pos=nodeMsg.getXpos()
|
|
||||||
if nodeMsg.getYpos() is not None: nodeOrDev.location.y_pos=nodeMsg.getYpos()
|
|
||||||
if nodeMsg.getIcon() is not None: nodeOrDev.icon=nodeMsg.getIcon()
|
|
||||||
if nodeMsg.getType() is not None:
|
|
||||||
try:
|
|
||||||
if isDev and devtypeDict.get(nodeMsg.getType()) is not None:
|
|
||||||
nodeOrDev.device_type = devtypeDict.get(nodeMsg.getType())
|
|
||||||
if emulationDict.get(nodeMsg.getType()) is not None:
|
|
||||||
nodeOrDev.emulation = emulationDict.get(nodeMsg.getType())
|
|
||||||
except e:
|
|
||||||
self.warn("Unmapped type in legacy node message")
|
|
||||||
|
|
||||||
# TODO: if nodeMsg.getCanvas() is not None: nodeOrDev.canvas=nodeMsg.getCanvas()
|
|
||||||
# TODO: association with networks
|
|
||||||
# TODO: services
|
|
||||||
|
|
||||||
if newMsg:
|
|
||||||
newMsg.purpose = coreapi2.MODIFY
|
|
||||||
api2msgs.append(coreapi2.pack(newMsg))
|
|
||||||
else:
|
|
||||||
self.warn("Received update for unknown node or device %d" % (nodeMsg.getNumber()))
|
|
||||||
|
|
||||||
|
|
||||||
def processLegacyLinkMsg(self, linkMsg, api2msgs):
|
|
||||||
'''
|
|
||||||
Intercept an outgoing legacy link message generated by the CORE daemon and generate the equivalent
|
|
||||||
API2 messages to send to the client
|
|
||||||
'''
|
|
||||||
|
|
||||||
if self.handler.debug:
|
|
||||||
print "LinkMessage"
|
|
||||||
print "\tn1number", linkMsg.getN1number()
|
|
||||||
print "\tn2number", linkMsg.getN2number()
|
|
||||||
print "\tdelay", linkMsg.getDelay()
|
|
||||||
print "\tbw", linkMsg.getBw()
|
|
||||||
print "\tper", linkMsg.getPer()
|
|
||||||
print "\tdup", linkMsg.getDup()
|
|
||||||
print "\tjitter", linkMsg.getJitter()
|
|
||||||
print "\tmer", linkMsg.getMer()
|
|
||||||
print "\tburst", linkMsg.getBurst()
|
|
||||||
print "\tsession", linkMsg.getSession()
|
|
||||||
print "\tmburst", linkMsg.getMburst()
|
|
||||||
print "\ttype", linkMsg.getType()
|
|
||||||
print "\tguiattr", linkMsg.getGuiattr()
|
|
||||||
print "\temuid", linkMsg.getEmuid()
|
|
||||||
print "\tnetid", linkMsg.getNetid()
|
|
||||||
print "\tkey", linkMsg.getKey()
|
|
||||||
print "\tif1num", linkMsg.getIf1num()
|
|
||||||
print "\tif1ip4", linkMsg.getIf1ip4()
|
|
||||||
print "\tif1ip4mask", linkMsg.getIf1ip4mask()
|
|
||||||
print "\tif1mac", linkMsg.getIf1mac()
|
|
||||||
print "\tif1ip6", linkMsg.getIf1ip6()
|
|
||||||
print "\tif1ip6mask", linkMsg.getIf1ip6mask()
|
|
||||||
print "\tif2num", linkMsg.getIf2num()
|
|
||||||
print "\tif2ip4", linkMsg.getIf2ip4()
|
|
||||||
print "\tif2ip4mask", linkMsg.getIf2ip4mask()
|
|
||||||
print "\tif2ip4mask", linkMsg.getIf2mac()
|
|
||||||
print "\tif2ip6", linkMsg.getIf2ip6()
|
|
||||||
print "\tif2ip6mask", linkMsg.getIf2ip6mask()
|
|
||||||
print "\topaque", linkMsg.getOpaque()
|
|
||||||
|
|
||||||
|
|
||||||
# When collecting information for a complete experment (i.e. when joining an experiment),
|
|
||||||
# add information from legacy Link messages to the experiment message being constructed.
|
|
||||||
# Otherwise, send as an independent Channel message.
|
|
||||||
newMsg = None
|
|
||||||
if not self.collector:
|
|
||||||
# TODO: Add code that will retrieve contextual information from the
|
|
||||||
# associated experiment. (See processLegacyNodeMsg)
|
|
||||||
# newMsg = coreapi2.CoreMessage()
|
|
||||||
# ....
|
|
||||||
return
|
|
||||||
|
|
||||||
|
|
||||||
# When collecting, a link message cannot be emitted by the CORE daemon
|
|
||||||
# prior to node messages. Thus, an experiment must have been created in
|
|
||||||
# the collector object, otherwise, we have a fault.
|
|
||||||
if not self.collector.experiment:
|
|
||||||
raise RuntimeError, 'Invalid collector'
|
|
||||||
|
|
||||||
if not self.collector.experiment.network:
|
|
||||||
self.collector.experiment.network.name = "default"
|
|
||||||
self.collector.experiment.network.idx = 1
|
|
||||||
|
|
||||||
|
|
||||||
# Endpoint 1
|
|
||||||
if coreapi2.findNodeByIdx(self.collector.experiment, linkMsg.getN1number()):
|
|
||||||
ep1 = coreapi2.getNodeInterfaceByIdx(self.collector.experiment,
|
|
||||||
linkMsg.getN1number(),
|
|
||||||
linkMsg.getIf1num())
|
|
||||||
else:
|
|
||||||
ep1 = coreapi2.getDeviceInterfaceByIdx(self.collector.experiment,
|
|
||||||
linkMsg.getN1number(),
|
|
||||||
linkMsg.getIf1num())
|
|
||||||
if linkMsg.getIf1ip4(): ep1.ip4_addr = linkMsg.getIf1ip4()
|
|
||||||
if linkMsg.getIf1ip4mask(): ep1.ip4_mask = linkMsg.getIf1ip4mask()
|
|
||||||
# TODO: Add IPv6 fields updates
|
|
||||||
|
|
||||||
# Endpoint 2
|
|
||||||
if coreapi2.findNodeByIdx(self.collector.experiment, linkMsg.getN2number()):
|
|
||||||
ep2 = coreapi2.getNodeInterfaceByIdx(self.collector.experiment,
|
|
||||||
linkMsg.getN2number(),
|
|
||||||
linkMsg.getIf2num())
|
|
||||||
else:
|
|
||||||
ep2 = coreapi2.getDeviceInterfaceByIdx(self.collector.experiment,
|
|
||||||
linkMsg.getN2number(),
|
|
||||||
linkMsg.getIf2num())
|
|
||||||
if linkMsg.getIf2ip4(): ep2.ip4_addr = linkMsg.getIf2ip4()
|
|
||||||
if linkMsg.getIf2ip4mask(): ep2.ip4_mask = linkMsg.getIf2ip4mask()
|
|
||||||
# TODO: Add IPv6 fields updates
|
|
||||||
|
|
||||||
# Capture updated link characteristics onto the Channel message
|
|
||||||
channel = coreapi2.getChannel(self.collector.network, ep1_interface, ep2_interface)
|
|
||||||
if linkMsg.getDelay() : channel.delay = linkMsg.getDelay()
|
|
||||||
if linkMsg.getBw(): channel.bandwidth = linkMsg.getBw()
|
|
||||||
if linkMsg.getPer(): channel.per = linkMsg.getPer()
|
|
||||||
if linkMsg.getDup(): channel.dups = linkMsg.getDup()
|
|
||||||
if linkMsg.getJitter(): channel.jitter = linkMsg.getJitter()
|
|
||||||
if linkMsg.getMer(): channel.mer = linkMsg.getMer()
|
|
||||||
if linkMsg.getBurst(): channel.burst = linkMsg.getBurst()
|
|
||||||
#TODO: Add remaining channel parameters
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def processApi2SessionMsg(self, message, purpose):
|
|
||||||
legacymsgs = []
|
|
||||||
if purpose == coreapi2.ADD:
|
|
||||||
if self.handler.debug:
|
|
||||||
self.info('Received ADD session request message')
|
|
||||||
|
|
||||||
legacymsgs.append(wrapper.RegMsg.instantiate(0, gui='true'))
|
|
||||||
return legacymsgs
|
|
||||||
# The response will be sent to the API2 client when a legacy session message is received from the daemon
|
|
||||||
elif purpose == coreapi2.MODIFY:
|
|
||||||
if self.handler.debug:
|
|
||||||
self.info('Received MODIFY session request message')
|
|
||||||
|
|
||||||
if message.HasField("experiment"):
|
|
||||||
exp = message.experiment
|
|
||||||
if exp.HasField("experimentId"):
|
|
||||||
expId = str(exp.experimentId)
|
|
||||||
response = coreapi2.CoreMessage()
|
|
||||||
response.experiment.experimentId = exp.experimentId;
|
|
||||||
response.purpose = purpose
|
|
||||||
with self.lock:
|
|
||||||
# Start a collector for nodes, devices and channels in the
|
|
||||||
self.collector = response
|
|
||||||
if expId.startswith('_'):
|
|
||||||
try:
|
|
||||||
legacySessNo = int(expId[1:])
|
|
||||||
if self.handler.debug:
|
|
||||||
self.info('request connection to session %d' % (legacySessNo))
|
|
||||||
msg = wrapper.SessionMsg.instantiate(
|
|
||||||
coreapi.CORE_API_ADD_FLAG | coreapi.CORE_API_STR_FLAG,
|
|
||||||
str(legacySessNo), nodecount="0")
|
|
||||||
legacymsgs.append(msg)
|
|
||||||
|
|
||||||
except Exception, e:
|
|
||||||
if self.handler.debug:
|
|
||||||
self.info("-"*60)
|
|
||||||
traceback.print_exc(file=sys.stdout)
|
|
||||||
self.info("-"*60)
|
|
||||||
raise e
|
|
||||||
else:
|
|
||||||
# TODO: get legacy session number from experimentId if running, or pass back
|
|
||||||
# non-running experiment components
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
self.warn("session modify request without an experimentId")
|
|
||||||
else:
|
|
||||||
self.warn("session modify request without an experiment")
|
|
||||||
|
|
||||||
return legacymsgs
|
|
||||||
elif purpose == coreapi2.DELETE:
|
|
||||||
legacymsgs.append(wrapper.ConfMsg.instantiate("all",
|
|
||||||
coreapi.CONF_TYPE_FLAGS_RESET))
|
|
||||||
# TODO: Remove experiment from dictionary
|
|
||||||
|
|
||||||
else:
|
|
||||||
self.warn('Received invalid purpose for SESSION')
|
|
||||||
|
|
||||||
|
|
||||||
def processApi2ExperimentMsg(self, exp, purpose):
|
|
||||||
if purpose == coreapi2.ADD:
|
|
||||||
if ExperimentStore.addExperiment(exp):
|
|
||||||
response = coreapi2.CoreMessage()
|
|
||||||
response.experiment.experimentId = exp.experimentId;
|
|
||||||
response.purpose = purpose
|
|
||||||
|
|
||||||
# Associate the newly added experiment with this bridge.
|
|
||||||
# Start a collector for gathering messages for nodes and links instantiated
|
|
||||||
# by the daemon
|
|
||||||
with self.lock:
|
|
||||||
if not self.collector:
|
|
||||||
self.assocExperiment = exp
|
|
||||||
self.collector = response
|
|
||||||
else:
|
|
||||||
raise RuntimeError, "Instantiation of experiment while another is active"
|
|
||||||
self.handler.request.sendall(coreapi2.pack(response))
|
|
||||||
return self.translateApi2ExperimentMsg(exp)
|
|
||||||
else:
|
|
||||||
return self.Api2Error("unable to add experiment")
|
|
||||||
elif purpose == coreapi2.MODIFY:
|
|
||||||
# Detect if a change in state is requested
|
|
||||||
if exp.HasField('running'):
|
|
||||||
if exp.running:
|
|
||||||
# TODO: Check for a state transition
|
|
||||||
# transition to instantiation state (legacy)
|
|
||||||
msgs = []
|
|
||||||
msgs.append(wrapper.EventMsg.instantiate(
|
|
||||||
legacy.CORE_EVENT_INSTANTIATION_STATE))
|
|
||||||
return msgs
|
|
||||||
else:
|
|
||||||
# TODO: Check for transition from running to not running
|
|
||||||
# transition to data collection state (legacy)
|
|
||||||
msgs = []
|
|
||||||
msgs.append(wrapper.EventMsg.instantiate(
|
|
||||||
legacy.CORE_EVENT_DATACOLLECT_STATE))
|
|
||||||
return msgs
|
|
||||||
else:
|
|
||||||
self.warn("Unsupported experiment modification received")
|
|
||||||
|
|
||||||
|
|
||||||
def translateApi2ExperimentMsg(self, message):
|
|
||||||
if self.handler.debug:
|
|
||||||
self.info('Received experiment message')
|
|
||||||
msgs = []
|
|
||||||
# Flag need to be 0 otherwise CORE will not enter runtime state (per JavaAdaptor, need verification)
|
|
||||||
msgs.append(wrapper.SessionMsg.instantiate(
|
|
||||||
0, "0",
|
|
||||||
nodecount=str(len(message.nodes) + len(message.devices))))
|
|
||||||
# Quickly transition through the definition and configuration states
|
|
||||||
msgs.append(wrapper.EventMsg.instantiate(
|
|
||||||
legacy.CORE_EVENT_DEFINITION_STATE))
|
|
||||||
msgs.append(wrapper.EventMsg.instantiate(
|
|
||||||
legacy.CORE_EVENT_CONFIGURATION_STATE))
|
|
||||||
|
|
||||||
# Send location
|
|
||||||
# TODO: Add this info to the Experiment
|
|
||||||
msgs.append(wrapper.ConfMsg.instantiate(obj="location",
|
|
||||||
dataTypes=(9,9,9,9,9,9),
|
|
||||||
dataValues='0|0| 47.5766974863|-122.125920191|0.0|150.0'))
|
|
||||||
|
|
||||||
# TODO
|
|
||||||
# Send control net configuration
|
|
||||||
# send node types
|
|
||||||
# send services
|
|
||||||
|
|
||||||
# send nodes
|
|
||||||
devices = {}
|
|
||||||
for node in message.nodes:
|
|
||||||
if node.idx in devices:
|
|
||||||
raise IOError, "received experiment with node/device duplicates"
|
|
||||||
devices[node.idx] = node
|
|
||||||
# TODO: Add other fields
|
|
||||||
msgs.append(wrapper.NodeMsg.instantiate(
|
|
||||||
legacy.CORE_API_ADD_FLAG|legacy.CORE_API_STR_FLAG,
|
|
||||||
node.idx,
|
|
||||||
str(node.name)))
|
|
||||||
|
|
||||||
for device in message.devices:
|
|
||||||
if device.idx in devices:
|
|
||||||
raise IOError, "received experiment with node/device duplicates"
|
|
||||||
devices[device.idx] = device
|
|
||||||
# TODO: Add other fields
|
|
||||||
msgs.append(wrapper.NodeMsg.instantiate(
|
|
||||||
legacy.CORE_API_ADD_FLAG|legacy.CORE_API_STR_FLAG,
|
|
||||||
device.idx,
|
|
||||||
str(device.name),
|
|
||||||
type = legacy.CORE_NODE_SWITCH)) # TODO: Update this later
|
|
||||||
|
|
||||||
for network in message.networks:
|
|
||||||
for channel in network.channels:
|
|
||||||
if len(channel.endpoints) == 2:
|
|
||||||
ep0 = channel.endpoints[0]
|
|
||||||
ep1 = channel.endpoints[1]
|
|
||||||
if ep0.dev_idx not in devices or ep1.dev_idx not in devices:
|
|
||||||
raise IOError, "received channel message with invalid first endpoint device (%d)" % (ep0.dev_idx)
|
|
||||||
if ep1.dev_idx not in devices:
|
|
||||||
raise IOError, "received channel message with invalid second endpoint device (%d)" % (ep1.dev_idx)
|
|
||||||
if ep0.intf_idx in devices[ep0.dev_idx].interfaces:
|
|
||||||
raise IOError, "received channel message with invalid first endpoint interface (%d)" % (ep0.intf_idx)
|
|
||||||
if ep1.intf_idx in devices[ep1.dev_idx].interfaces:
|
|
||||||
raise IOError, "received channel message with invalid second endpoint interface (%d)" % (ep1.intf_idx)
|
|
||||||
|
|
||||||
if0 = devices[ep0.dev_idx].interfaces[ep0.intf_idx]
|
|
||||||
if1 = devices[ep1.dev_idx].interfaces[ep1.intf_idx]
|
|
||||||
|
|
||||||
msgs.append(wrapper.LinkMsg.instantiate(legacy.CORE_API_ADD_FLAG,
|
|
||||||
ep0.dev_idx,ep0.intf_idx,
|
|
||||||
ep1.dev_idx,ep1.intf_idx,
|
|
||||||
if1ip4=if0.ip4_addr if if0.HasField("ip4_addr") else None,
|
|
||||||
if2ip4=if1.ip4_addr if if1.HasField("ip4_addr") else None))
|
|
||||||
|
|
||||||
# TODO
|
|
||||||
# send metadata
|
|
||||||
|
|
||||||
|
|
||||||
# Finally, set the new experiment ID in the legacy core session as metadata
|
|
||||||
# TODO: Append this to the end of metadata above
|
|
||||||
msgs.append(wrapper.ConfMsg.instantiate("metadata",
|
|
||||||
dataTypes = (coreapi.CONF_DATA_TYPE_STRING,),
|
|
||||||
dataValues = "experimentId=%s" % (str(message.experimentId))))
|
|
||||||
|
|
||||||
return msgs
|
|
||||||
|
|
||||||
|
|
||||||
def processApi2Event(self, event, purpose):
|
|
||||||
if self.debug:
|
|
||||||
self.info('Received event')
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -62,4 +62,4 @@ emane_models = RfPipe, Ieee80211abg, CommEffect, Bypass
|
||||||
#emane_log_level = 2
|
#emane_log_level = 2
|
||||||
emane_realtime = True
|
emane_realtime = True
|
||||||
|
|
||||||
api2port = 12222
|
aux_request_handler = core.addons.api2.CoreApi2RequestHandler:12222
|
||||||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue