methods were renamed

diff --git a/geni/methods/__init__.py b/geni/methods/__init__.py
index 9e871f5..6cde05e 100644 (file)
--- a/geni/methods/__init__.py
+++ b/geni/methods/__init__.py
@@ -9,8 +9,8 @@ register
 remove
 reset_slice
 resolve
-resources
-slices
+get_resources
+get_slices
 start_slice
 stop_slice
 update

diff --git a/geni/methods/resources.py b/geni/methods/resources.py
deleted file mode 100644 (file)
index 03ab6ae..0000000
--- a/geni/methods/resources.py
+++ /dev/null
@@ -1,38 +0,0 @@
-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 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/slices.py b/geni/methods/slices.py
deleted file mode 100644 (file)
index 91134ce..0000000
--- a/geni/methods/slices.py
+++ /dev/null
@@ -1,30 +0,0 @@
-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 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']