aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Duraffort <remi.duraffort@linaro.org>2018-07-20 09:15:50 +0200
committerNeil Williams <neil.williams@linaro.org>2018-07-20 07:52:56 +0000
commit6978ad89960cb5c9437247155750c1f5a67dd543 (patch)
treeb3bce038b8d26c803571347504b3be99a9308fff
parenta6c34e83f18cd7adce27756dfe10b8439fbee965 (diff)
Revert "Make primary key non-editable"
With this patch, it's impossible to create the corresponding objects from the admin UI. This reverts commit 6383230a6327f6c3c9970522e9ed2adbdf2b921e. Change-Id: If6581e9085fbf0e5b84b538fe815188df116f3f7
-rw-r--r--lava_scheduler_app/admin.py2
-rw-r--r--lava_scheduler_app/migrations/0038_make_primary_key_non_editable.py55
-rw-r--r--lava_scheduler_app/migrations/0038_set_default_device_health_maintenance.py (renamed from lava_scheduler_app/migrations/0039_set_default_device_health_maintenance.py)2
-rw-r--r--lava_scheduler_app/models.py16
4 files changed, 9 insertions, 66 deletions
diff --git a/lava_scheduler_app/admin.py b/lava_scheduler_app/admin.py
index d6db9226e..6f0490f34 100644
--- a/lava_scheduler_app/admin.py
+++ b/lava_scheduler_app/admin.py
@@ -219,7 +219,7 @@ class DeviceAdmin(admin.ModelAdmin):
fieldsets = (
('Properties', {
- 'fields': ('device_type', 'worker_host', 'device_version')}),
+ 'fields': (('device_type', 'hostname'), 'worker_host', 'device_version')}),
('Device owner', {
'fields': (('user', 'group'), ('physical_owner', 'physical_group'), 'is_public')}),
('Status', {
diff --git a/lava_scheduler_app/migrations/0038_make_primary_key_non_editable.py b/lava_scheduler_app/migrations/0038_make_primary_key_non_editable.py
deleted file mode 100644
index 57c818f51..000000000
--- a/lava_scheduler_app/migrations/0038_make_primary_key_non_editable.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.14 on 2018-07-17 08:35
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('lava_scheduler_app', '0037_notify_callback_separation'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='alias',
- name='name',
- field=models.CharField(editable=False, help_text='e.g. the device tree name(s)', max_length=200, primary_key=True, serialize=False, verbose_name='Alias for this device-type'),
- ),
- migrations.AlterField(
- model_name='architecture',
- name='name',
- field=models.CharField(editable=False, help_text='e.g. ARMv7', max_length=100, primary_key=True, serialize=False, verbose_name='Architecture version'),
- ),
- migrations.AlterField(
- model_name='bitwidth',
- name='width',
- field=models.PositiveSmallIntegerField(editable=False, help_text='integer: e.g. 32 or 64', primary_key=True, serialize=False, verbose_name='Processor bit width'),
- ),
- migrations.AlterField(
- model_name='core',
- name='name',
- field=models.CharField(editable=False, help_text='Name of a specific CPU core, e.g. Cortex-A9', max_length=100, primary_key=True, serialize=False, verbose_name='CPU core'),
- ),
- migrations.AlterField(
- model_name='device',
- name='hostname',
- field=models.CharField(editable=False, max_length=200, primary_key=True, serialize=False, verbose_name='Hostname'),
- ),
- migrations.AlterField(
- model_name='devicetype',
- name='name',
- field=models.SlugField(editable=False, primary_key=True, serialize=False),
- ),
- migrations.AlterField(
- model_name='processorfamily',
- name='name',
- field=models.CharField(editable=False, help_text='e.g. OMAP4, Exynos', max_length=100, primary_key=True, serialize=False, verbose_name='Processor Family'),
- ),
- migrations.AlterField(
- model_name='worker',
- name='hostname',
- field=models.CharField(default=None, editable=False, max_length=200, primary_key=True, serialize=False, verbose_name='Hostname'),
- ),
- ]
diff --git a/lava_scheduler_app/migrations/0039_set_default_device_health_maintenance.py b/lava_scheduler_app/migrations/0038_set_default_device_health_maintenance.py
index ff2052709..40eec3d43 100644
--- a/lava_scheduler_app/migrations/0039_set_default_device_health_maintenance.py
+++ b/lava_scheduler_app/migrations/0038_set_default_device_health_maintenance.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('lava_scheduler_app', '0038_make_primary_key_non_editable'),
+ ('lava_scheduler_app', '0037_notify_callback_separation'),
]
operations = [
diff --git a/lava_scheduler_app/models.py b/lava_scheduler_app/models.py
index 8eb474084..45ff45f17 100644
--- a/lava_scheduler_app/models.py
+++ b/lava_scheduler_app/models.py
@@ -99,7 +99,7 @@ class Architecture(models.Model):
verbose_name='Architecture version',
help_text='e.g. ARMv7',
max_length=100,
- editable=False,
+ editable=True,
)
def __str__(self):
@@ -112,7 +112,7 @@ class ProcessorFamily(models.Model):
verbose_name='Processor Family',
help_text='e.g. OMAP4, Exynos',
max_length=100,
- editable=False,
+ editable=True,
)
def __str__(self):
@@ -125,7 +125,7 @@ class Alias(models.Model):
verbose_name='Alias for this device-type',
help_text='e.g. the device tree name(s)',
max_length=200,
- editable=False,
+ editable=True,
)
def __str__(self):
@@ -137,7 +137,7 @@ class BitWidth(models.Model):
primary_key=True,
verbose_name='Processor bit width',
help_text='integer: e.g. 32 or 64',
- editable=False,
+ editable=True,
)
def __str__(self):
@@ -149,7 +149,7 @@ class Core(models.Model):
primary_key=True,
verbose_name='CPU core',
help_text='Name of a specific CPU core, e.g. Cortex-A9',
- editable=False,
+ editable=True,
max_length=100,
)
@@ -162,8 +162,7 @@ class DeviceType(models.Model):
A class of device, for example a pandaboard or a snowball.
"""
- name = models.SlugField(primary_key=True,
- editable=False)
+ name = models.SlugField(primary_key=True)
architecture = models.ForeignKey(
Architecture,
@@ -339,7 +338,7 @@ class Worker(models.Model):
max_length=200,
primary_key=True,
default=None,
- editable=False
+ editable=True
)
STATE_ONLINE, STATE_OFFLINE = range(2)
@@ -458,7 +457,6 @@ class Device(RestrictedResource):
verbose_name=_("Hostname"),
max_length=200,
primary_key=True,
- editable=False,
)
device_type = models.ForeignKey(