X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclientbin%2Fsfaadmin.py;h=1531886d13e0a1efc6c4908af22c4a1066f923ac;hb=54cfedbc9c7eea8dc9d0a45f6bf89f3f81b3dcb1;hp=d69314a8f864299bee0386957be7c78376c389ad;hpb=9ed5b7e791e0672730538a5ddc7bcb0e0de25519;p=sfa.git

diff --git a/sfa/clientbin/sfaadmin.py b/sfa/clientbin/sfaadmin.py
index d69314a8..1531886d 100755
--- a/sfa/clientbin/sfaadmin.py
+++ b/sfa/clientbin/sfaadmin.py
@@ -76,10 +76,8 @@ class RegistryCommands(Commands):
     def credential(self, xrn, type=None):
         cred = self.api.manager.GetCredential(self.api, xrn, type, self.api.hrn)
         print cred
-
-    def gid(self, xrn):
-        pass
-
+    
+    
 class CerficiateCommands(Commands):
     
     def import_records(self, xrn):
@@ -112,9 +110,16 @@ class AggregateCommands(Commands):
         status = self.api.manager.SliverStatus(self.api, urn, [], {})
         pprinter.pprint(status)
  
-    def resources(self, xrn):
-        pass
-
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn', default=None)
+    @args('-r', '--rspec-version', dest='rspec_version', metavar='<rspec_version>', 
+          default='GENI', help='version/format of the resulting rspec response')  
+    def resources(self, xrn=None, rspec_version='GENI'):
+        options = {'geni_rspec_version': rspec_version}
+        if xrn:
+            options['geni_slice_urn'] = xrn
+        resources = self.api.manager.ListResources(self.api, [], options)
+        pprinter.pprint(resources)
+        
     def create(self, xrn, rspec):
         pass