Skip to content

GitLab

emulab-devel
emulab-devel
Commit d352379f authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files
Options

Add code to extract the switch path (interswitch links) from assign's 

output, and store it in the lans table. This will be used to drive the
interswitch trunk setup in snmpit.
parent beb69f4e
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 14 deletions
db/Lan.pm.in
View file @ d352379f
......@@ -2195,6 +2195,15 @@ sub SetAttribute($$$;$)
return 0;
}
sub GetAttribute($$)
{
my ($self, $key) = @_;
return undef
if (!exists($self->{"ATTRS"}->{$key}));
return $self->{"ATTRS"}->{$key}->{"attrvalue"};
}
sub SetRole($$)
{
my ($self, $role) = @_;
......@@ -2656,6 +2665,19 @@ sub GetClass($)
# Assume experimental LAN
return "Experimental";
}
sub GetSwitchPath($) {
my ($self) = @_;
my $path;
return $path
if ($self->GetAttribute("switchpath", \$path) == 0);
return undef;
}
sub SetSwitchPath($$) {
my ($self, $path) = @_;
return $self->GetLan()->SetAttribute("switchpath", $path);
}
# VLan reservation for a specific lan in an experiment.
sub ReserveVlanTag($$;$$)
......@@ -3077,6 +3099,27 @@ sub Instantiate($;$)
return 0;
}
sub GetVlanSwitchPath($)
{
my ($class, $vlan) = @_;
if (!ref($vlan)) {
$vlan = VLan->Lookup($vlan);
}
return -1
if (!defined($vlan));
my $lanid = $vlan->lanid();
my $query_result =
DBQueryWarn("select switchpath from vlans where id='$lanid'");
return undef
if (!$query_result || !$query_result->numrows);
my ($path) = $query_result->fetchrow_array();
return $path;
}
#
# Some vlans are not kept sync with the DB; too difficult. Might
# reexamine this later. For sure, keeping the default vlan and the
......@@ -3146,16 +3189,24 @@ sub RecordVlanInsertion($$$)
my $tag = $vlan->GetReservedVlanTag();
return -1
if (!defined($tag));
my $path = $vlan->GetSwitchPath();
my @portlist;
$vlan->PortList(\@portlist) == 0
or return -1;
my $members = join(" ", @portlist);
#
# Not all vlans have the path set. Only intraswitch vlans do. In
# addition, internal, manual, elabinelab, etc. do not have a path.
#
$path = (defined($path) ? ", switchpath='$path'" : "");
$path = "";
DBQueryWarn("replace into vlans set ".
" id='$lanid', pid='$pid', eid='$eid', exptidx='$exptidx', ".
" virtual='$vname', members='$members', tag='$tag', ".
" stack='$stack'")
" stack='$stack' $path")
or return -1;
return 0;
......@@ -3173,14 +3224,21 @@ sub RecordVLanDeletion($$)
sub RecordVLanModification($$$$)
{
my ($class, $lanid, $added, $removed) = @_;
my ($class, $vlan, $added, $removed) = @_;
my %current = ();
if (!ref($vlan)) {
$vlan = VLan->Lookup($vlan);
}
return -1
if (!defined($vlan));
my $lanid = $vlan->lanid();
my $query_result =
DBQueryWarn("select members from vlans where id='$lanid'");
return -1
if (!$query_result);
my ($current) = $query_result->fetchrow_array();
if (defined($current) && $current ne "") {
%current = map { $_ => $_ } split(/\s+/, $current);
......@@ -3202,7 +3260,7 @@ sub RecordVLanModification($$$$)
}
}
my $members = join(" ", keys(%current));
DBQueryWarn("update vlans set members='$members' ".
"where id='$lanid'")
or return -1;
......
tbsetup/libvtop_test.pm.in
View file @ d352379f
......@@ -3875,9 +3875,11 @@ sub AddNodeToSolution($$$)
return 0;
}
sub AddLinkToSolution($$$$$$$$)
sub AddLinkToSolution($$$$$$$$;$)
{
my ($self, $vlink, $trivial, $direct, $nodeA, $portA, $nodeB, $portB) = @_;
my ($self,
$vlink, $trivial, $direct, $nodeA, $portA, $nodeB, $portB,
$switchpath) = @_;
#
# Map the solution back to our objects and store the results.
......@@ -3900,6 +3902,7 @@ sub AddLinkToSolution($$$$$$$$)
}
elsif (($lan,$virtA) =
($vlink =~ m|^linkdelaysrc/([^/]+)/(.+)$|)) {
# This is the link between the original node and the delay node.
$virtlan = $self->vlans()->{$lan};
$member0 = $virtlan->members()->{$virtA};
$member0->_pnode($nodeA);
......@@ -3946,10 +3949,13 @@ sub AddLinkToSolution($$$$$$$$)
}
elsif (($lan,$virtA) =
($vlink =~ m|^linkdelaydst/([^/]+)/(.+)$|)) {
# This is the link between the delay node and lannode.
$virtlan = $self->vlans()->{$lan};
# Special case since the other side is a lannode.
$member0 = $virtlan->members()->{$virtA};
$member0->_delayportB($portB);
# Stash the path here. Silly, but its easier.
$member0->_delaypath($switchpath);
}
elsif (($lan,$virtA,$virtB) =
($vlink =~ m|^linksdelaydst/(.+)/(.+),(.+)$|)) {
......@@ -3960,6 +3966,8 @@ sub AddLinkToSolution($$$$$$$$)
$member0->_pport($portA);
$member0->_delaynode($nodeB);
$member0->_delayport($portB);
# Stash the path here. Silly, but its easier.
$member0->_delaypath($switchpath);
}
else {
tberror("Bad vlink in solution: $vlink\n");
......@@ -3967,7 +3975,7 @@ sub AddLinkToSolution($$$$$$$$)
}
$self->solution_plinks()->{$vlink} =
[$linktag,$virtlan,$trivial,$direct,$member0,$member1];
[$linktag,$virtlan,$trivial,$direct,$member0,$member1,$switchpath];
if (!$trivial) {
$self->printdb(" $vlink ".
(defined($nodeA) ? "A:$nodeA:$portA " : "") .
......@@ -4037,18 +4045,23 @@ sub ReadTextSolution($$)
my ($vlink,$rawA,$rawB) = undef;
my $trivial = 0;
my $direct = 0;
my $swpath = undef;
/^End Edges$/ && last EDGEWHILE;
my @info = split;
my $line = $_;
$_ = $info[1]; # type
SWITCH1: {
my $type = $info[1];
SWITCH1: for ($type) {
/^intraswitch$/ && do {
($vlink,$rawA,$rawB) = @info[0,3,5];
last SWITCH1;
};
/^interswitch$/ && do {
($vlink,$rawA,$rawB) = @info[0,3,$#info];
#
# We need to save the path through the switches for later.
#
$swpath = getportlist(@info);
last SWITCH1;
};
/^direct$/ && do {
......@@ -4069,7 +4082,7 @@ sub ReadTextSolution($$)
my ($nodeportA,$nodeportB) = undef;
my ($switchportA,$switchportB) = undef;
my ($nodeA,$portA,$nodeB,$portB) = undef;
if (!$trivial) {
($nodeportA,$switchportA) = getnodeport($rawA);
if (defined($nodeportA)) {
......@@ -4096,7 +4109,7 @@ sub ReadTextSolution($$)
}
}
$self->AddLinkToSolution($vlink, $trivial, $direct,
$nodeA, $portA, $nodeB, $portB);
$nodeA, $portA, $nodeB, $portB, $swpath);
}
return 0;
}
......@@ -5298,7 +5311,7 @@ sub InterpLinksAux($)
while (@plinks) {
my $plink = shift(@plinks);
my ($linktag,$virtlan,$trivial,$direct,$member0,$member1) =
my ($linktag,$virtlan,$trivial,$direct,$member0,$member1,$pathA) =
@{$plinks{$plink}};
my $lan = $virtlan->vname();
......@@ -5314,6 +5327,8 @@ sub InterpLinksAux($)
else {
$self->printdb("plink $plink\n");
}
$self->printdb(" path - $pathA\n")
if (defined($pathA));
# There is always a member0.
my $virtA = $member0;
......@@ -5343,10 +5358,13 @@ sub InterpLinksAux($)
my $portB = $member0->_delayport();
my $nodeD = $member1->_delaynode();
my $portD = $member1->_delayport();
my $pathB = $member0->_delaypath();
$self->printdb("LINK delay: $virtA,$virtC - ".
"$nodeA:$portA,$nodeB:$portB,".
"$nodeD:$portD,$nodeC:$portC\n");
$self->printdb(" path - $pathB\n")
if (defined($pathB));
my $protolan = ProtoLan->Create($experiment, "$lan",
$self->impotent() ||
......@@ -5367,6 +5385,10 @@ sub InterpLinksAux($)
$protolandst->SetRole("delay");
$protolansrc->SetAttribute("link/lan", $lan);
$protolandst->SetAttribute("link/lan", $lan);
$protolansrc->SetAttribute("switchpath", "$pathA")
if (defined($pathA));
$protolandst->SetAttribute("switchpath", "$pathB")
if (defined($pathB));
$protolan->SetRole("link/lan");
$protolan->AddInterface($nodeC, $vnodeC, $vportC, $portC);
$protolan->AddInterface($nodeA, $vnodeA, $vportA, $portA);
......@@ -5399,6 +5421,7 @@ sub InterpLinksAux($)
# The delay node port/links
my $nodeB = $member0->_delaynode();
my $portB = $member0->_delayport();
my $pathB = $member0->_delaypath();
my $nodeD = $nodeB;
my $portD = $member0->_delayportB();
......@@ -5435,13 +5458,19 @@ sub InterpLinksAux($)
$protolanlan->SetAttribute("link/lan", $lan);
}
$protolanlan->AddMember($nodeD, $portD);
if (defined($pathB)) {
my $path = $protolanlan->GetAttribute("switchpath");
$protolanlan->SetAttribute("switchpath",
AddToSwitchPath($path, $pathB));
}
my $protolanlink = ProtoLan->Create($experiment, $dlink,
$self->impotent(),
$protolan);
$protolanlink->SetType("vlan");
$protolanlink->SetRole("delay");
$protolanlink->SetAttribute("link/lan", $lan);
$protolanlink->SetAttribute("switchpath", "$pathA")
if (defined($pathA));
$protolanlink->AddMember($nodeA, $portA);
$protolanlink->AddMember($nodeB, $portB);
......@@ -5697,6 +5726,8 @@ sub InterpLinksAux($)
$protovlan->SetType("vlan");
$protovlan->SetEncapStyle($virtlan->_encapstyle());
$protovlan->SetAttribute("link/lan", $lan);
$protovlan->SetAttribute("switchpath", "$pathA")
if (defined($pathA));
$protovlans{$lan} = $protovlan;
$protovlan->AddMember($nodeA, $portA)
......@@ -5719,6 +5750,8 @@ sub InterpLinksAux($)
$vlan_type = "vlan";
$vlan_role = "emulated";
$protolink->SetAttribute("link/lan", $lan);
$protolink->SetAttribute("switchpath", "$pathA")
if (defined($pathA));
}
$protolink->SetType($vlan_type);
$protolink->SetRole($vlan_role);
......@@ -5751,6 +5784,8 @@ sub InterpLinksAux($)
$protolink->SetType(($direct ? "direct" : "vlan"));
$protolink->SetRole("link/lan");
$protolink->SetAttribute("link/lan", $lan);
$protolink->SetAttribute("switchpath", "$pathA")
if (defined($pathA));
$protolink->AddInterface($nodeA, $vnodeA, $vportA, $portA);
$protolink->AddInterface($nodeB, $vnodeB, $vportB, $portB);
$protovlans{$lan} = $protolink;
......@@ -5873,6 +5908,12 @@ sub InterpLinksAux($)
}
$protovlan->AddMember($nodeA, $portA)
if (!$protovlan->IsMember($nodeA, $portA));
if (defined($pathA)) {
my $path = $protolan->GetAttribute("switchpath");
$protolan->SetAttribute("switchpath",
AddToSwitchPath($path, $pathA));
}
}
#
......@@ -5994,6 +6035,18 @@ sub InterpLinksAux($)
ProtoLan->Lookup($experiment,
$lan . "-delaylan");
$protolanlan->AddMember($nodeA, $portA);
if (defined($pathA)) {
my $path = $protolanlan->GetAttribute("switchpath");
$protolanlan->SetAttribute("switchpath",
AddToSwitchPath($path, $pathA));
}
}
else {
if (defined($pathA)) {
my $path = $protolan->GetAttribute("switchpath");
$protolan->SetAttribute("switchpath",
AddToSwitchPath($path, $pathA));
}
}
}
}
......@@ -8066,6 +8119,36 @@ sub getnodeport($)
return ($A, $B);
}
# getportlist
# Takes the list of arguments on an edges line and returns the set of
# ports spanned by that vlan.
sub getportlist(@)
{
my @info = @_;
my @result = ();
# The beginning and end of the list are ignored for the path
# since we care only about the Trunk links.
@info = splice(@info, 4, $#info);
while (@info) {
#
# Traverse two at a time. We can deduce the switch pair
# from the first string, but thats a kludge. The
# second string is supposed to be real interface info,
# but ignore that for now, until new ptopgen actually
# sets it.
#
my $field1 = shift(@info);
my $field2 = shift(@info);
if ($field1 =~ /^link\-/ &&
$field2 eq "((null),(null))") {
$field1 =~ s/^link\-//;
push(@result, $field1);
}
}
return join(" ", @result);
}
# Get the type for an interface.
sub physinterfacetype($$)
{
......@@ -8558,4 +8641,34 @@ sub VnameToNode($$)
return Node->Lookup($nodeid);
}
#
# A switchpath is "SW1:SW2 SW2:SW3 ..." This function takes an
# existing path, and adds new ones from the list, while watching for
# duplicates. We assume the new path is already unique since it came
# right out of assign. Note that assign might spit out either SW1:SW2
# or SW2:SW1, so have to watch for that too.
#
sub AddToSwitchPath($$)
{
my ($cur, $new) = @_;
print "N: $new\n";
return $new
if (!defined($cur));
my @cur = split(" ", $cur);
my @new = split(" ", $new);
foreach my $n (@new) {
my ($s1,$s2) = split(":", $n);
print "$n, $s1, $s2, @cur\n";
push(@cur, $n)
if (! ((grep {$_ eq $n} @cur) ||
(grep {$_ eq "$s2:$s1"} @cur)));
}
return join(" ", @cur);
}
1;
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