From 604241c9bbb50623c8461a12b6b341e304e1a9d8 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 4 Oct 2011 14:40:38 +0200 Subject: [PATCH] cosmetic --- sfa/managers/aggregate_manager_pl.py | 4 +--- sfa/managers/slice_manager_pl.py | 2 +- sfa/plc/aggregate.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index 3b82cb69..a870f8f5 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -1,5 +1,3 @@ - - import datetime import time import traceback @@ -298,7 +296,7 @@ def ListSlices(api, creds, call_id): return slice_urns -def ListResources(api, creds, options,call_id): +def ListResources(api, creds, options, call_id): if Callids().already_handled(call_id): return "" # get slice's hrn from options xrn = options.get('geni_slice_urn', None) diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index b82c7c3a..6ad78886 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -122,7 +122,7 @@ def ListResources(api, creds, options, call_id): rspec = server.ListResources(*args) return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"} except Exception, e: - api.logger.warn("ListResources failed at %s: %s" %(server.url, str(e))) + api.logger.log_exc("ListResources failed at %s" %(server.url)) return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception"} if Callids().already_handled(call_id): return "" diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py index a45cd2e9..f39fd619 100644 --- a/sfa/plc/aggregate.py +++ b/sfa/plc/aggregate.py @@ -99,7 +99,7 @@ class Aggregate: # filter out nodes with a whitelist: valid_nodes = [] for node in self.nodes.values(): - # only doing this becuase protogeni rspec needs + # only doing this because protogeni rspec needs # to advertise available initscripts node['pl_initscripts'] = self.pl_initscripts -- 2.43.0