Skip to content

Commit adb25fd

Browse files
steffannjeremystretch
authored andcommitted
822 bulk import of device components (#3711)
Closes #822: CSV import for device components * Implement CSV import for #822 * Comment out default_return_url until there is a proper target * Fix the default value of `enabled` when not included in the import * rear_port is definitely required here * Power Ports don't have a type (yet) * Add import for console-ports and console-server-ports * Add import for device-bays
1 parent f3a41df commit adb25fd

File tree

23 files changed

+523
-41
lines changed

23 files changed

+523
-41
lines changed

README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ Please see [the documentation](http://netbox.readthedocs.io/en/stable/) for
3636
instructions on installing NetBox. To upgrade NetBox, please download the [latest release](https://github.com/netbox-community/netbox/releases)
3737
and run `upgrade.sh`.
3838

39-
## Alternative Installations
40-
41-
* [Docker container](https://github.com/netbox-community/netbox-docker) (via [@cimnine](https://github.com/cimnine))
42-
* [Vagrant deployment](https://github.com/ryanmerolle/netbox-vagrant) (via [@ryanmerolle](https://github.com/ryanmerolle))
43-
* [Ansible deployment](https://github.com/lae/ansible-role-netbox) (via [@lae](https://github.com/lae))
44-
* [Kubernetes deployment](https://github.com/CENGN/netbox-kubernetes) (via [@CENGN](https://github.com/CENGN))
45-
4639
# Providing Feedback
4740

4841
Feature requests and bug reports must be submitted as GiHub issues. (Please be

docs/additional-features/custom-scripts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ class NewBranchScript(Script):
182182
class Meta:
183183
name = "New Branch"
184184
description = "Provision a new branch site"
185-
fields = ['site_name', 'switch_count', 'switch_model']
185+
field_order = ['site_name', 'switch_count', 'switch_model']
186186
187187
site_name = StringVar(
188188
description="Name of the new site"

docs/installation/3-http-daemon.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ server {
3232
proxy_set_header X-Forwarded-Host $server_name;
3333
proxy_set_header X-Real-IP $remote_addr;
3434
proxy_set_header X-Forwarded-Proto $scheme;
35-
add_header P3P 'CP="ALL DSP COR PSAa PSDa OUR NOR ONL UNI COM NAV"';
3635
}
3736
}
3837
```

docs/release-notes/version-2.6.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
# v2.6.8 (FUTURE)
2+
3+
## Enhancements
4+
5+
* [#3139](https://github.com/netbox-community/netbox/issues/3139) - Disable password change form for LDAP-authenticated users
6+
* [#3457](https://github.com/netbox-community/netbox/issues/3457) - Display cable colors on device view
7+
* [#3329](https://github.com/netbox-community/netbox/issues/3329) - Remove obsolete P3P policy header
8+
* [#3663](https://github.com/netbox-community/netbox/issues/3663) - Add query filters for `created` and `last_updated` fields
9+
10+
## Bug Fixes
11+
12+
* [#3669](https://github.com/netbox-community/netbox/issues/3669) - Include `weight` field in prefix/VLAN role form
13+
* [#3674](https://github.com/netbox-community/netbox/issues/3674) - Include comments on PowerFeed view
14+
* [#3679](https://github.com/netbox-community/netbox/issues/3679) - Fix link for assigned ipaddress in interface page
15+
116
# v2.6.7 (2019-11-01)
217

318
## Enhancements

netbox/circuits/filters.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
from django.db.models import Q
33

44
from dcim.models import Region, Site
5-
from extras.filters import CustomFieldFilterSet
5+
from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet
66
from tenancy.filtersets import TenancyFilterSet
77
from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter
88
from .constants import *
99
from .models import Circuit, CircuitTermination, CircuitType, Provider
1010

1111

12-
class ProviderFilter(CustomFieldFilterSet):
12+
class ProviderFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
1313
id__in = NumericInFilter(
1414
field_name='id',
1515
lookup_expr='in'
@@ -54,7 +54,7 @@ class Meta:
5454
fields = ['id', 'name', 'slug']
5555

5656

57-
class CircuitFilter(CustomFieldFilterSet, TenancyFilterSet):
57+
class CircuitFilter(CustomFieldFilterSet, TenancyFilterSet, CreatedUpdatedFilterSet):
5858
id__in = NumericInFilter(
5959
field_name='id',
6060
lookup_expr='in'

netbox/dcim/filters.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from django.contrib.auth.models import User
33
from django.db.models import Q
44

5-
from extras.filters import CustomFieldFilterSet, LocalConfigContextFilter
5+
from extras.filters import CustomFieldFilterSet, LocalConfigContextFilter, CreatedUpdatedFilterSet
66
from tenancy.filtersets import TenancyFilterSet
77
from tenancy.models import Tenant
88
from utilities.constants import COLOR_CHOICES
@@ -39,7 +39,7 @@ class Meta:
3939
fields = ['id', 'name', 'slug']
4040

4141

42-
class SiteFilter(TenancyFilterSet, CustomFieldFilterSet):
42+
class SiteFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
4343
id__in = NumericInFilter(
4444
field_name='id',
4545
lookup_expr='in'
@@ -117,7 +117,7 @@ class Meta:
117117
fields = ['id', 'name', 'slug', 'color']
118118

119119

120-
class RackFilter(TenancyFilterSet, CustomFieldFilterSet):
120+
class RackFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
121121
id__in = NumericInFilter(
122122
field_name='id',
123123
lookup_expr='in'
@@ -252,7 +252,7 @@ class Meta:
252252
fields = ['id', 'name', 'slug']
253253

254254

255-
class DeviceTypeFilter(CustomFieldFilterSet):
255+
class DeviceTypeFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
256256
id__in = NumericInFilter(
257257
field_name='id',
258258
lookup_expr='in'
@@ -424,7 +424,7 @@ class Meta:
424424
fields = ['id', 'name', 'slug', 'napalm_driver']
425425

426426

427-
class DeviceFilter(LocalConfigContextFilter, TenancyFilterSet, CustomFieldFilterSet):
427+
class DeviceFilter(LocalConfigContextFilter, TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
428428
id__in = NumericInFilter(
429429
field_name='id',
430430
lookup_expr='in'
@@ -1113,7 +1113,7 @@ def search(self, queryset, name, value):
11131113
return queryset.filter(qs_filter)
11141114

11151115

1116-
class PowerFeedFilter(CustomFieldFilterSet):
1116+
class PowerFeedFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
11171117
id__in = NumericInFilter(
11181118
field_name='id',
11191119
lookup_expr='in'

0 commit comments

Comments
 (0)