Clean-up

Author: cmd-ntrf

docs/jobstats.md

@@ -16,5 +16,4 @@ Optional:
 * node\_exporter (show node information)
 * redfish\_exporter (show power information)
 * lustre\_exporter and lustre\_exporter\_slurm (show Lustre information)
-* slurm_jobscripts.py (show the submitted jobscript)
 * pcm-sensor-server from Intel PCM (show CPU information like memory bandwidth, cache misses, etc.)

jobstats/admin.py

@@ -1,9 +0,0 @@
-from django.contrib import admin
-from jobstats.models import JobScript
-
-
-class JobScriptAdmin(admin.ModelAdmin):
-    pass
-
-
-admin.site.register(JobScript, JobScriptAdmin)

jobstats/migrations/0001_initial.py

@@ -1,6 +1,6 @@
 # Generated by Django 3.1.7 on 2021-05-27 19:57
 
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
@@ -11,12 +11,4 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='JobScript',
-            fields=[
-                ('id_job', models.PositiveIntegerField(primary_key=True, serialize=False)),
-                ('last_modified', models.DateTimeField(auto_now=True)),
-                ('submit_script', models.TextField()),
-            ],
-        ),
     ]

jobstats/migrations/0002_utf8.py

@@ -10,6 +10,4 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunSQL('ALTER TABLE jobstats_jobscript CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'),
-        migrations.RunSQL('ALTER TABLE jobstats_jobscript MODIFY submit_script LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'),
     ]

jobstats/models.py

@@ -1,7 +0,0 @@
-from django.db import models
-
-
-class JobScript(models.Model):
-    id_job = models.PositiveIntegerField(primary_key=True)
-    last_modified = models.DateTimeField(auto_now=True)
-    submit_script = models.TextField()

jobstats/serializers.py

@@ -1,16 +1,9 @@
-from jobstats.models import JobScript
 from slurm.models import JobTable
 from rest_framework import serializers
 import time
 import datetime
 
 
-class JobScriptSerializer(serializers.HyperlinkedModelSerializer):
-    class Meta:
-        model = JobScript
-        fields = ['id_job', 'submit_script']
-
-
 class UnixEpochDateField(serializers.DateTimeField):
     def to_internal_value(self, value):
         """ Return epoch time for a datetime object or ``None``"""

jobstats/tests.py

@@ -1,6 +1,5 @@
 from django.conf import settings
 from tests.tests import CustomTestCase
-from jobstats.models import JobScript
 
 
 class JobstatsTestCase(CustomTestCase):
@@ -93,22 +92,3 @@ def test_user_jobstats_job(self):
             self.assertContains(response, 'Details on job')
             self.assertContains(response, '({jobid})'.format(jobid=job[1]))
             self.assertContains(response, 'Submitted job script is not available')
-
-    def test_user_jobstats_jobscript(self):
-        job = settings.TESTS_JOBSTATS[0]
-        jobscript = JobScript(
-            id_job=job[1],
-            submit_script="""#!/bin/bash
-echo 'Hello World!'
-sleep 60
-echo 'Bye World!'"""
-        )
-        jobscript.save()
-
-        response = self.user_client.get('/secure/jobstats/{user}/{jobid}/'.format(
-            user=job[0],
-            jobid=job[1]))
-        self.assertEqual(response.status_code, 200)
-        self.assertNotContains(response, 'Submitted job script is not available')
-        self.assertContains(response, 'Hello World!')
-        self.assertContains(response, 'Line 3: sleep command is used')

jobstats/views.py

@@ -8,8 +8,7 @@
 from django.utils.translation import gettext as _
 from rest_framework import viewsets
 from rest_framework import permissions
-from jobstats.models import JobScript
-from jobstats.serializers import JobSerializer, JobScriptSerializer
+from jobstats.serializers import JobSerializer
 from notes.models import Note
 import statistics
 from jobstats.analyze_job import find_loaded_modules, analyze_jobscript
@@ -1986,12 +1985,6 @@ def value_cost(request, username, job_id):
     return JsonResponse(response)
 
 
-class JobScriptViewSet(viewsets.ModelViewSet):
-    queryset = JobScript.objects.all().order_by('-last_modified')
-    serializer_class = JobScriptSerializer
-    permission_classes = [permissions.IsAdminUser]
-
-
 class JobsViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = JobSerializer
     permission_classes = [permissions.IsAuthenticated]