From 89952d84436f46c6994ee24078bb350fde6b7771 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 6 Oct 2011 07:31:44 -0400 Subject: [PATCH] In CreateSliver() return the result rspec not the request rspec --- sfa/managers/slice_manager_pl.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index de3cc1b6..b82c7c3a 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -198,6 +198,7 @@ def CreateSliver(api, xrn, creds, rspec_str, users, call_id): # sfa aggregtes support both sfa and pg rspecs, no need to convert # if aggregate supports sfa rspecs. otherwise convert to pg rspec rspec = RSpecConverter.to_pg_rspec(rspec, 'request') + raise args = [xrn, credential, rspec, users] if _call_id_supported(api, server): args.append(call_id) @@ -243,13 +244,13 @@ def CreateSliver(api, xrn, creds, rspec_str, users, call_id): manifest_version = version_manager._get_version(rspec.version.type, rspec.version.version, 'manifest') result_rspec = RSpec(version=manifest_version) for result in results: - add_slicemgr_stat(rspec, "CreateSliver", result["aggregate"], result["elapsed"], result["status"]) + add_slicemgr_stat(result_rspec, "CreateSliver", result["aggregate"], result["elapsed"], result["status"]) if result["status"]=="success": try: result_rspec.version.merge(result["rspec"]) except: api.logger.log_exc("SM.CreateSliver: Failed to merge aggregate rspec") - return rspec.toxml() + return result_rspec.toxml() def RenewSliver(api, xrn, creds, expiration_time, call_id): def _RenewSliver(server, xrn, creds, expiration_time, call_id): -- 2.47.0