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+

This commit is contained in:
Blake J. Harnden 2018-05-01 10:40:25 -07:00
parent 9cb1513933
commit f5bff494c7
17 changed files with 53 additions and 50 deletions

View file

@ -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
"""