Commit df88dc8b authored by David Johnson's avatar David Johnson

Only use triv links if no bw/latency.

parent 8bf0d7b3
......@@ -481,19 +481,20 @@ clientvars.addVariable("AGGREGATES"," ".join(sorted(aggNodes.keys())))
def applyGenericNetworkSettings(lanlink,bandwidth=0,latency=0):
if params.trivialOk is True:
lanlink.trivial_ok = True
else:
lanlink.trivial_ok = False
if bandwidth > 0 or latency > 0:
if bandwidth > 0:
lanlink.bandwidth = bandwidth
if latency > 0:
lanlink.latency = latency
elif params.bestEffort is True:
lanlink.best_effort = True
else:
lanlink.best_effort = False
if params.bestEffort is True:
lanlink.best_effort = True
else:
lanlink.best_effort = False
if params.trivialOk is True:
lanlink.trivial_ok = True
else:
lanlink.trivial_ok = False
if params.multiplex is True:
lanlink.link_multiplexing = True
else:
......
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