Accommodate recent changes in feature branch

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)),

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,