From a4a56bfb6981e1abb8812f97e56e1b1fc4ae7dd5 Mon Sep 17 00:00:00 2001 From: Jonathon Duerig Date: Fri, 2 Sep 2011 16:03:42 -0600 Subject: [PATCH] Fix error in parsing vnode names. Tweak a few error messages. --- protogeni/lib/GeniCM.pm.in | 5 +++-- protogeni/lib/GeniXML.pm.in | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/protogeni/lib/GeniCM.pm.in b/protogeni/lib/GeniCM.pm.in index c80bea9f1..261172103 100644 --- a/protogeni/lib/GeniCM.pm.in +++ b/protogeni/lib/GeniCM.pm.in @@ -2586,7 +2586,7 @@ sub SliverWorkAux($$$$$$$) my $node = GeniUtil::LookupNode($vnode_id); if (!defined($node)) { - $message = "Bad vnode_id $resource_id"; + $message = "Bad vnode_id $vnode_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: $resource_id"; + $message = "Unknown vnode_id in ticket: $vnode_id"; goto bad; } # Must do this after mapper has run diff --git a/protogeni/lib/GeniXML.pm.in b/protogeni/lib/GeniXML.pm.in index 371414fbe..19a18a7fa 100644 --- a/protogeni/lib/GeniXML.pm.in +++ b/protogeni/lib/GeniXML.pm.in @@ -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); -- GitLab