removed issue with double loading services from core-daemon, fixed exceptions noted as not an error previously and updated code to more gracefully handle those cases, fixed issue with add_node when setting node.ype for all nodes

daemon/core/future/coreemu.py

@@ -487,7 +487,6 @@ class FutureSession(Session):
         node = self.add_object(cls=node_class, objid=_id, name=name, start=start)
 
         # set node attributes
-        node.type = node_options.model
         node.icon = node_options.icon
         node.canvas = node_options.canvas
         node.opaque = node_options.opaque
@@ -497,6 +496,8 @@ class FutureSession(Session):
 
         # add services to default and physical nodes only
         if _type in [NodeTypes.DEFAULT, NodeTypes.PHYSICAL]:
+            node.type = node_options.model
+            logger.debug("set node type: %s", node.type)
             logger.info("setting model (%s) with services (%s)", node.type, node_options.services)
             services = "|".join(node_options.services) or None
             self.services.addservicestonode(node, node.type, services)

daemon/core/future/futuredata.py

@@ -12,7 +12,7 @@ class NodeOptions(object):
         Create a NodeOptions object.
 
         :param str name: name of node, defaults to node class name postfix with its id
-        :param str model: model to use for this node, defines services, defaults to "router"
+        :param str model: defines services for default and physical nodes, defaults to "router"
         """
         self.name = name
         self.model = model

daemon/core/mobility.py

@@ -1152,11 +1152,7 @@ class Ns2ScriptedMobility(WayPointMobility):
         :rtype: int
         """
         nodenum = int(nodenum)
-        try:
+        return self.nodemap.get(nodenum, nodenum)
-            return self.nodemap[nodenum]
-        except KeyError:
-            logger.exception("error finding value in node map, ignored and returns node id")
-            return nodenum
 
     def startup(self):
         """

daemon/core/xml/xmlwriter1.py

@@ -213,7 +213,7 @@ class ScenarioPlan(XmlElement):
         self.setAttribute('xmlns:CORE', 'coreSpecific')
         self.setAttribute('compiled', 'true')
 
-        self.all_channel_members = dict()
+        self.all_channel_members = {}
         self.last_network_id = 0
         self.addNetworks()
         self.addDevices()
@@ -795,26 +795,23 @@ class InterfaceElement(NamedXmlElement):
         """
         Add a reference to the channel that uses this interface
         """
-        try:
+        # cm is None when an interface belongs to a switch
-            cm = self.scenPlan.all_channel_members[self.id]
+        #  or a hub within a network and the channel is yet to be defined
-            if cm is not None:
+        cm = self.scenPlan.all_channel_members.get(self.id)
-                ch = cm.base_element.parentNode
+        if cm is not None:
-                if ch is not None:
+            ch = cm.base_element.parentNode
-                    net = ch.parentNode
+            if ch is not None:
-                    if net is not None:
+                net = ch.parentNode
-                        MemberElement(self.scenPlan,
+                if net is not None:
-                                      self,
+                    MemberElement(self.scenPlan,
-                                      referenced_type=MembType.CHANNEL,
+                                  self,
-                                      referenced_id=ch.getAttribute("id"),
+                                  referenced_type=MembType.CHANNEL,
-                                      index=int(cm.getAttribute("index")))
+                                  referenced_id=ch.getAttribute("id"),
-                        MemberElement(self.scenPlan,
+                                  index=int(cm.getAttribute("index")))
-                                      self,
+                    MemberElement(self.scenPlan,
-                                      referenced_type=MembType.NETWORK,
+                                  self,
-                                      referenced_id=net.getAttribute("id"))
+                                  referenced_type=MembType.NETWORK,
-        except KeyError:
+                                  referenced_id=net.getAttribute("id"))
-            # Not an error. This occurs when an interface belongs to a switch
-            #  or a hub within a network and the channel is yet to be defined
-            logger.exception("noted as not an error, add channel reference error")
 
     def addAddresses(self, interface_object):
         """

daemon/scripts/core-daemon

@@ -13,7 +13,6 @@ import time
 from core import constants
 from core import enumerations
 from core import logger
-from core import services
 from core.legacy.corehandler import CoreHandler
 from core.legacy.coreserver import CoreServer
 from core.misc import nodeutils
@@ -139,7 +138,4 @@ if __name__ == "__main__":
 
         nodeutils.update_node_map(OVS_NODES)
 
-    # load default services
-    services.load()
-
     main()