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
8db4a8a9
Commit
8db4a8a9
authored
Jun 15, 2017
by
Leigh B Stoller
Browse files
More bridge fixes, related to Nick changing the bridge class.
parent
2c430720
Changes
2
Hide whitespace changes
Inline
Side-by-side
apt/APT_Rspec.pm.in
View file @
8db4a8a9
...
...
@@ -1827,7 +1827,7 @@ sub new($$$)
my
$
source
=
GetText
(
"source"
,
$
ref
);
my
$
capacity
=
GetText
(
"capacity"
,
$
ref
);
my
$
latency
=
GetText
(
"latency"
,
$
ref
);
my
$
lossrate
=
GetText
(
"
packet_
loss"
,
$
ref
);
my
$
lossrate
=
GetText
(
"loss
rate
"
,
$
ref
);
#
Geni
-
lib
will
always
add
the
node
to
the
iface_id
.
my
($
tmp
,$
iface_id
)
=
split
(
":"
,
$
source
);
...
...
apt/rspec2genilib.in
View file @
8db4a8a9
...
...
@@ -213,8 +213,7 @@ sub GenerateNodeStatements($)
foreach
my
$k
(
sort
(
keys
(
%
{
$node
->
pipes
()})))
{
my
$p
=
$node
->
pipes
()
->
{
$k
};
my
$pname
=
(
$p
->
{'
iface_id
'}
eq
$if0
?
"
pipe('
$if0
')
"
:
"
pipe('
$if1
')
");
my
$pname
=
(
$p
->
{'
iface_id
'}
eq
$if0
?
"
pipe0
"
:
"
pipe1
");
$node
->
addTagStatement
("
${pname}
.bandwidth =
"
.
$p
->
capacity
())
if
(
defined
(
$p
->
capacity
()));
...
...
@@ -365,7 +364,12 @@ sub GenerateNodeStatements($)
# the internally created interface, not add another one.
#
if
(
$ntype
eq
"
delay
")
{
$node
->
addStatement
("
$itag
=
${ntag}
.interface('
$iface_id
')
");
my
(
$iface0
,
$iface1
)
=
values
(
%
{
$node
->
{'
ifaces
'}});
my
(
undef
,
$if0
)
=
split
("
:
",
$iface0
->
{'
client_id
'});
my
(
undef
,
$if1
)
=
split
("
:
",
$iface1
->
{'
client_id
'});
my
$iname
=
(
$iface_id
eq
$if0
?
"
iface0
"
:
"
iface1
");
$node
->
addStatement
("
$itag
=
${ntag}
.
${iname}
");
if
(
$addr
)
{
$node
->
addStatement
("
${itag}
.addAddress(
$addr
)
");
}
...
...
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