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
8f6374ff
Commit
8f6374ff
authored
Apr 01, 2016
by
Gary Wong
Browse files
Implement proper support for P2PLTE interfaces and links.
parent
405527cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
tbsetup/libvtop_test.pm.in
View file @
8f6374ff
...
...
@@ -1892,7 +1892,7 @@ sub LoadVirtLans($)
$
virtlan
->
_implemented_by
($
implemented_by
);
$
virtlan
->
_vpath
(
undef
);
$
virtlan
->
_bridged
(
0
);
$
virtlan
->
_wiretype
(
"ethernet"
);
$
virtlan
->
_wiretype
(
$
protocol
eq
"P2PLTE"
?
$
protocol
:
"ethernet"
);
if
($
vlanmember
->
ofenabled
())
{
$
virtlan
->
_ofenabled
(
1
);
$
virtlan
->
_ofcontroller
($
vlanmember
->
ofcontroller
());
...
...
tbsetup/ptopgen.in
View file @
8f6374ff
...
...
@@ -1973,11 +1973,17 @@ while (($node1,$card1,$port1,$node2,$card2,$port2) =
}
# This comes from the switch info, unless its a direct link
# between two nodes; use ethernet in this case.
# between two nodes. Default to ethernet in the direct case unless
# there's an LTE interface.
my
$basetype
;
if
(
!
defined
(
$switchobj
))
{
$basetype
=
"
ethernet
";
if
(
$interfacetypes
{
"
$node1
:
$card1
:
$port1
"
}
eq
"
P2PLTE
"
||
$interfacetypes
{
"
$node2
:
$card2
:
$port2
"
}
eq
"
P2PLTE
"
)
{
$basetype
=
"
P2PLTE
";
}
else
{
$basetype
=
"
ethernet
";
}
}
elsif
(
$switchobj
->
NodeTypeAttribute
("
forwarding_protocols
",
\
$basetype
)
||
...
...
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