NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Allow editing A side termination when creating cable

Browse Source
This commit is contained in:
jeremystretch 2022-04-25 15:02:08 -04:00
parent c48c8cc353
commit 6c290353c1
3 changed files with 77 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
netbox/dcim/forms/connections.py
View File

@ -21,15 +21,29 @@ class ConnectCableToDeviceForm(TenancyForm, NetBoxModelForm):
""" """
Base form for connecting a Cable to a Device component Base form for connecting a Cable to a Device component
""" """
# Termination A
termination_a_id = DynamicModelChoiceField(
queryset=Interface.objects.all(),
label='Name',
disabled_indicator='_occupied'
)
# Termination B
termination_b_region = DynamicModelChoiceField( termination_b_region = DynamicModelChoiceField(
queryset=Region.objects.all(), queryset=Region.objects.all(),
label='Region', label='Region',
required=False required=False,
initial_params={
'sites': '$termination_b_site'
}
) )
termination_b_sitegroup = DynamicModelChoiceField( termination_b_sitegroup = DynamicModelChoiceField(
queryset=SiteGroup.objects.all(), queryset=SiteGroup.objects.all(),
label='Site group', label='Site group',
required=False required=False,
initial_params={
'sites': '$termination_b_site'
}
) )
termination_b_site = DynamicModelChoiceField( termination_b_site = DynamicModelChoiceField(
queryset=Site.objects.all(), queryset=Site.objects.all(),
@ -73,9 +87,9 @@ class ConnectCableToDeviceForm(TenancyForm, NetBoxModelForm):
class Meta: class Meta:
model = Cable model = Cable
fields = [ fields = [
'termination_b_region', 'termination_b_sitegroup', 'termination_b_site', 'termination_b_rack', 'termination_a_id', 'termination_b_region', 'termination_b_sitegroup', 'termination_b_site',
'termination_b_device', 'termination_b_id', 'type', 'status', 'tenant_group', 'tenant', 'label', 'color', 'termination_b_rack', 'termination_b_device', 'termination_b_id', 'type', 'status', 'tenant_group',
'length', 'length_unit', 'tags', 'tenant', 'label', 'color', 'length', 'length_unit', 'tags',
] ]
widgets = { widgets = {
'status': StaticSelect, 'status': StaticSelect,
@ -83,6 +97,10 @@ class ConnectCableToDeviceForm(TenancyForm, NetBoxModelForm):
'length_unit': StaticSelect, 'length_unit': StaticSelect,
} }
def clean_termination_a_id(self):
# Return the PK rather than the object
return getattr(self.cleaned_data['termination_a_id'], 'pk', None)
def clean_termination_b_id(self): def clean_termination_b_id(self):
# Return the PK rather than the object # Return the PK rather than the object
return getattr(self.cleaned_data['termination_b_id'], 'pk', None) return getattr(self.cleaned_data['termination_b_id'], 'pk', None)
@ -167,6 +185,14 @@ class ConnectCableToRearPortForm(ConnectCableToDeviceForm):
class ConnectCableToCircuitTerminationForm(TenancyForm, NetBoxModelForm): class ConnectCableToCircuitTerminationForm(TenancyForm, NetBoxModelForm):
# Termination A
termination_a_id = DynamicModelChoiceField(
queryset=Interface.objects.all(),
label='Side',
disabled_indicator='_occupied'
)
# Termination B
termination_b_provider = DynamicModelChoiceField( termination_b_provider = DynamicModelChoiceField(
queryset=Provider.objects.all(), queryset=Provider.objects.all(),
label='Provider', label='Provider',
@ -175,12 +201,18 @@ class ConnectCableToCircuitTerminationForm(TenancyForm, NetBoxModelForm):
termination_b_region = DynamicModelChoiceField( termination_b_region = DynamicModelChoiceField(
queryset=Region.objects.all(), queryset=Region.objects.all(),
label='Region', label='Region',
required=False required=False,
initial_params={
'sites': '$termination_b_site'
}
) )
termination_b_sitegroup = DynamicModelChoiceField( termination_b_sitegroup = DynamicModelChoiceField(
queryset=SiteGroup.objects.all(), queryset=SiteGroup.objects.all(),
label='Site group', label='Site group',
required=False required=False,
initial_params={
'sites': '$termination_b_site'
}
) )
termination_b_site = DynamicModelChoiceField( termination_b_site = DynamicModelChoiceField(
queryset=Site.objects.all(), queryset=Site.objects.all(),
@ -210,26 +242,44 @@ class ConnectCableToCircuitTerminationForm(TenancyForm, NetBoxModelForm):
class Meta(ConnectCableToDeviceForm.Meta): class Meta(ConnectCableToDeviceForm.Meta):
fields = [ fields = [
'termination_b_provider', 'termination_b_region', 'termination_b_sitegroup', 'termination_b_site', 'termination_a_id', 'termination_b_provider', 'termination_b_region', 'termination_b_sitegroup',
'termination_b_circuit', 'termination_b_id', 'type', 'status', 'tenant_group', 'tenant', 'label', 'color', 'termination_b_site', 'termination_b_circuit', 'termination_b_id', 'type', 'status', 'tenant_group',
'length', 'length_unit', 'tags', 'tenant', 'label', 'color', 'length', 'length_unit', 'tags',
] ]
def clean_termination_a_id(self):
# Return the PK rather than the object
return getattr(self.cleaned_data['termination_a_id'], 'pk', None)
def clean_termination_b_id(self): def clean_termination_b_id(self):
# Return the PK rather than the object # Return the PK rather than the object
return getattr(self.cleaned_data['termination_b_id'], 'pk', None) return getattr(self.cleaned_data['termination_b_id'], 'pk', None)
class ConnectCableToPowerFeedForm(TenancyForm, NetBoxModelForm): class ConnectCableToPowerFeedForm(TenancyForm, NetBoxModelForm):
# Termination A
termination_a_id = DynamicModelChoiceField(
queryset=Interface.objects.all(),
label='Name',
disabled_indicator='_occupied'
)
# Termination B
termination_b_region = DynamicModelChoiceField( termination_b_region = DynamicModelChoiceField(
queryset=Region.objects.all(), queryset=Region.objects.all(),
label='Region', label='Region',
required=False required=False,
initial_params={
'sites': '$termination_b_site'
}
) )
termination_b_sitegroup = DynamicModelChoiceField( termination_b_sitegroup = DynamicModelChoiceField(
queryset=SiteGroup.objects.all(), queryset=SiteGroup.objects.all(),
label='Site group', label='Site group',
required=False required=False,
initial_params={
'sites': '$termination_b_site'
}
) )
termination_b_site = DynamicModelChoiceField( termination_b_site = DynamicModelChoiceField(
queryset=Site.objects.all(), queryset=Site.objects.all(),
@ -268,11 +318,15 @@ class ConnectCableToPowerFeedForm(TenancyForm, NetBoxModelForm):
class Meta(ConnectCableToDeviceForm.Meta): class Meta(ConnectCableToDeviceForm.Meta):
fields = [ fields = [
'termination_b_region', 'termination_b_sitegroup', 'termination_b_site', 'termination_b_location', 'termination_a_id', 'termination_b_region', 'termination_b_sitegroup', 'termination_b_site',
'termination_b_powerpanel', 'termination_b_id', 'type', 'status', 'tenant_group', 'tenant', 'label', 'termination_b_location', 'termination_b_powerpanel', 'termination_b_id', 'type', 'status', 'tenant_group',
'color', 'length', 'length_unit', 'tags', 'tenant', 'label', 'color', 'length', 'length_unit', 'tags',
] ]
def clean_termination_a_id(self):
# Return the PK rather than the object
return getattr(self.cleaned_data['termination_a_id'], 'pk', None)
def clean_termination_b_id(self): def clean_termination_b_id(self):
# Return the PK rather than the object # Return the PK rather than the object
return getattr(self.cleaned_data['termination_b_id'], 'pk', None) return getattr(self.cleaned_data['termination_b_id'], 'pk', None)

9
netbox/dcim/views.py
View File

@ -12,7 +12,7 @@ from django.utils.html import escape
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.views.generic import View from django.views.generic import View
from circuits.models import Circuit from circuits.models import Circuit, CircuitTermination
from extras.views import ObjectConfigContextView from extras.views import ObjectConfigContextView
from ipam.models import ASN, IPAddress, Prefix, Service, VLAN, VLANGroup from ipam.models import ASN, IPAddress, Prefix, Service, VLAN, VLANGroup
from ipam.tables import AssignedIPAddressesTable, InterfaceVLANTable from ipam.tables import AssignedIPAddressesTable, InterfaceVLANTable
@ -2850,10 +2850,6 @@ class CableCreateView(generic.ObjectEditView):
# Set initial site and rack based on side A termination (if not already set) # Set initial site and rack based on side A termination (if not already set)
termination_a_site = getattr(obj.termination_a.parent_object, 'site', None) termination_a_site = getattr(obj.termination_a.parent_object, 'site', None)
if termination_a_site and 'termination_b_region' not in initial_data:
initial_data['termination_b_region'] = termination_a_site.region
if termination_a_site and 'termination_b_site_group' not in initial_data:
initial_data['termination_b_site_group'] = termination_a_site.group
if 'termination_b_site' not in initial_data: if 'termination_b_site' not in initial_data:
initial_data['termination_b_site'] = termination_a_site initial_data['termination_b_site'] = termination_a_site
if 'termination_b_rack' not in initial_data: if 'termination_b_rack' not in initial_data:
@ -2861,6 +2857,9 @@ class CableCreateView(generic.ObjectEditView):
form = self.form(instance=obj, initial=initial_data) form = self.form(instance=obj, initial=initial_data)
# Set the queryset of termination A
form.fields['termination_a_id'].queryset = kwargs['termination_a_type'].objects.all()
return render(request, self.template_name, { return render(request, self.template_name, {
'obj': obj, 'obj': obj,
'obj_type': Cable._meta.verbose_name, 'obj_type': Cable._meta.verbose_name,

19
netbox/templates/dcim/cable_connect.html
View File

@ -71,39 +71,28 @@
<input class="form-control" value="{{ termination_a|meta:"verbose_name"|capfirst }}" disabled /> <input class="form-control" value="{{ termination_a|meta:"verbose_name"|capfirst }}" disabled />
</div> </div>
</div> </div>
<div class="row mb-3">
<label class="col-sm-3 col-form-label text-lg-end">Name</label>
<div class="col">
<input class="form-control" value="{{ termination_a }}" disabled />
</div>
</div>
{% else %} {% else %}
{# Circuit termination #} {# Circuit termination #}
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-3 col-form-label">Site</label> <label class="col-sm-3 col-form-label text-lg-end">Site</label>
<div class="col"> <div class="col">
<input class="form-control" value="{{ termination_a.site }}" disabled /> <input class="form-control" value="{{ termination_a.site }}" disabled />
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-3 col-form-label">Provider</label> <label class="col-sm-3 col-form-label text-lg-end">Provider</label>
<div class="col"> <div class="col">
<input class="form-control" value="{{ termination_a.circuit.provider }}" disabled /> <input class="form-control" value="{{ termination_a.circuit.provider }}" disabled />
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-3 col-form-label">Circuit</label> <label class="col-sm-3 col-form-label text-lg-end">Circuit</label>
<div class="col"> <div class="col">
<input class="form-control" value="{{ termination_a.circuit.cid }}" disabled /> <input class="form-control" value="{{ termination_a.circuit.cid }}" disabled />
</div> </div>
</div> </div>
<div class="row mb-3">
<label class="col-sm-3 col-form-label">Side</label>
<div class="col">
<input class="form-control" value="{{ termination_a.term_side }}" disabled />
</div>
</div>
{% endif %} {% endif %}
{% render_field form.termination_a_id %}
</div> </div>
</div> </div>
</div> </div>