From: Tony Mack Date: Tue, 3 May 2011 02:44:24 +0000 (-0400) Subject: pl aggregate support sfa and protogeni rspec X-Git-Tag: sfa-1.0-21-ckp1~11 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=613eea54a3317606aa6541b5e150f02638bb947b pl aggregate support sfa and protogeni rspec --- diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 4fced173..bf043acf 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -798,7 +798,8 @@ class Sfi: delegated_cred = self.delegate_cred(user_cred, get_authority(self.authority)) creds.append(delegated_cred) server = self.get_server_from_opts(opts) - results = server.ListSlices(creds, unique_call_id()) + #results = server.ListSlices(creds, unique_call_id()) + results = server.ListSlices(creds) display_list(results) return @@ -823,8 +824,8 @@ class Sfi: creds.append(delegated_cred) if opts.rspec_version: call_options['rspec_version'] = opts.rspec_version - result = server.ListResources(creds, call_options,unique_call_id()) - #result = server.ListResources(creds, call_options) + #result = server.ListResources(creds, call_options,unique_call_id()) + result = server.ListResources(creds, call_options) format = opts.format if opts.file is None: display_rspec(result, format) diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index 11c90a98..75fdc8b6 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -181,8 +181,7 @@ def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id): nodes = api.plshell.GetNodes(api.plauth, slice['node_ids'], ['hostname']) current_slivers = [node['hostname'] for node in nodes] rspec = parse_rspec(rspec_string) - requested_slivers = rspec.get_nodes_with_slivers() - + requested_slivers = [str(host) for host in rspec.get_nodes_with_slivers()] # remove nodes not in rspec deleted_nodes = list(set(current_slivers).difference(requested_slivers))