From 892084de4a63f58e2ee21aeb8b9e327f503b1945 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 11 Dec 2012 13:38:12 -0500 Subject: [PATCH] remove rspec conversion code --- sfa/client/sfi.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 08737c3d..5d15c361 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -1225,7 +1225,6 @@ or with an slice hrn, shows currently provisioned resources # rspec rspec_file = self.get_rspec_file(args[1]) rspec = open(rspec_file).read() - # users # need to pass along user keys to the aggregate. # users = [ @@ -1240,19 +1239,9 @@ or with an slice hrn, shows currently provisioned resources user_urns = [hrn_to_urn(hrn, 'user') for hrn in user_hrns] user_records = self.registry().Resolve(user_urns, [self.my_credential_string]) - if 'sfa' not in server_version: - users = pg_users_arg(user_records) - rspec = RSpec(rspec) - cm_hrn = Xrn(xrn=server_version['urn']).get_hrn() - cm_urn = Xrn(cm_hrn, type='authority+cm').get_urn() - rspec.filter({'component_manager_id': cm_urn}) - rspec = RSpecConverter.to_pg_rspec(rspec.toxml(), content_type='request') - else: - users = sfa_users_arg(user_records, slice_record) - api_options = {} api_options ['call_id'] = unique_call_id() - api_options['geni_users'] = users + api_options['geni_users'] = users result = server.Allocate(slice_urn, creds, rspec, api_options) value = ReturnValue.get_value(result) if self.options.raw: -- 2.47.0