fixed bad logging and updated commeffect to default to connectivity being on, same as emane default

This commit is contained in:
Blake J. Harnden 2018-03-27 08:24:28 -07:00
parent fcedf68b55
commit ef48052d41
2 changed files with 3 additions and 3 deletions

View file

@ -42,7 +42,7 @@ class EmaneCommEffectModel(EmaneModel):
"", "receivebufferperiod"), "", "receivebufferperiod"),
] ]
_confmatrix_shim_091 = [ _confmatrix_shim_091 = [
("defaultconnectivitymode", ConfigDataTypes.BOOL.value, "0", ("defaultconnectivitymode", ConfigDataTypes.BOOL.value, "1",
"On,Off", "defaultconnectivity"), "On,Off", "defaultconnectivity"),
] ]
_confmatrix_shim = _confmatrix_shim_base + _confmatrix_shim_091 _confmatrix_shim = _confmatrix_shim_base + _confmatrix_shim_091
@ -110,7 +110,7 @@ class EmaneCommEffectModel(EmaneModel):
nemid = emane_node.getnemid(netif) nemid = emane_node.getnemid(netif)
nemid2 = emane_node.getnemid(netif2) nemid2 = emane_node.getnemid(netif2)
mbw = bw mbw = bw
logger.info("sending comm effect event")
event.append( event.append(
nemid, nemid,
latency=convert_none(delay), latency=convert_none(delay),

View file

@ -53,7 +53,7 @@ class EmaneModel(WirelessModel):
:param core.emane.emanemanager.EmaneManager emane_manager: emane manager for the session :param core.emane.emanemanager.EmaneManager emane_manager: emane manager for the session
:return: nothing :return: nothing
""" """
logger.info("%s has no post setup tasks: interface(%s)", ifc) logger.info("emane model(%s) has no post setup tasks", self.name)
def buildnemxmlfiles(self, e, ifc): def buildnemxmlfiles(self, e, ifc):
""" """