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

daemon/core/emane/commeffect.py

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

daemon/core/emane/ieee80211abg.py

@@ -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'),

daemon/core/emane/nodes.py

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

daemon/core/emane/rfpipe.py

@@ -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):

daemon/core/emane/tdma.py

@@ -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):

daemon/core/emane/universal.py

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