Commit 06be27d0 authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

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

parents c13a2cfa 28fd59ef
......@@ -60,11 +60,7 @@ sub runTest
my $num = $_[2];
startProgram($dest, "sh /local/bw-bottleneck-wavelet/multiplex-server.sh $serverPort /local/bw-bottleneck-wavelet", 0);
sleep(2);
<<<<<<< scan-multiplex.pl
startProgram($source, "sh /bw-bottleneck/multiplex-client.sh $serverPort /bw-bottleneck end-$dest $duration $source-to-$dest-run-$run-$num", 0);
=======
startProgram($source, "sh /local/bw-bottleneck-wavelet/multiplex-client.sh $serverPort /local/bw-bottleneck-wavelet node-$dest.$exp.$proj.emulab.net $duration $source-to-$dest-run-$run-$num", 0);
>>>>>>> 1.2
sleep($duration * 11);
stopProgram($dest);
......@@ -77,22 +73,11 @@ $count = 0;
srand($run);
<<<<<<< scan-multiplex.pl
#while (1)
#{
# $i = int(rand($nodeCount));
# $j = int(rand($nodeCount));
for ($i = 1; $i <= $nodeCount; ++$i)
=======
my %PairHash = ();
my $iterLimit = $nodeCount*($nodeCount-1);
while (1)
>>>>>>> 1.2
{
<<<<<<< scan-multiplex.pl
for ($j = 1; $j <= $nodeCount; ++$j)
=======
$i = int(rand($nodeCount)) + 1;
$j = int(rand($nodeCount)) + 1;
......@@ -102,16 +87,7 @@ while (1)
}
if ($i != $j)
>>>>>>> 1.2
{
<<<<<<< scan-multiplex.pl
if ($i != $j)
{
runTest($i, $j, $count);
++$count;
# runTest($nodes[$i], $nodes[$j]);
}
=======
my $nodeString = $i . ":" . $j;
if( not ( $PairHash{$nodeString} ) )
{
......@@ -125,7 +101,6 @@ while (1)
{
next;
}
>>>>>>> 1.2
}
}
# sleep(600);
......
......@@ -3133,6 +3133,7 @@ CREATE TABLE `sitevariables` (
`value` text,
`defaultvalue` text NOT NULL,
`description` text,
`ns_include` tinyint(0) NOT NULL default 0,
PRIMARY KEY (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
......
use strict;
use libdb;
sub DoUpdate($$$)
{
my ($dbhandle, $dbname, $version) = @_;
#
# Add a new column to the sitevariables table
#
if (!DBSlotExists("sitevariables", "ns_include")) {
DBQueryFatal("alter table sitevariables add column ns_include " .
"tinyint(0) NOT NULL default 0");
return 0;
}
}
1;
......@@ -566,6 +566,28 @@ sub GenDefsFile($)
}
print TCL "\n";
print TCL "# Site variables\n";
$query_result = DBQueryFatal("select name,value,defaultvalue " .
" from sitevariables where ns_include=TRUE");
while (my ($name,$value,$defaultvalue) = $query_result->fetchrow_array()) {
# Use the default value if unset, or skip altogether if the default
# is just the empty string.
if (!defined($value)) {
if ($defaultvalue eq "") {
next;
} else {
$value = $defaultvalue;
}
}
# Escape special characters in the value (just braces)
$value =~ s/([{}])/\\$1/g;
# Note: braces in tcl act like single quotes in other scripting
# languages (eg. no interpolation occurs)
print TCL "set sitevariables($name) {$value}\n";
}
print TCL "\n";
if (defined($pid)) {
print TCL "# OSIDs\n";
$query_result =
......
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006 University of Utah and the Flux Group.
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -302,6 +302,11 @@ DEVICE: foreach my $name (keys %portMap) {
$device = new snmpit_nortel($name);
last;
};
/hp/ && do {
require snmpit_hp;
$device = new snmpit_hp($name);
last;
};
# 'default' case
warn "WARNING: Unknown switch type ($type) for $name, skipping some ports\n";
......
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