Merge branch 'master' into senslab2

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

diff --git a/sfa/methods/Shutdown.py b/sfa/methods/Shutdown.py
index 60e2dd3..273b991 100644 (file)
--- a/sfa/methods/Shutdown.py
+++ b/sfa/methods/Shutdown.py
@@ -1,7 +1,5 @@
-from sfa.util.faults import *
-from sfa.util.namespace import *
-from sfa.util.method import Method
-from sfa.util.parameter import Parameter
+from sfa.storage.parameter import Parameter
+
 from sfa.methods.Stop import Stop
 
 class Shutdown(Stop):
@@ -12,7 +10,7 @@ class Shutdown(Stop):
     @param slice_urn (string) URN of slice to renew
     @param credentials ([string]) of credentials    
     """
-    interfaces = ['aggregate', 'slicemgr', 'geni_am']
+    interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(str, "Slice URN"),
         Parameter(type([str]), "List of credentials"),