Commit 85121ec2 authored by Jincao Zhu's avatar Jincao Zhu

Update profile.py for x2 handover

parent 05c8dce8
......@@ -129,6 +129,7 @@ pc.verifyParameters()
#
request = pc.makeRequestRSpec()
epclink = request.Link("s1-lan")
epclink2= request.link("s1-lan2")
# Checking for oaisim
......@@ -155,6 +156,17 @@ else:
enb1.addService(rspec.Execute(shell="sh", command=GLOBALS.OAI_CONF_SCRIPT + " -r ENB"))
enb1_rue1_rf = enb1.addInterface("rue1_rf")
# Add another NUC eNB node.
enb2 = request.RawPC("enb2")
if params.FIXED_ENB:
enb2.component_id = params.FIXED_ENB
enb2.hardware_type = GLOBALS.NUC_HWTYPE
enb2.disk_image = GLOBALS.OAI_ENB_IMG
enb2.Desire( "rf-radiated" if params.TYPE == "ota" else "rf-controlled", 1 )
connectOAI_DS(enb1, 0)
enb2.addService(rspec.Execute(shell="sh", command=GLOBALS.OAI_CONF_SCRIPT + " -r ENB"))
enb2_rue1_rf = enb2.addInterface("rue1_rf")
# Add an OTS (Nexus 5) UE
rue1 = request.UE("rue1")
if params.FIXED_UE:
......@@ -164,14 +176,21 @@ else:
rue1.Desire( "rf-radiated" if params.TYPE == "ota" else "rf-controlled", 1 )
rue1.adb_target = "adb-tgt"
rue1_enb1_rf = rue1.addInterface("enb1_rf")
rue1_enb2_rf = rue1.addInterface("enb2_rf")
# Create the RF link between the Nexus 5 UE and eNodeB
rflink2 = request.RFLink("rflink2")
rflink2.addInterface(enb1_rue1_rf)
rflink2.addInterface(rue1_enb1_rf)
rflink2.addInterface(enb2_rue1_rf)
rflink2.addInterface(rue1_enb2_rf)
rflink1 = request.RFLink("rflink1")
rflink1.addInterface(enb1_rue1_rf)
rflink1.addInterface(rue1_enb1_rf)
# Add a link connecting the NUC eNB and the OAI EPC node.
epclink.addNode(enb1)
epclink2.addNode(enb2)
# Add OAI EPC (HSS, MME, SPGW) node.
epc = request.RawPC("epc")
......@@ -184,6 +203,11 @@ epclink.link_multiplexing = True
epclink.vlan_tagging = True
epclink.best_effort = True
epclink2.addNode(epc)
epclink2.link_multiplexing = True
epclink2.vlan_tagging = True
epclink2.best_effort = True
tour = IG.Tour()
tour.Description(IG.Tour.MARKDOWN, tourDescription)
tour.Instructions(IG.Tour.MARKDOWN, tourInstructions)
......
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