From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 28 Sep 2015 14:00:20 +0000 (+0200)
Subject: SFI client passing -r parameter even if the rspec_type is not known by sfi.py client
X-Git-Tag: sfa-3.1-19~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f2fb620f136a9da36de7392a9fb2035f9693eb91;hp=173a76247edc78437a625e8d3eab1891ceb19f82;p=sfa.git

SFI client passing -r parameter even if the rspec_type is not known by sfi.py client
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 6f5f64df..b606d976 100644
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -1152,9 +1152,10 @@ use this if you mean an authority instead""")
                 # 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': 'geni', 'version': '3'}
+                api_options['geni_rspec_version'] = {'type': options.rspec_version}
         else:
             api_options['geni_rspec_version'] = {'type': 'geni', 'version': '3'}
+
         list_resources = server.ListResources (creds, api_options)
         value = ReturnValue.get_value(list_resources)
         if self.options.raw: