consolidated EmaneNode and EmaneNet, renaming EmaneNode to EmaneNet

daemon/core/services/emaneservices.py

@@ -1,4 +1,4 @@
-from core.emane.nodes import EmaneNode
+from core.emane.nodes import EmaneNet
 from core.services.coreservices import CoreService
 from core.xml import emanexml
 
@@ -21,7 +21,7 @@ class EmaneTransportService(CoreService):
             transport_commands = []
             for interface in node.netifs(sort=True):
                 network_node = node.session.get_node(interface.net.id)
-                if isinstance(network_node, EmaneNode):
+                if isinstance(network_node, EmaneNet):
                     config = node.session.emane.get_configs(
                         network_node.id, network_node.model.name
                     )

daemon/core/services/quagga.py

@@ -3,7 +3,7 @@ quagga.py: defines routing services provided by Quagga.
 """
 
 from core import constants
-from core.emane.nodes import EmaneNode
+from core.emane.nodes import EmaneNet
 from core.emulator.enumerations import LinkTypes
 from core.nodes import ipaddress
 from core.nodes.network import PtpNet, WlanNode
@@ -460,7 +460,7 @@ class Ospfv3mdr(Ospfv3):
         cfg = cls.mtucheck(ifc)
         # Uncomment the following line to use Address Family Translation for IPv4
         cfg += "  ipv6 ospf6 instance-id 65\n"
-        if ifc.net is not None and isinstance(ifc.net, (WlanNode, EmaneNode)):
+        if ifc.net is not None and isinstance(ifc.net, (WlanNode, EmaneNet)):
             return (
                 cfg
                 + """\