From 87b9be726b4c915a73e224672a42a4e2cf49dedc Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 7 Jan 2016 10:09:34 +0100 Subject: [PATCH] build geni_rspec_version in a consistent way --- sfa/client/sfi.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 92c4629b..1cecff1f 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -1208,16 +1208,8 @@ use this if you mean an authority instead""") api_options['cached'] = False else: api_options['cached'] = True - if options.rspec_version: - version_manager = VersionManager() - server_version = self.get_cached_server_version(server) - if 'sfa' in server_version: - # just request the version the client wants - api_options['geni_rspec_version'] = version_manager.get_version(options.rspec_version).to_dict() - else: - api_options['geni_rspec_version'] = {'type': options.rspec_version} - else: - api_options['geni_rspec_version'] = {'type': 'geni', 'version': '3'} + version_manager = VersionManager() + api_options['geni_rspec_version'] = version_manager.get_version(options.rspec_version).to_dict() list_resources = server.ListResources (creds, api_options) value = ReturnValue.get_value(list_resources) -- 2.43.0