fixed renaming issue with sessionid to session_id

daemon/core/api/coreapi.py

@@ -23,7 +23,7 @@ from core.enumerations import MessageTypes
 from core.enumerations import NodeTlvs
 from core.enumerations import RegisterTlvs
 from core.enumerations import SessionTlvs
-from core.misc import log
+from core.misc import log, structutils
 from core.misc.ipaddress import IpAddress
 from core.misc.ipaddress import MacAddress
 
@@ -692,6 +692,13 @@ class CoreMessage(object):
         message_type, message_flags, message_len = struct.unpack(cls.header_format, data[:cls.header_len])
         return message_type, message_flags, message_len
 
+    @classmethod
+    def create(cls, flags, values):
+        tlv_data = structutils.pack_values(cls.tlv_class, values)
+        packed = cls.pack(flags, tlv_data)
+        header_data = packed[:cls.header_len]
+        return cls(flags, header_data, tlv_data)
+
     @classmethod
     def pack(cls, message_flags, tlv_data):
         """

daemon/core/bsd/vnet.py

@@ -30,7 +30,7 @@ class NetgraphNet(PyCoreNet):
         if policy is not None:
             self.policy = policy
         self.name = name
-        self.ngname = "n_%s_%s" % (str(self.objid), self.session.sessionid)
+        self.ngname = "n_%s_%s" % (str(self.objid), self.session.session_id)
         self.ngid = None
         self.verbose = verbose
         self._netif = {}

daemon/core/netns/vnet.py

@@ -602,7 +602,7 @@ class GreTapBridge(LxBrNet):
         LxBrNet.__init__(self, session=session, objid=objid, name=name, policy=policy, start=False)
         self.grekey = key
         if self.grekey is None:
-            self.grekey = self.session.sessionid ^ self.objid
+            self.grekey = self.session.session_id ^ self.objid
         self.localnum = None
         self.remotenum = None
         self.remoteip = remoteip

daemon/core/xen/xen.py

@@ -152,7 +152,7 @@ class XenNode(PyCoreNode):
         self.lock = threading.RLock()
         self._netif = {}
         # domU name
-        self.vmname = "c" + str(session.sessionid) + "-" + name
+        self.vmname = "c" + str(session.session_id) + "-" + name
         # LVM volume group name
         self.vgname = self.getconfigitem('vg_name', vgname)
         # LVM logical volume name