Commit 386a3db8 authored by Jonathon Duerig's avatar Jonathon Duerig

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 836147d9 aa1a4701
......@@ -336,13 +336,15 @@ sub Stringify($)
return "[Experiment: $pid/$eid]";
}
# Keep this above @SELFLOADER_DATA@ ... elabinelab is a slot in
# the stats stats record, but was not being updated
sub elabinelab($) { return $_[0]->elab_in_elab(); }
1;
@SELFLOADER_DATA@
sub dbrow($$) { return $_[0]->{'EXPT'}; }
sub locked($) { return $_[0]->expt_locked(); }
sub elabinelab($) { return $_[0]->elab_in_elab(); }
sub description($){ return $_[0]->expt_name(); }
sub creator($) { return $_[0]->expt_head_uid(); }
sub created($) { return $_[0]->expt_created(); }
......
......@@ -4581,6 +4581,7 @@ sub LoadExperiment()
$expt_stats{"wanodes"} = $remotecount;
$expt_stats{"plabnodes"}= $plabcount;
$expt_stats{"simnodes"} = $simcount;
$expt_stats{"elabinelab"} => $elabinelab;
}
#
......
......@@ -1018,6 +1018,8 @@ sub AddNode($$)
if ($node->_iseinenode()) {
print "Will skip reload/reboot of inner elab node: $node_id.\n";
$node->ClearOsids();
# Need to initialize this for the stats code.
$node->_bootosinfo(undef);
return 0;
}
......
......@@ -3418,6 +3418,7 @@ sub CreateVtop($)
'minlinks' => 100000,
# includes emulated links. Maybe thats wrong.
'maxlinks' => 0,
'elabinelab' => $experiment->elabinelab(),
};
# Initialize counters.
......
......@@ -92,7 +92,7 @@ echo "$ELABROUTES" | sed -e 's/;/\n/g' | \
_if=`echo "$route" | sed -r -e 's/([^,]*),[^,]*/\1/'`
_rt=`echo "$route" | sed -r -e 's/[^,]*,([^,]*)/\1/'`
if [ $_if = $DEV ]; then
if [ $_if == $DEV ]; then
echo "Emulab configuring route for CT$VEID: exp net ($_if)"
$ROUTE add -host $_rt dev $_if
fi
......
......@@ -2798,7 +2798,7 @@ COMMAND_PROTOTYPE(dobridges)
* Get bridge parameters for the machine.
*/
res = mydb_query("select b.bridx,i.MAC,b.vnode,b.vname "
" from bridges as b"
" from bridges as b "
"left join interfaces as i on "
" i.node_id=b.node_id and i.iface=b.iface "
" where b.node_id='%s' order by bridx",
......
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