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

Merge branch 'emane-cleanup' of git-ssh.web.boeing.com:Boeing-CORE/CORE into emane-cleanup

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-21 19:08:53 -07:00
commit ef28d998dc
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,23 +15,20 @@ class EmaneRfPipeModel(EmaneModel):
# configuration parameters are # configuration parameters are
# ( "name", "type", "default", "possible-value-list", "caption") # ( "name", "type", "default", "possible-value-list", "caption")
# MAC parameters # MAC parameters
_confmatrix_mac_base = [ _confmatrix_mac = [
("datarate", ConfigDataTypes.UINT64.value, "1M", "", "data rate (bps)"),
("delay", ConfigDataTypes.FLOAT.value, "0.0", "", "transmission delay (sec)"),
("enablepromiscuousmode", ConfigDataTypes.BOOL.value, "0", "True,False", "enable promiscuous mode"), ("enablepromiscuousmode", ConfigDataTypes.BOOL.value, "0", "True,False", "enable promiscuous mode"),
("datarate", ConfigDataTypes.UINT32.value, "1M", "", "data rate (bps)"),
("flowcontrolenable", ConfigDataTypes.BOOL.value, "0", "On,Off", "enable traffic flow control"), ("flowcontrolenable", ConfigDataTypes.BOOL.value, "0", "On,Off", "enable traffic flow control"),
("flowcontroltokens", ConfigDataTypes.UINT16.value, "10", "", "number of flow control tokens"), ("flowcontroltokens", ConfigDataTypes.UINT16.value, "10", "", "number of flow control tokens"),
("pcrcurveuri", ConfigDataTypes.STRING.value, "%s/rfpipepcr.xml" % xml_path, "", "SINR/PCR curve file"),
]
_confmatrix_mac_091 = [
("jitter", ConfigDataTypes.FLOAT.value, "0.0", "", "transmission jitter (sec)"), ("jitter", ConfigDataTypes.FLOAT.value, "0.0", "", "transmission jitter (sec)"),
("delay", ConfigDataTypes.FLOAT.value, "0.0", "", "transmission delay (sec)"), ("neighbormetricdeletetime", ConfigDataTypes.FLOAT.value, "60.0", "",
"R2RI neighbor table inactivity time (sec)"),
("pcrcurveuri", ConfigDataTypes.STRING.value, "%s/rfpipepcr.xml" % xml_path, "", "SINR/PCR curve file"),
("radiometricenable", ConfigDataTypes.BOOL.value, "0", "On,Off", "report radio metrics via R2RI"), ("radiometricenable", ConfigDataTypes.BOOL.value, "0", "On,Off", "report radio metrics via R2RI"),
("radiometricreportinterval", ConfigDataTypes.FLOAT.value, "1.0", "", ("radiometricreportinterval", ConfigDataTypes.FLOAT.value, "1.0", "",
"R2RI radio metric report interval (sec)"), "R2RI radio metric report interval (sec)"),
("neighbormetricdeletetime", ConfigDataTypes.FLOAT.value, "60.0", "",
"R2RI neighbor table inactivity time (sec)"),
] ]
_confmatrix_mac = _confmatrix_mac_base + _confmatrix_mac_091
# PHY parameters from Universal PHY # PHY parameters from Universal PHY
_confmatrix_phy = EmaneUniversalModel.config_matrix _confmatrix_phy = EmaneUniversalModel.config_matrix

6
daemon/core/emane/tdma.py
View file

@ -8,9 +8,6 @@ from core.enumerations import ConfigDataTypes
class EmaneTdmaModel(EmaneModel): class EmaneTdmaModel(EmaneModel):
def __init__(self, session, object_id=None):
EmaneModel.__init__(self, session, object_id)
# model name # model name
name = "emane_tdma" name = "emane_tdma"
xml_path = "/usr/share/emane/xml/models/mac/tdmaeventscheduler" xml_path = "/usr/share/emane/xml/models/mac/tdmaeventscheduler"
@ -49,6 +46,9 @@ class EmaneTdmaModel(EmaneModel):
config_groups = "TDMA MAC Parameters:1-%d|Universal PHY Parameters:%d-%d" % ( config_groups = "TDMA MAC Parameters:1-%d|Universal PHY Parameters:%d-%d" % (
len(_confmatrix_mac), len(_confmatrix_mac) + 1, len(config_matrix)) len(_confmatrix_mac), len(_confmatrix_mac) + 1, len(config_matrix))
def __init__(self, session, object_id=None):
EmaneModel.__init__(self, session, object_id)
def buildnemxmlfiles(self, e, ifc): def buildnemxmlfiles(self, e, ifc):
""" """
Build the necessary nem, mac, and phy XMLs in the given path. Build the necessary nem, mac, and phy XMLs in the given path.