support multiple frequencies of interest with the EMANE 0.9.1 Universal Phy

(Boeing r1850)
This commit is contained in:
ahrenholz 2014-07-11 17:44:41 +00:00
parent 7905a26e4d
commit e6ff3b4cce
3 changed files with 47 additions and 1 deletions

View file

@ -126,10 +126,21 @@ class EmaneUniversalModel(EmaneModel):
# insert old options with their default values
for old in cls._confmatrix_ver074:
phy.appendChild(e.xmlparam(phydoc, old[0], old[2]))
frequencies = None
if e.version == e.EMANE091:
name = "frequencyofinterest"
value = mac.valueof(name, values)
frequencies = cls.valuestrtoparamlist(phydoc, name, value)
if frequencies:
phynames = list(phynames)
phynames.remove("frequencyofinterest")
# append all PHY options to phydoc
map( lambda n: phy.appendChild(e.xmlparam(phydoc, n, \
mac.valueof(n, values))), phynames)
if frequencies:
phy.appendChild(frequencies)
return phydoc