added mock for python testing, removed a couple unused methods, added some more quick tests for a variety of interface related methods

daemon/core/broker.py

@@ -437,6 +437,7 @@ class CoreBroker(ConfigurableManager):
         """
         try:
             net = self.session.get_object(node_id)
+            logger.info("adding net tunnel for: id(%s) %s", node_id, net)
         except KeyError:
             raise KeyError("network node %s not found" % node_id)
 
@@ -583,7 +584,9 @@ class CoreBroker(ConfigurableManager):
         :param int nodenum: node id to add
         :return: nothing
         """
+        logger.info("adding net to broker: %s", nodenum)
         self.network_nodes.add(nodenum)
+        logger.info("broker network nodes: %s", self.network_nodes)
 
     def addphys(self, nodenum):
         """
@@ -1010,10 +1013,10 @@ class CoreBroker(ConfigurableManager):
                 for server in servers:
                     if server.name == "localhost":
                         continue
-                    try:
+
+                    lhost, lport = None, None
+                    if server.sock:
                         lhost, lport = server.sock.getsockname()
-                    except IOError:
-                        lhost, lport = None, None
                     f.write("%s %s %s %s %s\n" % (server.name, server.host, server.port, lhost, lport))
         except IOError:
             logger.exception("error writing server list to the file: %s" % filename)

daemon/core/coreobj.py

@@ -273,16 +273,6 @@ class PyCoreNode(PyCoreObj):
         self.nodedir = None
         self.tmpnodedir = False
 
-    # TODO: getter method that should not be needed
-    def nodeid(self):
-        """
-        Retrieve node id.
-
-        :return: node id
-        :rtype: int
-        """
-        return self.objid
-
     def addservice(self, service):
         """
         Add a services to the service list.
@@ -465,35 +455,6 @@ class PyCoreNet(PyCoreObj):
         with self._linked_lock:
             del self._linked[netif]
 
-    # TODO: needs to be abstracted out, seems like it may be ok to remove
-    def netifparamstolink(self, netif):
-        """
-        Helper for tolinkmsgs() to build TLVs having link parameters from interface parameters.
-
-        :param PyCoreNetIf netif: network interface to retrieve params from
-        :return: tlv data
-        """
-
-        delay = netif.getparam("delay")
-        bw = netif.getparam("bw")
-        loss = netif.getparam("loss")
-        duplicate = netif.getparam("duplicate")
-        jitter = netif.getparam("jitter")
-
-        tlvdata = ""
-        if delay is not None:
-            tlvdata += coreapi.CoreLinkTlv.pack(LinkTlvs.DELAY.value, delay)
-        if bw is not None:
-            tlvdata += coreapi.CoreLinkTlv.pack(LinkTlvs.BANDWIDTH.value, bw)
-        if loss is not None:
-            tlvdata += coreapi.CoreLinkTlv.pack(LinkTlvs.PER.value, str(loss))
-        if duplicate is not None:
-            tlvdata += coreapi.CoreLinkTlv.pack(LinkTlvs.DUP.value, str(duplicate))
-        if jitter is not None:
-            tlvdata += coreapi.CoreLinkTlv.pack(LinkTlvs.JITTER.value, jitter)
-
-        return tlvdata
-
     def all_link_data(self, flags):
         """
         Build link data objects for this network. Each link object describes a link

daemon/core/xml/xmlwriter0.py

@@ -168,7 +168,7 @@ class CoreDocumentWriter0(Document):
         n = self.createElement("Node")
         self.np.appendChild(n)
         n.setAttribute("name", node.name)
-        n.setAttribute("id", "%s" % node.nodeid())
+        n.setAttribute("id", "%s" % node.objid)
         if node.type:
             n.setAttribute("type", node.type)
         self.addinterfaces(n, node)