diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index 6f3f9a8a7..f3894c02e 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -3,6 +3,7 @@ from django.db.models import Count
from dcim.models import Site, Device, Interface, Rack, VIRTUAL_IFACE_TYPES
from extras.forms import CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm
+from tenancy.forms import TenancyForm
from tenancy.models import Tenant
from utilities.forms import (
APISelect, BootstrapMixin, BulkImportForm, ChainedFieldsMixin, ChainedModelChoiceField, CommentField, CSVDataField,
@@ -83,12 +84,15 @@ class CircuitTypeForm(BootstrapMixin, forms.ModelForm):
# Circuits
#
-class CircuitForm(BootstrapMixin, CustomFieldForm):
+class CircuitForm(BootstrapMixin, TenancyForm, CustomFieldForm):
comments = CommentField()
class Meta:
model = Circuit
- fields = ['cid', 'type', 'provider', 'tenant', 'install_date', 'commit_rate', 'description', 'comments']
+ fields = [
+ 'cid', 'type', 'provider', 'install_date', 'commit_rate', 'description', 'tenant_group', 'tenant',
+ 'comments',
+ ]
help_texts = {
'cid': "Unique circuit ID",
'install_date': "Format: YYYY-MM-DD",
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 896e91f6a..07b3f9d74 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -8,6 +8,7 @@ from django.db.models import Count, Q
from extras.forms import CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm
from ipam.models import IPAddress
+from tenancy.forms import TenancyForm
from tenancy.models import Tenant
from utilities.forms import (
APISelect, add_blank_choice, ArrayFieldSelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
@@ -81,7 +82,7 @@ class RegionForm(BootstrapMixin, forms.ModelForm):
# Sites
#
-class SiteForm(BootstrapMixin, CustomFieldForm):
+class SiteForm(BootstrapMixin, TenancyForm, CustomFieldForm):
region = TreeNodeChoiceField(queryset=Region.objects.all(), required=False)
slug = SlugField()
comments = CommentField()
@@ -89,8 +90,8 @@ class SiteForm(BootstrapMixin, CustomFieldForm):
class Meta:
model = Site
fields = [
- 'name', 'slug', 'region', 'tenant', 'facility', 'asn', 'physical_address', 'shipping_address',
- 'contact_name', 'contact_phone', 'contact_email', 'comments',
+ 'name', 'slug', 'region', 'tenant_group', 'tenant', 'facility', 'asn', 'physical_address',
+ 'shipping_address', 'contact_name', 'contact_phone', 'contact_email', 'comments',
]
widgets = {
'physical_address': SmallTextarea(attrs={'rows': 3}),
@@ -185,7 +186,7 @@ class RackRoleForm(BootstrapMixin, forms.ModelForm):
# Racks
#
-class RackForm(BootstrapMixin, ChainedFieldsMixin, CustomFieldForm):
+class RackForm(BootstrapMixin, TenancyForm, CustomFieldForm):
group = ChainedModelChoiceField(
queryset=RackGroup.objects.all(),
chains={'site': 'site'},
@@ -199,8 +200,8 @@ class RackForm(BootstrapMixin, ChainedFieldsMixin, CustomFieldForm):
class Meta:
model = Rack
fields = [
- 'site', 'group', 'name', 'facility_id', 'tenant', 'role', 'type', 'width', 'u_height', 'desc_units',
- 'comments',
+ 'site', 'group', 'name', 'facility_id', 'tenant_group', 'tenant', 'role', 'type', 'width', 'u_height',
+ 'desc_units', 'comments',
]
help_texts = {
'site': "The site at which the rack exists",
@@ -534,7 +535,7 @@ class PlatformForm(BootstrapMixin, forms.ModelForm):
# Devices
#
-class DeviceForm(BootstrapMixin, ChainedFieldsMixin, CustomFieldForm):
+class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldForm):
site = forms.ModelChoiceField(
queryset=Site.objects.all(),
widget=forms.Select(
@@ -580,8 +581,8 @@ class DeviceForm(BootstrapMixin, ChainedFieldsMixin, CustomFieldForm):
class Meta:
model = Device
fields = [
- 'name', 'device_role', 'tenant', 'device_type', 'serial', 'asset_tag', 'site', 'rack', 'position', 'face',
- 'status', 'platform', 'primary_ip4', 'primary_ip6', 'comments',
+ 'name', 'device_role', 'device_type', 'serial', 'asset_tag', 'site', 'rack', 'position', 'face', 'status',
+ 'platform', 'primary_ip4', 'primary_ip6', 'tenant_group', 'tenant', 'comments',
]
help_texts = {
'device_role': "The function this device serves",
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index de610edf2..108fd0e2f 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -3,10 +3,11 @@ from django.db.models import Count
from dcim.models import Site, Rack, Device, Interface
from extras.forms import CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm
+from tenancy.forms import TenancyForm
from tenancy.models import Tenant
from utilities.forms import (
- APISelect, BootstrapMixin, BulkEditNullBooleanSelect, BulkImportForm, ChainedFieldsMixin, ChainedModelChoiceField,
- CSVDataField, ExpandableIPAddressField, FilterChoiceField, Livesearch, ReturnURLForm, SlugField, add_blank_choice,
+ APISelect, BootstrapMixin, BulkEditNullBooleanSelect, BulkImportForm, ChainedModelChoiceField, CSVDataField,
+ ExpandableIPAddressField, FilterChoiceField, Livesearch, ReturnURLForm, SlugField, add_blank_choice,
)
from .models import (
@@ -32,11 +33,11 @@ IPADDRESS_MASK_LENGTH_CHOICES = PREFIX_MASK_LENGTH_CHOICES + [(128, 128)]
# VRFs
#
-class VRFForm(BootstrapMixin, CustomFieldForm):
+class VRFForm(BootstrapMixin, TenancyForm, CustomFieldForm):
class Meta:
model = VRF
- fields = ['name', 'rd', 'tenant', 'enforce_unique', 'description']
+ fields = ['name', 'rd', 'enforce_unique', 'description', 'tenant_group', 'tenant']
labels = {
'rd': "RD",
}
@@ -163,7 +164,7 @@ class RoleForm(BootstrapMixin, forms.ModelForm):
# Prefixes
#
-class PrefixForm(BootstrapMixin, ChainedFieldsMixin, CustomFieldForm):
+class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldForm):
site = forms.ModelChoiceField(
queryset=Site.objects.all(), required=False, label='Site', widget=forms.Select(
attrs={'filter-for': 'vlan', 'nullable': 'true'}
@@ -177,7 +178,7 @@ class PrefixForm(BootstrapMixin, ChainedFieldsMixin, CustomFieldForm):
class Meta:
model = Prefix
- fields = ['prefix', 'vrf', 'tenant', 'site', 'vlan', 'status', 'role', 'is_pool', 'description']
+ fields = ['prefix', 'vrf', 'site', 'vlan', 'status', 'role', 'is_pool', 'description', 'tenant_group', 'tenant']
def __init__(self, *args, **kwargs):
super(PrefixForm, self).__init__(*args, **kwargs)
@@ -306,7 +307,7 @@ class PrefixFilterForm(BootstrapMixin, CustomFieldFilterForm):
# IP addresses
#
-class IPAddressForm(BootstrapMixin, ChainedFieldsMixin, ReturnURLForm, CustomFieldForm):
+class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldForm):
interface_site = forms.ModelChoiceField(
queryset=Site.objects.all(),
required=False,
@@ -399,7 +400,10 @@ class IPAddressForm(BootstrapMixin, ChainedFieldsMixin, ReturnURLForm, CustomFie
class Meta:
model = IPAddress
- fields = ['address', 'vrf', 'tenant', 'status', 'description', 'interface', 'primary_for_device', 'nat_inside']
+ fields = [
+ 'address', 'vrf', 'status', 'description', 'interface', 'primary_for_device', 'nat_inside', 'tenant_group',
+ 'tenant',
+ ]
def __init__(self, instance=None, initial=None, *args, **kwargs):
@@ -600,7 +604,7 @@ class VLANGroupFilterForm(BootstrapMixin, forms.Form):
# VLANs
#
-class VLANForm(BootstrapMixin, ChainedFieldsMixin, CustomFieldForm):
+class VLANForm(BootstrapMixin, TenancyForm, CustomFieldForm):
site = forms.ModelChoiceField(
queryset=Site.objects.all(),
widget=forms.Select(
@@ -619,7 +623,7 @@ class VLANForm(BootstrapMixin, ChainedFieldsMixin, CustomFieldForm):
class Meta:
model = VLAN
- fields = ['site', 'group', 'vid', 'name', 'tenant', 'status', 'role', 'description']
+ fields = ['site', 'group', 'vid', 'name', 'status', 'role', 'description', 'tenant_group', 'tenant']
help_texts = {
'site': "Leave blank if this VLAN spans multiple sites",
'group': "VLAN group (optional)",
diff --git a/netbox/templates/circuits/circuit_edit.html b/netbox/templates/circuits/circuit_edit.html
index 6b5e4497d..7cff002ae 100644
--- a/netbox/templates/circuits/circuit_edit.html
+++ b/netbox/templates/circuits/circuit_edit.html
@@ -8,12 +8,18 @@
{% render_field form.provider %}
{% render_field form.cid %}
{% render_field form.type %}
- {% render_field form.tenant %}
{% render_field form.install_date %}
{% render_field form.commit_rate %}
{% render_field form.description %}
+
+
Tenancy
+
+ {% render_field form.tenant_group %}
+ {% render_field form.tenant %}
+
+
Custom Fields
diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index 522d39d1d..7bfec5469 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -7,7 +7,6 @@
{% render_field form.name %}
{% render_field form.device_role %}
- {% render_field form.tenant %}
@@ -63,6 +62,13 @@
{% endif %}
+
+
Tenancy
+
+ {% render_field form.tenant_group %}
+ {% render_field form.tenant %}
+
+
Custom Fields
diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html
index dd4f610c3..d7a6f0dfb 100644
--- a/netbox/templates/dcim/rack_edit.html
+++ b/netbox/templates/dcim/rack_edit.html
@@ -6,11 +6,22 @@
Rack
{% render_field form.site %}
- {% render_field form.group %}
{% render_field form.name %}
{% render_field form.facility_id %}
- {% render_field form.tenant %}
+ {% render_field form.group %}
{% render_field form.role %}
+
+
+
+
Tenancy
+
+ {% render_field form.tenant_group %}
+ {% render_field form.tenant %}
+
+
+
Dimensions
+
{% render_field form.type %}
{% render_field form.width %}
{% render_field form.u_height %}
diff --git a/netbox/templates/dcim/site_edit.html b/netbox/templates/dcim/site_edit.html
index 98f16ad25..a1c13075a 100644
--- a/netbox/templates/dcim/site_edit.html
+++ b/netbox/templates/dcim/site_edit.html
@@ -8,11 +8,17 @@
{% render_field form.name %}
{% render_field form.slug %}
{% render_field form.region %}
- {% render_field form.tenant %}
{% render_field form.facility %}
{% render_field form.asn %}
+
Tenancy
+
+ {% render_field form.tenant_group %}
+ {% render_field form.tenant %}
+
+
Contact Info
diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html
index d5c5ad1af..d7aef0fe4 100644
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -13,12 +13,18 @@
IP Address
{% render_field form.address %}
- {% render_field form.vrf %}
- {% render_field form.tenant %}
{% render_field form.status %}
+ {% render_field form.vrf %}
{% render_field form.description %}
+
+
Tenancy
+
+ {% render_field form.tenant_group %}
+ {% render_field form.tenant %}
+
+
Interface Assignment
diff --git a/netbox/templates/ipam/prefix_edit.html b/netbox/templates/ipam/prefix_edit.html
index ca5de43b3..089335c02 100644
--- a/netbox/templates/ipam/prefix_edit.html
+++ b/netbox/templates/ipam/prefix_edit.html
@@ -6,14 +6,20 @@
Prefix
{% render_field form.prefix %}
+ {% render_field form.status %}
{% render_field form.vrf %}
- {% render_field form.tenant %}
{% render_field form.site %}
{% render_field form.vlan %}
- {% render_field form.status %}
{% render_field form.role %}
- {% render_field form.is_pool %}
{% render_field form.description %}
+ {% render_field form.is_pool %}
+
+
+
+
Tenancy
+
+ {% render_field form.tenant_group %}
+ {% render_field form.tenant %}
{% if form.custom_fields %}
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html
index 10c633aa5..1d468ceb9 100644
--- a/netbox/templates/ipam/vlan_edit.html
+++ b/netbox/templates/ipam/vlan_edit.html
@@ -9,12 +9,18 @@
{% render_field form.group %}
{% render_field form.vid %}
{% render_field form.name %}
- {% render_field form.tenant %}
{% render_field form.status %}
{% render_field form.role %}
{% render_field form.description %}
+
+
Tenancy
+
+ {% render_field form.tenant_group %}
+ {% render_field form.tenant %}
+
+
Custom Fields
diff --git a/netbox/templates/ipam/vrf_edit.html b/netbox/templates/ipam/vrf_edit.html
index fc4b438e6..63052129c 100644
--- a/netbox/templates/ipam/vrf_edit.html
+++ b/netbox/templates/ipam/vrf_edit.html
@@ -7,11 +7,17 @@
{% render_field form.name %}
{% render_field form.rd %}
- {% render_field form.tenant %}
{% render_field form.enforce_unique %}
{% render_field form.description %}
+
+
Tenancy
+
+ {% render_field form.tenant_group %}
+ {% render_field form.tenant %}
+
+
Custom Fields
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 485f2f34b..fc99c5175 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -2,8 +2,10 @@ from django import forms
from django.db.models import Count
from extras.forms import CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm
-from utilities.forms import BootstrapMixin, BulkImportForm, CommentField, CSVDataField, FilterChoiceField, SlugField
-
+from utilities.forms import (
+ APISelect, BootstrapMixin, BulkImportForm, ChainedFieldsMixin, ChainedModelChoiceField, CommentField, CSVDataField,
+ FilterChoiceField, SlugField,
+)
from .models import Tenant, TenantGroup
@@ -61,3 +63,37 @@ class TenantFilterForm(BootstrapMixin, CustomFieldFilterForm):
to_field_name='slug',
null_option=(0, 'None')
)
+
+
+#
+# Tenancy form extension
+#
+
+class TenancyForm(ChainedFieldsMixin, forms.Form):
+ tenant_group = forms.ModelChoiceField(
+ queryset=TenantGroup.objects.all(),
+ required=False,
+ widget=forms.Select(
+ attrs={'filter-for': 'tenant', 'nullable': 'true'}
+ )
+ )
+ tenant = ChainedModelChoiceField(
+ queryset=Tenant.objects.all(),
+ chains={'group': 'tenant_group'},
+ required=False,
+ widget=APISelect(
+ api_url='/api/tenancy/tenants/?group_id={{tenant_group}}'
+ )
+ )
+
+ def __init__(self, *args, **kwargs):
+
+ # Initialize helper selector
+ instance = kwargs.get('instance')
+ if instance and instance.tenant is not None:
+ try:
+ kwargs['initial']['tenant_group'] = instance.tenant.group
+ except KeyError:
+ kwargs['initial'] = {'tenant_group': instance.tenant.group}
+
+ super(TenancyForm, self).__init__(*args, **kwargs)