Skip to content
GitLab
Menu
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
3ad1910a
Commit
3ad1910a
authored
May 29, 2008
by
David Johnson
Browse files
Fix plabfed bwlimit, add a couple other things.
parent
59bdb0b4
Changes
1
Hide whitespace changes
Inline
Side-by-side
tbsetup/plab/libplab.py.in
View file @
3ad1910a
...
...
@@ -1778,9 +1778,13 @@ class Plab:
failsoon
.
append
(
entry
)
pass
# skip node renewal
print
"Finished slice %s/%s in %s/%s at %s:"
\
%
(
plcname
,
slicename
,
pid
,
eid
,
time
.
ctime
())
continue
elif
res
==
-
1
:
# slice did not get renewed, so skip
print
"Failingly finished slice %s/%s in %s/%s at %s:"
\
%
(
plcname
,
slicename
,
pid
,
eid
,
time
.
ctime
())
continue
else
:
if
entry
in
failedrenew
:
...
...
@@ -2268,6 +2272,10 @@ class EmulabPlcObjTranslator:
(
sip
[
2
]
&
smask
[
2
])
|
(
~
smask
[
2
]
&
0xff
),
(
sip
[
3
]
&
smask
[
3
])
|
(
~
smask
[
3
]
&
0xff
),)
if
bwlimit
==
''
:
bwlimit
=
None
pass
retval
[
'hostname'
]
=
hostname
ctrl_network
=
{
'ip'
:
IP
,
'bwlimit'
:
bwlimit
,
'method'
:
boot_method
,
'network'
:
n_network
,
'netmask'
:
netmask
,
...
...
@@ -2625,6 +2633,18 @@ class Slice:
pass
return
retval
def
getSliceNodeObjects
(
self
):
"""
Return a tuple containing node objects for nodes in this slice
"""
retval
=
[]
for
n
in
self
.
nodelist
:
nn
=
Node
(
self
,
n
)
# Grab the IP and hostname
retval
.
append
(
nn
)
pass
return
retval
def
getSliceUsers
(
self
):
return
self
.
userlist
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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