git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix packaging for f37 (4/n)
[plcapi.git]
/
PLC
/
Methods
/
AddSliceToNodes.py
diff --git
a/PLC/Methods/AddSliceToNodes.py
b/PLC/Methods/AddSliceToNodes.py
index
0601ac5
..
b0bd880
100644
(file)
--- a/
PLC/Methods/AddSliceToNodes.py
+++ b/
PLC/Methods/AddSliceToNodes.py
@@
-1,5
+1,3
@@
-# $Id$
-# $URL$
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
@@
-35,31
+33,32
@@
class AddSliceToNodes(Method):
# Get slice information
slices = Slices(self.api, [slice_id_or_name])
if not slices:
# Get slice information
slices = Slices(self.api, [slice_id_or_name])
if not slices:
- raise PLCInvalidArgument
, "No such slice %r"%slice_id_or_name
+ raise PLCInvalidArgument
("No such slice %r"%slice_id_or_name)
slice = slices[0]
if slice['peer_id'] is not None:
slice = slices[0]
if slice['peer_id'] is not None:
- raise PLCInvalidArgument
, "Not a local slice"
+ raise PLCInvalidArgument
("Not a local slice")
if 'admin' not in self.caller['roles']:
if self.caller['person_id'] in slice['person_ids']:
pass
elif 'pi' not in self.caller['roles']:
if 'admin' not in self.caller['roles']:
if self.caller['person_id'] in slice['person_ids']:
pass
elif 'pi' not in self.caller['roles']:
- raise PLCPermissionDenied
, "Not a member of the specified slice"
+ raise PLCPermissionDenied
("Not a member of the specified slice")
elif slice['site_id'] not in self.caller['site_ids']:
elif slice['site_id'] not in self.caller['site_ids']:
- raise PLCPermissionDenied
, "Specified slice not associated with any of your sites"
+ raise PLCPermissionDenied
("Specified slice not associated with any of your sites")
# Get specified nodes, add them to the slice
# Get specified nodes, add them to the slice
- nodes = Nodes(self.api, node_id_or_hostname_list, ['node_id', 'hostname', 'slice_ids', 'slice_ids_whitelist', 'site_id'])
+ nodes = Nodes(self.api, node_id_or_hostname_list,
+ ['node_id', 'hostname', 'slice_ids', 'slice_ids_whitelist', 'site_id'])
for node in nodes:
# check the slice whitelist on each node first
for node in nodes:
# check the slice whitelist on each node first
- # allow
users at site to add node to slice, ignoring whitelist
+ # allow users at site to add node to slice, ignoring whitelist
if node['slice_ids_whitelist'] and \
slice['slice_id'] not in node['slice_ids_whitelist'] and \
not set(self.caller['site_ids']).intersection([node['site_id']]):
if node['slice_ids_whitelist'] and \
slice['slice_id'] not in node['slice_ids_whitelist'] and \
not set(self.caller['site_ids']).intersection([node['site_id']]):
- raise PLCInvalidArgument
,
"%s is not allowed on %s (not on the whitelist)" % \
- (slice['name'], node['hostname'])
+ raise PLCInvalidArgument
(
"%s is not allowed on %s (not on the whitelist)" % \
+ (slice['name'], node['hostname'])
)
if slice['slice_id'] not in node['slice_ids']:
slice.add_node(node, commit = False)
if slice['slice_id'] not in node['slice_ids']:
slice.add_node(node, commit = False)