Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
a4a56bfb
Commit
a4a56bfb
authored
Sep 02, 2011
by
Jonathon Duerig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error in parsing vnode names. Tweak a few error messages.
parent
4c147b21
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
protogeni/lib/GeniCM.pm.in
protogeni/lib/GeniCM.pm.in
+3
-2
protogeni/lib/GeniXML.pm.in
protogeni/lib/GeniXML.pm.in
+1
-1
No files found.
protogeni/lib/GeniCM.pm.in
View file @
a4a56bfb
...
...
@@ -2586,7 +2586,7 @@ sub SliverWorkAux($$$$$$$)
my
$
node
=
GeniUtil
::
LookupNode
($
vnode_id
);
if
(
!defined($node)) {
$
message
=
"Bad vnode_id $
resourc
e_id"
;
$
message
=
"Bad vnode_id $
vnod
e_id"
;
goto
bad
;
}
...
...
@@ -2835,6 +2835,7 @@ sub SliverWorkAux($$$$$$$)
my
$
vnode_id
=
GeniXML
::
GetVnodeId
($
ref
);
my
$
virtual_id
=
GeniXML
::
GetVirtualId
($
ref
);
my
$
manager_id
=
GeniXML
::
GetManagerId
($
ref
);
my
$
inaggregate
=
0
;
my
$
sliver
;
...
...
@@ -2865,7 +2866,7 @@ sub SliverWorkAux($$$$$$$)
my
$
node
=
GeniUtil
::
LookupNode
($
vnode_id
);
if
(
!defined($node)) {
$
message
=
"Unknown vnode_id in ticket: $
resourc
e_id"
;
$
message
=
"Unknown vnode_id in ticket: $
vnod
e_id"
;
goto
bad
;
}
#
Must
do
this
after
mapper
has
run
...
...
protogeni/lib/GeniXML.pm.in
View file @
a4a56bfb
...
...
@@ -382,7 +382,7 @@ sub GetVnodeId($)
if (IsVersion0($node)) {
$result = GetNodeId($node);
} else {
my $vnoderef = GeniXML::FindNodesNS("vnode", $node,
my $vnoderef = GeniXML::FindNodesNS("
n:
vnode", $node,
$EMULAB_NS)->pop();
if (defined($vnoderef)) {
$result = GetText("name", $vnoderef);
...
...
Write
Preview
Markdown
is supported
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