From 79aec84973032e15ae9d36fcbd7d7d42af3283d1 Mon Sep 17 00:00:00 2001 From: maxbr Date: Fri, 19 Aug 2016 17:10:31 +0200 Subject: Split the dashboard into different apps, add tests JIRA: RELENG-12 Signed-off-by: maxbr --- .../dashboard/migrations/0001_initial.py | 82 +--------------------- .../migrations/0002_resourceutilization.py | 23 ++++++ .../migrations/0003_auto_20160813_1302.py | 23 ++++++ .../dashboard/migrations/0004_resource_owners.py | 22 ++++++ 4 files changed, 71 insertions(+), 79 deletions(-) create mode 100644 pharos-dashboard/dashboard/migrations/0002_resourceutilization.py create mode 100644 pharos-dashboard/dashboard/migrations/0003_auto_20160813_1302.py create mode 100644 pharos-dashboard/dashboard/migrations/0004_resource_owners.py (limited to 'pharos-dashboard/dashboard/migrations') diff --git a/pharos-dashboard/dashboard/migrations/0001_initial.py b/pharos-dashboard/dashboard/migrations/0001_initial.py index 12de299..b93d829 100644 --- a/pharos-dashboard/dashboard/migrations/0001_initial.py +++ b/pharos-dashboard/dashboard/migrations/0001_initial.py @@ -1,10 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.8 on 2016-07-24 13:06 +# Generated by Django 1.10 on 2016-08-12 09:51 from __future__ import unicode_literals -from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -12,42 +10,16 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('booking_id', models.AutoField(primary_key=True, serialize=False)), - ('start_date_time', models.DateTimeField()), - ('end_date_time', models.DateTimeField()), - ('creation', models.DateTimeField(auto_now=True)), - ('purpose', models.CharField(max_length=300)), - ], - options={ - 'db_table': 'booking', - }, - ), - migrations.CreateModel( - name='Pod', - fields=[ - ('pod_id', models.AutoField(primary_key=True, serialize=False)), - ('chassis', models.CharField(blank=True, max_length=500, null=True)), - ], - options={ - 'db_table': 'pod', - }, - ), migrations.CreateModel( name='Resource', fields=[ - ('resource_id', models.AutoField( - primary_key=True, serialize=False)), + ('id', models.AutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=100, unique=True)), ('slavename', models.CharField(blank=True, max_length=50, null=True)), - ('description', models.CharField( - blank=True, max_length=300, null=True)), + ('description', models.CharField(blank=True, max_length=300, null=True)), ('url', models.CharField(blank=True, max_length=100, null=True)), ('bookable', models.BooleanField(default=False)), ('active', models.BooleanField(default=True)), @@ -56,52 +28,4 @@ class Migration(migrations.Migration): 'db_table': 'resource', }, ), - migrations.CreateModel( - name='Server', - fields=[ - ('server_id', models.AutoField(primary_key=True, serialize=False)), - ('model', models.CharField(blank=True, max_length=200, null=True)), - ('cpu', models.CharField(blank=True, max_length=200, null=True)), - ('ram', models.CharField(blank=True, max_length=200, null=True)), - ('storage', models.CharField(blank=True, max_length=200, null=True)), - ('count', models.IntegerField(default=1)), - ('resource', models.ForeignKey( - on_delete=django.db.models.deletion.DO_NOTHING, to='dashboard.Resource')), - ], - options={ - 'db_table': 'server', - }, - ), - migrations.CreateModel( - name='UserResource', - fields=[ - ('user_resource_id', models.AutoField( - primary_key=True, serialize=False)), - ('resource', models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to='dashboard.Resource')), - ('user', models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'db_table': 'user_resource', - }, - ), - migrations.AddField( - model_name='pod', - name='resource', - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to='dashboard.Resource'), - ), - migrations.AddField( - model_name='booking', - name='resource', - field=models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to='dashboard.Resource'), - ), - migrations.AddField( - model_name='booking', - name='user', - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), ] diff --git a/pharos-dashboard/dashboard/migrations/0002_resourceutilization.py b/pharos-dashboard/dashboard/migrations/0002_resourceutilization.py new file mode 100644 index 0000000..8e10acf --- /dev/null +++ b/pharos-dashboard/dashboard/migrations/0002_resourceutilization.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-08-13 12:50 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dashboard', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='ResourceUtilization', + fields=[ + ('timestamp', models.DateTimeField(auto_created=True)), + ('id', models.AutoField(primary_key=True, serialize=False)), + ('pod_status', models.IntegerField()), + ], + ), + ] diff --git a/pharos-dashboard/dashboard/migrations/0003_auto_20160813_1302.py b/pharos-dashboard/dashboard/migrations/0003_auto_20160813_1302.py new file mode 100644 index 0000000..8c4c213 --- /dev/null +++ b/pharos-dashboard/dashboard/migrations/0003_auto_20160813_1302.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-08-13 13:02 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('dashboard', '0002_resourceutilization'), + ] + + operations = [ + migrations.RemoveField( + model_name='resource', + name='active', + ), + migrations.RemoveField( + model_name='resource', + name='bookable', + ), + ] diff --git a/pharos-dashboard/dashboard/migrations/0004_resource_owners.py b/pharos-dashboard/dashboard/migrations/0004_resource_owners.py new file mode 100644 index 0000000..b851588 --- /dev/null +++ b/pharos-dashboard/dashboard/migrations/0004_resource_owners.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-08-13 14:43 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('dashboard', '0003_auto_20160813_1302'), + ] + + operations = [ + migrations.AddField( + model_name='resource', + name='owners', + field=models.ManyToManyField(to=settings.AUTH_USER_MODEL), + ), + ] -- cgit 1.2.3-korg