Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorLoic Baron <loic.baron@lip6.fr>
Mon, 28 Sep 2015 14:01:27 +0000 (16:01 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 28 Sep 2015 14:01:27 +0000 (16:01 +0200)
sfa/client/sfi.py

index bcddd22..be94f82 100644 (file)
@@ -1186,9 +1186,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: