X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAddLeases.py;h=0ae7ca3fad6e023a4a3e561f1d4b425294536d68;hb=627477ce2065f9181498bd596e11d5179537bca5;hp=46d5242444709ad04f904093f3d3b1204d48ddbc;hpb=bd0cbf4f7f2e4cf7ceda500bfa6f98c0a700018b;p=plcapi.git

diff --git a/PLC/Methods/AddLeases.py b/PLC/Methods/AddLeases.py
index 46d5242..0ae7ca3 100644
--- a/PLC/Methods/AddLeases.py
+++ b/PLC/Methods/AddLeases.py
@@ -13,6 +13,7 @@ from PLC.Timestamp import Timestamp
 
 can_update = ['name', 'instantiation', 'url', 'description', 'max_nodes']
 
+
 class AddLeases(Method):
     """
     Adds a new lease.
@@ -30,32 +31,37 @@ class AddLeases(Method):
 
     accepts = [
         Auth(),
-        Mixed(Node.fields['node_id'],[Node.fields['node_id']],
-              Node.fields['hostname'],[Node.fields['hostname']],),
+        Mixed(Node.fields['node_id'], [Node.fields['node_id']],
+              Node.fields['hostname'], [Node.fields['hostname']],),
         Mixed(Slice.fields['slice_id'],
               Slice.fields['name']),
         Mixed(Lease.fields['t_from']),
         Mixed(Lease.fields['t_until']),
-        ]
-
-    returns = Parameter(dict, " 'new_ids' is the list of newly created ids, 'errors' is a list of error strings")
+    ]
 
-    def call(self, auth, node_id_or_hostname_s, slice_id_or_name, t_from, t_until):
+    returns = Parameter(
+        dict,
+        " 'new_ids' is the list of newly created ids,"
+        "'errors' is a list of error strings")
 
-        # xxx - round to plain hours somewhere
+    def call(self, auth, node_id_or_hostname_s, slice_id_or_name,
+             t_from, t_until):
 
         # Get node information
         nodes = Nodes(self.api, node_id_or_hostname_s)
         if not nodes:
-            raise PLCInvalidArgument, "No such node(s) %r"%node_id_or_hostname_s
+            raise PLCInvalidArgument(
+                "No such node(s) {}".format(node_id_or_hostname_s))
         for node in nodes:
             if node['node_type'] != 'reservable':
-                raise PLCInvalidArgument, "Node %s is not reservable"%node['hostname']
+                raise PLCInvalidArgument(
+                    "Node {} is not reservable".format(node['hostname']))
 
         # 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 {}".format(slice_id_or_name))
         slice = slices[0]
 
         # check access
@@ -63,36 +69,48 @@ class AddLeases(Method):
             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']:
-                raise PLCPermissionDenied, "Specified slice not associated with any of your sites"
+                raise PLCPermissionDenied(
+                    "Specified slice not associated with any of your sites")
 
-        # normalize timestamps
+        # normalize timestamps - use granularity to round up limits
         t_from = Timestamp.sql_validate_utc(t_from)
         t_until = Timestamp.sql_validate_utc(t_until)
 
-        ########## create stuff
-        errors=[]
-        result_ids=[]
+        # create stuff
+        errors = []
+        result_ids = []
         for node in nodes:
             if node['peer_id'] is not None:
-                errors.append("Cannot set lease on remote node %r"%node['hostname'])
+                errors.append("Cannot set lease on remote node {}"
+                              .format(node['hostname']))
                 continue
             # let the DB check for time consistency
             try:
-                lease = Lease (self.api, {'node_id':node['node_id'], 'slice_id': slice['slice_id'],
-                                          't_from':t_from, 't_until':t_until})
+                lease = Lease(self.api, {'node_id': node['node_id'],
+                                         'slice_id': slice['slice_id'],
+                                         't_from': t_from, 't_until': t_until})
                 lease.sync()
                 result_ids.append(lease['lease_id'])
-            except Exception,e:
-                errors.append("Could not create lease on n=%s s=%s [%s .. %s] -- %r" % \
-                                  (node['hostname'],slice['name'],t_from,t_until,e))
+
+            except PLCDBError as e:
+                errors.append(
+                    "Timeslot busy - could not create overlapping lease"
+                    " on n={} s={} [{} .. {}]"
+                    .format(node['hostname'], slice['name'], t_from, t_until))
+                nodes.remove(node)
+            except Exception as e:
+                errors.append(
+                    "Could not create lease on n={} s={} [{} .. {}] -- {}"
+                    .format(node['hostname'], slice['name'], t_from, t_until, e))
                 nodes.remove(node)
 
         self.event_objects = {'Slice': [slice['slice_id']],
                               'Node': [node['node_id'] for node in nodes]}
-        self.message = "New leases %r on n=%r s=%s [%s -> %s]" % \
-            (result_ids,[node['hostname'] for node in nodes],slice['name'],t_from,t_until)
+        self.message = "New leases {} on n={} s={} [{} -> {}]"\
+            .format(result_ids, [node['hostname'] for node in nodes],
+                    slice['name'], t_from, t_until)
 
-        return {'new_ids': result_ids,
-                'errors': errors}
+        return {'new_ids': result_ids, 'errors': errors}