Skip to content
Snippets Groups Projects
Commit b73d7c13 authored by Jörn Künsemöller's avatar Jörn Künsemöller
Browse files

TMSS-241: Remove auto-created quota again, due to misleading ticket

parent bd726f9b
No related branches found
No related tags found
1 merge request!184Resolve TMSS-241
...@@ -286,20 +286,29 @@ class Project(NamedCommonPK): ...@@ -286,20 +286,29 @@ class Project(NamedCommonPK):
project_category = ForeignKey('ProjectCategory', null=True, on_delete=PROTECT, help_text='Project category.') project_category = ForeignKey('ProjectCategory', null=True, on_delete=PROTECT, help_text='Project category.')
period_category = ForeignKey('PeriodCategory', null=True, on_delete=PROTECT, help_text='Period category.') period_category = ForeignKey('PeriodCategory', null=True, on_delete=PROTECT, help_text='Period category.')
# also create default project quotas when projects are created # JK, 29/07/20 - after discussion with Sander, it turns out that the ticket TMSS-277 was a misunderstanding.
def save(self, force_insert=False, force_update=False, using=None, update_fields=None): # 'default' does not refer to 'default values' that are supposed to be filled in by the backend.
creating = self._state.adding # True on create, False on update # It was meant to be 'resource_types displayed in the frontend by default', where the other resource_types are
super().save(force_insert, force_update, using, update_fields) # optionally added to the set of quota. These can then be customized in the frontend and are created by the
if creating: # frontend in the backend, but no quota are intended to be added automatically. So nothing is really needed in
# todo: review these defaults for being sensible # the backend for this (apart from the set of predefined resource_types).
ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="lta_storage"), value=1024^4, project=self) # There was some open question on whether there may be a required subset of quota that have to be enforced. So
ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="cep_storage"), value=1024^4, project=self) # I'll leave this in for now, until that question is cleared up.
ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="cep_processing_time"), value=60*60*24, project=self) #
ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="lofar_observing_time"), value=60*60*24, project=self) # # also create default project quotas when projects are created
ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="lofar_observing_time_prio_a"), value=60*60*12, project=self) # def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="lofar_observing_time_prio_b"), value=60*60*12, project=self) # creating = self._state.adding # True on create, False on update
ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="support_time"), value=60*60*6, project=self) # super().save(force_insert, force_update, using, update_fields)
ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="number_of_triggers"), value=42, project=self) # if creating:
# # todo: review these defaults for being sensible
# ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="lta_storage"), value=1024^4, project=self)
# ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="cep_storage"), value=1024^4, project=self)
# ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="cep_processing_time"), value=60*60*24, project=self)
# ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="lofar_observing_time"), value=60*60*24, project=self)
# ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="lofar_observing_time_prio_a"), value=60*60*12, project=self)
# ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="lofar_observing_time_prio_b"), value=60*60*12, project=self)
# ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="support_time"), value=60*60*6, project=self)
# ProjectQuota.objects.create(resource_type=ResourceType.objects.get(name="number_of_triggers"), value=42, project=self)
class ProjectQuota(Model): class ProjectQuota(Model):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment