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
0e778e00
Commit
0e778e00
authored
Aug 10, 2012
by
Robert Ricci
Browse files
Minor improvements to error messages
parent
3fc894e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
tbsetup/snmpit_test/snmpit_arista_switch_daemon.py.in
View file @
0e778e00
...
...
@@ -70,7 +70,7 @@ def vlanExists(sysdb, vlan_num):
def
setPortStatus
(
sysdb
,
port
,
up
=
1
):
ic
=
sysdb
[
'interface'
][
'status'
][
'all'
].
get
(
port
)
if
ic
is
None
:
debug
(
"setPortStatus("
+
str
(
port
)
+
","
+
str
(
up
)
+
") error: can
not get port."
)
debug
(
"setPortStatus("
+
str
(
port
)
+
","
+
str
(
up
)
+
") error: cannot get port."
)
return
if
up
==
1
:
ic
.
linkStatus
=
'linkUp'
...
...
@@ -132,7 +132,7 @@ def _removeVlan(vlan_num):
del
bc
.
vlanConfig
[
int
(
vlan_num
)]
retval
=
1
else
:
retval
=
"VLAN #%d not exist
s
."
%
(
int
(
vlan_num
),)
retval
=
"VLAN #%d
does
not exist."
%
(
int
(
vlan_num
),)
except
:
print
sign
+
" error: "
+
str
(
sys
.
exc_info
())
retval
=
str
(
sys
.
exc_info
())
...
...
@@ -153,14 +153,14 @@ def _setPortVlan(vlan_num, ports):
bc
=
getBridgingConfig
(
sysdbroot
)
if
not
vlanExists
(
sysdbroot
,
vlan_num
):
debug
(
"setPortVlan: VLAN #%d not exist
s
."
%
(
int
(
vlan_num
),))
debug
(
"setPortVlan: VLAN #%d
does
not exist."
%
(
int
(
vlan_num
),))
return
0
for
p
in
ports
:
try
:
pbc
=
bc
.
switchIntfConfig
.
newMember
(
p
)
except
:
debug
(
"setPortVlan: Error
s
when getting port %s
,
%s"
debug
(
"setPortVlan: Error when getting port %s
-
%s"
%
(
str
(
p
),
str
(
sys
.
exc_info
())))
errors
+=
1
else
:
...
...
@@ -195,7 +195,7 @@ def _removePortsFromVlan(vlan_num, ports):
try
:
pbc
=
bc
.
switchIntfConfig
.
newMember
(
p
)
except
:
debug
(
"removePortsFromVlan: Error
s
when getting port %s
,
%s"
debug
(
"removePortsFromVlan: Error when getting port %s
-
%s"
%
(
str
(
p
),
str
(
sys_exc_info
())))
errors
+=
1
else
:
...
...
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