Skip to content

GitLab

Commit 4465cbec authored by Gary Wong's avatar Gary Wong
Browse files
Options

When redeeming (or otherwise parsing) a ticket, if both URNs and UUIDs 

are present, prefer to use the URN.
parent 337f6350
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
protogeni/lib/GeniCM.pm.in
View file @ 4465cbec
......@@ -1488,9 +1488,11 @@ sub SliverWork($$)
# Make sure all nodes requested are allocated.
#
foreach my $ref (@{$rspec->{'node'}}) {
my $resource_uuid = $ref->{'component_uuid'} || $ref->{'uuid'};
my $resource_uuid = $ref->{'component_urn'} ||
$ref->{'component_uuid'} || $ref->{'uuid'};
my $node_nickname = $ref->{'virtual_id'} || $ref->{'nickname'};
my $manager_uuid = $ref->{'component_manager_uuid'};
my $manager_uuid = $ref->{'component_manager_urn'} ||
$ref->{'component_manager_uuid'};
# Let remote nodes pass through.
next
......
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