daemon: Remove tracking remote node boot status.

The instantiation-complete status of remote servers should indicate
when all nodes are running.

daemon/core/broker.py

@@ -71,7 +71,6 @@ class CoreBroker(ConfigurableManager):
         self.nodemap_lock = threading.Lock()
         # reference counts of nodes on servers
         self.nodecounts = {}
-        self.bootcount = 0
         # set of node numbers that are link-layer nodes (networks)
         self.nets = set()
         # set of node numbers that are PhysicalNode nodes
@@ -117,7 +116,6 @@ class CoreBroker(ConfigurableManager):
             if count < 1:
                 self.delserver(server)
         self.nodecounts.clear()
-        self.bootcount = 0
         self.nodemap_lock.release()
         self.nets.clear()
         self.phys.clear()
@@ -197,12 +195,6 @@ class CoreBroker(ConfigurableManager):
                 nodenum = msg.gettlv(coreapi.CORE_TLV_NODE_NUMBER)
                 if nodenum is not None:
                     count = self.delnodemap(server, nodenum)
-            # snoop node add response to increment booted node count
-            # (only CoreNodes send these response messages)
-            elif msgflags & \
-                (coreapi.CORE_API_ADD_FLAG | coreapi.CORE_API_LOC_FLAG):
-                self.incrbootcount()
-                self.session.checkruntime()
         elif msgtype == coreapi.CORE_API_LINK_MSG:
             # this allows green link lines for remote WLANs
             msg = coreapi.CoreLinkMessage(msgflags, msghdr, msgdata)
@@ -462,17 +454,6 @@ class CoreBroker(ConfigurableManager):
                 self.nodecounts[server] = count
             return count
 
-    def incrbootcount(self):
-        ''' Count a node that has booted.
-        '''
-        self.bootcount += 1
-        return self.bootcount
-            
-    def getbootcount(self):
-        ''' Return the number of booted nodes.
-        '''
-        return self.bootcount
-
     def getserversbynode(self, nodenum):
         ''' Retrieve a set of emulation servers given a node number.
         '''
@@ -673,12 +654,6 @@ class CoreBroker(ConfigurableManager):
                 # do not record server name for networks since network
                 # nodes are replicated across all server
                 return servers
-            if issubclass(nodecls, PyCoreNet) and \
-                nodetype == coreapi.CORE_NODE_WLAN:
-                # special case where remote WLANs not in session._objs, and no
-                # node response message received, so they are counted here
-                if msg.gettlv(coreapi.CORE_TLV_NODE_EMUSRV) is not None:
-                    self.incrbootcount()
             elif issubclass(nodecls, PyCoreNode):
                 name = msg.gettlv(coreapi.CORE_TLV_NODE_NAME)
                 if name:

daemon/core/session.py

@@ -647,7 +647,7 @@ class Session(object):
             self.broadcastraw(None, msg)
         # assume either all nodes have booted already, or there are some
         # nodes on slave servers that will be booted and those servers will
-        # send a node status response message
+        # send a status response message
         self.checkruntime()
 
     def getnodecount(self):
@@ -680,20 +680,7 @@ class Session(object):
             return
         if self.getstate() == coreapi.CORE_EVENT_RUNTIME_STATE:
             return
-        session_node_count = int(self.node_count)
+        # check if all servers have completed instantiation
-        nc = self.getnodecount()
-        # count booted nodes not emulated on this server
-        # TODO: let slave server determine RUNTIME and wait for Event Message
-        # broker.getbootocunt() counts all CoreNodes from status reponse
-        #  messages, plus any remote WLANs; remote EMANE, hub, switch, etc.
-        #  are already counted in self._objs
-        nc += self.broker.getbootcount()
-        self.info("Checking for runtime with %d of %d session nodes" % \
-                    (nc, session_node_count))
-        if nc < session_node_count:
-            return # do not have information on all nodes yet
-        # information on all nodes has been received and they have been started
-        # enter the runtime state
         if not self.broker.instantiation_complete():
             return
         state = coreapi.CORE_EVENT_RUNTIME_STATE