group db-related stuff in sfa/storage

[sfa.git] / sfa / methods / SliverStatus.py

diff --git a/sfa/methods/SliverStatus.py b/sfa/methods/SliverStatus.py
index 0da6b50..f722c7c 100644 (file)
--- a/sfa/methods/SliverStatus.py
+++ b/sfa/methods/SliverStatus.py
@@ -1,7 +1,7 @@
-from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter
+
+from sfa.storage.parameter import Parameter, Mixed
 
 class SliverStatus(Method):
     """
@@ -10,22 +10,22 @@ class SliverStatus(Method):
     @param slice_urn (string) URN of slice to allocate to
     
     """
-    interfaces = ['aggregate', 'slicemgr', 'component', 'geni_am']
+    interfaces = ['aggregate', 'slicemgr', 'component']
     accepts = [
         Parameter(str, "Slice URN"),
         Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")),
+        Parameter(dict, "Options")
         ]
     returns = Parameter(dict, "Status details")
 
-    def call(self, slice_xrn, creds):
+    def call(self, slice_xrn, creds, options={}):
         hrn, type = urn_to_hrn(slice_xrn)
         valid_creds = self.api.auth.checkCredentials(creds, 'sliverstatus', hrn)
 
         self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
     
-        manager = self.api.get_interface_manager()
-        status = manager.delete_slice(self.api, xrn, valid_creds)
+        status = self.api.manager.SliverStatus(self.api, hrn, valid_creds, options)
 
         return status