From 3e47b2868063a93014c03f5490b0a2c86fd9b352 Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Thu, 14 May 2009 19:37:08 +0000 Subject: [PATCH] fixed tabbing. Changed logic. Trying to avoid overflowing max_int --- PLC/Methods/UpdateSlice.py | 42 +++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/PLC/Methods/UpdateSlice.py b/PLC/Methods/UpdateSlice.py index 901ecbc4..91534d79 100644 --- a/PLC/Methods/UpdateSlice.py +++ b/PLC/Methods/UpdateSlice.py @@ -10,7 +10,7 @@ from PLC.Sites import Site, Sites related_fields = Slice.related_fields.keys() can_update = lambda (field, value): field in \ ['instantiation', 'url', 'description', 'max_nodes', 'expires'] + \ - related_fields + related_fields class UpdateSlice(Method): @@ -45,7 +45,7 @@ class UpdateSlice(Method): def call(self, auth, slice_id_or_name, slice_fields): slice_fields = dict(filter(can_update, slice_fields.items())) - slices = Slices(self.api, [slice_id_or_name]) + slices = Slices(self.api, [slice_id_or_name]) if not slices: raise PLCInvalidArgument, "No such slice" slice = slices[0] @@ -62,7 +62,10 @@ class UpdateSlice(Method): raise PLCPermissionDenied, "Specified slice not associated with any of your sites" # Renewing - if 'expires' in slice_fields and slice_fields['expires'] > slice['expires']: + if 'expires' in slice_fields: + if slice_fields['expires'] < time.time(): + raise PLCInvalidArgument, "Slice can only be renewed to time in the future." + sites = Sites(self.api, [slice['site_id']]) assert sites site = sites[0] @@ -74,34 +77,35 @@ class UpdateSlice(Method): # XXX Make this configurable max_expires = time.time() + (8 * 7 * 24 * 60 * 60) + if 'admin' not in self.caller['roles'] and slice_fields['expires'] > max_expires: raise PLCInvalidArgument, "Cannot renew a slice beyond 8 weeks from now" - # XXX Make this a configurable policy + # XXX Make this a configurable policy if slice['description'] is None or not slice['description'].strip(): - if 'description' not in slice_fields or slice_fields['description'] is None or \ - not slice_fields['description'].strip(): - raise PLCInvalidArgument, "Cannot renew a slice with an empty description or URL" + if 'description' not in slice_fields or slice_fields['description'] is None or \ + not slice_fields['description'].strip(): + raise PLCInvalidArgument, "Cannot renew a slice with an empty description or URL" - if slice['url'] is None or not slice['url'].strip(): - if 'url' not in slice_fields or slice_fields['url'] is None or \ - not slice_fields['url'].strip(): + if slice['url'] is None or not slice['url'].strip(): + if 'url' not in slice_fields or slice_fields['url'] is None or \ + not slice_fields['url'].strip(): raise PLCInvalidArgument, "Cannot renew a slice with an empty description or URL" - + if 'max_nodes' in slice_fields and slice_fields['max_nodes'] != slice['max_nodes']: if 'admin' not in self.caller['roles'] and \ - 'pi' not in self.caller['roles']: + 'pi' not in self.caller['roles']: raise PLCInvalidArgument, "Only admins and PIs may update max_nodes" - # Make requested associations - for field in related_fields: - if field in slice_fields: - slice.associate(auth, field, slice_fields[field]) - slice_fields.pop(field) + # Make requested associations + for field in related_fields: + if field in slice_fields: + slice.associate(auth, field, slice_fields[field]) + slice_fields.pop(field) - slice.update(slice_fields) + slice.update(slice_fields) slice.sync() - self.event_objects = {'Slice': [slice['slice_id']]} + self.event_objects = {'Slice': [slice['slice_id']]} return 1 -- 2.47.0