From: Tony Mack <tmack@cs.princeton.edu>
Date: Fri, 14 Aug 2009 00:51:29 +0000 (+0000)
Subject: added 2 new methods, 'get_aggregates' and 'get_registries'
X-Git-Tag: sfa-0.9-1~85
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=54b05a6839dd4e86bada479be94ac991b5f5b720;p=sfa.git

added 2 new methods, 'get_aggregates' and 'get_registries'
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index b2688ff6..68a933b2 100755
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -276,6 +276,8 @@ class Sfi:
                   "remove": "name",
                   "add": "record",
                   "update": "record",
+                  "aggregates": "[name]",
+                  "registries": "[name]",   
                   "slices": "",
                   "resources": "[name]",
                   "create": "name rspec",
@@ -507,7 +509,28 @@ class Sfi:
        else:
            raise "unknown record type" + record.get_type()
        return self.registry.update(cred, record)
+   
     
+    def aggregates(self, opts, args):
+        user_cred = self.get_user_cred()
+        hrn = None
+        if args: 
+            hrn = args[0]
+        
+        result = self.registry.get_aggregates(user_cred, hrn)
+        self.display_list(result)
+        return 
+
+    def registries(self, opts, args):
+        user_cred = self.get_user_cred()
+        hrn = None
+        if args:
+            hrn = args[0]
+        
+        result = self.registry.get_registries(user_cred, hrn)
+        self.display_list(result)
+        return
+ 
     #
     # Slice-related commands
     #
diff --git a/sfa/methods/__init__.py b/sfa/methods/__init__.py
index 236af72c..f6aefdd8 100644
--- a/sfa/methods/__init__.py
+++ b/sfa/methods/__init__.py
@@ -3,7 +3,9 @@ all = """
 create_gid
 create_slice
 delete_slice
+get_aggregates
 get_credential
+get_registries
 get_resources
 get_slices
 get_ticket
diff --git a/sfa/util/geniclient.py b/sfa/util/geniclient.py
index 54ded71e..9d959d33 100644
--- a/sfa/util/geniclient.py
+++ b/sfa/util/geniclient.py
@@ -218,8 +218,17 @@ class GeniClient:
         result = self.server.get_resources(cred.save_to_string(save_parents=True), hrn)
         return result
 
+    ## list info about all known aggregates
+
     def get_aggregates(self, cred, hrn=None):
-        result = self.server.get_resources(cred.save_to_string(save_parents=True), hrn)
+        result = self.server.get_aggregates(cred.save_to_string(save_parents=True), hrn)
+        return result
+
+
+    ## list info about all known registries
+
+    def get_registries(self, cred, hrn=None):
+        result = self.server.get_registries(cred.save_to_string(save_parents=True), hrn)
         return result
 
     ## get policy