Skip to content

Commit 71ef487

Browse files
author
menckend
committed
UI cleanup and DB migrations
1 parent 8513612 commit 71ef487

File tree

5 files changed

+120
-39
lines changed

5 files changed

+120
-39
lines changed

‎netbox_rpki/migrations/00005_rpki.py

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# Generated by Django 5.1.4 on 2025-01-17 03:09
2+
3+
import django.db.models.deletion
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('ipam', '0076_natural_ordering'),
11+
('netbox_rpki', '0004_assignedresources'),
12+
]
13+
14+
operations = [
15+
migrations.AlterField(
16+
model_name='certificate',
17+
name='ca_repository',
18+
field=models.CharField(blank=True, max_length=200),
19+
),
20+
migrations.AlterField(
21+
model_name='certificate',
22+
name='private_key',
23+
field=models.CharField(blank=True, max_length=200),
24+
),
25+
migrations.AlterField(
26+
model_name='certificate',
27+
name='public_key',
28+
field=models.CharField(blank=True, max_length=200),
29+
),
30+
migrations.AlterField(
31+
model_name='certificate',
32+
name='publication_url',
33+
field=models.CharField(blank=True, max_length=200),
34+
),
35+
migrations.AlterField(
36+
model_name='certificate',
37+
name='rpki_org',
38+
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='certificates', to='netbox_rpki.organization'),
39+
),
40+
migrations.AlterField(
41+
model_name='certificate',
42+
name='self_hosted',
43+
field=models.BooleanField(max_length=200),
44+
),
45+
migrations.AlterField(
46+
model_name='certificateasn',
47+
name='asn',
48+
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ASNtoCertificateTable', to='ipam.asn'),
49+
),
50+
migrations.AlterField(
51+
model_name='certificateasn',
52+
name='certificate_name2',
53+
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='CertificatetoASNTable', to='netbox_rpki.certificate'),
54+
),
55+
migrations.AlterField(
56+
model_name='certificateprefix',
57+
name='certificate_name',
58+
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='CertificateToPrefixTable', to='netbox_rpki.certificate'),
59+
),
60+
migrations.AlterField(
61+
model_name='certificateprefix',
62+
name='prefix',
63+
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='PrefixToCertificateTable', to='ipam.prefix'),
64+
),
65+
migrations.AlterField(
66+
model_name='roa',
67+
name='origin_as',
68+
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='roas', to='ipam.asn'),
69+
),
70+
migrations.AlterField(
71+
model_name='roaprefix',
72+
name='prefix',
73+
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='PrefixToRoaTable', to='ipam.prefix'),
74+
),
75+
migrations.AlterField(
76+
model_name='roaprefix',
77+
name='roa_name',
78+
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='RoaToPrefixTable', to='netbox_rpki.roa'),
79+
),
80+
]
81+

‎netbox_rpki/navigation.py

+33-33
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@
2626
),
2727
),
2828
),
29-
PluginMenuItem(
30-
link='plugins:netbox_rpki:certificateprefix_list',
31-
link_text='Assigned Prefixes',
32-
buttons=(
33-
PluginMenuButton(
34-
link='plugins:netbox_rpki:certificateprefix_add',
35-
title='Add',
36-
icon_class='mdi mdi-plus-thick',
37-
),
38-
),
39-
),
40-
PluginMenuItem(
41-
link='plugins:netbox_rpki:certificateasn_list',
42-
link_text='Assigned ASNs ',
43-
buttons=(
44-
PluginMenuButton(
45-
link='plugins:netbox_rpki:certificateasn_add',
46-
title='Add',
47-
icon_class='mdi mdi-plus-thick',
48-
),
49-
),
50-
),
29+
# PluginMenuItem(
30+
# link='plugins:netbox_rpki:certificateprefix_list',
31+
# link_text='Attested Prefixes',
32+
# buttons=(
33+
# PluginMenuButton(
34+
# link='plugins:netbox_rpki:certificateprefix_add',
35+
# title='Add',
36+
# icon_class='mdi mdi-plus-thick',
37+
# ),
38+
# ),
39+
# ),
40+
# PluginMenuItem(
41+
# link='plugins:netbox_rpki:certificateasn_list',
42+
# link_text='Attested ASNs ',
43+
# buttons=(
44+
# PluginMenuButton(
45+
# link='plugins:netbox_rpki:certificateasn_add',
46+
# title='Add',
47+
# icon_class='mdi mdi-plus-thick',
48+
# ),
49+
# ),
50+
# ),
5151
)
5252
roa_menu_items = (
5353
PluginMenuItem(
@@ -61,17 +61,17 @@
6161
),
6262
),
6363
),
64-
PluginMenuItem(
65-
link='plugins:netbox_rpki:roaprefix_list',
66-
link_text='ROA prefixes',
67-
buttons=(
68-
PluginMenuButton(
69-
link='plugins:netbox_rpki:roaprefix_add',
70-
title='Add',
71-
icon_class='mdi mdi-plus-thick',
72-
),
73-
),
74-
),
64+
# PluginMenuItem(
65+
# link='plugins:netbox_rpki:roaprefix_list',
66+
# link_text='ROA prefixes',
67+
# buttons=(
68+
# PluginMenuButton(
69+
# link='plugins:netbox_rpki:roaprefix_add',
70+
# title='Add',
71+
# icon_class='mdi mdi-plus-thick',
72+
# ),
73+
# ),
74+
# ),
7575
)
7676
plugin_settings = settings.PLUGINS_CONFIG.get('netbox_rpki', {})
7777

‎netbox_rpki/templates/netbox_rpki/certificate.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ <h5 class="card-header">RPKI Customer Certificate</h5>
100100
{% include 'inc/panels/tags.html' %}
101101
{% include 'inc/panels/comments.html' %}
102102
<div class="card">
103-
<h5 class="card-header">Assigned IP Netblock Resources</h5>
103+
<h5 class="card-header">Attested IP Netblock Resources</h5>
104104
<div class="card-body table-responsive">
105105
{% render_table assigned_prefixes_table %}
106106
</div>
107107
</div>
108108
<div class="card">
109-
<h5 class="card-header">Assigned ASN Resources</h5>
109+
<h5 class="card-header">Attested ASN Resource</h5>
110110
<div class="card-body table-responsive">
111111
{% render_table assigned_asns_table %}
112112
</div>

‎netbox_rpki/templates/netbox_rpki/certificateasn.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
{% load render_table from django_tables2 %}
33

44
{% block breadcrumbs %}
5-
<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_rpki:certificateasn_list' %}">RPKI Assigned Autonomous System (AS) number resources</a></li>
5+
<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_rpki:certificateasn_list' %}">RPKI Attested Autonomous System (AS) number resources</a></li>
66
{% endblock breadcrumbs %}
77

88
{% block content %}
99
<div class="row mb-3">
1010
<div class="col col-md-6">
1111
<div class="card">
12-
<h5 class="card-header">RPKI assigned ASNs</h5>
12+
<h5 class="card-header">RPKI attested ASNs</h5>
1313
<div class="card-body">
1414
<table class="table table-hover attr-table">
1515
<tr>

‎netbox_rpki/templates/netbox_rpki/certificateprefix.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
{% load render_table from django_tables2 %}
33

44
{% block breadcrumbs %}
5-
<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_rpki:certificateprefix_list' %}">RPKI Assigned IP Net-block resources</a></li>
5+
<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_rpki:certificateprefix_list' %}">RPKI Attested IP Net-block resources</a></li>
66
{% endblock breadcrumbs %}
77

88
{% block content %}
99
<div class="row mb-3">
1010
<div class="col col-md-6">
1111
<div class="card">
12-
<h5 class="card-header">RPKI assigned IP netblocks</h5>
12+
<h5 class="card-header">RPKI Attested IP netblocks</h5>
1313
<div class="card-body">
1414
<table class="table table-hover attr-table">
1515
<tr>

0 commit comments

Comments
 (0)