Commit e3a6a547 authored by Robert Ricci's avatar Robert Ricci

Update to latest 'live' profile

parent f4e89491
......@@ -85,7 +85,7 @@ pc.defineParameter("HWTYPE","Node Hardware Type",
pc.defineParameter("LINKBW","Default Link Bandwidth (Mbps)",
portal.ParameterType.INTEGER, 0,
longDescription="Specify the default LAN bandwidth in Mbps for all EPC LANs. Leave at \"0\" to indicate \"best effort\". Values that do not line up with common physical interface speeds (e.g. 10, 100, or 1000) WILL cause the insertion of link shaping elements.",
longDescription="Specify the default LAN bandwidth in Mbps for all EPC LANs. Leave at \"0\" to indicate \"best effort\". Values that do not line up with common physical interface speeds (e.g. 10, 100, 1000, 10000) WILL cause the insertion of link shaping elements. Additionally, above 1Gbps, such shaping elements are unlikely to be accurate.",
advanced=True)
#
......@@ -106,7 +106,7 @@ if params.NUMENB < 1 or params.NUMENB > 3:
pc.reportError(perr)
pass
if int(params.LINKBW) not in [0, 10, 100, 1000]:
if int(params.LINKBW) not in [0, 10, 100, 1000, 10000]:
pwarn = portal.ParameterWarning("You are asking for a default link bandwidth that is NOT a standard physical link speed. Link shaping resources WILL be inserted!", ['LINKBW'])
pc.reportWarning(pwarn)
pass
......@@ -140,6 +140,13 @@ if params.HWTYPE.find("vm") >= 0:
if params.HWTYPE == "pc":
params.HWTYPE = None
#
# Force gigabit speed for d430 nodes when no bandwidth is requested.
#
if params.HWTYPE == "d430":
if params.LINKBW == 0:
params.LINKBW = 1000 * 1000
#
# Set the hardware and image for the epc node factory function
#
......@@ -150,6 +157,10 @@ PN.EPCNodeFactorySettings.disk_image = GLOBALS.EPCIMG
# Create the lans we need
#
mgmt = rspec.EPClan(PN.EPCLANS.MGMT, vmlan = usevms)
mgmt.bandwidth = params.LINKBW
# Hack for d430 node type ...
if params.LINKBW != 0:
mgmt.best_effort = False
net_a = rspec.EPClan(PN.EPCLANS.NET_A, vmlan = usevms)
net_a.bandwidth = params.LINKBW
net_b = rspec.EPClan(PN.EPCLANS.NET_B, vmlan = usevms)
......@@ -212,4 +223,4 @@ for i in range(1, params.NUMCLI + 1):
#
# Print and go!
#
pc.printRequestRSpec(rspec)
\ No newline at end of file
pc.printRequestRSpec(rspec)
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