From 7c667f3485fb8d266cdcdcfa034f9f25ad5c5b84 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 7 Jul 2021 11:55:20 -0400 Subject: [PATCH] Fixes #6710: Fix assignment of VM interface parent via REST API --- docs/release-notes/version-2.11.md | 8 ++++++++ netbox/dcim/tests/test_api.py | 3 ++- netbox/virtualization/api/nested_serializers.py | 5 ++--- netbox/virtualization/tests/test_api.py | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md index c5a500698..8ed901918 100644 --- a/docs/release-notes/version-2.11.md +++ b/docs/release-notes/version-2.11.md @@ -1,5 +1,13 @@ # NetBox v2.11 +## v2.11.9 (FUTURE) + +### Bug Fixes + +* [#6710](https://github.com/netbox-community/netbox/issues/6710) - Fix assignment of VM interface parent via REST API + +--- + ## v2.11.8 (2021-07-06) ### Enhancements diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 5e7f44203..9b5448e95 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -1211,8 +1211,9 @@ class InterfaceTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase { 'device': device.pk, 'name': 'Interface 6', - 'type': '1000base-t', + 'type': 'virtual', 'mode': InterfaceModeChoices.MODE_TAGGED, + 'parent': interfaces[0].pk, 'tagged_vlans': [vlans[0].pk, vlans[1].pk], 'untagged_vlan': vlans[2].pk, }, diff --git a/netbox/virtualization/api/nested_serializers.py b/netbox/virtualization/api/nested_serializers.py index aa0a9437e..16e10b5fd 100644 --- a/netbox/virtualization/api/nested_serializers.py +++ b/netbox/virtualization/api/nested_serializers.py @@ -1,8 +1,7 @@ from rest_framework import serializers -from dcim.models import Interface from netbox.api import WritableNestedSerializer -from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine +from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface __all__ = [ 'NestedClusterGroupSerializer', @@ -61,5 +60,5 @@ class NestedVMInterfaceSerializer(WritableNestedSerializer): virtual_machine = NestedVirtualMachineSerializer(read_only=True) class Meta: - model = Interface + model = VMInterface fields = ['id', 'url', 'display', 'virtual_machine', 'name'] diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index bcf3195f2..cb45a192a 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -251,6 +251,7 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase): { 'virtual_machine': virtualmachine.pk, 'name': 'Interface 6', + 'parent': interfaces[0].pk, 'mode': InterfaceModeChoices.MODE_TAGGED, 'tagged_vlans': [vlans[0].pk, vlans[1].pk], 'untagged_vlan': vlans[2].pk,