From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 7 Jan 2016 09:09:34 +0000 (+0100)
Subject: build geni_rspec_version in a consistent way
X-Git-Tag: sfa-3.1-21~40
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=87b9be726b4c915a73e224672a42a4e2cf49dedc;hp=add6aefc38dc8b8ef3d315d6a0d729ad7bc1c931;p=sfa.git

build geni_rspec_version in a consistent way
---

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)