Merge branch 'feature' into 9102-cabling

netbox/dcim/migrations/0155_interface_poe_mode_type.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.0.5 on 2022-06-22 00:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0154_half_height_rack_units'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='interface',
+            name='poe_mode',
+            field=models.CharField(blank=True, max_length=50),
+        ),
+        migrations.AddField(
+            model_name='interface',
+            name='poe_type',
+            field=models.CharField(blank=True, max_length=50),
+        ),
+    ]

netbox/dcim/migrations/0156_location_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.5 on 2022-06-22 17:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0155_interface_poe_mode_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='location',
+            name='status',
+            field=models.CharField(default='active', max_length=50),
+        ),
+    ]

netbox/dcim/migrations/0157_new_cabling_models.py

@@ -6,7 +6,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('contenttypes', '0002_remove_content_type_name'),
-        ('dcim', '0154_half_height_rack_units'),
+        ('dcim', '0156_location_status'),
     ]
 
     operations = [

netbox/dcim/migrations/0158_populate_cable_terminations.py

@@ -40,7 +40,7 @@ def populate_cable_terminations(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('dcim', '0155_new_cabling_models'),
+        ('dcim', '0157_new_cabling_models'),
     ]
 
     operations = [

netbox/dcim/migrations/0159_populate_cable_paths.py

@@ -39,7 +39,7 @@ def populate_cable_paths(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('dcim', '0156_populate_cable_terminations'),
+        ('dcim', '0158_populate_cable_terminations'),
     ]
 
     operations = [

netbox/dcim/migrations/0160_populate_cable_ends.py

@@ -30,8 +30,8 @@ def populate_cable_terminations(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('circuits', '0036_new_cabling_models'),
-        ('dcim', '0157_populate_cable_paths'),
+        ('circuits', '0037_new_cabling_models'),
+        ('dcim', '0159_populate_cable_paths'),
     ]
 
     operations = [

netbox/dcim/migrations/0161_cabling_cleanup.py

@@ -4,7 +4,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('dcim', '0158_populate_cable_ends'),
+        ('dcim', '0160_populate_cable_ends'),
     ]
 
     operations = [