git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
[sfa.git]
/
sfa
/
methods
/
UpdateSliver.py
diff --git
a/sfa/methods/UpdateSliver.py
b/sfa/methods/UpdateSliver.py
index
8307572
..
3302b56
100644
(file)
--- a/
sfa/methods/UpdateSliver.py
+++ b/
sfa/methods/UpdateSliver.py
@@
-1,6
+1,5
@@
-from sfa.util.faults import *
-from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
+from sfa.storage.parameter import Parameter, Mixed
+
from sfa.methods.CreateSliver import CreateSliver
class UpdateSliver(CreateSliver):
from sfa.methods.CreateSliver import CreateSliver
class UpdateSliver(CreateSliver):
@@
-22,13
+21,13
@@
class UpdateSliver(CreateSliver):
Parameter(type([str]), "List of credentials")),
Parameter(str, "RSpec"),
Parameter(type([]), "List of user information"),
Parameter(type([str]), "List of credentials")),
Parameter(str, "RSpec"),
Parameter(type([]), "List of user information"),
- Parameter(
str, "call_id
"),
+ Parameter(
dict, "options
"),
]
returns = Parameter(str, "Allocated RSpec")
]
returns = Parameter(str, "Allocated RSpec")
- def call(self, slice_xrn, creds, rspec, users,
call_id=""
):
+ def call(self, slice_xrn, creds, rspec, users,
options={}
):
- return CreateSliver.call(self, slice_xrn, creds, rspec, users,
call_id
)
+ return CreateSliver.call(self, slice_xrn, creds, rspec, users,
options
)