Commit ca3f5497 authored by Mike Hibler's avatar Mike Hibler

Tweaks to allow 40Gb bandwidth.

Actually should allow up to 100Gb.
parent 33beb373
#!/usr/bin/perl -w
#
# Copyright (c) 2005-2018 University of Utah and the Flux Group.
# Copyright (c) 2005-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -10310,10 +10310,22 @@ sub GetWiretype($$$)
# 1 Gbit
$wiretype = "ethernet-1000000";
}
else {
elsif ($bandwidth <= 10000000) {
# 10 Gbit
$wiretype = "ethernet-10000000";
}
elsif ($bandwidth <= 25000000) {
# 25 Gbit
$wiretype = "ethernet-25000000";
}
elsif ($bandwidth <= 40000000) {
# 40 Gbit
$wiretype = "ethernet-40000000";
}
else {
# 100 Gbit
$wiretype = "ethernet-100000000";
}
return $wiretype;
}
......
#!/usr/bin/perl -w
#
# Copyright (c) 2005-2018 University of Utah and the Flux Group.
# Copyright (c) 2005-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -10348,10 +10348,22 @@ sub GetWiretype($$$)
# 1 Gbit
$wiretype = "ethernet-1000000";
}
else {
elsif ($bandwidth <= 10000000) {
# 10 Gbit
$wiretype = "ethernet-10000000";
}
elsif ($bandwidth <= 25000000) {
# 25 Gbit
$wiretype = "ethernet-25000000";
}
elsif ($bandwidth <= 40000000) {
# 40 Gbit
$wiretype = "ethernet-40000000";
}
else {
# 100 Gbit
$wiretype = "ethernet-100000000";
}
return $wiretype;
}
......
# -*- tcl -*-
#
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -264,7 +264,7 @@ LanLink instproc init {s nodes bw d type} {
# Make sure BW is reasonable.
# XXX: Should come from DB instead of hardwired max.
# Measured in kbps
set maxbw 25000000
set maxbw 100000000
# XXX skip this check for a simulated lanlink even if it
# causes nse to not keep up with real time. The actual max
......
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