Commit fb700396 authored by Gary Wong's avatar Gary Wong

Add parameter for controlled vs. radiated RF link.

parent a838eeb8
......@@ -96,6 +96,10 @@ pc.defineParameter("FIXED_ENB", "Bind to a specific eNodeB",
portal.ParameterType.STRING, "",
longDescription="Input the name of a PhantomNet eNodeB device to allocate (e.g., \'nuc1\'). Leave blank to let the mapping algorithm choose. If you bind both UE and eNodeB devices, mapping will fail unless there is path between them via the attenuator matrix.")
pc.defineParameter("RADIATEDRF", "Radiated (over-the-air) RF transmissions",
portal.ParameterType.BOOLEAN, False,
longDescription="When enabled, RF devices with real antennas and transmissions propagated through free space will be selected. Leave disabled (default) to assign RF devices connected via transmission lines with variable attenuator control.")
params = pc.bindParameters()
#
......@@ -126,7 +130,7 @@ if params.FIXED_ENB:
enb1.component_id = params.FIXED_ENB
enb1.hardware_type = GLOBALS.NUC_HWTYPE
enb1.disk_image = GLOBALS.OAI_ENB_IMG
enb1.Desire('rf-radiated', 1)
enb1.Desire( "rf-radiated" if params.RADIATEDRF else "rf-controlled", 1 )
connectOAI_DS(enb1)
enb1.addService(rspec.Execute(shell="sh", command=GLOBALS.OAI_CONF_SCRIPT + " -r ENB"))
enb1_rue1_rf = enb1.addInterface("rue1_rf")
......@@ -137,7 +141,7 @@ if params.FIXED_UE:
rue1.component_id = params.FIXED_UE
rue1.hardware_type = GLOBALS.UE_HWTYPE
rue1.disk_image = GLOBALS.UE_IMG
rue1.Desire('rf-radiated', 1)
rue1.Desire( "rf-radiated" if params.RADIATEDRF else "rf-controlled", 1 )
rue1.adb_target = "adb-tgt"
rue1_enb1_rf = rue1.addInterface("enb1_rf")
......@@ -157,4 +161,4 @@ epclink.best_effort = True
#
# Print and go!
#
pc.printRequestRSpec(request)
\ No newline at end of file
pc.printRequestRSpec(request)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment