afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed old log imports and dont bail out on tdma model exception

Browse source
This commit is contained in:
Blake J. Harnden 2017-08-08 09:17:09 -07:00
parent f3863ead73
commit 67d451c3e9
7 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/emane/tdma.py
View file

@ -3,6 +3,7 @@ tdma.py: EMANE TDMA model bindings for CORE
"""
from core import emane
from core import logger
from core.emane.emanemodel import EmaneModel
from core.emane.universal import EmaneUniversalModel
from core.enumerations import ConfigDataTypes
@ -14,10 +15,9 @@ class EmaneTdmaModel(EmaneModel):
# model name
name = "emane_tdma"
if emane.VERSION >= emane.EMANE101:
xml_path = "/usr/share/emane/xml/models/mac/tdmaeventscheduler"
else:
raise Exception("EMANE TDMA requires EMANE 1.0.1 or greater")
xml_path = "/usr/share/emane/xml/models/mac/tdmaeventscheduler"
if emane.VERSION < emane.EMANE101:
logger.error("EMANE TDMA requires EMANE 1.0.1 or greater")
# MAC parameters
_confmatrix_mac = [