added InvalidRSpecVersion fault

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 421ff10..97f89a3 100755 (executable)
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -979,8 +979,13 @@ class Sfi:
                 # regardless of what the client user requested 
                 options['rspec_version'] = version_manager.get_version('ProtoGENI 2').to_dict()     
 
+        options['rspec_version']['type'] = options['rspec_version']['type'].lower() 
+        options['rspec_version']['version'] = long(options['rspec_version']['version'])
+        options['geni_compressed'] = True 
+        print options['rspec_version']
         call_args = [creds, options]
         result = server.ListResources(*call_args)
+        print result
         value = ReturnValue.get_value(result)
         if opts.file is None:
             display_rspec(value, opts.format)

diff --git a/sfa/rspecs/version_manager.py b/sfa/rspecs/version_manager.py
index 27eba93..66bad74 100644 (file)
--- a/sfa/rspecs/version_manager.py
+++ b/sfa/rspecs/version_manager.py
@@ -1,5 +1,5 @@
 import os
-from sfa.util.faults import InvalidRSpec
+from sfa.util.faults import InvalidRSpec, InvalidRSpecVersion
 from sfa.rspecs.baseversion import BaseVersion 
 from sfa.util.sfalogging import logger    
 
@@ -36,7 +36,7 @@ class VersionManager:
                       or version.content_type == '*':
                         retval = version
         if not retval:
-            raise InvalidRSpec("No such version format: %s version: %s type:%s "% (type, version_num, content_type))
+            raise InvalidRSpecVersion("No such version format: %s version: %s type:%s "% (type, version_num, content_type))
         return retval
 
     def get_version(self, version=None):

diff --git a/sfa/util/faults.py b/sfa/util/faults.py
index 4a1a5e4..267932e 100644 (file)
--- a/sfa/util/faults.py
+++ b/sfa/util/faults.py
@@ -255,6 +255,14 @@ class InvalidRSpec(SfaFault):
     def __str__(self):
         return repr(self.value)
 
+class InvalidRSpecVersion(SfaFault):
+    def __init__(self, value, extra = None):
+        self.value = value
+        faultString = "Invalid RSpec version: %(value)s" % locals()
+        SfaFault.__init__(self, GENICODE.BADVERSION, faultString, extra)
+    def __str__(self):
+        return repr(self.value)
+
 class InvalidRSpecElement(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value