Skip to content
GitLab
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
45c6b202
Commit
45c6b202
authored
Feb 22, 2011
by
Leigh B Stoller
Browse files
Minor fix to previous revision.
parent
7554bdd8
Changes
1
Hide whitespace changes
Inline
Side-by-side
tbsetup/libvtop.pm.in
View file @
45c6b202
...
...
@@ -5510,11 +5510,20 @@ sub InterpLinksAux($)
$self->impotent() ||
$self->alloconly(),
$protovlan);
$protolink->SetType((defined($protovlan) ?
"emulated" : "vlan"));
$protolink->SetRole("link/lan");
$protolink->SetAttribute("link/lan", $lan)
if (!defined($protovlan));
my $vlan_type;
my $vlan_role;
if (defined($protovlan)) {
$vlan_type = "emulated";
$vlan_role = "link/lan";
}
else {
$vlan_type = "vlan";
$vlan_role = "emulated";
$protolink->SetAttribute("link/lan", $lan);
}
$protolink->SetType($vlan_type);
$protolink->SetRole($vlan_role);
$protolink->AddInterface($nodeA, $vnodeA, $vportA,
$virtifaceA->viface(),
...
...
@@ -6931,7 +6940,7 @@ sub UploadVlans($)
# Only care about encapsulated links.
next
if (! ($lan->type() eq "emulated" ||
$lan->
typ
e() eq "
vlan
"));
$lan->
GetRol
e() eq "
emulated
"));
my $virtlan = $self->vlans()->{$lan->vname()};
if (!defined($virtlan)) {
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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