From d51e80fac8e2a74f9f959cfb846e357350d98c3f Mon Sep 17 00:00:00 2001 From: "Blake J. Harnden" Date: Wed, 12 Jul 2017 09:29:36 -0700 Subject: [PATCH] updated emane commeffect test to turn on default connectivity, test now passes --- daemon/core/conf.py | 1 + daemon/tests/test_emane.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/daemon/core/conf.py b/daemon/core/conf.py index 11ec465f..b436dd2e 100644 --- a/daemon/core/conf.py +++ b/daemon/core/conf.py @@ -351,6 +351,7 @@ class Configurable(object): typeflags = ConfigFlags.NONE.value values = manager.getconfig(node_id, cls.name, defaults)[1] if values is None: + logger.warn("no active configuration for node (%s), ignoring request") # node has no active config for this model (don't send defaults) return None # reply with config options diff --git a/daemon/tests/test_emane.py b/daemon/tests/test_emane.py index 2a4c2af4..b34da87a 100644 --- a/daemon/tests/test_emane.py +++ b/daemon/tests/test_emane.py @@ -1,7 +1,7 @@ """ Unit tests for testing with a CORE switch. """ - +from core.data import ConfigData from core.emane.bypass import EmaneBypassModel from core.emane.commeffect import EmaneCommEffectModel from core.emane.ieee80211abg import EmaneIeee80211abgModel @@ -90,6 +90,16 @@ class TestGui: # set the emane model core_emane.set_emane_model(emane_node, EmaneCommEffectModel) + # configure emane to enable default connectivity + config_data = ConfigData( + node=emane_node.objid, + object="emane_commeffect", + type=2, + data_types=(11,), + data_values="defaultconnectivitymode=1" + ) + EmaneCommEffectModel.configure_emane(core_emane.session, config_data) + # create nodes core_emane.create_node("n1", objid=1, position=(150, 150), services=_EMANE_SERVICES, model="mdr") core_emane.create_node("n2", objid=2, position=(300, 150), services=_EMANE_SERVICES, model="mdr")