cleanup

Author: menckend

netbox_rpki/navigation.py

@@ -28,7 +28,7 @@
     ),
     PluginMenuItem(
         link='plugins:netbox_rpki:certificateprefix_list',
-        link_text='Assigned Prefices',
+        link_text='Assigned Prefixes',
         buttons=(
             PluginMenuButton(
                 link='plugins:netbox_rpki:certificateprefix_add',
@@ -63,7 +63,7 @@
     ),
     PluginMenuItem(
         link='plugins:netbox_rpki:roaprefix_list',
-        link_text='ROA Prefices',
+        link_text='ROA prefixes',
         buttons=(
             PluginMenuButton(
                 link='plugins:netbox_rpki:roaprefix_add',

netbox_rpki/templates/netbox_rpki/certificate.html

@@ -102,7 +102,7 @@ <h5 class="card-header">RPKI Customer Certificate</h5>
       <div class="card">
         <h5 class="card-header">Assigned IP Netblock Resources</h5>
         <div class="card-body table-responsive">
-          {% render_table assigned_prefices_table %}
+          {% render_table assigned_prefixes_table %}
         </div>
       </div>
       <div class="card">

netbox_rpki/templates/netbox_rpki/roa.html

@@ -71,9 +71,9 @@ <h5 class="card-header">RPKI Route Origination Authorization (ROA)</h5>
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">Prefices Included in this ROA</h5>
+        <h5 class="card-header">Prefixes Included in this ROA</h5>
         <div class="card-body table-responsive">
-          {% render_table myroaprefices_table %}
+          {% render_table myroaprefixes_table %}
         </div>
       </div>
     </div>

netbox_rpki/templates/netbox_rpki/roaprefix.html

@@ -2,14 +2,14 @@
 {% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
-<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_rpki:roaprefix_list' %}">RPKI ROA prefices</a></li>
+<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_rpki:roaprefix_list' %}">RPKI ROA prefixes</a></li>
 {% endblock breadcrumbs %}
 
 {% block content %}
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">ROA Prefices)</h5>
+        <h5 class="card-header">ROA prefixes)</h5>
         <div class="card-body">
           <table class="table table-hover attr-table">
             <tr>

netbox_rpki/urls.py

@@ -32,19 +32,19 @@
     path('roa/<int:pk>/delete/', views.RoaDeleteView.as_view(), name='roa_delete'),
     path('roa/<int:pk>/', include(get_model_urls('netbox_rpki', 'roa'))),
     # roaprefix
-    path('roaprefices/', views.RoaPrefixListView.as_view(), name='roaprefix_list'),
-    path('roaprefices/add/', views.RoaPrefixEditView.as_view(), name='roaprefix_add'),
-    path('roaprefices/<int:pk>/', views.RoaPrefixView.as_view(), name='roaprefix'),
-    path('roaprefices/<int:pk>/edit/', views.RoaPrefixEditView.as_view(), name='roaprefix_edit'),
-    path('roaprefices/<int:pk>/delete/', views.RoaPrefixDeleteView.as_view(), name='roaprefix_delete'),
-    path('roaprefices/<int:pk>/', include(get_model_urls('netbox_rpki', 'roaprefix'))),
+    path('roaprefixes/', views.RoaPrefixListView.as_view(), name='roaprefix_list'),
+    path('roaprefixes/add/', views.RoaPrefixEditView.as_view(), name='roaprefix_add'),
+    path('roaprefixes/<int:pk>/', views.RoaPrefixView.as_view(), name='roaprefix'),
+    path('roaprefixes/<int:pk>/edit/', views.RoaPrefixEditView.as_view(), name='roaprefix_edit'),
+    path('roaprefixes/<int:pk>/delete/', views.RoaPrefixDeleteView.as_view(), name='roaprefix_delete'),
+    path('roaprefixes/<int:pk>/', include(get_model_urls('netbox_rpki', 'roaprefix'))),
     # certificateprefix
-    path('certificateprefices/', views.CertificatePrefixListView.as_view(), name='certificateprefix_list'),
-    path('certificateprefices/add/', views.CertificatePrefixEditView.as_view(), name='certificateprefix_add'),
-    path('certificateprefices/<int:pk>/', views.CertificatePrefixView.as_view(), name='certificateprefix'),
-    path('certificateprefices/<int:pk>/edit/', views.CertificatePrefixEditView.as_view(), name='certificateprefix_edit'),
-    path('certificateprefices/<int:pk>/delete/', views.CertificatePrefixDeleteView.as_view(), name='certificateprefix_delete'),
-    path('certificateprefices/<int:pk>/', include(get_model_urls('netbox_rpki', 'certificateprefix'))),
+    path('certificateprefixes/', views.CertificatePrefixListView.as_view(), name='certificateprefix_list'),
+    path('certificateprefixes/add/', views.CertificatePrefixEditView.as_view(), name='certificateprefix_add'),
+    path('certificateprefixes/<int:pk>/', views.CertificatePrefixView.as_view(), name='certificateprefix'),
+    path('certificateprefixes/<int:pk>/edit/', views.CertificatePrefixEditView.as_view(), name='certificateprefix_edit'),
+    path('certificateprefixes/<int:pk>/delete/', views.CertificatePrefixDeleteView.as_view(), name='certificateprefix_delete'),
+    path('certificateprefixes/<int:pk>/', include(get_model_urls('netbox_rpki', 'certificateprefix'))),
     # certificateasn
     path('certificateasns/', views.CertificateAsnListView.as_view(), name='certificateasn_list'),
     path('certificateasns/add/', views.CertificateAsnEditView.as_view(), name='certificateasn_add'),

netbox_rpki/views.py

@@ -17,7 +17,7 @@ def get_extra_context(self, request, instance):
         return {
             'signed_roas_table': roa_table,
             'assigned_asns_table': certificateasn_table,
-            'assigned_prefices_table': certificateprefix_table
+            'assigned_prefixes_table': certificateprefix_table
         }
 
 
@@ -89,7 +89,7 @@ def get_extra_context(self, request, instance):
         roaprefix_table.configure(request)
 
         return {
-            'myroaprefices_table': roaprefix_table
+            'myroaprefixes_table': roaprefix_table
         }