From 341243c2ec3eb6785f3e1930161b1f40463432f3 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 4 Nov 2022 08:55:32 -0400 Subject: [PATCH] Accommodate recent changes in feature branch --- ...evicecontexts.py => 0166_virtualdevicecontexts.py} | 11 ++++++----- netbox/dcim/models/devices.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) rename netbox/dcim/migrations/{0165_virtualdevicecontexts.py => 0166_virtualdevicecontexts.py} (88%) diff --git a/netbox/dcim/migrations/0165_virtualdevicecontexts.py b/netbox/dcim/migrations/0166_virtualdevicecontexts.py similarity index 88% rename from netbox/dcim/migrations/0165_virtualdevicecontexts.py rename to netbox/dcim/migrations/0166_virtualdevicecontexts.py index f72061005..1db331bb3 100644 --- a/netbox/dcim/migrations/0165_virtualdevicecontexts.py +++ b/netbox/dcim/migrations/0166_virtualdevicecontexts.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.2 on 2022-11-02 13:24 +# Generated by Django 4.1.2 on 2022-11-04 12:46 from django.db import migrations, models import django.db.models.deletion @@ -9,10 +9,10 @@ import utilities.json class Migration(migrations.Migration): dependencies = [ - ('ipam', '0062_unique_constraints'), - ('extras', '0082_exporttemplate_content_types'), - ('tenancy', '0008_unique_constraints'), - ('dcim', '0164_rack_mounting_depth'), + ('extras', '0083_savedfilter'), + ('ipam', '0063_standardize_description_comments'), + ('tenancy', '0009_standardize_description_comments'), + ('dcim', '0165_standardize_description_comments'), ] operations = [ @@ -23,6 +23,7 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True, null=True)), ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder)), + ('description', models.CharField(blank=True, max_length=200)), ('name', models.CharField(max_length=64)), ('status', models.CharField(blank=True, max_length=50)), ('identifier', models.PositiveSmallIntegerField(blank=True, null=True)), diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index 4cc8cff71..5e34cf25b 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -1065,7 +1065,7 @@ class VirtualChassis(PrimaryModel): return super().delete(*args, **kwargs) -class VirtualDeviceContext(NetBoxModel): +class VirtualDeviceContext(PrimaryModel): device = models.ForeignKey( to='Device', on_delete=models.PROTECT,