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

7
daemon/core/emane/rfpipe.py
View file

@ -2,11 +2,11 @@
rfpipe.py: EMANE RF-PIPE model for CORE
"""
from core.emane.emanemodel import EmaneModel
from core.emane import emanemodel
from core.enumerations import ConfigDataTypes
class EmaneRfPipeModel(EmaneModel):
class EmaneRfPipeModel(emanemodel.EmaneModel):
# model name
name = "emane_rfpipe"
library = "rfpipemaclayer"
@ -27,3 +27,6 @@ class EmaneRfPipeModel(EmaneModel):
("radiometricreportinterval", ConfigDataTypes.FLOAT.value, "1.0", "",
"R2RI radio metric report interval (sec)"),
]
config_matrix = _config_mac + emanemodel.EmaneModel._config_phy
config_groups = emanemodel.create_config_groups(_config_mac, config_matrix)