From 9a8a2290431bf64f972a3353b92b0ab4883f4de6 Mon Sep 17 00:00:00 2001 From: Jonathon Duerig Date: Tue, 6 Sep 2011 11:35:00 -0600 Subject: [PATCH] Bugfix: Return nickname as the resource_id for GeniAggregates. GeniAggregates can apparently be used in place of GeniSlivers in some contexts. This bug fix makes them more compatible. --- protogeni/lib/GeniAggregate.pm.in | 1 + protogeni/lib/GeniCMV2.pm.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/protogeni/lib/GeniAggregate.pm.in b/protogeni/lib/GeniAggregate.pm.in index 54f2c3684..55386336f 100755 --- a/protogeni/lib/GeniAggregate.pm.in +++ b/protogeni/lib/GeniAggregate.pm.in @@ -225,6 +225,7 @@ sub field($$) { return ((! ref($_[0])) ? -1 : $_[0]->{'AGGREGATE'}->{$_[1]}); } sub idx($) { return field($_[0], "idx"); } sub uuid($) { return field($_[0], "uuid"); } sub nickname($) { return field($_[0], "nickname"); } +sub resource_id($) { return $_[0]->nickname(); } sub type($) { return field($_[0], "type"); } sub slice_uuid($) { return field($_[0], "slice_uuid"); } sub creator_uuid($) { return field($_[0], "creator_uuid"); } diff --git a/protogeni/lib/GeniCMV2.pm.in b/protogeni/lib/GeniCMV2.pm.in index ebd22192a..8803beb3d 100755 --- a/protogeni/lib/GeniCMV2.pm.in +++ b/protogeni/lib/GeniCMV2.pm.in @@ -980,7 +980,7 @@ sub SliverStatus($) } my $sliver_urn = $sliver->sliver_urn(); - my $resource_id = $sliver->resource_id(); + my $resource_id = $sliver->resource_id(); my $state = $sliver->state(); my $status = $sliver->status(); my $error = ""; -- GitLab