Merge branch 'master' into eucalyptus-devel

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

diff --git a/sfa/methods/UpdateSliver.py b/sfa/methods/UpdateSliver.py
index 4e23aa6..8307572 100644 (file)
--- a/sfa/methods/UpdateSliver.py
+++ b/sfa/methods/UpdateSliver.py
@@ -1,8 +1,6 @@
 from sfa.util.faults import *
-from sfa.util.namespace import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-import sys
 from sfa.methods.CreateSliver import CreateSliver
 
 class UpdateSliver(CreateSliver):
@@ -17,19 +15,20 @@ class UpdateSliver(CreateSliver):
     @param rspec (string) rspec to allocate
     
     """
-    interfaces = ['aggregate', 'slicemgr', 'geni_am']
+    interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(str, "Slice URN"),
         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(str, "call_id"),
         ]
     returns = Parameter(str, "Allocated RSpec")
 
 
 
-    def call(self, slice_xrn, creds, rspec, users):
+    def call(self, slice_xrn, creds, rspec, users, call_id=""):
 
-        return CreateSliver.call(self, slice_xrn, creds, rspec, users)
+        return CreateSliver.call(self, slice_xrn, creds, rspec, users, call_id)