Commit f6825eed authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Tweaks to elabinelab singlenet option; now turned on by default, but

do not mess up existing elabinelab experiments.
parent 9fe94ed8
......@@ -332,6 +332,8 @@ sub keyhash($) { return field($_[0], 'keyhash');}
sub paniced($) { return field($_[0], 'paniced');}
sub cpu_usage($) { return field($_[0], 'cpu_usage');}
sub encap_style($) { return field($_[0], 'encap_style');}
sub minimum_nodes($) { return field($_[0], 'minimum_nodes');}
sub maximum_nodes($) { return field($_[0], 'maximum_nodes');}
sub multiplex_factor($) { return field($_[0], 'multiplex_factor');}
sub delay_capacity($) { return field($_[0], 'delay_capacity');}
sub virtnode_count($) { return field($_[0], 'virtnode_count');}
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004-2008 University of Utah and the Flux Group.
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
# All rights reserved.
#
......
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -671,21 +671,14 @@ sub GenDefsFile($)
# ElabInElab stuff.
#
my $maxnodes = 0;
if (defined($pid)) {
my $elabinelab = 0;
my $elabinelab_eid;
TBExptIsElabInElab($pid, $eid, \$elabinelab, \$elabinelab_eid)
or tbdie("Failed to get ElabInElab attributes!");
if ($elabinelab && defined($elabinelab_eid)) {
if (! TBExptMinMaxNodes($pid, $elabinelab_eid, undef, \$maxnodes)) {
tbdie("Could not get max nodes from DB!");
}
}
my $singlenet = 1;
if (defined($experiment) && $experiment->elabinelab()) {
$maxnodes = $experiment->maximum_nodes();
$singlenet = $experiment->elabinelab_singlenet();
}
# Be sure to initialize this to something ...
print TCL "set elabinelab_maxpcs $maxnodes\n\n";
print TCL "set ::GLOBALS::elabinelab_singlenet $singlenet\n";
#
# For Templates.
......
# -*- tcl -*-
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006, 2008, 2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -1736,10 +1736,14 @@ proc tb-set-elabinelab-cvstag {cvstag} {
set elabinelab_cvstag $cvstag
}
proc tb-elabinelab-singlenet {} {
proc tb-elabinelab-singlenet {args} {
var_import ::GLOBALS::elabinelab_singlenet
set onoff 1
set elabinelab_singlenet 1
if {$args != {}} {
set onoff [lindex $args 0]
}
set elabinelab_singlenet $onoff
}
#
......
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