refactored new apis to sit under the emulator module, also reverted moving files under a legacy module to help avoid breaking code using core internals for 5.0+

daemon/tests/conftest.py

@@ -13,6 +13,10 @@ from core.api.coreapi import CoreEventMessage
 from core.api.coreapi import CoreExecMessage
 from core.api.coreapi import CoreLinkMessage
 from core.api.coreapi import CoreNodeMessage
+from core.corehandlers import CoreHandler
+from core.coreserver import CoreServer
+from core.emulator.coreemu import CoreEmu
+from core.emulator.emudata import IpPrefixes
 from core.enumerations import CORE_API_PORT
 from core.enumerations import ConfigTlvs
 from core.enumerations import EventTlvs
@@ -23,10 +27,6 @@ from core.enumerations import LinkTypes
 from core.enumerations import MessageFlags
 from core.enumerations import NodeTlvs
 from core.enumerations import NodeTypes
-from core.future.coreemu import CoreEmu
-from core.future.futuredata import IpPrefixes
-from core.legacy.corehandler import CoreHandler
-from core.legacy.coreserver import CoreServer
 from core.misc import ipaddress
 from core.misc.ipaddress import MacAddress
 

daemon/tests/test_core.py

@@ -11,8 +11,8 @@ import pytest
 from mock import MagicMock
 
 from core.data import ConfigData
+from core.emulator.emudata import NodeOptions
 from core.enumerations import MessageFlags, NodeTypes
-from core.future.futuredata import NodeOptions
 from core.mobility import BasicRangeModel
 from core.netns.vnodeclient import VnodeClient
 from core.service import ServiceManager
@@ -250,7 +250,7 @@ class TestCore:
         """
         Test basic wlan network.
 
-        :param core.future.coreemu.FutureSession session: session for test
+        :param core.emulator.coreemu.EmuSession session: session for test
         :param ip_prefixes: generates ip addresses for nodes
         """
 
@@ -283,7 +283,7 @@ class TestCore:
         """
         Test basic wlan network.
 
-        :param core.future.coreemu.FutureSession session: session for test
+        :param core.emulator.coreemu.EmuSession session: session for test
         :param ip_prefixes: generates ip addresses for nodes
         """
 

daemon/tests/test_emane.py

@@ -10,7 +10,7 @@ from core.emane.commeffect import EmaneCommEffectModel
 from core.emane.ieee80211abg import EmaneIeee80211abgModel
 from core.emane.rfpipe import EmaneRfPipeModel
 from core.emane.tdma import EmaneTdmaModel
-from core.future.futuredata import NodeOptions
+from core.emulator.emudata import NodeOptions
 
 _EMANE_MODELS = [
     EmaneIeee80211abgModel,
@@ -27,7 +27,7 @@ class TestEmane:
         """
         Test emane models within a basic network.
 
-        :param core.future.coreemu.FutureSession session: session for test
+        :param core.emulator.coreemu.EmuSession session: session for test
         :param model: emane model to test
         :param ip_prefixes: generates ip addresses for nodes
         """

daemon/tests/test_gui.py

@@ -105,7 +105,7 @@ class TestGui:
         """
         Test session broker creation.
 
-        :param core.future.coreemu.FutureSession session: session for test
+        :param core.emulator.coreemu.EmuSession session: session for test
         :param cored: cored daemon server to test with
         """
 

daemon/tests/test_links.py

@@ -1,5 +1,5 @@
+from core.emulator.emudata import LinkOptions
 from core.enumerations import NodeTypes
-from core.future.futuredata import LinkOptions
 from core.misc import utils
 
 
@@ -138,7 +138,7 @@ class TestLinks:
         """
         Test ptp node network with modifying link bandwidth.
 
-        :param core.future.coreemu.FutureSession session: session for test
+        :param core.emulator.coreemu.EmuSession session: session for test
         :param ip_prefixes: generates ip addresses for nodes
         """
 
@@ -169,7 +169,7 @@ class TestLinks:
         """
         Test ptp node network with modifying link packet loss.
 
-        :param core.future.coreemu.FutureSession session: session for test
+        :param core.emulator.coreemu.EmuSession session: session for test
         :param ip_prefixes: generates ip addresses for nodes
         """
 
@@ -200,7 +200,7 @@ class TestLinks:
         """
         Test ptp node network with modifying link packet delay.
 
-        :param core.future.coreemu.FutureSession session: session for test
+        :param core.emulator.coreemu.EmuSession session: session for test
         :param ip_prefixes: generates ip addresses for nodes
         """
 
@@ -232,7 +232,7 @@ class TestLinks:
         """
         Test ptp node network with modifying link packet jitter.
 
-        :param core.future.coreemu.FutureSession session: session for test
+        :param core.emulator.coreemu.EmuSession session: session for test
         :param ip_prefixes: generates ip addresses for nodes
         """
 

daemon/tests/test_nodes.py

@@ -3,8 +3,8 @@ import time
 
 import pytest
 
+from core.emulator.emudata import NodeOptions
 from core.enumerations import NodeTypes
-from core.future.futuredata import NodeOptions
 from core.misc import utils
 
 MODELS = [