NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-27 01:36:11 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

#9047 - Fix broken tests

Browse Source
This commit is contained in:
Daniel Sheppard 2023-03-28 13:09:58 -05:00
parent c4e031ed84
commit 8f3590fdd5
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/circuits/forms/model_forms.py
View File

@ -127,22 +127,12 @@ class CircuitForm(TenancyForm, NetBoxModelForm):
class CircuitTerminationForm(NetBoxModelForm): class CircuitTerminationForm(NetBoxModelForm):
provider_account = DynamicModelChoiceField(
queryset=ProviderAccount.objects.all(),
required=False,
initial_params={
'circuits': '$circuit'
},
query_params={
'provider': '$provider',
},
selector=True
)
circuit = DynamicModelChoiceField( circuit = DynamicModelChoiceField(
queryset=Circuit.objects.all(), queryset=Circuit.objects.all(),
query_params={ query_params={
'provider_id': '$provider', 'provider_id': '$provider',
}, },
selector=True
) )
site = DynamicModelChoiceField( site = DynamicModelChoiceField(
queryset=Site.objects.all(), queryset=Site.objects.all(),
@ -158,8 +148,8 @@ class CircuitTerminationForm(NetBoxModelForm):
class Meta: class Meta:
model = CircuitTermination model = CircuitTermination
fields = [ fields = [
'provider_account', 'circuit', 'term_side', 'site', 'provider_network', 'mark_connected', 'circuit', 'term_side', 'site', 'provider_network', 'mark_connected', 'port_speed', 'upstream_speed',
'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'tags', 'xconnect_id', 'pp_info', 'description', 'tags',
] ]
widgets = { widgets = {
'port_speed': SelectSpeedWidget(), 'port_speed': SelectSpeedWidget(),

2
netbox/dcim/tests/test_cablepaths.py
View File

@ -1437,7 +1437,7 @@ class CablePathTestCase(TestCase):
""" """
interface1 = Interface.objects.create(device=self.device, name='Interface 1') interface1 = Interface.objects.create(device=self.device, name='Interface 1')
interface2 = Interface.objects.create(device=self.device, name='Interface 2') interface2 = Interface.objects.create(device=self.device, name='Interface 2')
circuit2 = Circuit.objects.create(provider_account=self.circuit.provider_account, type=self.circuit.type, cid='Circuit 2') circuit2 = Circuit.objects.create(provider=self.circuit.provider, provider_account=self.circuit.provider_account, type=self.circuit.type, cid='Circuit 2')
circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='A') circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='A')
circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='Z') circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='Z')
circuittermination3 = CircuitTermination.objects.create(circuit=circuit2, site=self.site, term_side='A') circuittermination3 = CircuitTermination.objects.create(circuit=circuit2, site=self.site, term_side='A')

2
netbox/templates/circuits/circuittermination_edit.html
View File

@ -7,8 +7,6 @@
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Circuit Termination</h5> <h5 class="offset-sm-3">Circuit Termination</h5>
</div> </div>
{% render_field form.provider %}
{% render_field form.provider_account %}
{% render_field form.circuit %} {% render_field form.circuit %}
{% render_field form.term_side %} {% render_field form.term_side %}
{% render_field form.tags %} {% render_field form.tags %}