Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
f6825eed
Commit
f6825eed
authored
Mar 22, 2010
by
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
Changes
4
Hide whitespace changes
Inline
Side-by-side
db/Experiment.pm.in
View file @
f6825eed
...
...
@@ -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'
);}
...
...
tbsetup/ns2ir/elabinelab.ns
View file @
f6825eed
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004-200
8
University of Utah and the Flux Group.
# Copyright (c) 2004-20
1
0 University of Utah and the Flux Group.
# All rights reserved.
#
...
...
tbsetup/ns2ir/parse-ns.in
View file @
f6825eed
...
...
@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-200
8
University of Utah and the Flux Group.
# Copyright (c) 2000-20
1
0 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.
...
...
tbsetup/ns2ir/tb_compat.tcl.in
View file @
f6825eed
# -*- tcl -*-
#
# EMULAB-COPYRIGHT
# Copyright
(
c
)
2000-200
6, 2008, 2009
University of Utah and the Flux Group.
# Copyright
(
c
)
2000-20
1
0 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
}
#
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment