Merge branch 'master' into senslab2

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

diff --git a/sfa/methods/UpdateSliver.py b/sfa/methods/UpdateSliver.py
index 6c1c5be..72910d7 100644 (file)
--- a/sfa/methods/UpdateSliver.py
+++ b/sfa/methods/UpdateSliver.py
@@ -1,7 +1,5 @@
-from sfa.util.faults import *
-from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
-import sys
+from sfa.storage.parameter import Parameter, Mixed
+
 from sfa.methods.CreateSliver import CreateSliver
 
 class UpdateSliver(CreateSliver):
@@ -22,13 +20,14 @@ class UpdateSliver(CreateSliver):
         Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")),
         Parameter(str, "RSpec"),
-        Parameter(type([]), "List of user information")
+        Parameter(type([]), "List of user information"),
+        Parameter(dict, "options"),
         ]
     returns = Parameter(str, "Allocated RSpec")
 
 
 
-    def call(self, slice_xrn, creds, rspec, users):
+    def call(self, slice_xrn, creds, rspec, users, options):
 
-        return CreateSliver.call(self, slice_xrn, creds, rspec, users)
+        return CreateSliver.call(self, slice_xrn, creds, rspec, users, options)