Lab as a Service 2.0

See changes here:
https://wiki.opnfv.org/display/INF/Pharos+Laas

Change-Id: I59ada5f98e70a28d7f8c14eab3239597e236ca26
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>

6 files changed, 74 insertions, 70 deletions

diff --git a/src/account/migrations/0001_initial.py b/src/account/migrations/0001_initial.py
index 591f702..c8b5bdc 100644
--- a/src/account/migrations/0001_initial.py
+++ b/src/account/migrations/0001_initial.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-03 13:33
-from __future__ import unicode_literals
+# Generated by Django 2.1 on 2018-09-14 14:48
 
 import account.models
 from django.conf import settings
@@ -18,21 +16,50 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
+            name='Lab',
+            fields=[
+                ('name', models.CharField(max_length=200, primary_key=True, serialize=False, unique=True)),
+                ('contact_email', models.EmailField(blank=True, max_length=200, null=True)),
+                ('contact_phone', models.CharField(blank=True, max_length=20, null=True)),
+                ('status', models.IntegerField(default=0)),
+                ('location', models.TextField(default='unknown')),
+                ('api_token', models.CharField(max_length=50)),
+                ('lab_user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
             name='UserProfile',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('timezone', models.CharField(default='UTC', max_length=100)),
                 ('ssh_public_key', models.FileField(blank=True, null=True, upload_to=account.models.upload_to)),
                 ('pgp_public_key', models.FileField(blank=True, null=True, upload_to=account.models.upload_to)),
+                ('email_addr', models.CharField(default='email@mail.com', max_length=300)),
                 ('company', models.CharField(max_length=200)),
                 ('oauth_token', models.CharField(max_length=1024)),
                 ('oauth_secret', models.CharField(max_length=1024)),
                 ('jira_url', models.CharField(default='', max_length=100)),
                 ('full_name', models.CharField(default='', max_length=100)),
+                ('booking_privledge', models.BooleanField(default=False)),
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'db_table': 'user_profile',
             },
         ),
+        migrations.CreateModel(
+            name='VlanManager',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('vlans', models.TextField()),
+                ('block_size', models.IntegerField()),
+                ('allow_overlapping', models.BooleanField()),
+                ('reserved_vlans', models.TextField()),
+            ],
+        ),
+        migrations.AddField(
+            model_name='lab',
+            name='vlan_manager',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='account.VlanManager'),
+        ),
     ]
diff --git a/src/account/migrations/0002_auto_20180110_1636.py b/src/account/migrations/0002_auto_20180110_1636.py
deleted file mode 100644
index 6170acb..0000000
--- a/src/account/migrations/0002_auto_20180110_1636.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2018-01-10 16:36
-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):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('account', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Lab',
-            fields=[
-                ('id', models.CharField(max_length=200, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=200, unique=True)),
-                ('contact_email', models.EmailField(blank=True, max_length=200, null=True)),
-                ('contact_phone', models.CharField(blank=True, max_length=20, null=True)),
-                ('lab_user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='userprofile',
-            name='email_addr',
-            field=models.CharField(default='email@mail.com', max_length=300),
-        ),
-    ]
diff --git a/src/account/migrations/0002_lab_description.py b/src/account/migrations/0002_lab_description.py
new file mode 100644
index 0000000..445501a
--- /dev/null
+++ b/src/account/migrations/0002_lab_description.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.1 on 2018-09-14 20:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='lab',
+            name='description',
+            field=models.CharField(default='Lab description default', max_length=240),
+            preserve_default=False,
+        ),
+    ]
diff --git a/src/account/migrations/0003_auto_20180110_1639.py b/src/account/migrations/0003_auto_20180110_1639.py
deleted file mode 100644
index d0bc4d6..0000000
--- a/src/account/migrations/0003_auto_20180110_1639.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2018-01-10 16:39
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('account', '0002_auto_20180110_1636'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='lab',
-            name='id',
-        ),
-        migrations.AlterField(
-            model_name='lab',
-            name='name',
-            field=models.CharField(max_length=200, primary_key=True, serialize=False, unique=True),
-        ),
-    ]
diff --git a/src/account/migrations/0003_publicnetwork.py b/src/account/migrations/0003_publicnetwork.py
new file mode 100644
index 0000000..71e5caa
--- /dev/null
+++ b/src/account/migrations/0003_publicnetwork.py
@@ -0,0 +1,25 @@
+# Generated by Django 2.1 on 2018-09-26 14:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0002_lab_description'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PublicNetwork',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('vlan', models.IntegerField()),
+                ('in_use', models.BooleanField(default=False)),
+                ('cidr', models.CharField(default='0.0.0.0/0', max_length=50)),
+                ('gateway', models.CharField(default='0.0.0.0', max_length=50)),
+                ('lab', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='account.Lab')),
+            ],
+        ),
+    ]
diff --git a/src/account/migrations/__init__.py b/src/account/migrations/__init__.py
index b5914ce..e69de29 100644
--- a/src/account/migrations/__init__.py
+++ b/src/account/migrations/__init__.py
@@ -1,10 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Max Breitenfeldt and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-