quick fixes

4 files changed, 121 insertions, 5 deletions

diff --git a/src/caas/migrations/0001_initial.py b/src/caas/migrations/0001_initial.py
new file mode 100644
index 0000000..409c48f
--- /dev/null
+++ b/src/caas/migrations/0001_initial.py
@@ -0,0 +1,74 @@
+# Generated by Django 3.0.5 on 2020-05-04 16:28
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='VcpfeLocation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('fuze_spm_site_id', models.CharField(max_length=16)),
+                ('fuze_spm_site_name', models.CharField(max_length=255)),
+                ('fuze_spm_market', models.CharField(max_length=255)),
+                ('fuze_spm_submarket', models.CharField(max_length=255)),
+                ('fuze_spm_site_type', models.CharField(choices=[('DRAN', 'DRAN'), ('CRAN', 'CRAN')], max_length=4)),
+                ('central_controller_sap_clli', models.CharField(max_length=255)),
+                ('vcu_sap_clli', models.CharField(max_length=255)),
+                ('csr_hostname', models.CharField(max_length=255)),
+                ('f1c_f1u_subnet', models.CharField(max_length=255)),
+                ('f1c_f1u_default_gateway', models.CharField(max_length=255)),
+                ('oam_subnet', models.CharField(max_length=255)),
+                ('oam_default_gateway', models.CharField(max_length=255)),
+                ('mgmt_subnet', models.CharField(max_length=255)),
+                ('mgmt_default_gateway', models.CharField(max_length=255)),
+                ('ilo_subnet', models.CharField(max_length=255)),
+                ('ilo_default_gateway', models.CharField(max_length=255)),
+                ('fhgw_subnet', models.CharField(max_length=255)),
+                ('fhgw_default_gateway', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Vlan',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('host_vlan', models.PositiveSmallIntegerField()),
+                ('oam_vlan', models.PositiveSmallIntegerField()),
+                ('mgmt_vlan', models.PositiveSmallIntegerField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='VcpfeServer',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('server_number', models.PositiveSmallIntegerField()),
+                ('server_hostname', models.CharField(max_length=255)),
+                ('cluster_name', models.CharField(max_length=255)),
+                ('f1u_address', models.CharField(max_length=255)),
+                ('f1c_address', models.CharField(max_length=255)),
+                ('oam_host_address', models.CharField(max_length=255)),
+                ('oam_vip_address', models.CharField(max_length=255)),
+                ('mgmt_address_range_start', models.CharField(max_length=255)),
+                ('mgmt_address_range_end', models.CharField(max_length=255)),
+                ('ilo_host_address', models.CharField(max_length=255)),
+                ('fhgw_host_address', models.CharField(max_length=255)),
+                ('vlan_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='caas.Vlan')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Namespace',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('namespace_name', models.CharField(max_length=255)),
+                ('server_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='caas.VcpfeServer')),
+            ],
+        ),
+    ]
diff --git a/src/caas/migrations/0002_vlan_yourmom.py b/src/caas/migrations/0002_vlan_yourmom.py
new file mode 100644
index 0000000..9b41b10
--- /dev/null
+++ b/src/caas/migrations/0002_vlan_yourmom.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.6 on 2020-05-04 17:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('caas', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vlan',
+            name='yourmom',
+            field=models.PositiveSmallIntegerField(blank=True, null=True),
+        ),
+    ]
diff --git a/src/caas/migrations/0003_remove_vlan_yourmom.py b/src/caas/migrations/0003_remove_vlan_yourmom.py
new file mode 100644
index 0000000..cadda81
--- /dev/null
+++ b/src/caas/migrations/0003_remove_vlan_yourmom.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.0.6 on 2020-05-04 17:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('caas', '0002_vlan_yourmom'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='vlan',
+            name='yourmom',
+        ),
+    ]
diff --git a/src/caas/models.py b/src/caas/models.py
index 562951b..6ad754f 100644
--- a/src/caas/models.py
+++ b/src/caas/models.py
@@ -9,12 +9,20 @@ class Vlan(models.Model):
         return "host_vlan: %s , oam_vlan: %s , mgmt_vlan: %s" % (self.host_vlan, self.oam_vlan, self.mgmt_vlan)
 
 
-class VcpfeLocation(models.Mode):
+class Namespace(models.Model):
+    namespace_name = models.CharField(max_length=255)
+    server_id = models.ForeignKey('VcpfeServer', on_delete=models.SET_NULL, blank=True, null=True)
+    
+    def __str__(self):
+        return "namespace_name: %s , server_id : %s" % (self.namespace_name, self.server_id)
+
+
+class VcpfeLocation(models.Model):
     fuze_spm_site_id = models.CharField(max_length=16)
     fuze_spm_site_name = models.CharField(max_length=255)
     fuze_spm_market = models.CharField(max_length=255)
     fuze_spm_submarket = models.CharField(max_length=255)
-    fuze_spm_site_type = models.CharField(max_length=4, choices=[('DRAN', 'DRAN'), ('CRAN', 'CRAN')]))
+    fuze_spm_site_type = models.CharField(max_length=4, choices=[('DRAN', 'DRAN'), ('CRAN', 'CRAN')])
     central_controller_sap_clli = models.CharField(max_length=255)
     vcu_sap_clli = models.CharField(max_length=255)
     csr_hostname = models.CharField(max_length=255)
@@ -30,14 +38,13 @@ class VcpfeLocation(models.Mode):
     fhgw_default_gateway = models.CharField(max_length=255)
 
     def __str__(self):
-        return "%s : %s : %s : %s : %s" % (self.fuze_spm_site_id, self.fuze_spm_site_name, self.fuze_spm_market self.fuze_spm_submarket, self.fuze_spm_site_type)
+        return "%s : %s : %s : %s : %s" % (self.fuze_spm_site_id, self.fuze_spm_site_name, self.fuze_spm_market, self.fuze_spm_submarket, self.fuze_spm_site_type)
 
 
 class VcpfeServer(models.Model):
     server_number = models.PositiveSmallIntegerField()
     server_hostname = models.CharField(max_length=255)
     cluster_name = models.CharField(max_length=255)
-    namespace_name = models.CharField(max_length=255)
     f1u_address = models.CharField(max_length=255)
     f1c_address = models.CharField(max_length=255)
     oam_host_address = models.CharField(max_length=255)
@@ -46,7 +53,7 @@ class VcpfeServer(models.Model):
     mgmt_address_range_end = models.CharField(max_length=255)
     ilo_host_address = models.CharField(max_length=255)
     fhgw_host_address = models.CharField(max_length=255)
-    vlan_id = models.ForeignKey(Vlan, on_delete=models.SET_NULL, blank=True, null=True)
+    vlan_id = models.ForeignKey('Vlan', on_delete=models.SET_NULL, blank=True, null=True)
 
     def __str__(self):
         return "%s : %s : %s" % (self.server_hostname, self.cluster_name, self.namespace_name)