Commit 6d45b88d authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Bugfix: Make sure to use vnode id when looking up nodes in ProtoGENI.

parent ed49e5ce
...@@ -2101,6 +2101,7 @@ sub SliverWorkAux($$$$$$$) ...@@ -2101,6 +2101,7 @@ sub SliverWorkAux($$$$$$$)
foreach my $ref (GeniXML::FindNodes("n:node", foreach my $ref (GeniXML::FindNodes("n:node",
$rspec)->get_nodelist()) { $rspec)->get_nodelist()) {
my $resource_id = GeniXML::GetNodeId($ref); my $resource_id = GeniXML::GetNodeId($ref);
my $vnode_id = GeniXML::GetVnodeId($ref);
my $node_nickname = GeniXML::GetVirtualId($ref); my $node_nickname = GeniXML::GetVirtualId($ref);
my $manager_id = GeniXML::GetManagerId($ref); my $manager_id = GeniXML::GetManagerId($ref);
...@@ -2130,9 +2131,9 @@ sub SliverWorkAux($$$$$$$) ...@@ -2130,9 +2131,9 @@ sub SliverWorkAux($$$$$$$)
next; next;
} }
my $node = GeniUtil::LookupNode($resource_id); my $node = GeniUtil::LookupNode($vnode_id);
if (!defined($node)) { if (!defined($node)) {
$message = "Bad resource_id $resource_id"; $message = "Bad vnode_id $resource_id";
goto bad; goto bad;
} }
...@@ -2362,6 +2363,7 @@ sub SliverWorkAux($$$$$$$) ...@@ -2362,6 +2363,7 @@ sub SliverWorkAux($$$$$$$)
my %rspecmap = (); my %rspecmap = ();
foreach my $ref (GeniXML::FindNodes("n:node", $rspec)->get_nodelist()) { foreach my $ref (GeniXML::FindNodes("n:node", $rspec)->get_nodelist()) {
my $resource_id = GeniXML::GetNodeId($ref); my $resource_id = GeniXML::GetNodeId($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);
...@@ -2408,9 +2410,9 @@ sub SliverWorkAux($$$$$$$) ...@@ -2408,9 +2410,9 @@ sub SliverWorkAux($$$$$$$)
next; next;
} }
my $node = GeniUtil::LookupNode($resource_id); my $node = GeniUtil::LookupNode($vnode_id);
if (!defined($node)) { if (!defined($node)) {
$message = "Unknown resource_id in ticket: $resource_id"; $message = "Unknown vnode_id in ticket: $resource_id";
goto bad; goto bad;
} }
# Must do this after mapper has run # Must do this after mapper has run
......
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