just autopep8'ed refreshpeer

[plcapi.git] / PLC / Methods / AddSliceToNodes.py

diff --git a/PLC/Methods/AddSliceToNodes.py b/PLC/Methods/AddSliceToNodes.py
index 3cfd327..db074ca 100644 (file)
--- a/PLC/Methods/AddSliceToNodes.py
+++ b/PLC/Methods/AddSliceToNodes.py
@@ -3,6 +3,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
 from PLC.Slices import Slice, Slices
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
 from PLC.Slices import Slice, Slices

+from PLC.Persons import Person, Persons

 from PLC.Auth import Auth
 
 class AddSliceToNodes(Method):
 from PLC.Auth import Auth
 
 class AddSliceToNodes(Method):


@@ -22,7 +23,7 @@ class AddSliceToNodes(Method):
         Auth(),
         Mixed(Slice.fields['slice_id'],
               Slice.fields['name']),
         Auth(),
         Mixed(Slice.fields['slice_id'],
               Slice.fields['name']),

-       [Mixed(Node.fields['node_id'],
+        [Mixed(Node.fields['node_id'],

                Node.fields['hostname'])]
         ]
 
                Node.fields['hostname'])]
         ]
 


@@ -32,7 +33,7 @@ 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"
+            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:


@@ -45,21 +46,27 @@ class AddSliceToNodes(Method):
                 raise PLCPermissionDenied, "Not a member of the specified slice"
             elif slice['site_id'] not in self.caller['site_ids']:
                 raise PLCPermissionDenied, "Specified slice not associated with any of your sites"
                 raise PLCPermissionDenied, "Not a member of the specified slice"
             elif slice['site_id'] not in self.caller['site_ids']:
                 raise PLCPermissionDenied, "Specified slice not associated with any of your sites"

-       
-        # Get specified nodes, add them to the slice         
-        nodes = Nodes(self.api, node_id_or_hostname_list)
-       for node in nodes:
-           # check the slice whitelist on each node first
-           if node['slice_ids_whitelist'] and \
-              slice['slice_id'] not in node['slice_ids_whitelist']:
-               raise PLCInvalidArgument, "%s is not on %s's whitelist" % \
-                 (slice['name'], node['hostname'])
+
+        # 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'])
+
+        for node in nodes:
+            # check the slice whitelist on each node first
+            # 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']]):
+                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)
 
         slice.sync()
 
             if slice['slice_id'] not in node['slice_ids']:
                 slice.add_node(node, commit = False)
 
         slice.sync()
 

-       self.event_objects = {'Node': [node['node_id'] for node in nodes],
-                             'Slice': [slice['slice_id']]}
+        nodeids = [node['node_id'] for node in nodes]
+        self.event_objects = {'Node': nodeids,
+                              'Slice': [slice['slice_id']]}
+        self.message = 'Slice %d added to nodes %s' % (slice['slice_id'], nodeids)

 
         return 1
 
         return 1