Commit fd697af0 authored by Tarun Prabhu's avatar Tarun Prabhu

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

parents 8510926c 15152726
......@@ -992,7 +992,7 @@ sub GetTicketAuxAux($$$$$$$$$)
"vport" => $vport};
# This is used after the mapper runs since it uses vname:vport.
$vportmap{"$node_nickname:$vport"} = $linkref;
$vportmap{"$node_nickname:$vport"} = {"rspec" => $linkref};
}
}
......@@ -1151,8 +1151,9 @@ sub GetTicketAuxAux($$$$$$$$$)
if (defined($user_bandwidth)) {
$bandwidth = $user_bandwidth;
}
$virtexperiment->NewTableRow("virt_lans",
my $virtlan =
$virtexperiment->NewTableRow("virt_lans",
{"vname" => $lanname,
"vnode" => $node_nickname,
"vport" => $iface_vport,
......@@ -1167,6 +1168,7 @@ sub GetTicketAuxAux($$$$$$$$$)
"rbandwidth" => $bandwidth, # kbps
"rlossrate" => 0.0,
"fixed_iface" => $iface_name});
$vportmap{$member}->{"virtlan"} = $virtlan;
$ifacenum++;
}
$linknum++;
......@@ -1352,12 +1354,16 @@ sub GetTicketAuxAux($$$$$$$$$)
"Virtual node ID or virtual interface ID missing on interface");
goto bad;
}
my $linkref = $vportmap{"$virtual_node_id:$virtual_port_id"};
my $vportp = $vportmap{"$virtual_node_id:$virtual_port_id"};
my $linkref = $vportp->{'rspec'};
my $virtlan = $vportp->{'virtlan'};
$virtlan->fixed_iface($component_id)
if (defined($component_id));
$component_id = "lo0"
if (!defined($component_id));
if (! GeniXML::SetText("component_id", $linkref, $component_id)) {
$response = GeniResponse->Create(GENIRESPONSE_ERROR, undef,
"Bad XML: Failed to add component_id");
"Bad XML: Failed to add component_id");
goto bad;
}
}
......
......@@ -107,7 +107,9 @@ ticket = response["value"]
#print str(ticket)
#
# Update the ticket.
# Update the ticket. Send back the original rspec, but technically wrong.
# Proper to dig out the rspec from the ticket and use that, modified if
# desired.
#
print "Got the ticket, doing a update on it. "
params = {}
......
......@@ -58,7 +58,8 @@ my $user = "geniuser";
my $group = "GeniSlices";
# Need a command line option.
my $debug = 1;
my $debug = 0;
my $mailerrors = 1;
# Determined by version.
my $responder;
......@@ -296,6 +297,9 @@ if ($@) {
else {
if (GeniResponse::IsError($result)) {
$message .= "Error: " . $result->{'code'} . "\n";
if ($mailerrors) {
print STDERR "Mail Errors is on.\n";
}
}
else {
$message .= "Code: " . $result->{'code'} . "\n";
......
......@@ -397,6 +397,9 @@ if ($showlinks) {
my $rbackfill = $row{"rbackfill"};
my $rlossrate = $row{"rlossrate"};
my $protocol = $row{"protocol"};
my $fixed_iface = $row{"fixed_iface"};
$protocol .= " ($fixed_iface)"
if (defined($fixed_iface) && $fixed_iface ne "");
push @data, [$vname, $member, $ipmap{$member},
$delay, $bandwidth, $backfill, $lossrate];
push @data, ["", $protocol, $mask, $rdelay, $rbandwidth, $rbackfill, $rlossrate];
......
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