Commit edb24215 authored by Mike Hibler's avatar Mike Hibler

Add support for 1000Mb inner control net via TBCOMPAT::elabinelab_cnetspeed.

Note that this only makes sense for singlenet==0 where we can control the
speed of the inner elab control network.
parent d4516994
...@@ -730,6 +730,7 @@ sub SetupFsNode() ...@@ -730,6 +730,7 @@ sub SetupFsNode()
my $inner_controlif; my $inner_controlif;
my $inner_ip; my $inner_ip;
my $inner_netmask; my $inner_netmask;
my $inner_speed;
if (! $emulabconfig{"CONFIG_SINGLECNET"}) { if (! $emulabconfig{"CONFIG_SINGLECNET"}) {
if (getifconfig(\@ifacelist) != 0 || !@ifacelist) { if (getifconfig(\@ifacelist) != 0 || !@ifacelist) {
...@@ -738,6 +739,16 @@ sub SetupFsNode() ...@@ -738,6 +739,16 @@ sub SetupFsNode()
$inner_controlif = $ifacelist[0]->{IFACE}; $inner_controlif = $ifacelist[0]->{IFACE};
$inner_ip = $ifacelist[0]->{IPADDR}; $inner_ip = $ifacelist[0]->{IPADDR};
$inner_netmask = $ifacelist[0]->{IPMASK}; $inner_netmask = $ifacelist[0]->{IPMASK};
$inner_speed = $ifacelist[0]->{SPEED};
if ($inner_speed =~ /^(100|1000)Mbps$/) {
$inner_speed = $1;
} else {
print STDERR
"*** Unrecognized inner control net speed '$inner_speed';".
" defaulting to 100Mbps\n";
$inner_speed = "100";
}
} }
# #
...@@ -926,7 +937,7 @@ sub SetupFsNode() ...@@ -926,7 +937,7 @@ sub SetupFsNode()
print RC "network_interfaces=\"\$network_interfaces $inner_controlif\"\n"; print RC "network_interfaces=\"\$network_interfaces $inner_controlif\"\n";
print RC "ifconfig_${inner_controlif}=". print RC "ifconfig_${inner_controlif}=".
"\"inet $inner_ip netmask $inner_netmask ". "\"inet $inner_ip netmask $inner_netmask ".
"media 100baseTX mediaopt full-duplex\"\n"; "media ${inner_speed}baseTX mediaopt full-duplex\"\n";
} }
print RC "network_interfaces=\"\$network_interfaces lo0\"\n"; print RC "network_interfaces=\"\$network_interfaces lo0\"\n";
print RC "static_routes=\"outerboss vnodes\"\n"; print RC "static_routes=\"outerboss vnodes\"\n";
...@@ -1159,6 +1170,7 @@ sub SetupOpsNode($) ...@@ -1159,6 +1170,7 @@ sub SetupOpsNode($)
my $inner_controlif; my $inner_controlif;
my $inner_ip; my $inner_ip;
my $inner_netmask; my $inner_netmask;
my $inner_speed;
if (! $emulabconfig{"CONFIG_SINGLECNET"}) { if (! $emulabconfig{"CONFIG_SINGLECNET"}) {
if (getifconfig(\@ifacelist) != 0 || !@ifacelist) { if (getifconfig(\@ifacelist) != 0 || !@ifacelist) {
...@@ -1167,6 +1179,16 @@ sub SetupOpsNode($) ...@@ -1167,6 +1179,16 @@ sub SetupOpsNode($)
$inner_controlif = $ifacelist[0]->{IFACE}; $inner_controlif = $ifacelist[0]->{IFACE};
$inner_ip = $ifacelist[0]->{IPADDR}; $inner_ip = $ifacelist[0]->{IPADDR};
$inner_netmask = $ifacelist[0]->{IPMASK}; $inner_netmask = $ifacelist[0]->{IPMASK};
$inner_speed = $ifacelist[0]->{SPEED};
if ($inner_speed =~ /^(100|1000)Mbps$/) {
$inner_speed = $1;
} else {
print STDERR
"*** Unrecognized inner control net speed '$inner_speed';".
" defaulting to 100Mbps\n";
$inner_speed = "100";
}
} }
# #
...@@ -1394,7 +1416,7 @@ sub SetupOpsNode($) ...@@ -1394,7 +1416,7 @@ sub SetupOpsNode($)
print RC "network_interfaces=\"\$network_interfaces $inner_controlif\"\n"; print RC "network_interfaces=\"\$network_interfaces $inner_controlif\"\n";
print RC "ifconfig_${inner_controlif}=". print RC "ifconfig_${inner_controlif}=".
"\"inet $inner_ip netmask $inner_netmask ". "\"inet $inner_ip netmask $inner_netmask ".
"media 100baseTX mediaopt full-duplex\"\n"; "media ${inner_speed}baseTX mediaopt full-duplex\"\n";
} }
print RC "network_interfaces=\"\$network_interfaces lo0\"\n"; print RC "network_interfaces=\"\$network_interfaces lo0\"\n";
print RC "static_routes=\"outerboss vnodes\"\n"; print RC "static_routes=\"outerboss vnodes\"\n";
...@@ -1781,6 +1803,7 @@ sub SetupBossNode($) ...@@ -1781,6 +1803,7 @@ sub SetupBossNode($)
my $inner_controlif; my $inner_controlif;
my $inner_ip; my $inner_ip;
my $inner_netmask; my $inner_netmask;
my $inner_speed;
if (! $emulabconfig{"CONFIG_SINGLECNET"}) { if (! $emulabconfig{"CONFIG_SINGLECNET"}) {
if (getifconfig(\@ifacelist) != 0 || !@ifacelist) { if (getifconfig(\@ifacelist) != 0 || !@ifacelist) {
...@@ -1789,6 +1812,16 @@ sub SetupBossNode($) ...@@ -1789,6 +1812,16 @@ sub SetupBossNode($)
$inner_controlif = $ifacelist[0]->{IFACE}; $inner_controlif = $ifacelist[0]->{IFACE};
$inner_ip = $ifacelist[0]->{IPADDR}; $inner_ip = $ifacelist[0]->{IPADDR};
$inner_netmask = $ifacelist[0]->{IPMASK}; $inner_netmask = $ifacelist[0]->{IPMASK};
$inner_speed = $ifacelist[0]->{SPEED};
if ($inner_speed =~ /^(100|1000)Mbps$/) {
$inner_speed = $1;
} else {
print STDERR
"*** Unrecognized inner control net speed '$inner_speed';".
" defaulting to 100Mbps\n";
$inner_speed = "100";
}
} }
# #
...@@ -2063,7 +2096,7 @@ sub SetupBossNode($) ...@@ -2063,7 +2096,7 @@ sub SetupBossNode($)
print RC "network_interfaces=\"\$network_interfaces $inner_controlif\"\n"; print RC "network_interfaces=\"\$network_interfaces $inner_controlif\"\n";
print RC "ifconfig_${inner_controlif}=". print RC "ifconfig_${inner_controlif}=".
"\"inet $inner_ip netmask $inner_netmask ". "\"inet $inner_ip netmask $inner_netmask ".
"media 100baseTX mediaopt full-duplex\"\n"; "media ${inner_speed}baseTX mediaopt full-duplex\"\n";
} }
print RC "network_interfaces=\"\$network_interfaces lo0\"\n"; print RC "network_interfaces=\"\$network_interfaces lo0\"\n";
print RC "static_routes=\"outerboss vnodes\"\n"; print RC "static_routes=\"outerboss vnodes\"\n";
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2004-2011 University of Utah and the Flux Group. # Copyright (c) 2004-2012 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -87,7 +87,12 @@ for {set i 1} {$i <= $maxpcs} {incr i} { ...@@ -87,7 +87,12 @@ for {set i 1} {$i <= $maxpcs} {incr i} {
} }
if { ${::GLOBALS::elabinelab_singlenet} == 0 } { if { ${::GLOBALS::elabinelab_singlenet} == 0 } {
set publiclan [$ns make-lan $lanstr 100Mb 0ms] if { ${::TBCOMPAT::elabinelab_cnetspeed} != 0 } {
set _cnetspeed ${::TBCOMPAT::elabinelab_cnetspeed}
} else {
set _cnetspeed 100
}
set publiclan [$ns make-lan $lanstr ${_cnetspeed}Mb 0ms]
tb-set-ip-lan $myboss $publiclan 10.200.1.252 tb-set-ip-lan $myboss $publiclan 10.200.1.252
for {set i 1} {$i <= $maxpcs} {incr i} { for {set i 1} {$i <= $maxpcs} {incr i} {
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group. # Copyright (c) 2004-2012 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -135,7 +135,12 @@ for {set i 1} {$i <= $maxpcs} {incr i} { ...@@ -135,7 +135,12 @@ for {set i 1} {$i <= $maxpcs} {incr i} {
} }
if { ${::GLOBALS::elabinelab_singlenet} == 0 } { if { ${::GLOBALS::elabinelab_singlenet} == 0 } {
set publiclan [$ns make-lan $lanstr 100Mb 0ms] if { ${::TBCOMPAT::elabinelab_cnetspeed} != 0 } {
set _cnetspeed ${::TBCOMPAT::elabinelab_cnetspeed}
} else {
set _cnetspeed 100
}
set publiclan [$ns make-lan $lanstr ${_cnetspeed}Mb 0ms]
tb-set-ip-lan $myboss $publiclan 10.200.1.252 tb-set-ip-lan $myboss $publiclan 10.200.1.252
tb-set-ip-lan $myops $publiclan 10.200.1.253 tb-set-ip-lan $myops $publiclan 10.200.1.253
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group. # Copyright (c) 2004-2012 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -112,7 +112,12 @@ for {set i 1} {$i <= $maxpcs} {incr i} { ...@@ -112,7 +112,12 @@ for {set i 1} {$i <= $maxpcs} {incr i} {
} }
if { ${::GLOBALS::elabinelab_singlenet} == 0 } { if { ${::GLOBALS::elabinelab_singlenet} == 0 } {
set publiclan [$ns make-lan $lanstr 100Mb 0ms] if { ${::TBCOMPAT::elabinelab_cnetspeed} != 0 } {
set _cnetspeed ${::TBCOMPAT::elabinelab_cnetspeed}
} else {
set _cnetspeed 100
}
set publiclan [$ns make-lan $lanstr ${_cnetspeed}Mb 0ms]
tb-set-ip-lan $myboss $publiclan 10.200.1.252 tb-set-ip-lan $myboss $publiclan 10.200.1.252
tb-set-ip-lan $myops $publiclan 10.200.1.253 tb-set-ip-lan $myops $publiclan 10.200.1.253
...@@ -131,7 +136,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("boss")]} { ...@@ -131,7 +136,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("boss")]} {
tb-set-node-os $myboss $sitevariables(elabinelab/boss_osid) tb-set-node-os $myboss $sitevariables(elabinelab/boss_osid)
} }
} else { } else {
tb-set-node-os $myboss FBSD63-STD tb-set-node-os $myboss FBSD73-STD
} }
if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} { if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
...@@ -143,5 +148,5 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} { ...@@ -143,5 +148,5 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
tb-set-node-os $myops $sitevariables(elabinelab/ops_osid) tb-set-node-os $myops $sitevariables(elabinelab/ops_osid)
} }
} else { } else {
tb-set-node-os $myops FBSD63-STD tb-set-node-os $myops FBSD73-STD
} }
...@@ -131,6 +131,7 @@ namespace eval TBCOMPAT { ...@@ -131,6 +131,7 @@ namespace eval TBCOMPAT {
variable elabinelab_nodeos variable elabinelab_nodeos
variable elabinelab_source_tarfile "" variable elabinelab_source_tarfile ""
variable elabinelab_tarfiles variable elabinelab_tarfiles
variable elabinelab_cnetspeed 0
# Elabinelab attribute stuff. # Elabinelab attribute stuff.
variable elabinelab_attributes variable elabinelab_attributes
......
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