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
trimmed useless imports, unstarred all imports
[sfa.git]
/
sfa
/
methods
/
CreateSliver.py
diff --git
a/sfa/methods/CreateSliver.py
b/sfa/methods/CreateSliver.py
index
0c729b9
..
dcb25eb
100644
(file)
--- a/
sfa/methods/CreateSliver.py
+++ b/
sfa/methods/CreateSliver.py
@@
-1,4
+1,4
@@
-from sfa.util.faults import
*
+from sfa.util.faults import
SfaInvalidArgument
from sfa.util.xrn import urn_to_hrn
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.util.xrn import urn_to_hrn
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
@@
-23,11
+23,12
@@
class CreateSliver(Method):
Mixed(Parameter(str, "Credential string"),
Parameter(type([str]), "List of credentials")),
Parameter(str, "RSpec"),
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")
]
returns = Parameter(str, "Allocated RSpec")
- def call(self, slice_xrn, creds, rspec, users):
+ def call(self, slice_xrn, creds, rspec, users
, call_id=""
):
hrn, type = urn_to_hrn(slice_xrn)
self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
hrn, type = urn_to_hrn(slice_xrn)
self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
@@
-36,6
+37,11
@@
class CreateSliver(Method):
valid_creds = self.api.auth.checkCredentials(creds, 'createsliver', hrn)
origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
valid_creds = self.api.auth.checkCredentials(creds, 'createsliver', hrn)
origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
+ # make sure users info is specified
+ if not users:
+ msg = "'users' musst be specified and cannot be null. You may need to update your client."
+ raise SfaInvalidArgument(name='users', extra=msg)
+
manager = self.api.get_interface_manager()
# flter rspec through sfatables
manager = self.api.get_interface_manager()
# flter rspec through sfatables
@@
-43,7
+49,7
@@
class CreateSliver(Method):
chain_name = 'INCOMING'
elif self.api.interface in ['slicemgr']:
chain_name = 'FORWARD-INCOMING'
chain_name = 'INCOMING'
elif self.api.interface in ['slicemgr']:
chain_name = 'FORWARD-INCOMING'
+ self.api.logger.debug("CreateSliver: sfatables on chain %s"%chain_name)
rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec)
rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec)
- allocated = manager.create_slice(self.api, slice_xrn, creds, rspec, users)
- return
rspec
+ return
manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id)