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

removed unused imports in emane files, refactored emane testing to simplify test cases and reduce repeated code

Browse source
This commit is contained in:
Blake J. Harnden 2017-07-10 10:44:10 -07:00
parent dced47b588
commit 673fdc94b5
9 changed files with 99 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,11 +9,6 @@ from core.misc import log
logger = log.get_logger(__name__)
try:
from emanesh.events import EventService
except ImportError:
logger.error("error importing emanesh")
try:
import emaneeventservice
import emaneeventcommeffect
@ -99,8 +94,7 @@ class EmaneCommEffectModel(EmaneModel):
link parameters.
"""
if emane.VERSION >= emane.EMANE091:
raise NotImplementedError, \
"CommEffect linkconfig() not implemented for EMANE 0.9.1+"
raise NotImplementedError("CommEffect linkconfig() not implemented for EMANE 0.9.1+")
def z(x):
"""

7
daemon/core/emane/ieee80211abg.py
View file

@ -10,11 +10,6 @@ from core.misc import log
logger = log.get_logger(__name__)
try:
from emanesh.events import EventService
except:
logger.error("error importing emanesh")
class EmaneIeee80211abgModel(EmaneModel):
def __init__(self, session, object_id=None):
@ -33,7 +28,7 @@ class EmaneIeee80211abgModel(EmaneModel):
# MAC parameters
_confmatrix_mac_base = [
("mode", ConfigDataTypes.UINT8.value, '0',
'0 802.11b (DSSS only),1 802.11b (DSSS only),' + \
'0 802.11b (DSSS only),1 802.11b (DSSS only),' +
'2 802.11a or g (OFDM),3 802.11b/g (DSSS and OFDM)', 'mode'),
("enablepromiscuousmode", ConfigDataTypes.BOOL.value, '0',
'On,Off', 'enable promiscuous mode'),

1
daemon/core/emane/nodes.py
View file

@ -16,7 +16,6 @@ from core.misc import log
logger = log.get_logger(__name__)
try:
from emanesh.events import EventService
from emanesh.events import LocationEvent
except ImportError:
logger.error("error loading emanesh")

5
daemon/core/emane/rfpipe.py
View file

@ -10,11 +10,6 @@ from core.misc import log
logger = log.get_logger(__name__)
try:
from emanesh.events import EventService
except ImportError:
logger.error("error importing emanesh")
class EmaneRfPipeModel(EmaneModel):
def __init__(self, session, object_id=None):

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

@ -10,11 +10,6 @@ from core.misc import log
logger = log.get_logger(__name__)
try:
from emanesh.events import EventService
except:
logger.error("error importing emanesh")
class EmaneTdmaModel(EmaneModel):
def __init__(self, session, object_id=None):

5
daemon/core/emane/universal.py
View file

@ -10,11 +10,6 @@ from core.misc import log
logger = log.get_logger(__name__)
try:
from emanesh.events import EventService
except ImportError:
logger.error("error importing emanesh")
class EmaneUniversalModel(EmaneModel):
"""

16
daemon/core/session.py
View file

@ -1054,16 +1054,14 @@ class Session(object):
updown_script = None
if net_index == 0:
try:
if self.config["controlnet_updown_script"]:
updown_script = self.config["controlnet_updown_script"]
except KeyError:
logger.exception("error retreiving controlnet updown script")
updown_script = self.config.get("controlnet_updown_script")
if not updown_script:
logger.warning("controlnet updown script not configured")
# Check if session option set, overwrite if so
new_updown_script = getattr(self.options, "controlnet_updown_script", None)
if new_updown_script:
updown_script = new_updown_script
# check if session option set, overwrite if so
options_updown_script = getattr(self.options, "controlnet_updown_script", None)
if options_updown_script:
updown_script = options_updown_script
prefixes = prefix_spec.split()
if len(prefixes) > 1: