Commit a4a56bfb authored by Jonathon Duerig's avatar Jonathon Duerig

Fix error in parsing vnode names. Tweak a few error messages.

parent 4c147b21
...@@ -2586,7 +2586,7 @@ sub SliverWorkAux($$$$$$$) ...@@ -2586,7 +2586,7 @@ sub SliverWorkAux($$$$$$$)
my $node = GeniUtil::LookupNode($vnode_id); my $node = GeniUtil::LookupNode($vnode_id);
if (!defined($node)) { if (!defined($node)) {
$message = "Bad vnode_id $resource_id"; $message = "Bad vnode_id $vnode_id";
goto bad; goto bad;
} }
...@@ -2835,6 +2835,7 @@ sub SliverWorkAux($$$$$$$) ...@@ -2835,6 +2835,7 @@ sub SliverWorkAux($$$$$$$)
my $vnode_id = GeniXML::GetVnodeId($ref); my $vnode_id = GeniXML::GetVnodeId($ref);
my $virtual_id = GeniXML::GetVirtualId($ref); my $virtual_id = GeniXML::GetVirtualId($ref);
my $manager_id = GeniXML::GetManagerId($ref); my $manager_id = GeniXML::GetManagerId($ref);
my $inaggregate = 0; my $inaggregate = 0;
my $sliver; my $sliver;
...@@ -2865,7 +2866,7 @@ sub SliverWorkAux($$$$$$$) ...@@ -2865,7 +2866,7 @@ sub SliverWorkAux($$$$$$$)
my $node = GeniUtil::LookupNode($vnode_id); my $node = GeniUtil::LookupNode($vnode_id);
if (!defined($node)) { if (!defined($node)) {
$message = "Unknown vnode_id in ticket: $resource_id"; $message = "Unknown vnode_id in ticket: $vnode_id";
goto bad; goto bad;
} }
# Must do this after mapper has run # Must do this after mapper has run
......
...@@ -382,7 +382,7 @@ sub GetVnodeId($) ...@@ -382,7 +382,7 @@ sub GetVnodeId($)
if (IsVersion0($node)) { if (IsVersion0($node)) {
$result = GetNodeId($node); $result = GetNodeId($node);
} else { } else {
my $vnoderef = GeniXML::FindNodesNS("vnode", $node, my $vnoderef = GeniXML::FindNodesNS("n:vnode", $node,
$EMULAB_NS)->pop(); $EMULAB_NS)->pop();
if (defined($vnoderef)) { if (defined($vnoderef)) {
$result = GetText("name", $vnoderef); $result = GetText("name", $vnoderef);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment