mirror of
https://github.com/netbox-community/netbox.git
synced 2024-05-10 07:54:54 +00:00
Remove NullableCharFieldFilter; add missing filter fields
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
import django_filters
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from django.db.models import Q
|
||||
from netaddr import EUI
|
||||
from netaddr.core import AddrFormatError
|
||||
@@ -16,14 +15,14 @@ class ClusterTypeFilter(NameSlugSearchFilterSet):
|
||||
|
||||
class Meta:
|
||||
model = ClusterType
|
||||
fields = ['name', 'slug']
|
||||
fields = ['id', 'name', 'slug']
|
||||
|
||||
|
||||
class ClusterGroupFilter(NameSlugSearchFilterSet):
|
||||
|
||||
class Meta:
|
||||
model = ClusterGroup
|
||||
fields = ['name', 'slug']
|
||||
fields = ['id', 'name', 'slug']
|
||||
|
||||
|
||||
class ClusterFilter(CustomFieldFilterSet):
|
||||
@@ -167,7 +166,7 @@ class VirtualMachineFilter(CustomFieldFilterSet):
|
||||
|
||||
class Meta:
|
||||
model = VirtualMachine
|
||||
fields = ['id', 'name', 'cluster']
|
||||
fields = ['id', 'name', 'cluster', 'vcpus', 'memory', 'disk']
|
||||
|
||||
def search(self, queryset, name, value):
|
||||
if not value.strip():
|
||||
@@ -201,7 +200,7 @@ class InterfaceFilter(django_filters.FilterSet):
|
||||
|
||||
class Meta:
|
||||
model = Interface
|
||||
fields = ['name', 'enabled', 'mtu']
|
||||
fields = ['id', 'name', 'enabled', 'mtu']
|
||||
|
||||
def _mac_address(self, queryset, name, value):
|
||||
value = value.strip()
|
||||
|
||||
@@ -464,7 +464,7 @@ class VirtualMachineTest(APITestCase):
|
||||
def test_config_context_included_by_default_in_list_view(self):
|
||||
|
||||
url = reverse('virtualization-api:virtualmachine-list')
|
||||
url = '{}?id__in={}'.format(url, self.virtualmachine_with_context_data.pk)
|
||||
url = '{}?id={}'.format(url, self.virtualmachine_with_context_data.pk)
|
||||
response = self.client.get(url, **self.header)
|
||||
|
||||
self.assertEqual(response.data['results'][0].get('config_context', {}).get('A'), 1)
|
||||
|
||||
Reference in New Issue
Block a user