Commit c19612e8 authored by Kirk Webb's avatar Kirk Webb

Refactor.

parent 27dadf9f
......@@ -181,6 +181,15 @@ gnb1.hardware_type = GLOBALS.PC_HWTYPE
gnb1.disk_image = GLOBALS.OAI_NR_IMG
connectOAI_DS(gnb1)
# Add NR-UE PC.
rue1 = request.RawPC("rue1")
if params.FIXED_ENB:
rue1.component_id = params.FIXED_ENB
rue1.hardware_type = GLOBALS.PC_HWTYPE
#rue1.Desire("site-meb", 1.0)
rue1.disk_image = GLOBALS.OAI_NR_IMG
connectOAI_DS(rue1)
if params.REAL:
# Add USRP link for PC node and set address.
gnb1_usrp_if = gnb1.addInterface( "usrp_if" )
......@@ -195,16 +204,6 @@ if params.REAL:
enblnk.bandwidth = GLOBALS.TENGIG
enblnk.setJumboFrames()
# Add NR-UE PC.
rue1 = request.RawPC("rue1")
if params.FIXED_ENB:
rue1.component_id = params.FIXED_ENB
rue1.hardware_type = GLOBALS.PC_HWTYPE
#rue1.Desire("site-meb", 1.0)
rue1.disk_image = GLOBALS.OAI_NR_IMG
connectOAI_DS(rue1)
if params.REAL:
# Add USRP link for PC node and set address.
rue1_usrp_if = rue1.addInterface( "usrp_if" )
rue1_usrp_if.addAddress( rspec.IPv4Address( "192.168.30.1", "255.255.255.0" ) )
......@@ -219,7 +218,7 @@ if params.REAL:
uelnk.bandwidth = GLOBALS.TENGIG
uelnk.setJumboFrames()
if not params.REAL:
else:
# Create NR-UE to gNB PC Ethernet link for performing simulated runs
ethlnk = request.Link( "ue-gnb", members = [gnb1, rue1] )
ethlnk.bandwidth = GLOBALS.TENGIG
......
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