updates to support emane 1.2.1

daemon/core/emane/emanemanager.py

@@ -29,21 +29,21 @@ from core.misc import utils
 from core.misc.ipaddress import MacAddress
 from core.xml import xmlutils
 
-_PATH = os.path.abspath(os.path.dirname(__file__))
+try:
+    from emane.events import EventService
+    from emane.events import LocationEvent
+except ImportError:
+    try:
+        from emanesh.events import EventService
+        from emanesh.events import LocationEvent
+    except ImportError:
+        logger.info("emane 0.9.1+ not found")
 
-# EMANE 0.7.4/0.8.1
 try:
     import emaneeventservice
     import emaneeventlocation
 except ImportError:
-    logger.error("error importing emaneeventservice and emaneeventlocation")
+    logger.info("emane < 0.9.1 not found")
-
-# EMANE 0.9.1+
-try:
-    from emanesh.events import EventService
-    from emanesh.events import LocationEvent
-except ImportError:
-    logger.error("error importing emanesh")
 
 EMANE_MODELS = [
     EmaneRfPipeModel,

daemon/core/emane/nodes.py

@@ -14,19 +14,18 @@ from core.enumerations import NodeTypes
 from core.enumerations import RegisterTlvs
 
 try:
-    from emanesh.events import LocationEvent
+    from emane.events import LocationEvent
 except ImportError:
-    logger.error("error loading emanesh")
+    try:
+        from emanesh.events import LocationEvent
+    except ImportError:
+        logger.info("emane 0.9.1+ not found")
 
 try:
     import emaneeventservice
     import emaneeventlocation
 except ImportError:
-    """
+    logger.info("emane < 0.9.1 not found")
-    Don't require all CORE users to have EMANE libeventservice and its
-    Python bindings installed.
-    """
-    logger.error("error loading emaneeventservice and emaneeventlocation")
 
 
 class EmaneNet(PyCoreNet):