From a6de767f02153b46d964d551f10bc9561aa28d0c Mon Sep 17 00:00:00 2001 From: Sean Smith Date: Thu, 23 Jul 2020 17:16:58 -0400 Subject: Make static OPNFV references dynamic Change-Id: I3830a30a927834b642052643d94c39a9faec4d54 Signed-off-by: Sean Smith --- src/account/migrations/0005_auto_20200723_2100.py | 23 +++++++++++++++++++++++ src/account/models.py | 5 ++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/account/migrations/0005_auto_20200723_2100.py (limited to 'src/account') diff --git a/src/account/migrations/0005_auto_20200723_2100.py b/src/account/migrations/0005_auto_20200723_2100.py new file mode 100644 index 0000000..d995f80 --- /dev/null +++ b/src/account/migrations/0005_auto_20200723_2100.py @@ -0,0 +1,23 @@ +# Generated by Django 2.2 on 2020-07-23 21:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('account', '0004_downtime'), + ] + + operations = [ + migrations.AddField( + model_name='lab', + name='lab_info_link', + field=models.URLField(null=True), + ), + migrations.AddField( + model_name='lab', + name='project', + field=models.CharField(default='LaaS', max_length=100), + ), + ] diff --git a/src/account/models.py b/src/account/models.py index 4aab306..03b31df 100644 --- a/src/account/models.py +++ b/src/account/models.py @@ -16,6 +16,7 @@ import random from collections import Counter + class LabStatus(object): """ A Poor man's enum for the status of a lab. @@ -204,6 +205,8 @@ class Lab(models.Model): # This token must apear in API requests from this lab api_token = models.CharField(max_length=50) description = models.CharField(max_length=240) + lab_info_link = models.URLField(null=True) + project = models.CharField(default='LaaS', max_length=100) @staticmethod def make_api_token(): @@ -216,7 +219,7 @@ class Lab(models.Model): def get_available_resources(self): # Cannot import model normally due to ciruclar import - Server = apps.get_model('resource_inventory', 'Server') # TODO: Find way to import ResourceQuery + Server = apps.get_model('resource_inventory', 'Server') # TODO: Find way to import ResourceQuery resources = [str(resource.profile) for resource in Server.objects.filter(lab=self, booked=False)] return dict(Counter(resources)) -- cgit 1.2.3-korg