add cluster-related changes

coldfront/core/allocation/forms.py

@@ -1,16 +1,20 @@
+import logging
 import re
 
 from django import forms
 from django.conf import settings
 from django.db.models.functions import Lower
 from django.shortcuts import get_object_or_404
 from django.core.exceptions import ValidationError
+from django.core.validators import MinValueValidator, MaxValueValidator
 
 from coldfront.core.allocation.models import (
     AllocationAccount,
     AllocationAttributeType,
     AllocationAttribute,
-    AllocationStatusChoice
+    AllocationStatusChoice,
+    AllocationUserAttribute,
+    AllocationUser
 )
 from coldfront.core.allocation.utils import get_user_resources
 from coldfront.core.project.models import Project
@@ -28,6 +32,8 @@
 HSPH_CODE = import_from_settings('HSPH_CODE', '000-000-000-000-000-000-000-000-000-000-000')
 SEAS_CODE = import_from_settings('SEAS_CODE', '111-111-111-111-111-111-111-111-111-111-111')
 
+logger = logging.getLogger(__name__)
+
 
 class ExpenseCodeField(forms.CharField):
     """custom field for expense_code"""
@@ -56,6 +62,28 @@ def clean(self, value):
         # formatted_value = insert_dashes(digits_only)
         return value
 
+
+class AllocationUserRawSareField(forms.CharField):
+    """custom field for rawshare"""
+
+    def validate(self, value):
+        try:
+            integer_value = int(value)
+            if integer_value < 0:
+                raise ValidationError('RawShare value must be a positive integer number or the string "parent".')
+            if integer_value > 1410065399:
+                raise ValidationError('RawShare value must be a positive integer number below 1410065399 or the string "parent".')
+        except ValueError:
+            if value not in ['parent']:
+                raise ValidationError('RawShare value must be a positive integer number or the string "parent".')
+        except Exception:
+            raise ValidationError('Invalid RawShare value detected. It must be a positive integer number or the string "parent".')
+
+    def clean(self, value):
+        value = super().clean(value)
+        return value
+
+
 ALLOCATION_SPECIFICATIONS = [
     ('Heavy IO', 'My lab will perform heavy I/O from the cluster against this space (more than 100 cores)'),
     ('Mounted', 'My lab intends to mount the storage to our local machine as an additional drive'),
@@ -277,6 +305,17 @@ class AllocationAddUserForm(forms.Form):
     email = forms.EmailField(max_length=100, required=False, disabled=True)
     selected = forms.BooleanField(initial=False, required=False)
 
+class AllocationAddNonProjectUserForm(forms.Form):
+    username = forms.CharField(max_length=150, disabled=True)
+    first_name = forms.CharField(max_length=150, required=False, disabled=True)
+    last_name = forms.CharField(max_length=150, required=False, disabled=True)
+    email = forms.EmailField(max_length=100, required=False, disabled=True)
+    selected = forms.BooleanField(initial=False, required=False)
+
+
+class AllocationEditUserForm(forms.Form):
+    fairshare = forms.CharField(max_length=10, required=True)
+
 
 class AllocationRemoveUserForm(forms.Form):
     username = forms.CharField(max_length=150, disabled=True)
@@ -402,6 +441,15 @@ def clean(self):
         allocation_attribute.clean()
 
 
+class AllocationUserAttributeUpdateForm(forms.Form):
+    attribute_pk = forms.IntegerField(required=True)
+    value = AllocationUserRawSareField(required=True)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['attribute_pk'].widget = forms.HiddenInput()
+
+
 class AllocationChangeForm(forms.Form):
     EXTENSION_CHOICES = [
         (0, 'No Extension')

coldfront/core/allocation/management/commands/add_allocation_defaults.py

@@ -43,11 +43,8 @@ def handle(self, *args, **options):
         for choice in ('Active', 'Error', 'Removed', ):
             AllocationUserStatusChoice.objects.get_or_create(name=choice)
 
-        for name, attribute_type, is_private in (
-            ('FairShare', 'Float', False),
-            ('NormShares', 'Float', False),
-            ('EffectvUsage', 'Float', False),
-            ('RawUsage', 'Int', False),
+        for name, attribute_type, is_private, is_changeable in (
+            ('slurm_specs', 'Attribute Expanded Text', False, True),
         ):
             AllocationUserAttributeType.objects.update_or_create(
                 name=name,
@@ -92,7 +89,7 @@ def handle(self, *args, **options):
             # ('Purchase Order Number', 'Int', False, True),
             # ('send_expiry_email_on_date', 'Date', False, True),
             ('slurm_account_name', 'Text', False, False),
-            # ('slurm_specs', 'Attribute Expanded Text', False, True),
+            ('slurm_specs', 'Attribute Expanded Text', False, True),
             # ('slurm_specs_attriblist', 'Text', False, True),
             # ('slurm_user_specs', 'Attribute Expanded Text', False, True),
             # ('slurm_user_specs_attriblist', 'Text', False, True),