mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

filtering multiple regions with null

Browse Source
This commit is contained in:
kobayashi
2019-10-28 02:24:44 -04:00
parent 766b5dff24
commit d2aa9b8e79
3 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
netbox/dcim/tests/test_api.py
View File

@@ -127,7 +127,9 @@ class SiteTest(APITestCase):
self.region2 = Region.objects.create(name='Test Region 2', slug='test-region-2')
self.site1 = Site.objects.create(region=self.region1, name='Test Site 1', slug='test-site-1')
self.site2 = Site.objects.create(region=self.region1, name='Test Site 2', slug='test-site-2')
self.site3 = Site.objects.create(region=self.region1, name='Test Site 3', slug='test-site-3')
self.site3 = Site.objects.create(region=self.region2, name='Test Site 3', slug='test-site-3')
self.site_non_region1 = Site.objects.create(name='Test Site Null Region1', slug='test-site-no-region1')
self.site_non_region2 = Site.objects.create(name='Test Site Null Region2', slug='test-site-no-region2')
def test_get_site(self):
@@ -162,7 +164,7 @@ class SiteTest(APITestCase):
url = reverse('dcim-api:site-list')
response = self.client.get(url, **self.header)
self.assertEqual(response.data['count'], 3)
self.assertEqual(response.data['count'], 5)
def test_list_sites_brief(self):
@@ -176,14 +178,18 @@ class SiteTest(APITestCase):
def test_list_sites_null_region(self):
Site.objects.create(name='Test Site Null Region1', slug='test-site-no-region1')
Site.objects.create(name='Test Site Null Region2', slug='test-site-no-region2')
url = reverse('dcim-api:site-list')
response = self.client.get('{}?region=null'.format(url), **self.header)
self.assertEqual(response.data['count'], 2)
def test_list_sites_multiple_regions(self):
url = reverse('dcim-api:site-list')
response = self.client.get('{}?region=null&region=test-region-1'.format(url), **self.header)
self.assertEqual(response.data['count'], 4)
def test_create_site(self):
data = {
@@ -197,7 +203,7 @@ class SiteTest(APITestCase):
response = self.client.post(url, data, format='json', **self.header)
self.assertHttpStatus(response, status.HTTP_201_CREATED)
self.assertEqual(Site.objects.count(), 4)
self.assertEqual(Site.objects.count(), 6)
site4 = Site.objects.get(pk=response.data['id'])
self.assertEqual(site4.name, data['name'])
self.assertEqual(site4.slug, data['slug'])
@@ -230,7 +236,7 @@ class SiteTest(APITestCase):
response = self.client.post(url, data, format='json', **self.header)
self.assertHttpStatus(response, status.HTTP_201_CREATED)
self.assertEqual(Site.objects.count(), 6)
self.assertEqual(Site.objects.count(), 8)
self.assertEqual(response.data[0]['name'], data[0]['name'])
self.assertEqual(response.data[1]['name'], data[1]['name'])
self.assertEqual(response.data[2]['name'], data[2]['name'])
@@ -247,7 +253,7 @@ class SiteTest(APITestCase):
response = self.client.put(url, data, format='json', **self.header)
self.assertHttpStatus(response, status.HTTP_200_OK)
self.assertEqual(Site.objects.count(), 3)
self.assertEqual(Site.objects.count(), 5)
site1 = Site.objects.get(pk=response.data['id'])
self.assertEqual(site1.name, data['name'])
self.assertEqual(site1.slug, data['slug'])
@@ -259,7 +265,7 @@ class SiteTest(APITestCase):
response = self.client.delete(url, **self.header)
self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
self.assertEqual(Site.objects.count(), 2)
self.assertEqual(Site.objects.count(), 4)
class RackGroupTest(APITestCase):
@@ -1763,7 +1769,7 @@ class DeviceTest(APITestCase):
super().setUp()
region = Region.objects.create(name='Test Region', slug='test-region')
region = Region.objects.create(name='Test Region', slug='test-region-1')
self.site1 = Site.objects.create(region=region, name='Test Site 1', slug='test-site-1')
self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2')
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
@@ -1812,6 +1818,20 @@ class DeviceTest(APITestCase):
'B': 2
}
)
self.device_non_region1 = Device.objects.create(
device_type=self.devicetype1,
device_role=self.devicerole1,
name='Test Device Null Region1',
site=self.site2,
cluster=self.cluster1
)
self.device_non_region2 = Device.objects.create(
device_type=self.devicetype1,
device_role=self.devicerole1,
name='Test Device Null Region2',
site=self.site2,
cluster=self.cluster1
)
def test_get_device(self):
@@ -1827,7 +1847,7 @@ class DeviceTest(APITestCase):
url = reverse('dcim-api:device-list')
response = self.client.get(url, **self.header)
self.assertEqual(response.data['count'], 4)
self.assertEqual(response.data['count'], 6)
def test_list_devices_brief(self):
@@ -1839,20 +1859,19 @@ class DeviceTest(APITestCase):
['display_name', 'id', 'name', 'url']
)
def test_list_device_null_region(self):
Device.objects.create(
device_type=self.devicetype1,
device_role=self.devicerole1,
name='Test Device Null Region',
site=self.site2,
cluster=self.cluster1
)
def test_list_devices_null_region(self):
url = reverse('dcim-api:device-list')
response = self.client.get('{}?region=null'.format(url), **self.header)
self.assertEqual(response.data['count'], 1)
self.assertEqual(response.data['count'], 2)
def test_list_devices_multiple_regions(self):
url = reverse('dcim-api:device-list')
response = self.client.get('{}?region=null&region=test-region-1'.format(url), **self.header)
self.assertEqual(response.data['count'], 6)
def test_create_device(self):
@@ -1868,7 +1887,7 @@ class DeviceTest(APITestCase):
response = self.client.post(url, data, format='json', **self.header)
self.assertHttpStatus(response, status.HTTP_201_CREATED)
self.assertEqual(Device.objects.count(), 5)
self.assertEqual(Device.objects.count(), 7)
device4 = Device.objects.get(pk=response.data['id'])
self.assertEqual(device4.device_type_id, data['device_type'])
self.assertEqual(device4.device_role_id, data['device_role'])
@@ -1903,7 +1922,7 @@ class DeviceTest(APITestCase):
response = self.client.post(url, data, format='json', **self.header)
self.assertHttpStatus(response, status.HTTP_201_CREATED)
self.assertEqual(Device.objects.count(), 7)
self.assertEqual(Device.objects.count(), 9)
self.assertEqual(response.data[0]['name'], data[0]['name'])
self.assertEqual(response.data[1]['name'], data[1]['name'])
self.assertEqual(response.data[2]['name'], data[2]['name'])
@@ -1927,7 +1946,7 @@ class DeviceTest(APITestCase):
response = self.client.put(url, data, format='json', **self.header)
self.assertHttpStatus(response, status.HTTP_200_OK)
self.assertEqual(Device.objects.count(), 4)
self.assertEqual(Device.objects.count(), 6)
device1 = Device.objects.get(pk=response.data['id'])
self.assertEqual(device1.device_type_id, data['device_type'])
self.assertEqual(device1.device_role_id, data['device_role'])
@@ -1942,7 +1961,7 @@ class DeviceTest(APITestCase):
response = self.client.delete(url, **self.header)
self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
self.assertEqual(Device.objects.count(), 3)
self.assertEqual(Device.objects.count(), 5)
def test_config_context_included_by_default_in_list_view(self):