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

reverted to using class variables for emane models due to inheritence from config class

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-29 14:38:32 -07:00
parent 19ccd6a63b
commit beb5be2ee9
6 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ commeffect.py: EMANE CommEffect model for CORE
"""
from core import logger
from core.emane.emanemodel import EmaneModel
from core.emane import emanemodel
from core.enumerations import ConfigDataTypes
try:
@ -24,7 +24,7 @@ def convert_none(x):
return int(x)
class EmaneCommEffectModel(EmaneModel):
class EmaneCommEffectModel(emanemodel.EmaneModel):
name = "emane_commeffect"
config_matrix = [
@ -35,9 +35,7 @@ class EmaneCommEffectModel(EmaneModel):
("defaultconnectivitymode", ConfigDataTypes.BOOL.value, "1", "On,Off", "defaultconnectivity"),
]
@property
def config_groups(self):
return "CommEffect SHIM Parameters:1-%d" % len(self.config_matrix)
config_groups = "CommEffect SHIM Parameters:1-%d" % len(config_matrix)
def build_xml_files(self, emane_manager, interface):
"""