renamed some methods

diff --git a/cmdline/sfi.py b/cmdline/sfi.py
index f060343..c1d1174 100755 (executable)
--- a/cmdline/sfi.py
+++ b/cmdline/sfi.py
@@ -441,7 +441,7 @@ def update(opts, args):
 def slices(opts, args):
    global slicemgr
    user_cred = get_user_cred() 
-   results = slicemgr.slices(user_cred)
+   results = slicemgr.get_slices(user_cred)
    display_list(results)
    return
 
@@ -450,10 +450,10 @@ def resources(opts, args):
    global slicemgr
    if args: 
        slice_cred = get_slice_cred(args[0])
-       result = slicemgr.resources(slice_cred, args[0])
+       result = slicemgr.get_resources(slice_cred, args[0])
    else:
        user_cred = get_user_cred()
-       result = slicemgr.resources(user_cred)
+       result = slicemgr.get_resources(user_cred)
    format = opts.format      
    display_rspec(result, format)
    if (opts.file is not None):

diff --git a/geni/methods/get_resources.py b/geni/methods/get_resources.py
new file mode 100644 (file)
index 0000000..1248431
--- /dev/null
+++ b/geni/methods/get_resources.py
@@ -0,0 +1,38 @@
+from geni.util.faults import *
+from geni.util.excep import *
+from geni.util.method import Method
+from geni.util.parameter import Parameter, Mixed
+from geni.util.auth import Auth
+from geni.util.nodes import Nodes
+
+class get_resources(Method):
+    """
+    Get an resource specification (rspec). The rspec may describe the resources
+    available at an authority or the resources being used by a slice.      
+
+    @param cred credential string specifying the rights of the caller
+    @param hrn human readable name of the slice we are interesed in or None 
+           for an authority.  
+    """
+
+    interfaces = ['aggregate', 'slicemgr']
+    
+    accepts = [
+        Parameter(str, "Credential string"),
+        Mixed(Parameter(str, "Human readable name (hrn)"),
+              Parameter(None, "hrn not specified"))
+        ]
+
+    returns = Parameter(str, "String representatin of an rspec")
+    
+    def call(self, cred, hrn=None):
+        
+        self.api.auth.check(cred, 'listnodes')
+        nodes = Nodes(self.api)
+        if hrn:
+            rspec = nodes.get_rspec(hrn)
+        else:
+            nodes.refresh()
+            rspec = nodes['rspec']
+        
+        return rspec

diff --git a/geni/methods/get_slices.py b/geni/methods/get_slices.py
new file mode 100644 (file)
index 0000000..40f68f6
--- /dev/null
+++ b/geni/methods/get_slices.py
@@ -0,0 +1,30 @@
+from geni.util.faults import *
+from geni.util.excep import *
+from geni.util.misc import *
+from geni.util.method import Method
+from geni.util.parameter import Parameter, Mixed
+from geni.util.auth import Auth
+from geni.util.slices import Slices
+
+class get_slices(Method):
+    """
+    Get a list of instantiated slices at this authority.      
+
+    @param cred credential string specifying the rights of the caller
+    @return list of human readable slice names (hrn).  
+    """
+
+    interfaces = ['aggregate', 'slicemgr']
+    
+    accepts = [
+        Parameter(str, "Credential string"),
+        ]
+
+    returns = [Parameter(str, "Human readable slice name (hrn)")]
+    
+    def call(self, cred):
+       
+        self.api.auth.check(cred, 'listslices')
+        slices = Slices(self.api)
+        slices.refresh()    
+        return slices['hrn']

diff --git a/geni/util/geniclient.py b/geni/util/geniclient.py
index 4bee85d..41fd8d9 100644 (file)
--- a/geni/util/geniclient.py
+++ b/geni/util/geniclient.py
@@ -248,8 +248,8 @@ class GeniClient():
     # @param cred a credential
     # @param hrn slice hrn
 
-    def resources(self, cred, hrn=None):
-        result = self.server.resources(cred.save_to_string(save_parents=True), hrn)
+    def get_resources(self, cred, hrn=None):
+        result = self.server.get_resources(cred.save_to_string(save_parents=True), hrn)
         return result
 
     ## get policy
@@ -329,8 +329,8 @@ class GeniClient():
     #
     # @return a list of slice names
 
-    def slices(self, cred):
-        result = self.server.slices(cred.save_to_string(save_parents=True))
+    def get_slices(self, cred):
+        result = self.server.get_slices(cred.save_to_string(save_parents=True))
         return result
 
     ##