separated legacy API wrapper. added ipv4 addresses to interfaces

daemon/core/api/corewrapper.py

@@ -0,0 +1,592 @@
+#
+# CORE API 1.0 Wrapper
+# Copyright (c)2016 the Boeing Company.
+# See the LICENSE file included in this distribution.
+#
+# author: Changzhou Wang
+#         Rod Santiago
+#
+
+import socket
+from core.api.coreapi import *
+from core.misc.ipaddr import *
+
+'''
+Convenience wrappers on the CORE TLV based API classes
+TODO: handle exceptions
+'''
+
+
+CORE_IFACE_STATE_UP = 0
+CORE_IFACE_STATE_DOWN = 1
+
+
+
+class CoreMessageParser(object):
+    def __init__(self, msgstr):
+        self.msgtype, self.msgflags, self.msglen = CoreMessage.unpackhdr(msgstr)
+        self.hdr = msgstr[0:CoreMessage.hdrsiz]
+        self.data = msgstr[CoreMessage.hdrsiz:]
+
+    def getType(self):
+        return self.msgtype
+
+    def getFlags(self):
+        return self.msgflags
+
+    def createWrapper(self):
+        global msgwrappermap
+        return msgwrappermap[self.msgtype](self.msgflags, self.hdr, self.data)
+
+    
+class NodeMsg(CoreNodeMessage):
+                    
+    @staticmethod
+    def instantiate(flags, number, name=None, type=CORE_NODE_DEF, model=None, \
+                    emusrv=None, session=None, emuid=-1, netid=-1, services=None, \
+                    ipaddr=None, macaddr=None, ip6addr=None, \
+                    xpos=-1, ypos=-1, canvas=-1, \
+                    lat=None, long=None, alt=None, icon=None, opaque=None):
+        tlvdata = CoreNodeTlv.pack(CORE_TLV_NODE_NUMBER,number)
+        tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_TYPE,type)
+        if name is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_NAME,name)
+        if ipaddr is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_IPADDR,IPAddr(AF_INET, socket.inet_aton(ipaddr)))
+        if macaddr is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_MACADDR,MacAddr.fromstring(macaddr))
+        if ip6addr is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_IP6ADDR,IPAddr(AF_INET6, ip6addr))
+        if model is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_MODEL,model)
+        if emusrv is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_EMUSRV,emusrv)
+        if session is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_SESSION,session)
+        if xpos >= 0:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_XPOS,xpos)
+        if ypos >= 0:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_YPOS,ypos)
+        if canvas >= 0:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_CANVAS,canvas)
+       # if emuid >= 0:
+        tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_EMUID,number)
+        if netid >= 0:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_NETID,netid)
+        if services is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_SERVICES,services)
+        if lat is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_LAT,lat)
+        if long is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_LONG,long)
+        if alt is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_ALT,alt)
+        if icon is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_ICON,icon)
+        if opaque is not None:
+            tlvdata = tlvdata + CoreNodeTlv.pack(CORE_TLV_NODE_OPAQUE,opaque)
+        hdr = struct.pack(CoreMessage.hdrfmt, CoreNodeMessage.msgtype, flags, len(tlvdata))
+        return CoreNodeMessage(flags, hdr, tlvdata)
+
+
+    def getNumber(self):
+        return self.gettlv(CORE_TLV_NODE_NUMBER)
+    def getType(self):
+        return self.gettlv(CORE_TLV_NODE_TYPE)
+    def getName(self):
+        return self.gettlv(CORE_TLV_NODE_NAME)
+    def getIpaddr(self):
+        return self.gettlv(CORE_TLV_NODE_IPADDR)
+    def getMacaddr(self):
+        return self.gettlv(CORE_TLV_NODE_MACADDR)
+    def getIp6addr(self):
+        return self.gettlv(CORE_TLV_NODE_IP6ADDR)
+    def getModel(self):
+        return self.gettlv(CORE_TLV_NODE_MODEL)
+    def getEmusrv(self):
+        return self.gettlv(CORE_TLV_NODE_EMUSRV)
+    def getSession(self):
+        return self.gettlv(CORE_TLV_NODE_SESSION)
+    def getXpos(self):
+        return self.gettlv(CORE_TLV_NODE_XPOS)
+    def getYpos(self):
+        return self.gettlv(CORE_TLV_NODE_YPOS)
+    def getCanvas(self):
+        return self.gettlv(CORE_TLV_NODE_CANVAS)
+    def getEmuid(self):
+        return self.gettlv(CORE_TLV_NODE_EMUID)
+    def getNetid(self):
+        return self.gettlv(CORE_TLV_NODE_NETID)
+    def getServices(self):
+        return self.gettlv(CORE_TLV_NODE_SERVICES)
+    def getLat(self):
+        return self.gettlv(CORE_TLV_NODE_LAT)
+    def getLong(self):
+        return self.gettlv(CORE_TLV_NODE_LONG)
+    def getAlt(self):
+        return self.gettlv(CORE_TLV_NODE_ALT)
+    def getIcon(self):
+        return self.gettlv(CORE_TLV_NODE_ICON)
+    def getOpaque(self):
+        return self.gettlv(CORE_TLV_NODE_OPAQUE)
+
+class LinkMsg(CoreLinkMessage):
+
+    @staticmethod
+    def instantiate(flags, n1number, if1num, n2number, if2num, 
+                    delay=0, bw=0, per=None, dup=None, jitter=0, mer=0, burst=0, mburst=0, 
+                    session=None, type=CORE_LINK_WIRED, guiattr=None, 
+                    emuid=-1, netid=-1, key=-1, 
+                    if1ip4=None, if1ip4mask=24, if1mac=None, if1ip6=None, if1ip6mask=64, 
+                    if2ip4=None, if2ip4mask=24, if2mac=None, if2ip6=None, if2ip6mask=64, 
+                    opaque=None):
+        tlvdata = CoreLinkTlv.pack(CORE_TLV_LINK_N1NUMBER,n1number)
+        tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_N2NUMBER,n2number)
+        # TODO: do we need to set delay, bw, per, dup for default values (as in api.tcl)?
+        tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_DELAY,delay)
+        tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_BW,bw)
+        if per is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_PER,per)
+        if dup is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_DUP,dup)
+        if jitter > 0:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_JITTER,jitter)
+        if mer > 0:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_MER,mer)
+        if burst > 0:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_BURST,burst)
+        if mburst > 0:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_MBURST,mburst)
+        if session is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_SESSION,session)
+        tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_TYPE,type)
+        if guiattr is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_GUIATTR,guiattr)
+        if emuid >= 0:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_EMUID,emuid)
+        if netid >= 0:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_NETID,netid)
+        if key >= 0:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_KEY,key)
+        if if1num > -2:
+        	tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF1NUM,if1num)
+        if if1ip4 is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF1IP4,IPAddr(AF_INET, socket.inet_aton(if1ip4)))
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF1IP4MASK,if1ip4mask)
+        if if1mac is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF1MAC,MacAddr.fromstring(if1mac))
+        if if1ip6 is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF1IP6,IPAddr(AF_INET6, socket.inet_pton(AF_INET6,if1ip6)))
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF1IP6MASK,if1ip6mask)
+        if if2num > -2:
+        	tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF2NUM,if2num)
+        if if2ip4 is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF2IP4,IPAddr(AF_INET, socket.inet_aton(if2ip4)))
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF2IP4MASK,if2ip4mask)
+        if if2mac is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF2MAC,MacAddr.fromstring(if2mac))
+        if if2ip6 is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF2IP6,IPAddr(AF_INET6, socket.inet_pton(AF_INET6,if2ip6)))
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_IF2IP6MASK,if2ip6mask)
+        if opaque is not None:
+            tlvdata = tlvdata + CoreLinkTlv.pack(CORE_TLV_LINK_OPAQUE,opaque)
+
+        hdr = struct.pack(CoreMessage.hdrfmt, CoreLinkMessage.msgtype, flags, len(tlvdata))
+        return CoreLinkMessage(flags, hdr, tlvdata)
+
+
+
+    def getN1number(self):
+        return self.gettlv(CORE_TLV_LINK_N1NUMBER)
+    def getN2number(self):
+        return self.gettlv(CORE_TLV_LINK_N2NUMBER)
+    def getDelay(self):
+        return self.gettlv(CORE_TLV_LINK_DELAY)
+    def getBw(self):
+        return self.gettlv(CORE_TLV_LINK_BW)
+    def getPer(self):
+        return self.gettlv(CORE_TLV_LINK_PER)
+    def getDup(self):
+        return self.gettlv(CORE_TLV_LINK_DUP)
+    def getJitter(self):
+        return self.gettlv(CORE_TLV_LINK_JITTER)
+    def getMer(self):
+        return self.gettlv(CORE_TLV_LINK_MER)
+    def getBurst(self):
+        return self.gettlv(CORE_TLV_LINK_BURST)
+    def getSession(self):
+        return self.gettlv(CORE_TLV_LINK_SESSION)
+    def getMburst(self):
+        return self.gettlv(CORE_TLV_LINK_MBURST)
+    def getType(self):
+        return self.gettlv(CORE_TLV_LINK_TYPE)
+    def getGuiattr(self):
+        return self.gettlv(CORE_TLV_LINK_GUIATTR)
+    def getEmuid(self):
+        return self.gettlv(CORE_TLV_LINK_EMUID)
+    def getNetid(self):
+        return self.gettlv(CORE_TLV_LINK_NETID)
+    def getKey(self):
+        return self.gettlv(CORE_TLV_LINK_KEY)
+    def getIf1num(self):
+        return self.gettlv(CORE_TLV_LINK_IF1NUM)
+    def getIf1ip4(self):
+        return self.gettlv(CORE_TLV_LINK_IF1IP4)
+    def getIf1ip4mask(self):
+        return self.gettlv(CORE_TLV_LINK_IF1IP4MASK)
+    def getIf1mac(self):
+        return self.gettlv(CORE_TLV_LINK_IF1MAC)
+    def getIf1ip6(self):
+        return self.gettlv(CORE_TLV_LINK_IF1IP6)
+    def getIf1ip6mask(self):
+        return self.gettlv(CORE_TLV_LINK_IF1IP6MASK)
+    def getIf2num(self):
+        return self.gettlv(CORE_TLV_LINK_IF2NUM)
+    def getIf2ip4(self):
+        return self.gettlv(CORE_TLV_LINK_IF2IP4)
+    def getIf2ip4mask(self):
+        return self.gettlv(CORE_TLV_LINK_IF2IP4MASK)
+    def getIf2mac(self):
+        return self.gettlv(CORE_TLV_LINK_IF2MAC)
+    def getIf2ip6(self):
+        return self.gettlv(CORE_TLV_LINK_IF2IP6)
+    def getIf2ip6mask(self):
+        return self.gettlv(CORE_TLV_LINK_IF2IP6MASK)
+    def getOpaque(self):
+        return self.gettlv(CORE_TLV_LINK_OPAQUE)
+        
+class ExecMsg(CoreExecMessage):
+    def getNode(self):
+        return self.gettlv(CORE_TLV_EXEC_NODE)
+    def getNum(self):
+        return self.gettlv(CORE_TLV_EXEC_NUM)
+    def getTime(self):
+        return self.gettlv(CORE_TLV_EXEC_TIME)
+    def getCmd(self):
+        return self.gettlv(CORE_TLV_EXEC_CMD)
+    def getResult(self):
+        return self.gettlv(CORE_TLV_EXEC_RESULT)
+    def getStatus(self):
+        return self.gettlv(CORE_TLV_EXEC_STATUS)
+    def getSession(self):
+        return self.gettlv(CORE_TLV_EXEC_SESSION)
+
+class RegMsg(CoreRegMessage):
+    #
+    # Overrides of CoreMessage methods to account for multiple values per key in 
+    # RegisterMessages. 
+    #
+
+    def addtlvdata(self, k, v):
+        ''' Append the value 'v' to list of values corresponding to key 'k'
+        '''
+        if k in self.tlvdata:
+            self.tlvdata[k].append(v)
+        else:
+            self.tlvdata[k] = [v]
+
+    def gettlv(self, tlvtype, idx=0):
+        if tlvtype in self.tlvdata:
+            return self.tlvdata[tlvtype][idx]
+        else:
+            return None
+
+    def packtlvdata(self):
+        ''' Return packed TLV data as in CoreMessage. Account for multiple values per key.
+        '''
+        tlvdata = ""
+        keys = sorted(self.tlvdata.keys())
+        for k in keys:
+            for v in self.tlvdata[k]:
+                tlvdata += self.tlvcls.pack(k, v)
+        return tlvdata
+
+    def __str__(self):
+        tmp = "%s <msgtype = %s, flags = %s>" % \
+              (self.__class__.__name__, self.typestr(), self.flagstr())
+        for k, m in self.tlvdata.iteritems():
+            if k in self.tlvcls.tlvtypemap:
+                tlvtype = self.tlvcls.tlvtypemap[k]
+            else:
+                tlvtype = "tlv type %s" % k
+            tmp += "\n  %s: " % tlvtype
+            for v in m:
+                tmp += "%s " % v
+        return tmp
+
+    @staticmethod
+    def instantiate(flags, wireless=None, mobility=None, utility=None, execsrv=None, 
+                    gui=None, emulsrv=None, session=None):
+        tlvdata = ""
+        if wireless is not None:
+            tlvdata = tlvdata + CoreRegTlv.pack(CORE_TLV_REG_WIRELESS,wireless)
+        if mobility is not None:
+            tlvdata = tlvdata + CoreRegTlv.pack(CORE_TLV_REG_MOBILITY,mobility)
+        if utility is not None:
+            tlvdata = tlvdata + CoreRegTlv.pack(CORE_TLV_REG_UTILITY,utility)
+        if execsrv is not None:
+            tlvdata = tlvdata + CoreRegTlv.pack(CORE_TLV_REG_EXECSRV,execsrv)
+        if gui is not None:
+            tlvdata = tlvdata + CoreRegTlv.pack(CORE_TLV_REG_GUI,gui)
+        if emulsrv is not None:
+            tlvdata = tlvdata + CoreRegTlv.pack(CORE_TLV_REG_EMULSRV,emulsrv)
+        if session is not None:
+            tlvdata = tlvdata + CoreRegTlv.pack(CORE_TLV_REG_SESSION,session)
+        hdr = struct.pack(CoreMessage.hdrfmt, CoreRegMessage.msgtype, flags, len(tlvdata))
+        return CoreRegMessage(flags, hdr, tlvdata)
+
+
+    def getWireless(self):
+        return self.gettlv(CORE_TLV_REG_WIRELESS)
+    def getMobility(self):
+        return self.gettlv(CORE_TLV_REG_MOBILITY)
+    def getUtility(self):
+        return self.gettlv(CORE_TLV_REG_UTILITY)
+    def getExecsrv(self):
+        return self.gettlv(CORE_TLV_REG_EXECSRV)
+    def getGui(self):
+        return self.gettlv(CORE_TLV_REG_GUI)
+    def getEmulsrv(self):
+        return self.gettlv(CORE_TLV_REG_EMULSRV)
+    def getSession(self):
+        return self.gettlv(CORE_TLV_REG_SESSION)
+
+class ConfMsg(CoreConfMessage):
+
+    @staticmethod
+    def instantiate(obj, type=CONF_TYPE_FLAGS_NONE, node=-1, netid=-1, session=None, \
+                    dataTypes=None, dataValues=None, possibleValues=None, valueGroups=None, \
+                    captions=None, bitmap=None, opaque=None):
+        tlvdata = CoreConfTlv.pack(CORE_TLV_CONF_OBJ,obj)
+        if type != CONF_TYPE_FLAGS_NONE:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_TYPE,type)
+        if node >= 0:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_NODE,node)
+        if dataTypes is not None:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_DATA_TYPES,dataTypes)
+        if dataValues is not None:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_VALUES,dataValues)
+        if captions is not None:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_CAPTIONS,captions)
+        if bitmap is not None:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_BITMAP,bitmap)
+        if possibleValues is not None:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_POSSIBLE_VALUES,possibleValues)
+        if valueGroups is not None:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_GROUPS,valueGroups)
+        if session is not None:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_SESSION,session)
+        if netid >= 0:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_NETID,netid)
+        if opaque is not None:
+            tlvdata = tlvdata + CoreConfTlv.pack(CORE_TLV_CONF_OPAQUE,opaque)
+        hdr = struct.pack(CoreMessage.hdrfmt, CoreConfMessage.msgtype, 0, len(tlvdata))
+        return CoreConfMessage(0, hdr, tlvdata)
+
+
+
+    def getNode(self):
+        return self.gettlv(CORE_TLV_CONF_NODE)
+    def getObj(self):
+        return self.gettlv(CORE_TLV_CONF_OBJ)
+    def getType(self):
+        return self.gettlv(CORE_TLV_CONF_TYPE)
+    def getData(self):
+        return self.gettlv(CORE_TLV_CONF_DATA_TYPES)
+    def getValues(self):
+        return self.gettlv(CORE_TLV_CONF_VALUES)
+    def getCaptions(self):
+        return self.gettlv(CORE_TLV_CONF_CAPTIONS)
+    def getBitmap(self):
+        return self.gettlv(CORE_TLV_CONF_BITMAP)
+    def getPossible(self):
+        return self.gettlv(CORE_TLV_CONF_POSSIBLE_VALUES)
+    def getGroups(self):
+        return self.gettlv(CORE_TLV_CONF_GROUPS)
+    def getSession(self):
+        return self.gettlv(CORE_TLV_CONF_SESSION)
+    def getNetid(self):
+        return self.gettlv(CORE_TLV_CONF_NETID)
+    def getOpaque(self):
+        return self.gettlv(CORE_TLV_CONF_OPAQUE)
+
+class FileMsg(CoreFileMessage):
+    def getNode(self):
+        return self.gettlv(CORE_TLV_FILE_NODE)
+    def getName(self):
+        return self.gettlv(CORE_TLV_FILE_NAME)
+    def getMode(self):
+        return self.gettlv(CORE_TLV_FILE_MODE)
+    def getNum(self):
+        return self.gettlv(CORE_TLV_FILE_NUM)
+    def getType(self):
+        return self.gettlv(CORE_TLV_FILE_TYPE)
+    def getSrcname(self):
+        return self.gettlv(CORE_TLV_FILE_SRCNAME)
+    def getSession(self):
+        return self.gettlv(CORE_TLV_FILE_SESSION)
+    def getData(self):
+        return self.gettlv(CORE_TLV_FILE_DATA)
+    def getCmpdata(self):
+        return self.gettlv(CORE_TLV_FILE_CMPDATA)
+
+class IfaceMsg(CoreIfaceMessage):
+
+    @staticmethod
+    def instantiate(flags, node, num, type=CORE_LINK_WIRED, state=CORE_IFACE_STATE_UP, name=None, 
+                    ip4=None, ip4mask=24, mac=None, ip6=None, ip6mask=64,
+                    session=None, emuid=-1, netid=-1):
+        tlvdata = CoreIfaceTlv.pack(CORE_TLV_IFACE_NODE,node)
+        tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_NUM,num)
+        if name is not None:
+            tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_NAME,name)
+        if ip4 is not None:
+            tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_IPADDR,IPAddr(AF_INET, socket.inet_aton(ip4)))
+            tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_MASK,ip4mask)
+        if mac is not None:
+            tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_MACADDR,MacAddr.fromstring(if1mac))
+        if ip6 is not None:
+            tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_IP6ADDR,IPAddr(AF_INET6, ip6))
+            tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_IP6MASK,ip6mask)
+        tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_TYPE,type)
+        if session is not None:
+            tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_SESSION,session)
+        tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_STATE,state)
+        if emuid >= 0:
+            tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_EMUID,emuid)
+        if netid >= 0:
+            tlvdata = tlvdata + CoreIfaceTlv.pack(CORE_TLV_IFACE_NETID,netid)
+
+        hdr = struct.pack(CoreMessage.hdrfmt, CoreIfaceMessage.msgtype, 0, len(tlvdata))
+        return CoreIfaceMessage(0, hdr, tlvdata)
+
+
+
+    def getNode(self):
+        return self.gettlv(CORE_TLV_IFACE_NODE)
+    def getNum(self):
+        return self.gettlv(CORE_TLV_IFACE_NUM)
+    def getName(self):
+        return self.gettlv(CORE_TLV_IFACE_NAME)
+    def getIpaddr(self):
+        return self.gettlv(CORE_TLV_IFACE_IPADDR)
+    def getMask(self):
+        return self.gettlv(CORE_TLV_IFACE_MASK)
+    def getMacaddr(self):
+        return self.gettlv(CORE_TLV_IFACE_MACADDR)
+    def getIp6addr(self):
+        return self.gettlv(CORE_TLV_IFACE_IP6ADDR)
+    def getIp6mask(self):
+        return self.gettlv(CORE_TLV_IFACE_IP6MASK)
+    def getType(self):
+        return self.gettlv(CORE_TLV_IFACE_TYPE)
+    def getSession(self):
+        return self.gettlv(CORE_TLV_IFACE_SESSION)
+    def getState(self):
+        return self.gettlv(CORE_TLV_IFACE_STATE)
+    def getEmuid(self):
+        return self.gettlv(CORE_TLV_IFACE_EMUID)
+    def getNetid(self):
+        return self.gettlv(CORE_TLV_IFACE_NETID)
+
+class EventMsg(CoreEventMessage):
+
+    @staticmethod
+    def instantiate(type, flags=0, nodenum=-1, name=None, data=None, session=None):
+        tlvdata = CoreEventTlv.pack(CORE_TLV_EVENT_TYPE, type)
+        if nodenum >= 0:
+            tlvdata = tlvdata + CoreEventTlv.pack(CORE_TLV_EVENT_NODE, nodenum)
+        if name is not None:
+            tlvdata = tlvdata + CoreEventTlv.pack(CORE_TLV_EVENT_NAME, name)
+        if data is not None:
+            tlvdata = tlvdata + CoreEventTlv.pack(CORE_TLV_EVENT_DATA, data)
+        if session is not None:
+            tlvdata = tlvdata + CoreEventTlv.pack(CORE_TLV_EVENT_SESSION, session)
+        hdr = struct.pack(CoreMessage.hdrfmt, CoreEventMessage.msgtype, flags, len(tlvdata))
+        return CoreEventMessage(flags, hdr, tlvdata)
+
+    def getNode(self):
+        return self.gettlv(CORE_TLV_EVENT_NODE)
+    def getType(self):
+        return self.gettlv(CORE_TLV_EVENT_TYPE)
+    def getName(self):
+        return self.gettlv(CORE_TLV_EVENT_NAME)
+    def getData(self):
+        return self.gettlv(CORE_TLV_EVENT_DATA)
+    def getTime(self):
+        return self.gettlv(CORE_TLV_EVENT_TIME)
+    def getSession(self):
+        return self.gettlv(CORE_TLV_EVENT_SESSION)
+
+class SessionMsg(CoreSessionMessage):
+
+    @staticmethod
+    def instantiate(flags, number, name=None, file=None, nodecount=None, thumb=None, user=None, opaque=None):
+        tlvdata = CoreSessionTlv.pack(CORE_TLV_SESS_NUMBER,number)
+        if name is not None:
+            tlvdata = tlvdata + CoreSessionTlv.pack(CORE_TLV_SESS_NAME,name)
+        if file is not None:
+            tlvdata = tlvdata + CoreSessionTlv.pack(CORE_TLV_SESS_FILE,file)
+        if nodecount is not None: # CORE API expects a string, which can be a list of node numbers
+            tlvdata = tlvdata + CoreSessionTlv.pack(CORE_TLV_SESS_NODECOUNT,nodecount)
+        if thumb is not None:
+            tlvdata = tlvdata + CoreSessionTlv.pack(CORE_TLV_SESS_THUMB,thumb)
+        if user is not None:
+            tlvdata = tlvdata + CoreSessionTlv.pack(CORE_TLV_SESS_USER,user)
+        if opaque is not None:
+            tlvdata = tlvdata + CoreSessionTlv.pack(CORE_TLV_SESS_OPAQUE,opaque)
+        hdr = struct.pack(CoreMessage.hdrfmt, CoreSessionMessage.msgtype, flags, len(tlvdata))
+        return CoreSessionMessage(flags, hdr, tlvdata)
+
+
+    def getNumber(self):
+        return self.gettlv(CORE_TLV_SESS_NUMBER)
+    def getName(self):
+        return self.gettlv(CORE_TLV_SESS_NAME)
+    def getFile(self):
+        return self.gettlv(CORE_TLV_SESS_FILE)
+    def getNodecount(self):
+        return self.gettlv(CORE_TLV_SESS_NODECOUNT)
+    def getDate(self):
+        return self.gettlv(CORE_TLV_SESS_DATE)
+    def getThumb(self):
+        return self.gettlv(CORE_TLV_SESS_THUMB)
+    def getUser(self):
+        return self.gettlv(CORE_TLV_SESS_USER)
+    def getOpaque(self):
+        return self.gettlv(CORE_TLV_SESS_OPAQUE)
+
+class ExceptionMsg(CoreExceptionMessage):
+    def getNode(self):
+        return self.gettlv(CORE_TLV_EXCP_NODE)
+    def getSession(self):
+        return self.gettlv(CORE_TLV_EXCP_SESSION)
+    def getLevel(self):
+        return self.gettlv(CORE_TLV_EXCP_LEVEL)
+    def getSource(self):
+        return self.gettlv(CORE_TLV_EXCP_SOURCE)
+    def getDate(self):
+        return self.gettlv(CORE_TLV_EXCP_DATE)
+    def getText(self):
+        return self.gettlv(CORE_TLV_EXCP_TEXT)
+    def getOpaque(self):
+        return self.gettlv(CORE_TLV_EXCP_OPAQUE)
+
+class UnknownMsg(CoreMessage):
+    "No method"
+    pass
+
+msgwrappermap = {
+    CORE_API_NODE_MSG: NodeMsg,
+    CORE_API_LINK_MSG: LinkMsg,
+    CORE_API_EXEC_MSG: ExecMsg,
+    CORE_API_REG_MSG:  RegMsg,
+    CORE_API_CONF_MSG: ConfMsg,
+    CORE_API_FILE_MSG: FileMsg,
+    CORE_API_IFACE_MSG:IfaceMsg,
+    CORE_API_EVENT_MSG:EventMsg,
+    CORE_API_SESS_MSG: SessionMsg,
+    CORE_API_EXCP_MSG: ExceptionMsg,
+}
+
+