From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 19 Oct 2012 20:45:38 +0000 (-0400)
Subject: fix Status
X-Git-Tag: sfa-3.0-0~108
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8bf2388afc7410f17bc0c2b716aef89b3e52ab94

fix Status
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 054b7631..8f12e084 100644
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -1307,7 +1307,7 @@ or with an slice hrn, shows currently provisioned resources
         api_options['call_id']=unique_call_id()
         if options.show_credential:
             show_credentials(creds)
-        result = server.Status(slice_urn, creds, *self.ois(server,api_options))
+        result = server.Status([slice_urn], creds, *self.ois(server,api_options))
         value = ReturnValue.get_value(result)
         if self.options.raw:
             save_raw_to_file(result, self.options.raw, self.options.rawformat, self.options.rawbanner)
diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index 61c7d1dd..0b97c638 100644
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -44,8 +44,9 @@ class AggregateManager:
         return version_string
 
     def GetVersion(self, api, options):
-        xrn=Xrn(api.hrn)
+        xrn=Xrn(api.hrn, type='authority')
         version = version_core()
+        cred_types = [{'geni_type': 'geni_sfa', 'geni_version': str(i)} for i in range(4)[-2:]]
         version_generic = {
             'testbed': self.driver.testbed_name(),
             'interface':'aggregate',
@@ -56,10 +57,7 @@ class AggregateManager:
             'geni_single_allocation': 0, # Accept operations that act on as subset of slivers in a given state.
             'geni_allocate': 'geni_many',# Multiple slivers can exist and be incrementally added, including those which connect or overlap in some way.
             'geni_best_effort': 'true',
-            'geni_credential_types': [{
-                'geni_type': 'geni_sfa',
-                'geni_version': 3,
-            }],
+            'geni_credential_types': cred_types,
         }
         version.update(version_generic)
         version.update(self.rspec_versions())
diff --git a/sfa/methods/Status.py b/sfa/methods/Status.py
index 83aa023a..8415cb13 100644
--- a/sfa/methods/Status.py
+++ b/sfa/methods/Status.py
@@ -13,7 +13,7 @@ class Status(Method):
     interfaces = ['aggregate', 'slicemgr', 'component']
     accepts = [
         Parameter(type([str]), "Slice or sliver URNs"),
-        Parameter(dict, "credentials"),
+        Parameter(type([dict]), "credentials"),
         Parameter(dict, "Options")
         ]
     returns = Parameter(dict, "Status details")
diff --git a/sfa/rspecs/version_manager.py b/sfa/rspecs/version_manager.py
index e8c34110..4e60bacb 100644
--- a/sfa/rspecs/version_manager.py
+++ b/sfa/rspecs/version_manager.py
@@ -55,6 +55,8 @@ class VersionManager:
             retval = self._get_version(type, version_num, content_type) 
         elif isinstance(version, RSpecVersion):
             retval = version
+        elif not version:
+            retval = self.versions[0]
         else:
             raise UnsupportedRSpecVersion("No such version: %s "% str(version))