From e37068b68d4627444190641bdef4bae031c7ed60 Mon Sep 17 00:00:00 2001 From: yash-pal1 Date: Fri, 10 May 2024 11:49:14 +0530 Subject: [PATCH 01/16] NB-6 plugin name changed to netbox_cloud_pilot to netbox_paas --- Dockerfile | 2 +- MANIFEST.in | 2 +- configuration/plugins.py | 4 +- .../__init__.py | 2 +- .../api/__init__.py | 0 .../api/serializers.py | 6 +- .../api/urls.py | 2 +- .../api/views.py | 0 .../constants.py | 0 {netbox_cloud_pilot => netbox_paas}/forms.py | 0 {netbox_cloud_pilot => netbox_paas}/iaas.py | 2 +- .../migrations/0001_initial.py | 0 .../migrations/0002_rename_application.py | 92 +++++++++++++++++++ .../migrations/__init__.py | 0 {netbox_cloud_pilot => netbox_paas}/models.py | 6 +- .../navigation.py | 12 +-- .../nb_settings.py | 0 {netbox_cloud_pilot => netbox_paas}/tables.py | 2 +- .../netbox_cloud_pilot/inc/env_info.html | 0 .../inc/env_node_groups.html | 4 +- .../netbox_cloud_pilot/inc/plugin_store.html | 10 +- .../netboxconfiguration.html | 16 ++-- .../netbox_cloud_pilot/netboxdbbackup.html | 2 +- .../netbox_cloud_pilot/nodelogs.html | 2 +- .../netbox_cloud_pilot/plugin_disable.html | 2 +- .../netbox_cloud_pilot/plugin_enable.html | 2 +- .../netbox_cloud_pilot/plugin_uninstall.html | 2 +- .../netbox_cloud_pilot/plugins_store.html | 6 +- {netbox_cloud_pilot => netbox_paas}/urls.py | 2 +- {netbox_cloud_pilot => netbox_paas}/utils.py | 0 {netbox_cloud_pilot => netbox_paas}/views.py | 48 +++++----- pyproject.toml | 2 +- setup.py | 8 +- test.sh | 2 +- 34 files changed, 166 insertions(+), 74 deletions(-) rename {netbox_cloud_pilot => netbox_paas}/__init__.py (94%) rename {netbox_cloud_pilot => netbox_paas}/api/__init__.py (100%) rename {netbox_cloud_pilot => netbox_paas}/api/serializers.py (95%) rename {netbox_cloud_pilot => netbox_paas}/api/urls.py (90%) rename {netbox_cloud_pilot => netbox_paas}/api/views.py (100%) rename {netbox_cloud_pilot => netbox_paas}/constants.py (100%) rename {netbox_cloud_pilot => netbox_paas}/forms.py (100%) rename {netbox_cloud_pilot => netbox_paas}/iaas.py (99%) rename {netbox_cloud_pilot => netbox_paas}/migrations/0001_initial.py (100%) create mode 100644 netbox_paas/migrations/0002_rename_application.py rename {netbox_cloud_pilot => netbox_paas}/migrations/__init__.py (100%) rename {netbox_cloud_pilot => netbox_paas}/models.py (98%) rename {netbox_cloud_pilot => netbox_paas}/navigation.py (54%) rename {netbox_cloud_pilot => netbox_paas}/nb_settings.py (100%) rename {netbox_cloud_pilot => netbox_paas}/tables.py (91%) rename {netbox_cloud_pilot => netbox_paas}/templates/netbox_cloud_pilot/inc/env_info.html (100%) rename {netbox_cloud_pilot => netbox_paas}/templates/netbox_cloud_pilot/inc/env_node_groups.html (96%) rename {netbox_cloud_pilot => netbox_paas}/templates/netbox_cloud_pilot/inc/plugin_store.html (72%) rename {netbox_cloud_pilot => netbox_paas}/templates/netbox_cloud_pilot/netboxconfiguration.html (82%) rename {netbox_cloud_pilot => netbox_paas}/templates/netbox_cloud_pilot/netboxdbbackup.html (94%) rename {netbox_cloud_pilot => netbox_paas}/templates/netbox_cloud_pilot/nodelogs.html (91%) rename {netbox_cloud_pilot => netbox_paas}/templates/netbox_cloud_pilot/plugin_disable.html (91%) rename {netbox_cloud_pilot => netbox_paas}/templates/netbox_cloud_pilot/plugin_enable.html (91%) rename {netbox_cloud_pilot => netbox_paas}/templates/netbox_cloud_pilot/plugin_uninstall.html (91%) rename {netbox_cloud_pilot => netbox_paas}/templates/netbox_cloud_pilot/plugins_store.html (74%) rename {netbox_cloud_pilot => netbox_paas}/urls.py (97%) rename {netbox_cloud_pilot => netbox_paas}/utils.py (100%) rename {netbox_cloud_pilot => netbox_paas}/views.py (91%) diff --git a/Dockerfile b/Dockerfile index 0ba4236..3f5805d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ RUN mkdir -pv /plugins/netbox-cloud-pilot COPY . /plugins/netbox-cloud-pilot RUN python3 /plugins/netbox-cloud-pilot/setup.py develop -RUN cp -rf /plugins/netbox-cloud-pilot/netbox_cloud_pilot/ /opt/netbox/venv/lib/python3.11/site-packages/netbox_cloud_pilot +RUN cp -rf /plugins/netbox-cloud-pilot/netbox_paas/ /opt/netbox/venv/lib/python3.11/site-packages/netbox_paas diff --git a/MANIFEST.in b/MANIFEST.in index 8f937b7..b20c58e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ include README.md -recursive-include netbox_cloud_pilot/templates * +recursive-include netbox_pass/templates * diff --git a/configuration/plugins.py b/configuration/plugins.py index 874d3a5..ebf05f5 100644 --- a/configuration/plugins.py +++ b/configuration/plugins.py @@ -5,9 +5,9 @@ # See https://github.com/netbox-community/netbox-docker/wiki/Using-Netbox-Plugins PLUGINS = [ - "netbox_cloud_pilot", + "netbox_paas", ] PLUGINS_CONFIG = { # type: ignore - "netbox_cloud_pilot": {}, + "netbox_paas": {}, } diff --git a/netbox_cloud_pilot/__init__.py b/netbox_paas/__init__.py similarity index 94% rename from netbox_cloud_pilot/__init__.py rename to netbox_paas/__init__.py index edf484a..4dc0e31 100644 --- a/netbox_cloud_pilot/__init__.py +++ b/netbox_paas/__init__.py @@ -3,7 +3,7 @@ from extras.plugins import PluginConfig -metadata = metadata("netbox_cloud_pilot") +metadata = metadata("netbox_paas") class NetBoxCloudPilot(PluginConfig): diff --git a/netbox_cloud_pilot/api/__init__.py b/netbox_paas/api/__init__.py similarity index 100% rename from netbox_cloud_pilot/api/__init__.py rename to netbox_paas/api/__init__.py diff --git a/netbox_cloud_pilot/api/serializers.py b/netbox_paas/api/serializers.py similarity index 95% rename from netbox_cloud_pilot/api/serializers.py rename to netbox_paas/api/serializers.py index 85ef849..590488c 100644 --- a/netbox_cloud_pilot/api/serializers.py +++ b/netbox_paas/api/serializers.py @@ -20,7 +20,7 @@ class NetBoxConfigurationSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_cloud_pilot-api:netboxconfiguration-detail" + view_name="plugins-api:netbox_paas-api:netboxconfiguration-detail" ) env_name = serializers.CharField( @@ -55,7 +55,7 @@ class Meta: class NestedNetBoxConfigurationSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_cloud_pilot-api:netboxconfiguration-detail" + view_name="plugins-api:netbox_paas-api:netboxconfiguration-detail" ) class Meta: @@ -64,7 +64,7 @@ class Meta: class NetBoxDBBackupSerializer(NetBoxModelSerializer): - url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_cloud_pilot-api:netboxdbbackup-detail") + url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_paas-api:netboxdbbackup-detail") netbox_env = NestedNetBoxConfigurationSerializer() diff --git a/netbox_cloud_pilot/api/urls.py b/netbox_paas/api/urls.py similarity index 90% rename from netbox_cloud_pilot/api/urls.py rename to netbox_paas/api/urls.py index 05c401d..cc9f840 100644 --- a/netbox_cloud_pilot/api/urls.py +++ b/netbox_paas/api/urls.py @@ -2,7 +2,7 @@ from . import views -app_name = "netbox_cloud_pilot" +app_name = "netbox_paas" router = NetBoxRouter() router.register("configurations", views.NetBoxConfigurationViewSet) diff --git a/netbox_cloud_pilot/api/views.py b/netbox_paas/api/views.py similarity index 100% rename from netbox_cloud_pilot/api/views.py rename to netbox_paas/api/views.py diff --git a/netbox_cloud_pilot/constants.py b/netbox_paas/constants.py similarity index 100% rename from netbox_cloud_pilot/constants.py rename to netbox_paas/constants.py diff --git a/netbox_cloud_pilot/forms.py b/netbox_paas/forms.py similarity index 100% rename from netbox_cloud_pilot/forms.py rename to netbox_paas/forms.py diff --git a/netbox_cloud_pilot/iaas.py b/netbox_paas/iaas.py similarity index 99% rename from netbox_cloud_pilot/iaas.py rename to netbox_paas/iaas.py index 40be86c..3d9165d 100644 --- a/netbox_cloud_pilot/iaas.py +++ b/netbox_paas/iaas.py @@ -18,7 +18,7 @@ from . import utils from .constants import JELASTIC_API, NODE_GROUP_CP, NODE_GROUP_SQLDB, DISABLED_PLUGINS_FILE_NAME, PLUGINS_FILE_NAME -logger = logging.getLogger("netbox_cloud_pilot") +logger = logging.getLogger("netbox_paas") __all__ = ( "IaaS", diff --git a/netbox_cloud_pilot/migrations/0001_initial.py b/netbox_paas/migrations/0001_initial.py similarity index 100% rename from netbox_cloud_pilot/migrations/0001_initial.py rename to netbox_paas/migrations/0001_initial.py diff --git a/netbox_paas/migrations/0002_rename_application.py b/netbox_paas/migrations/0002_rename_application.py new file mode 100644 index 0000000..607f8b2 --- /dev/null +++ b/netbox_paas/migrations/0002_rename_application.py @@ -0,0 +1,92 @@ +# Generated by Django 4.2.8 on 2024-05-10 05:43 + +from django.db import migrations + + +def named_tuple_fetch_all(cursor): + "Return all rows from a cursor as a namedtuple" + from collections import namedtuple + + desc = cursor.description + Result = namedtuple("Result", [col[0] for col in desc]) + return [Result(*row) for row in cursor.fetchall()] + + +def rename_indexes(apps, schema_editor): + from django.db import connection + + with connection.cursor() as cursor: + cursor.execute( + """SELECT indexname FROM pg_indexes + WHERE tablename LIKE 'netbox_cloud_pilot%'""" + ) + for result in named_tuple_fetch_all(cursor): + old_index_name = result.indexname + new_index_name = old_index_name.replace( + "netbox_cloud_pilot_", "netbox_paas_", 1 + ) + cursor.execute( + f"""ALTER INDEX IF EXISTS {old_index_name} + RENAME TO {new_index_name}""" + ) + + +def rename_foreignkeys(apps, schema_editor): + from django.db import connection + + with connection.cursor() as cursor: + cursor.execute( + """SELECT table_name, constraint_name + FROM information_schema.key_column_usage + WHERE constraint_catalog=CURRENT_CATALOG + AND table_name LIKE 'netbox_cloud_pilot%' + AND position_in_unique_constraint notnull""" + ) + for result in named_tuple_fetch_all(cursor): + table_name = result.table_name + old_foreignkey_name = result.constraint_name + new_foreignkey_name = old_foreignkey_name.replace( + "netbox_cloud_pilot_", "netbox_paas_", 1 + ) + cursor.execute( + f"""ALTER TABLE {table_name} + RENAME CONSTRAINT {old_foreignkey_name} + TO {new_foreignkey_name}""" + ) + + +def migrate_models(apps, schema_editor): + OldModel1 = apps.get_model('netbox_cloud_pilot', 'NetBoxConfiguration') + NewModel1 = apps.get_model('netbox_paas', 'NetBoxConfiguration') + + OldModel2 = apps.get_model('netbox_cloud_pilot', 'NetBoxDBBackup') + NewModel2 = apps.get_model('netbox_paas', 'NetBoxDBBackup') + + # Check if the table with the old app name exists for both models + if schema_editor.connection.introspection.table_name_converter( + OldModel1._meta.db_table) in schema_editor.connection.introspection.table_names(): + # Rename the table with the old app name to the new app name for Model 1 + schema_editor.execute('ALTER TABLE %s RENAME TO %s' % ( + schema_editor.quote_name(OldModel1._meta.db_table), + schema_editor.quote_name(NewModel1._meta.db_table), + )) + + if schema_editor.connection.introspection.table_name_converter( + OldModel2._meta.db_table) in schema_editor.connection.introspection.table_names(): + # Rename the table with the old app name to the new app name for Model 2 + schema_editor.execute('ALTER TABLE %s RENAME TO %s' % ( + schema_editor.quote_name(OldModel2._meta.db_table), + schema_editor.quote_name(NewModel2._meta.db_table), + )) + + +class Migration(migrations.Migration): + dependencies = [ + ('netbox_paas', '0001_initial'), + ] + + operations = [ + migrations.RunPython(rename_indexes, migrations.RunPython.noop), + migrations.RunPython(rename_foreignkeys, migrations.RunPython.noop), + migrations.RunPython(migrate_models), + ] diff --git a/netbox_cloud_pilot/migrations/__init__.py b/netbox_paas/migrations/__init__.py similarity index 100% rename from netbox_cloud_pilot/migrations/__init__.py rename to netbox_paas/migrations/__init__.py diff --git a/netbox_cloud_pilot/models.py b/netbox_paas/models.py similarity index 98% rename from netbox_cloud_pilot/models.py rename to netbox_paas/models.py index 63a9066..2ba9285 100644 --- a/netbox_cloud_pilot/models.py +++ b/netbox_paas/models.py @@ -65,7 +65,7 @@ def env_name(self): return os.environ.get("ENV_NAME") def get_absolute_url(self): - return reverse("plugins:netbox_cloud_pilot:netboxconfiguration", args=[self.pk]) + return reverse("plugins:netbox_paas:netboxconfiguration", args=[self.pk]) def clean(self): if self.__class__.objects.exists() and not self.pk: @@ -237,7 +237,7 @@ def schedule_restart(self): class NetBoxDBBackup(ChangeLoggedModel): netbox_env = models.ForeignKey( - to="netbox_cloud_pilot.NetBoxConfiguration", + to="netbox_paas.NetBoxConfiguration", on_delete=models.CASCADE, related_name="db_backups", verbose_name="NetBox Environment", @@ -262,7 +262,7 @@ class Meta: verbose_name_plural = "NetBox DB Backups" def get_absolute_url(self): - return reverse("plugins:netbox_cloud_pilot:netboxdbbackup", args=[self.pk]) + return reverse("plugins:netbox_paas:netboxdbbackup", args=[self.pk]) def __str__(self): return self.crontab diff --git a/netbox_cloud_pilot/navigation.py b/netbox_paas/navigation.py similarity index 54% rename from netbox_cloud_pilot/navigation.py rename to netbox_paas/navigation.py index 275db8f..ca7e764 100644 --- a/netbox_cloud_pilot/navigation.py +++ b/netbox_paas/navigation.py @@ -10,18 +10,18 @@ ( PluginMenuItem( link_text="Manage", - link="plugins:netbox_cloud_pilot:netboxconfiguration_list", - permissions=["netbox_cloud_pilot.view_netboxconfiguration"], + link="plugins:netbox_paas:netboxconfiguration_list", + permissions=["netbox_paas.view_netboxconfiguration"], ), PluginMenuItem( link_text="DB Backups", - link="plugins:netbox_cloud_pilot:netboxdbbackup_list", - permissions=["netbox_cloud_pilot.change_netboxconfiguration"], + link="plugins:netbox_paas:netboxdbbackup_list", + permissions=["netbox_paas.change_netboxconfiguration"], ), PluginMenuItem( link_text="Plugins Store", - link="plugins:netbox_cloud_pilot:netboxplugin_list", - permissions=["netbox_cloud_pilot.view_netboxconfiguration"], + link="plugins:netbox_paas:netboxplugin_list", + permissions=["netbox_paas.view_netboxconfiguration"], ), ), ), diff --git a/netbox_cloud_pilot/nb_settings.py b/netbox_paas/nb_settings.py similarity index 100% rename from netbox_cloud_pilot/nb_settings.py rename to netbox_paas/nb_settings.py diff --git a/netbox_cloud_pilot/tables.py b/netbox_paas/tables.py similarity index 91% rename from netbox_cloud_pilot/tables.py rename to netbox_paas/tables.py index e49374e..9bd64c2 100644 --- a/netbox_cloud_pilot/tables.py +++ b/netbox_paas/tables.py @@ -5,7 +5,7 @@ __all__ = ("NetBoxBackupsTable",) RESTORE_BUTTON = """ -
+ {% csrf_token %} @@ -61,7 +61,7 @@

Logs diff --git a/netbox_cloud_pilot/templates/netbox_cloud_pilot/inc/plugin_store.html b/netbox_paas/templates/netbox_cloud_pilot/inc/plugin_store.html similarity index 72% rename from netbox_cloud_pilot/templates/netbox_cloud_pilot/inc/plugin_store.html rename to netbox_paas/templates/netbox_cloud_pilot/inc/plugin_store.html index f84f9cd..aa1b5ac 100644 --- a/netbox_cloud_pilot/templates/netbox_cloud_pilot/inc/plugin_store.html +++ b/netbox_paas/templates/netbox_cloud_pilot/inc/plugin_store.html @@ -35,28 +35,28 @@

{{ plugin_name }}

{% if plugin.installed %} {% if plugin.disabled %} + href="{% url 'plugins:netbox_paas:netboxconfiguration_plugin_enable' pk=object.pk %}?name={{ plugin_name }}&return_url={{ request.path }}"> Enable {% else %} + href="{% url 'plugins:netbox_paas:netboxconfiguration_plugin_disable' pk=object.pk %}?name={{ plugin_name }}&return_url={{ request.path }}"> Disable {% endif %} + href="{% url 'plugins:netbox_paas:netboxconfiguration_plugin_install' pk=object.pk %}?name={{ plugin_name }}&version={{ plugin.current_version }}&type=update&return_url={{ request.path }}"> Configure + href="{% url 'plugins:netbox_paas:netboxconfiguration_plugin_uninstall' pk=object.pk %}?name={{ plugin_name }}&return_url={{ request.path }}"> Uninstall {% else %} + href="{% url 'plugins:netbox_paas:netboxconfiguration_plugin_install' pk=object.pk %}?name={{ plugin_name }}&type=install&return_url={{ request.path }}"> Install {% endif %} diff --git a/netbox_cloud_pilot/templates/netbox_cloud_pilot/netboxconfiguration.html b/netbox_paas/templates/netbox_cloud_pilot/netboxconfiguration.html similarity index 82% rename from netbox_cloud_pilot/templates/netbox_cloud_pilot/netboxconfiguration.html rename to netbox_paas/templates/netbox_cloud_pilot/netboxconfiguration.html index 1cd2cfb..d6cbf06 100644 --- a/netbox_cloud_pilot/templates/netbox_cloud_pilot/netboxconfiguration.html +++ b/netbox_paas/templates/netbox_cloud_pilot/netboxconfiguration.html @@ -6,13 +6,13 @@
{% if object.get_env.is_upgrade_available %} - + Upgrade Available {% endif %} - {% if perms.netbox_cloud_pilot.change_netboxconfiguration %} - Edit NetBox Settings @@ -51,7 +51,7 @@
Overview
{% if object.env_name_storage %} {{ object.env_name_storage }} {% else %} - Add Backup Storage @@ -108,19 +108,19 @@
NetBox Admin Access
- {% include 'netbox_cloud_pilot/inc/env_info.html' with card_header="NetBox" env_info=object.get_env.get_env %} + {% include 'netbox_paas/inc/env_info.html' with card_header="NetBox" env_info=object.get_env.get_env %}
- {% include 'netbox_cloud_pilot/inc/env_node_groups.html' with card_header="NetBox" node_groups=object.get_env.get_node_groups env_name=object.env_name object=object %} + {% include 'netbox_paas/inc/env_node_groups.html' with card_header="NetBox" node_groups=object.get_env.get_node_groups env_name=object.env_name object=object %}
{% if object.env_name_storage %}
- {% include 'netbox_cloud_pilot/inc/env_info.html' with card_header="Storage" env_info=object.get_env_storage.get_env %} + {% include 'netbox_paas/inc/env_info.html' with card_header="Storage" env_info=object.get_env_storage.get_env %}
- {% include 'netbox_cloud_pilot/inc/env_node_groups.html' with card_header="Storage" node_groups=object.get_env_storage.get_node_groups env_name=object.env_name_storage object=object %} + {% include 'netbox_paas/inc/env_node_groups.html' with card_header="Storage" node_groups=object.get_env_storage.get_node_groups env_name=object.env_name_storage object=object %}
{% endif %} diff --git a/netbox_cloud_pilot/templates/netbox_cloud_pilot/netboxdbbackup.html b/netbox_paas/templates/netbox_cloud_pilot/netboxdbbackup.html similarity index 94% rename from netbox_cloud_pilot/templates/netbox_cloud_pilot/netboxdbbackup.html rename to netbox_paas/templates/netbox_cloud_pilot/netboxdbbackup.html index 673bd4f..ae885ff 100644 --- a/netbox_cloud_pilot/templates/netbox_cloud_pilot/netboxdbbackup.html +++ b/netbox_paas/templates/netbox_cloud_pilot/netboxdbbackup.html @@ -4,7 +4,7 @@ {% block extra_controls %} {% csrf_token %} - diff --git a/netbox_cloud_pilot/templates/netbox_cloud_pilot/nodelogs.html b/netbox_paas/templates/netbox_cloud_pilot/nodelogs.html similarity index 91% rename from netbox_cloud_pilot/templates/netbox_cloud_pilot/nodelogs.html rename to netbox_paas/templates/netbox_cloud_pilot/nodelogs.html index 0f8c498..fa48d83 100644 --- a/netbox_cloud_pilot/templates/netbox_cloud_pilot/nodelogs.html +++ b/netbox_paas/templates/netbox_cloud_pilot/nodelogs.html @@ -9,7 +9,7 @@
{% csrf_token %} diff --git a/netbox_cloud_pilot/templates/netbox_cloud_pilot/plugin_disable.html b/netbox_paas/templates/netbox_cloud_pilot/plugin_disable.html similarity index 91% rename from netbox_cloud_pilot/templates/netbox_cloud_pilot/plugin_disable.html rename to netbox_paas/templates/netbox_cloud_pilot/plugin_disable.html index 7493c47..222df10 100644 --- a/netbox_cloud_pilot/templates/netbox_cloud_pilot/plugin_disable.html +++ b/netbox_paas/templates/netbox_cloud_pilot/plugin_disable.html @@ -10,7 +10,7 @@
- + {% csrf_token %}
diff --git a/netbox_cloud_pilot/templates/netbox_cloud_pilot/plugin_enable.html b/netbox_paas/templates/netbox_cloud_pilot/plugin_enable.html similarity index 91% rename from netbox_cloud_pilot/templates/netbox_cloud_pilot/plugin_enable.html rename to netbox_paas/templates/netbox_cloud_pilot/plugin_enable.html index eb541e3..81e9f62 100644 --- a/netbox_cloud_pilot/templates/netbox_cloud_pilot/plugin_enable.html +++ b/netbox_paas/templates/netbox_cloud_pilot/plugin_enable.html @@ -10,7 +10,7 @@
- + {% csrf_token %}
diff --git a/netbox_cloud_pilot/templates/netbox_cloud_pilot/plugin_uninstall.html b/netbox_paas/templates/netbox_cloud_pilot/plugin_uninstall.html similarity index 91% rename from netbox_cloud_pilot/templates/netbox_cloud_pilot/plugin_uninstall.html rename to netbox_paas/templates/netbox_cloud_pilot/plugin_uninstall.html index 725b9a4..cfca427 100644 --- a/netbox_cloud_pilot/templates/netbox_cloud_pilot/plugin_uninstall.html +++ b/netbox_paas/templates/netbox_cloud_pilot/plugin_uninstall.html @@ -10,7 +10,7 @@
- + {% csrf_token %}
diff --git a/netbox_cloud_pilot/templates/netbox_cloud_pilot/plugins_store.html b/netbox_paas/templates/netbox_cloud_pilot/plugins_store.html similarity index 74% rename from netbox_cloud_pilot/templates/netbox_cloud_pilot/plugins_store.html rename to netbox_paas/templates/netbox_cloud_pilot/plugins_store.html index 3a9a37c..92a3ef4 100644 --- a/netbox_cloud_pilot/templates/netbox_cloud_pilot/plugins_store.html +++ b/netbox_paas/templates/netbox_cloud_pilot/plugins_store.html @@ -15,21 +15,21 @@

Installed Plugins

{% for plugin_name, plugin in plugins.installed.items %} - {% include 'netbox_cloud_pilot/inc/plugin_store.html' with plugin_name=plugin_name plugin=plugin %} + {% include 'netbox_paas/inc/plugin_store.html' with plugin_name=plugin_name plugin=plugin %} {% endfor %}

Subscription Store

{% for plugin_name, plugin in plugins.not_installed.subscription.items %} - {% include 'netbox_cloud_pilot/inc/plugin_store.html' with plugin_name=plugin_name plugin=plugin %} + {% include 'netbox_paas/inc/plugin_store.html' with plugin_name=plugin_name plugin=plugin %} {% endfor %}

Community Store

{% for plugin_name, plugin in plugins.not_installed.community.items %} - {% include 'netbox_cloud_pilot/inc/plugin_store.html' with plugin_name=plugin_name plugin=plugin %} + {% include 'netbox_paas/inc/plugin_store.html' with plugin_name=plugin_name plugin=plugin %} {% endfor %}
{% endblock %} diff --git a/netbox_cloud_pilot/urls.py b/netbox_paas/urls.py similarity index 97% rename from netbox_cloud_pilot/urls.py rename to netbox_paas/urls.py index f3f719e..3ca11eb 100644 --- a/netbox_cloud_pilot/urls.py +++ b/netbox_paas/urls.py @@ -3,7 +3,7 @@ from utilities.urls import get_model_urls from . import views -app_name = "netbox_cloud_pilot" +app_name = "netbox_paas" urlpatterns = ( # Configurations diff --git a/netbox_cloud_pilot/utils.py b/netbox_paas/utils.py similarity index 100% rename from netbox_cloud_pilot/utils.py rename to netbox_paas/utils.py diff --git a/netbox_cloud_pilot/views.py b/netbox_paas/views.py similarity index 91% rename from netbox_cloud_pilot/views.py rename to netbox_paas/views.py index a11f994..2b29855 100644 --- a/netbox_cloud_pilot/views.py +++ b/netbox_paas/views.py @@ -25,9 +25,9 @@ class NetBoxConfigurationListView(generic.ObjectListView): def get(self, request): if obj := models.NetBoxConfiguration.objects.first(): - return redirect("plugins:netbox_cloud_pilot:netboxconfiguration", pk=obj.pk) + return redirect("plugins:netbox_paas:netboxconfiguration", pk=obj.pk) - return redirect("plugins:netbox_cloud_pilot:netboxconfiguration_add") + return redirect("plugins:netbox_paas:netboxconfiguration_add") @register_model_view(models.NetBoxConfiguration, "edit") @@ -39,7 +39,7 @@ class NetBoxConfigurationEditView(generic.ObjectEditView): @register_model_view(models.NetBoxConfiguration, "logs") class NetBoxNodeLog(PermissionRequiredMixin, View): def get_permission_required(self): - return ["netbox_cloud_pilot.view_netboxconfiguration"] + return ["netbox_paas.view_netboxconfiguration"] def post(self, request, pk): """ @@ -55,7 +55,7 @@ def post(self, request, pk): logs = iaas.get_node_log(node_id) return render( request, - "netbox_cloud_pilot/nodelogs.html", + "netbox_paas/nodelogs.html", { "object": instance, "env_name": env_name, @@ -68,7 +68,7 @@ def post(self, request, pk): @register_model_view(models.NetBoxConfiguration, "settings") class NetBoxSettingsView(PermissionRequiredMixin, GetReturnURLMixin, View): def get_permission_required(self): - return ["netbox_cloud_pilot.change_netboxconfiguration"] + return ["netbox_paas.change_netboxconfiguration"] def get(self, request, *args, **kwargs): obj = get_object_or_404(models.NetBoxConfiguration, pk=kwargs["pk"]) @@ -82,7 +82,7 @@ def get(self, request, *args, **kwargs): "object": obj, "form": form, "return_url": reverse( - "plugins:netbox_cloud_pilot:netboxconfiguration", + "plugins:netbox_paas:netboxconfiguration", kwargs={"pk": obj.pk}, ), }, @@ -116,7 +116,7 @@ def post(self, request, *args, **kwargs): @register_model_view(models.NetBoxConfiguration, "restart") class NetBoxRestartView(PermissionRequiredMixin, View): def get_permission_required(self): - return ["netbox_cloud_pilot.change_netboxconfiguration"] + return ["netbox_paas.change_netboxconfiguration"] def post(self, request, pk): """ @@ -131,13 +131,13 @@ def post(self, request, pk): node_groups=[node_group], ) messages.success(request, utils.job_msg(job)) - return redirect("plugins:netbox_cloud_pilot:netboxconfiguration", pk=instance.pk) + return redirect("plugins:netbox_paas:netboxconfiguration", pk=instance.pk) @register_model_view(models.NetBoxConfiguration, "backup_storage", path="backup-storage") class NetBoxStorageView(PermissionRequiredMixin, GetReturnURLMixin, View): def get_permission_required(self): - return ["netbox_cloud_pilot.view_netboxconfiguration"] + return ["netbox_paas.view_netboxconfiguration"] def get(self, request, *args, **kwargs): obj = get_object_or_404(models.NetBoxConfiguration, pk=kwargs["pk"]) @@ -151,7 +151,7 @@ def get(self, request, *args, **kwargs): "object": obj, "form": form, "return_url": reverse( - "plugins:netbox_cloud_pilot:netboxconfiguration", + "plugins:netbox_paas:netboxconfiguration", kwargs={"pk": obj.pk}, ), }, @@ -214,9 +214,9 @@ class NetBoxDBBackupListView(generic.ObjectListView): def get(self, request): if obj := models.NetBoxDBBackup.objects.first(): - return redirect("plugins:netbox_cloud_pilot:netboxdbbackup", pk=obj.pk) + return redirect("plugins:netbox_paas:netboxdbbackup", pk=obj.pk) - return redirect("plugins:netbox_cloud_pilot:netboxdbbackup_add") + return redirect("plugins:netbox_paas:netboxdbbackup_add") @register_model_view(models.NetBoxDBBackup, "edit") @@ -233,7 +233,7 @@ class NetBoxDBBackupDeleteView(generic.ObjectDeleteView): @register_model_view(models.NetBoxDBBackup, "backup") class NetBoxDBBackupBackupView(PermissionRequiredMixin, View): def get_permission_required(self): - return ["netbox_cloud_pilot.change_netboxdbbackup"] + return ["netbox_paas.change_netboxdbbackup"] def post(self, request, pk): """ @@ -249,7 +249,7 @@ def post(self, request, pk): @register_model_view(models.NetBoxDBBackup, "restore") class NetBoxDBBackupRestoreView(PermissionRequiredMixin, View): def get_permission_required(self): - return ["netbox_cloud_pilot.change_netboxdbbackup"] + return ["netbox_paas.change_netboxdbbackup"] def post(self, request, pk): """ @@ -260,7 +260,7 @@ def post(self, request, pk): job = instance.restore(request, backup_name) messages.success(request, utils.job_msg(job)) - return redirect("plugins:netbox_cloud_pilot:netboxdbbackup", pk=instance.pk) + return redirect("plugins:netbox_paas:netboxdbbackup", pk=instance.pk) class NetBoxPluginListView(View): @@ -324,12 +324,12 @@ def get(self, request): return render( request, - "netbox_cloud_pilot/plugins_store.html", + "netbox_paas/plugins_store.html", {"object": nc, "plugins": plugins}, ) messages.error(request, "You must configure NetBox first.") - return redirect("plugins:netbox_cloud_pilot:netboxconfiguration_add") + return redirect("plugins:netbox_paas:netboxconfiguration_add") @register_model_view(models.NetBoxConfiguration, "upgrades") @@ -338,7 +338,7 @@ class NetBoxPluginUpgradesView(PermissionRequiredMixin, GetReturnURLMixin, View) form = forms.NetBoxUpgradeForm def get_permission_required(self): - return ["netbox_cloud_pilot.change_netboxconfiguration"] + return ["netbox_paas.change_netboxconfiguration"] def get(self, request, pk, *args, **kwargs): obj = get_object_or_404(models.NetBoxConfiguration, pk=pk) @@ -440,7 +440,7 @@ def post(self, request, *args, **kwargs): @register_model_view(models.NetBoxConfiguration, "plugin_uninstall", path="plugin-uninstall") class NetBoxPluginUninstallView(generic.ObjectDeleteView): queryset = models.NetBoxConfiguration.objects.all() - template_name = "netbox_cloud_pilot/plugin_uninstall.html" + template_name = "netbox_paas/plugin_uninstall.html" def get(self, request, *args, **kwargs): obj = self.get_object(**kwargs) @@ -448,7 +448,7 @@ def get(self, request, *args, **kwargs): if plugin is None: messages.error(request, "Plugin not found.") - return redirect("plugins:netbox_cloud_pilot:netboxplugin_list") + return redirect("plugins:netbox_paas:netboxplugin_list") form = forms.ConfirmationForm(initial=request.GET) @@ -489,7 +489,7 @@ def post(self, request, *args, **kwargs): @register_model_view(models.NetBoxConfiguration, "plugin_enable", path="plugin-enable") class NetBoxPluginEnableView(generic.ObjectDeleteView): queryset = models.NetBoxConfiguration.objects.all() - template_name = "netbox_cloud_pilot/plugin_enable.html" + template_name = "netbox_paas/plugin_enable.html" def get(self, request, *args, **kwargs): obj = self.get_object(**kwargs) @@ -497,7 +497,7 @@ def get(self, request, *args, **kwargs): if plugin is None: messages.error(request, "Plugin not found.") - return redirect("plugins:netbox_cloud_pilot:netboxplugin_list") + return redirect("plugins:netbox_paas:netboxplugin_list") form = forms.ConfirmationForm(initial=request.GET) @@ -538,7 +538,7 @@ def post(self, request, *args, **kwargs): @register_model_view(models.NetBoxConfiguration, "plugin_disable", path="plugin-disable") class NetBoxPluginDisableView(generic.ObjectDeleteView): queryset = models.NetBoxConfiguration.objects.all() - template_name = "netbox_cloud_pilot/plugin_disable.html" + template_name = "netbox_paas/plugin_disable.html" def get(self, request, *args, **kwargs): obj = self.get_object(**kwargs) @@ -546,7 +546,7 @@ def get(self, request, *args, **kwargs): if plugin is None: messages.error(request, "Plugin not found.") - return redirect("plugins:netbox_cloud_pilot:netboxplugin_list") + return redirect("plugins:netbox_paas:netboxplugin_list") form = forms.ConfirmationForm(initial=request.GET) diff --git a/pyproject.toml b/pyproject.toml index 653edae..6329d5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ profile = "black" max-line-length = 120 [tool.pyright] -include = ["netbox_cloud_pilot"] +include = ["netbox_paas"] exclude = [ "**/node_modules", "**/__pycache__", diff --git a/setup.py b/setup.py index cf528f0..115e209 100644 --- a/setup.py +++ b/setup.py @@ -8,13 +8,13 @@ long_description = fh.read() setup( - name="netbox-cloud-pilot", - version="0.1.20", + name="netbox-paas", + version="0.2.0", description="Enhances NetBox on CloudMyDC's VAP with advanced management and control features.", long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/Onemind-Services-LLC/netbox-cloud-pilot/", - download_url="https://github.com/Onemind-Services-LLC/netbox-cloud-pilot/", + url="https://github.com/Onemind-Services-LLC/netbox-paas/", + download_url="https://github.com/Onemind-Services-LLC/netbox-paas/", author="Abhimanyu Saharan", author_email="asaharan@onemindservices.com", maintainer="Abhimanyu Saharan", diff --git a/test.sh b/test.sh index cad6125..5754ad2 100755 --- a/test.sh +++ b/test.sh @@ -9,7 +9,7 @@ doco="docker compose --file docker-compose.yml" test_netbox_unit_tests() { echo "⏱ Running NetBox Unit Tests" - $doco run --rm netbox python manage.py test netbox_cloud_pilot + $doco run --rm netbox python manage.py test netbox_pass } test_cleanup() { From 27de67b939eee5a93c546d29f54331daa0f2ff7c Mon Sep 17 00:00:00 2001 From: yash-pal1 Date: Fri, 10 May 2024 11:55:11 +0530 Subject: [PATCH 02/16] NB-6 lint fix --- netbox_paas/api/serializers.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/netbox_paas/api/serializers.py b/netbox_paas/api/serializers.py index 590488c..5319d87 100644 --- a/netbox_paas/api/serializers.py +++ b/netbox_paas/api/serializers.py @@ -19,9 +19,7 @@ class NetBoxConfigurationSerializer(NetBoxModelSerializer): - url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_paas-api:netboxconfiguration-detail" - ) + url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_paas-api:netboxconfiguration-detail") env_name = serializers.CharField( read_only=True, @@ -54,9 +52,7 @@ class Meta: class NestedNetBoxConfigurationSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_paas-api:netboxconfiguration-detail" - ) + url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_paas-api:netboxconfiguration-detail") class Meta: model = NetBoxConfiguration From 54437964067f7a8214bd0cf91cb8a3406ef4130f Mon Sep 17 00:00:00 2001 From: yash-pal1 Date: Fri, 10 May 2024 11:58:27 +0530 Subject: [PATCH 03/16] NB-6 directory name fixes --- Dockerfile | 8 ++++---- docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f5805d..01bebef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ ARG NETBOX_VARIANT=v3.6 FROM netboxcommunity/netbox:${NETBOX_VARIANT} -RUN mkdir -pv /plugins/netbox-cloud-pilot -COPY . /plugins/netbox-cloud-pilot +RUN mkdir -pv /plugins/netbox-paas +COPY . /plugins/netbox-paas -RUN python3 /plugins/netbox-cloud-pilot/setup.py develop -RUN cp -rf /plugins/netbox-cloud-pilot/netbox_paas/ /opt/netbox/venv/lib/python3.11/site-packages/netbox_paas +RUN python3 /plugins/netbox-paas/setup.py develop +RUN cp -rf /plugins/netbox-paas/netbox_paas/ /opt/netbox/venv/lib/python3.11/site-packages/netbox_paas diff --git a/docker-compose.yml b/docker-compose.yml index 52a505c..8313427 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: - redis env_file: env/netbox.env environment: - ENV_NAME: netbox-cloud-pilot + ENV_NAME: netbox-paas volumes: - ./configuration:/etc/netbox/config:z,ro From 3b4d1035c31ea2e1a00154120bff789d59ad2c71 Mon Sep 17 00:00:00 2001 From: yash-pal1 Date: Fri, 10 May 2024 12:02:41 +0530 Subject: [PATCH 04/16] NB-6 name fixes netbox_pass to netbox_paas --- MANIFEST.in | 2 +- .../templates/netbox_cloud_pilot/netboxconfiguration.html | 2 +- test.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index b20c58e..18346af 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ include README.md -recursive-include netbox_pass/templates * +recursive-include netbox_paas/templates * diff --git a/netbox_paas/templates/netbox_cloud_pilot/netboxconfiguration.html b/netbox_paas/templates/netbox_cloud_pilot/netboxconfiguration.html index d6cbf06..a38b1b1 100644 --- a/netbox_paas/templates/netbox_cloud_pilot/netboxconfiguration.html +++ b/netbox_paas/templates/netbox_cloud_pilot/netboxconfiguration.html @@ -11,7 +11,7 @@ {% endif %} - {% if perms.netbox_pass.change_netboxconfiguration %} + {% if perms.netbox_paas.change_netboxconfiguration %} Edit NetBox Settings diff --git a/test.sh b/test.sh index 5754ad2..8ebc09e 100755 --- a/test.sh +++ b/test.sh @@ -9,14 +9,14 @@ doco="docker compose --file docker-compose.yml" test_netbox_unit_tests() { echo "⏱ Running NetBox Unit Tests" - $doco run --rm netbox python manage.py test netbox_pass + $doco run --rm netbox python manage.py test netbox_paas } test_cleanup() { echo "💣 Cleaning Up" $doco down -v $doco rm -fsv - docker image rm docker.io/library/netbox-cloud-pilot-netbox || echo '' + docker image rm docker.io/library/netbox-paas-netbox || echo '' } echo "🐳🐳🐳 Start testing'" From 5e7bcf751a8d66c43a2b9cbe966be026abde59a8 Mon Sep 17 00:00:00 2001 From: yash-pal1 Date: Fri, 10 May 2024 12:34:13 +0530 Subject: [PATCH 05/16] NB-6 alter foreign key in migration file --- netbox_paas/migrations/0002_rename_application.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/netbox_paas/migrations/0002_rename_application.py b/netbox_paas/migrations/0002_rename_application.py index 607f8b2..06262ae 100644 --- a/netbox_paas/migrations/0002_rename_application.py +++ b/netbox_paas/migrations/0002_rename_application.py @@ -1,6 +1,7 @@ # Generated by Django 4.2.8 on 2024-05-10 05:43 -from django.db import migrations +from django.db import migrations, models +import django.db.models.deletion def named_tuple_fetch_all(cursor): @@ -86,6 +87,12 @@ class Migration(migrations.Migration): ] operations = [ + migrations.AlterField( + model_name='netboxdbbackup', + name='netbox_env', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_backups', + to='netbox_paas.netboxconfiguration'), + ), migrations.RunPython(rename_indexes, migrations.RunPython.noop), migrations.RunPython(rename_foreignkeys, migrations.RunPython.noop), migrations.RunPython(migrate_models), From 3d68d2bffa746292452a4d5ef0b08c0456fd6150 Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Wed, 15 May 2024 13:33:13 +0530 Subject: [PATCH 06/16] NB-6 fixed missing rename strings --- netbox_paas/__init__.py | 10 +-- netbox_paas/migrations/0001_initial.py | 2 +- .../migrations/0002_rename_application.py | 71 +++++++++---------- netbox_paas/navigation.py | 4 +- 4 files changed, 43 insertions(+), 44 deletions(-) diff --git a/netbox_paas/__init__.py b/netbox_paas/__init__.py index 4dc0e31..e1f1f64 100644 --- a/netbox_paas/__init__.py +++ b/netbox_paas/__init__.py @@ -6,16 +6,16 @@ metadata = metadata("netbox_paas") -class NetBoxCloudPilot(PluginConfig): +class NetBoxPaas(PluginConfig): name = metadata.get("Name").replace("-", "_") verbose_name = metadata.get("Name") description = metadata.get("Summary") version = metadata.get("Version") author = metadata.get("Author") author_email = metadata.get("Author-email") - base_url = "cloud-pilot" - min_version = "3.6.0" - max_version = "3.6.99" + base_url = "paas" + min_version = "3.7.0" + max_version = "3.7.99" def ready(self): super().ready() @@ -25,4 +25,4 @@ def ready(self): raise Exception("ENV_NAME is not set in the environment") -config = NetBoxCloudPilot +config = NetBoxPaas diff --git a/netbox_paas/migrations/0001_initial.py b/netbox_paas/migrations/0001_initial.py index 1f12835..b696386 100644 --- a/netbox_paas/migrations/0001_initial.py +++ b/netbox_paas/migrations/0001_initial.py @@ -43,7 +43,7 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('crontab', models.CharField(default='@daily', max_length=255)), ('keep_backups', models.PositiveIntegerField(default=1)), - ('netbox_env', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_backups', to='netbox_cloud_pilot.netboxconfiguration')), + ('netbox_env', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_backups', to='netbox_paas.netboxconfiguration')), ], options={ 'verbose_name': 'NetBox DB Backup', diff --git a/netbox_paas/migrations/0002_rename_application.py b/netbox_paas/migrations/0002_rename_application.py index 06262ae..2cba143 100644 --- a/netbox_paas/migrations/0002_rename_application.py +++ b/netbox_paas/migrations/0002_rename_application.py @@ -17,19 +17,11 @@ def rename_indexes(apps, schema_editor): from django.db import connection with connection.cursor() as cursor: - cursor.execute( - """SELECT indexname FROM pg_indexes - WHERE tablename LIKE 'netbox_cloud_pilot%'""" - ) + cursor.execute("SELECT indexname FROM pg_indexes WHERE tablename LIKE 'netbox_cloud_pilot%'") for result in named_tuple_fetch_all(cursor): old_index_name = result.indexname - new_index_name = old_index_name.replace( - "netbox_cloud_pilot_", "netbox_paas_", 1 - ) - cursor.execute( - f"""ALTER INDEX IF EXISTS {old_index_name} - RENAME TO {new_index_name}""" - ) + new_index_name = old_index_name.replace("netbox_cloud_pilot_", "netbox_paas_", 1) + cursor.execute(f"ALTER INDEX IF EXISTS {old_index_name} RENAME TO {new_index_name}") def rename_foreignkeys(apps, schema_editor): @@ -37,23 +29,19 @@ def rename_foreignkeys(apps, schema_editor): with connection.cursor() as cursor: cursor.execute( - """SELECT table_name, constraint_name + """ + SELECT table_name, constraint_name FROM information_schema.key_column_usage - WHERE constraint_catalog=CURRENT_CATALOG + WHERE constraint_catalog=CURRENT_CATALOG AND table_name LIKE 'netbox_cloud_pilot%' - AND position_in_unique_constraint notnull""" + AND position_in_unique_constraint notnull + """ ) for result in named_tuple_fetch_all(cursor): table_name = result.table_name old_foreignkey_name = result.constraint_name - new_foreignkey_name = old_foreignkey_name.replace( - "netbox_cloud_pilot_", "netbox_paas_", 1 - ) - cursor.execute( - f"""ALTER TABLE {table_name} - RENAME CONSTRAINT {old_foreignkey_name} - TO {new_foreignkey_name}""" - ) + new_foreignkey_name = old_foreignkey_name.replace("netbox_cloud_pilot_", "netbox_paas_", 1) + cursor.execute(f"ALTER TABLE {table_name} RENAME CONSTRAINT {old_foreignkey_name} TO {new_foreignkey_name}") def migrate_models(apps, schema_editor): @@ -64,21 +52,29 @@ def migrate_models(apps, schema_editor): NewModel2 = apps.get_model('netbox_paas', 'NetBoxDBBackup') # Check if the table with the old app name exists for both models - if schema_editor.connection.introspection.table_name_converter( - OldModel1._meta.db_table) in schema_editor.connection.introspection.table_names(): + if ( + schema_editor.connection.introspection.table_name_converter(OldModel1._meta.db_table) + in schema_editor.connection.introspection.table_names() + ): # Rename the table with the old app name to the new app name for Model 1 - schema_editor.execute('ALTER TABLE %s RENAME TO %s' % ( - schema_editor.quote_name(OldModel1._meta.db_table), - schema_editor.quote_name(NewModel1._meta.db_table), - )) + schema_editor.execute( + "ALTER TABLE {} RENAME TO {}".format( + schema_editor.quote_name(OldModel1._meta.db_table), + schema_editor.quote_name(NewModel1._meta.db_table), + ) + ) - if schema_editor.connection.introspection.table_name_converter( - OldModel2._meta.db_table) in schema_editor.connection.introspection.table_names(): + if ( + schema_editor.connection.introspection.table_name_converter(OldModel2._meta.db_table) + in schema_editor.connection.introspection.table_names() + ): # Rename the table with the old app name to the new app name for Model 2 - schema_editor.execute('ALTER TABLE %s RENAME TO %s' % ( - schema_editor.quote_name(OldModel2._meta.db_table), - schema_editor.quote_name(NewModel2._meta.db_table), - )) + schema_editor.execute( + "ALTER TABLE {} RENAME TO {}".format( + schema_editor.quote_name(OldModel2._meta.db_table), + schema_editor.quote_name(NewModel2._meta.db_table), + ) + ) class Migration(migrations.Migration): @@ -90,8 +86,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='netboxdbbackup', name='netbox_env', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_backups', - to='netbox_paas.netboxconfiguration'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='db_backups', + to='netbox_paas.netboxconfiguration', + ), ), migrations.RunPython(rename_indexes, migrations.RunPython.noop), migrations.RunPython(rename_foreignkeys, migrations.RunPython.noop), diff --git a/netbox_paas/navigation.py b/netbox_paas/navigation.py index ca7e764..8336f5b 100644 --- a/netbox_paas/navigation.py +++ b/netbox_paas/navigation.py @@ -1,8 +1,8 @@ from extras.plugins import PluginMenu -from extras.plugins import PluginMenuButton, PluginMenuItem +from extras.plugins import PluginMenuItem menu = PluginMenu( - label="Netbox Cloud Pilot", + label="Netbox PAAS", icon_class="mdi mdi-cloud", groups=( ( From a048a335c07006d487d5c6192d99a722eb2d5163 Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Wed, 15 May 2024 13:44:53 +0530 Subject: [PATCH 07/16] NB-6 fixed migrations --- netbox_paas/__init__.py | 4 +- netbox_paas/migrations/0001_initial.py | 2 +- .../migrations/0002_rename_application.py | 92 +++++-------------- netbox_paas/models.py | 3 +- 4 files changed, 30 insertions(+), 71 deletions(-) diff --git a/netbox_paas/__init__.py b/netbox_paas/__init__.py index e1f1f64..e7c3efa 100644 --- a/netbox_paas/__init__.py +++ b/netbox_paas/__init__.py @@ -14,8 +14,8 @@ class NetBoxPaas(PluginConfig): author = metadata.get("Author") author_email = metadata.get("Author-email") base_url = "paas" - min_version = "3.7.0" - max_version = "3.7.99" + min_version = "3.6.0" + max_version = "3.6.99" def ready(self): super().ready() diff --git a/netbox_paas/migrations/0001_initial.py b/netbox_paas/migrations/0001_initial.py index b696386..1f12835 100644 --- a/netbox_paas/migrations/0001_initial.py +++ b/netbox_paas/migrations/0001_initial.py @@ -43,7 +43,7 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('crontab', models.CharField(default='@daily', max_length=255)), ('keep_backups', models.PositiveIntegerField(default=1)), - ('netbox_env', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_backups', to='netbox_paas.netboxconfiguration')), + ('netbox_env', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_backups', to='netbox_cloud_pilot.netboxconfiguration')), ], options={ 'verbose_name': 'NetBox DB Backup', diff --git a/netbox_paas/migrations/0002_rename_application.py b/netbox_paas/migrations/0002_rename_application.py index 2cba143..2f99e61 100644 --- a/netbox_paas/migrations/0002_rename_application.py +++ b/netbox_paas/migrations/0002_rename_application.py @@ -4,77 +4,37 @@ import django.db.models.deletion -def named_tuple_fetch_all(cursor): - "Return all rows from a cursor as a namedtuple" - from collections import namedtuple - - desc = cursor.description - Result = namedtuple("Result", [col[0] for col in desc]) - return [Result(*row) for row in cursor.fetchall()] - - -def rename_indexes(apps, schema_editor): - from django.db import connection - - with connection.cursor() as cursor: - cursor.execute("SELECT indexname FROM pg_indexes WHERE tablename LIKE 'netbox_cloud_pilot%'") - for result in named_tuple_fetch_all(cursor): - old_index_name = result.indexname - new_index_name = old_index_name.replace("netbox_cloud_pilot_", "netbox_paas_", 1) - cursor.execute(f"ALTER INDEX IF EXISTS {old_index_name} RENAME TO {new_index_name}") - - -def rename_foreignkeys(apps, schema_editor): - from django.db import connection - - with connection.cursor() as cursor: - cursor.execute( - """ - SELECT table_name, constraint_name - FROM information_schema.key_column_usage - WHERE constraint_catalog=CURRENT_CATALOG - AND table_name LIKE 'netbox_cloud_pilot%' - AND position_in_unique_constraint notnull - """ - ) - for result in named_tuple_fetch_all(cursor): - table_name = result.table_name - old_foreignkey_name = result.constraint_name - new_foreignkey_name = old_foreignkey_name.replace("netbox_cloud_pilot_", "netbox_paas_", 1) - cursor.execute(f"ALTER TABLE {table_name} RENAME CONSTRAINT {old_foreignkey_name} TO {new_foreignkey_name}") - - def migrate_models(apps, schema_editor): - OldModel1 = apps.get_model('netbox_cloud_pilot', 'NetBoxConfiguration') - NewModel1 = apps.get_model('netbox_paas', 'NetBoxConfiguration') + try: + OldModel1 = apps.get_model('netbox_cloud_pilot', 'NetBoxConfiguration') + OldModel2 = apps.get_model('netbox_cloud_pilot', 'NetBoxDBBackup') + except LookupError: + # Skip if the old models don't exist + return - OldModel2 = apps.get_model('netbox_cloud_pilot', 'NetBoxDBBackup') + NewModel1 = apps.get_model('netbox_paas', 'NetBoxConfiguration') NewModel2 = apps.get_model('netbox_paas', 'NetBoxDBBackup') - # Check if the table with the old app name exists for both models - if ( - schema_editor.connection.introspection.table_name_converter(OldModel1._meta.db_table) - in schema_editor.connection.introspection.table_names() - ): - # Rename the table with the old app name to the new app name for Model 1 - schema_editor.execute( - "ALTER TABLE {} RENAME TO {}".format( - schema_editor.quote_name(OldModel1._meta.db_table), - schema_editor.quote_name(NewModel1._meta.db_table), - ) + # Migrate data from old models to new models + for old_instance in OldModel1.objects.all(): + new_instance = NewModel1( + id=old_instance.id, + name=old_instance.name, + netbox_url=old_instance.netbox_url, + netbox_token=old_instance.netbox_token, + env_name=old_instance.env_name, ) - - if ( - schema_editor.connection.introspection.table_name_converter(OldModel2._meta.db_table) - in schema_editor.connection.introspection.table_names() - ): - # Rename the table with the old app name to the new app name for Model 2 - schema_editor.execute( - "ALTER TABLE {} RENAME TO {}".format( - schema_editor.quote_name(OldModel2._meta.db_table), - schema_editor.quote_name(NewModel2._meta.db_table), - ) + new_instance.save() + + for old_instance in OldModel2.objects.all(): + new_instance = NewModel2( + id=old_instance.id, + netbox_env_id=old_instance.netbox_env_id, + backup_name=old_instance.backup_name, + backup_url=old_instance.backup_url, + backup_date=old_instance.backup_date, ) + new_instance.save() class Migration(migrations.Migration): @@ -92,7 +52,5 @@ class Migration(migrations.Migration): to='netbox_paas.netboxconfiguration', ), ), - migrations.RunPython(rename_indexes, migrations.RunPython.noop), - migrations.RunPython(rename_foreignkeys, migrations.RunPython.noop), migrations.RunPython(migrate_models), ] diff --git a/netbox_paas/models.py b/netbox_paas/models.py index 2ba9285..8d10ce3 100644 --- a/netbox_paas/models.py +++ b/netbox_paas/models.py @@ -12,7 +12,6 @@ from django.core.validators import MinLengthValidator, MaxLengthValidator from django.db import models from django.urls import reverse -from django.utils.text import slugify from jelastic.api.exceptions import JelasticApiError import json @@ -53,6 +52,8 @@ class NetBoxConfiguration(JobsMixin, PrimaryModel): null=True, ) + tags = None + class Meta: verbose_name = "NetBox Configuration" verbose_name_plural = "NetBox Configurations" From 69005adf1990cbd41eb0c34416f9e8e85a9f4315 Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Wed, 15 May 2024 13:48:36 +0530 Subject: [PATCH 08/16] NB-6 renamed docs --- CONTRIBUTING.md | 6 +++--- README.md | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 15e7c1d..712c845 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,12 +3,12 @@ ## Reporting Bugs * First, ensure that you're running the [latest stable version](https://github.com/netbox-community/netbox/releases) -of NetBox or this plugin [latest stable version](https://github.com/Onemind-Services-LLC/netbox-cloud-pilot/releases). +of NetBox or this plugin [latest stable version](https://github.com/Onemind-Services-LLC/netbox-paas/releases). If you're running an older version, it's possible that the bug has already been fixed or you are running a version of the plugin not tested with the NetBox version you are running [Compatibility Matrix](./README.md#compatibility). -* Next, check the GitHub [issues list](https://github.com/Onemind-Services-LLC/netbox-cloud-pilot/issues) +* Next, check the GitHub [issues list](https://github.com/Onemind-Services-LLC/netbox-paas/issues) to see if the bug you've found has already been reported. If you think you may be experiencing a reported issue that hasn't already been resolved, please click "add a reaction" in the top right corner of the issue and add a thumbs @@ -27,7 +27,7 @@ provide all information request in the issue template, including: ## Feature Requests -* First, check the GitHub [issues list](https://github.com/Onemind-Services-LLC/netbox-cloud-pilot/issues) +* First, check the GitHub [issues list](https://github.com/Onemind-Services-LLC/netbox-paas/issues) to see if the feature you're requesting is already listed. (Be sure to search closed issues as well, since some feature requests have been rejected.) If the feature you'd like to see has already been requested and is open, click "add a diff --git a/README.md b/README.md index 335bc69..291a4db 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ -# NetBox Cloud Pilot +# NetBox PaaS -[NetBox Cloud Pilot](https://github.com/Onemind-Services-LLC/netbox-cloud-pilot) is a specialized plugin tailored for +[NetBox PaaS](https://github.com/Onemind-Services-LLC/netbox-paas) is a specialized plugin tailored for NetBox, offering enhanced functionality for users on the [CloudMyDC public Cloud platform (VAP)](https://app.xapp.cloudmydc.com/). This plugin simplifies the management of various NetBox components and infrastructure, streamlining processes and offering a more integrated experience. -NetBox Cloud Pilot, developed and maintained by [Onemind Services LLC](https://onemindservices.com/), introduces an +NetBox PaaS, developed and maintained by [Onemind Services LLC](https://onemindservices.com/), introduces an exclusive plugin store for NetBox. It caters to users with a diverse range of both free and paid plugins, enhancing the NetBox experience. ## Features -NetBox Cloud Pilot integrates several key features: +NetBox PaaS integrates several key features: - **Management of NetBox Settings**: Control settings for Database (DB), Redis, System, and security and much more. - **Infrastructure Log Viewing**: Access and monitor logs from different nodes within the infrastructure. @@ -28,13 +28,13 @@ NetBox Cloud Pilot integrates several key features: # Installation -For updates, visit [NetBox Cloud Pilot releases](https://github.com/Onemind-Services-LLC/netbox-cloud-pilot/releases). +For updates, visit [NetBox PaaS releases](https://github.com/Onemind-Services-LLC/netbox-paas/releases). ## Support -For support, questions, or feedback, please file an issue on our [GitHub issue tracker](https://github.com/Onemind-Services-LLC/netbox-cloud-pilot/issues). +For support, questions, or feedback, please file an issue on our [GitHub issue tracker](https://github.com/Onemind-Services-LLC/netbox-paas/issues). ## Contributing -Contributions to NetBox Cloud Pilot are welcome! If you'd like to contribute, please fork the repository and submit a +Contributions to NetBox PaaS are welcome! If you'd like to contribute, please fork the repository and submit a pull request. For more detailed information, refer to our contributing guidelines in the repository. From 89e7ff3f2a267a9b7dd6f360def0d8b0aa86f55e Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Wed, 15 May 2024 13:54:12 +0530 Subject: [PATCH 09/16] NB-6 removed deprecated version --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8313427..4fbe8a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.4' - services: netbox: build: From 759afbf2406b7455155de2d72320e864cb5ab811 Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Wed, 15 May 2024 14:08:25 +0530 Subject: [PATCH 10/16] NB-6 fixed migrations --- .../migrations/0002_rename_application.py | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/netbox_paas/migrations/0002_rename_application.py b/netbox_paas/migrations/0002_rename_application.py index 2f99e61..c0c58e7 100644 --- a/netbox_paas/migrations/0002_rename_application.py +++ b/netbox_paas/migrations/0002_rename_application.py @@ -19,20 +19,25 @@ def migrate_models(apps, schema_editor): for old_instance in OldModel1.objects.all(): new_instance = NewModel1( id=old_instance.id, - name=old_instance.name, - netbox_url=old_instance.netbox_url, - netbox_token=old_instance.netbox_token, - env_name=old_instance.env_name, + key=old_instance.key, + env_name_storage=old_instance.env_name_storage, + license=old_instance.license, + description=old_instance.description, + created=old_instance.created, + last_updated=old_instance.last_updated, + custom_field_data=old_instance.custom_field_data, + comments=old_instance.comments, ) new_instance.save() for old_instance in OldModel2.objects.all(): new_instance = NewModel2( id=old_instance.id, - netbox_env_id=old_instance.netbox_env_id, - backup_name=old_instance.backup_name, - backup_url=old_instance.backup_url, - backup_date=old_instance.backup_date, + created=old_instance.created, + last_updated=old_instance.last_updated, + crontab=old_instance.crontab, + keep_backups=old_instance.keep_backups, + netbox_env=old_instance.netbox_env, ) new_instance.save() From ba9ae47f32d4b18bb6cd3be8dc0979deb0775b52 Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Wed, 15 May 2024 14:28:03 +0530 Subject: [PATCH 11/16] NB-6 removed old tags field --- netbox_paas/models.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/netbox_paas/models.py b/netbox_paas/models.py index 2c03424..7079d91 100644 --- a/netbox_paas/models.py +++ b/netbox_paas/models.py @@ -17,7 +17,6 @@ import json from netbox.models import ChangeLoggedModel, PrimaryModel from netbox.models.features import JobsMixin -from taggit.managers import TaggableManager from .constants import ( NETBOX_SUPERUSER_SETTINGS, NETBOX_SETTINGS, @@ -53,11 +52,6 @@ class NetBoxConfiguration(JobsMixin, PrimaryModel): null=True, ) - tags = TaggableManager( - through='extras.TaggedItem', - related_name='netbox_cloud_pilot_netboxconfigurations', - ) - class Meta: verbose_name = "NetBox Configuration" verbose_name_plural = "NetBox Configurations" From 4afbcf733686c1319cab3c5d776fec4ab5484b86 Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Wed, 15 May 2024 14:33:48 +0530 Subject: [PATCH 12/16] NB-6 fixed netbox_env fk reference --- netbox_paas/migrations/0001_initial.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox_paas/migrations/0001_initial.py b/netbox_paas/migrations/0001_initial.py index 1f12835..b696386 100644 --- a/netbox_paas/migrations/0001_initial.py +++ b/netbox_paas/migrations/0001_initial.py @@ -43,7 +43,7 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('crontab', models.CharField(default='@daily', max_length=255)), ('keep_backups', models.PositiveIntegerField(default=1)), - ('netbox_env', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_backups', to='netbox_cloud_pilot.netboxconfiguration')), + ('netbox_env', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_backups', to='netbox_paas.netboxconfiguration')), ], options={ 'verbose_name': 'NetBox DB Backup', From 9194f515489f7480e310dc387a3322703eb44956 Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Wed, 15 May 2024 14:35:40 +0530 Subject: [PATCH 13/16] NB-6 removed extra migration --- netbox_paas/migrations/0002_rename_application.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/netbox_paas/migrations/0002_rename_application.py b/netbox_paas/migrations/0002_rename_application.py index c0c58e7..46b27ef 100644 --- a/netbox_paas/migrations/0002_rename_application.py +++ b/netbox_paas/migrations/0002_rename_application.py @@ -48,14 +48,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AlterField( - model_name='netboxdbbackup', - name='netbox_env', - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name='db_backups', - to='netbox_paas.netboxconfiguration', - ), - ), migrations.RunPython(migrate_models), ] From 2d743704279fc5161f4a5619a29b3508e63dcb91 Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Wed, 15 May 2024 14:38:08 +0530 Subject: [PATCH 14/16] NB-6 fixed missed renames --- netbox_paas/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox_paas/models.py b/netbox_paas/models.py index 7079d91..3f5059b 100644 --- a/netbox_paas/models.py +++ b/netbox_paas/models.py @@ -236,7 +236,7 @@ def schedule_restart(self): class NetBoxDBBackup(ChangeLoggedModel): netbox_env = models.ForeignKey( - to="netbox_cloud_pilot.NetBoxConfiguration", + to="netbox_paas.NetBoxConfiguration", on_delete=models.CASCADE, related_name="db_backups", verbose_name="NetBox Environment", @@ -261,7 +261,7 @@ class Meta: verbose_name_plural = "NetBox DB Backups" def get_absolute_url(self): - return reverse("plugins:netbox_cloud_pilot:netboxdbbackup", args=[self.pk]) + return reverse("plugins:netbox_paas:netboxdbbackup", args=[self.pk]) def __str__(self): return self.crontab From eabeafdd06d5799cac445d618deab1c66e020c96 Mon Sep 17 00:00:00 2001 From: yash-pal1 Date: Wed, 15 May 2024 16:36:29 +0530 Subject: [PATCH 15/16] NB-6 migrations file env error fix --- netbox_paas/migrations/0002_rename_application.py | 2 +- netbox_paas/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox_paas/migrations/0002_rename_application.py b/netbox_paas/migrations/0002_rename_application.py index 46b27ef..fb301c1 100644 --- a/netbox_paas/migrations/0002_rename_application.py +++ b/netbox_paas/migrations/0002_rename_application.py @@ -37,7 +37,7 @@ def migrate_models(apps, schema_editor): last_updated=old_instance.last_updated, crontab=old_instance.crontab, keep_backups=old_instance.keep_backups, - netbox_env=old_instance.netbox_env, + netbox_env_id=old_instance.netbox_env.id, ) new_instance.save() diff --git a/netbox_paas/models.py b/netbox_paas/models.py index 3f5059b..b1f8070 100644 --- a/netbox_paas/models.py +++ b/netbox_paas/models.py @@ -236,7 +236,7 @@ def schedule_restart(self): class NetBoxDBBackup(ChangeLoggedModel): netbox_env = models.ForeignKey( - to="netbox_paas.NetBoxConfiguration", + to=NetBoxConfiguration, on_delete=models.CASCADE, related_name="db_backups", verbose_name="NetBox Environment", From b4771bf33d479f69a25dcc88d2809fa21b78b378 Mon Sep 17 00:00:00 2001 From: yash-pal1 Date: Wed, 15 May 2024 19:00:31 +0530 Subject: [PATCH 16/16] NB-6 template name fixed issue NB-35 --- .../{netbox_cloud_pilot => netbox_paas}/inc/env_info.html | 0 .../{netbox_cloud_pilot => netbox_paas}/inc/env_node_groups.html | 0 .../{netbox_cloud_pilot => netbox_paas}/inc/plugin_store.html | 0 .../{netbox_cloud_pilot => netbox_paas}/netboxconfiguration.html | 0 .../{netbox_cloud_pilot => netbox_paas}/netboxdbbackup.html | 0 .../templates/{netbox_cloud_pilot => netbox_paas}/nodelogs.html | 0 .../{netbox_cloud_pilot => netbox_paas}/plugin_disable.html | 0 .../{netbox_cloud_pilot => netbox_paas}/plugin_enable.html | 0 .../{netbox_cloud_pilot => netbox_paas}/plugin_uninstall.html | 0 .../{netbox_cloud_pilot => netbox_paas}/plugins_store.html | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename netbox_paas/templates/{netbox_cloud_pilot => netbox_paas}/inc/env_info.html (100%) rename netbox_paas/templates/{netbox_cloud_pilot => netbox_paas}/inc/env_node_groups.html (100%) rename netbox_paas/templates/{netbox_cloud_pilot => netbox_paas}/inc/plugin_store.html (100%) rename netbox_paas/templates/{netbox_cloud_pilot => netbox_paas}/netboxconfiguration.html (100%) rename netbox_paas/templates/{netbox_cloud_pilot => netbox_paas}/netboxdbbackup.html (100%) rename netbox_paas/templates/{netbox_cloud_pilot => netbox_paas}/nodelogs.html (100%) rename netbox_paas/templates/{netbox_cloud_pilot => netbox_paas}/plugin_disable.html (100%) rename netbox_paas/templates/{netbox_cloud_pilot => netbox_paas}/plugin_enable.html (100%) rename netbox_paas/templates/{netbox_cloud_pilot => netbox_paas}/plugin_uninstall.html (100%) rename netbox_paas/templates/{netbox_cloud_pilot => netbox_paas}/plugins_store.html (100%) diff --git a/netbox_paas/templates/netbox_cloud_pilot/inc/env_info.html b/netbox_paas/templates/netbox_paas/inc/env_info.html similarity index 100% rename from netbox_paas/templates/netbox_cloud_pilot/inc/env_info.html rename to netbox_paas/templates/netbox_paas/inc/env_info.html diff --git a/netbox_paas/templates/netbox_cloud_pilot/inc/env_node_groups.html b/netbox_paas/templates/netbox_paas/inc/env_node_groups.html similarity index 100% rename from netbox_paas/templates/netbox_cloud_pilot/inc/env_node_groups.html rename to netbox_paas/templates/netbox_paas/inc/env_node_groups.html diff --git a/netbox_paas/templates/netbox_cloud_pilot/inc/plugin_store.html b/netbox_paas/templates/netbox_paas/inc/plugin_store.html similarity index 100% rename from netbox_paas/templates/netbox_cloud_pilot/inc/plugin_store.html rename to netbox_paas/templates/netbox_paas/inc/plugin_store.html diff --git a/netbox_paas/templates/netbox_cloud_pilot/netboxconfiguration.html b/netbox_paas/templates/netbox_paas/netboxconfiguration.html similarity index 100% rename from netbox_paas/templates/netbox_cloud_pilot/netboxconfiguration.html rename to netbox_paas/templates/netbox_paas/netboxconfiguration.html diff --git a/netbox_paas/templates/netbox_cloud_pilot/netboxdbbackup.html b/netbox_paas/templates/netbox_paas/netboxdbbackup.html similarity index 100% rename from netbox_paas/templates/netbox_cloud_pilot/netboxdbbackup.html rename to netbox_paas/templates/netbox_paas/netboxdbbackup.html diff --git a/netbox_paas/templates/netbox_cloud_pilot/nodelogs.html b/netbox_paas/templates/netbox_paas/nodelogs.html similarity index 100% rename from netbox_paas/templates/netbox_cloud_pilot/nodelogs.html rename to netbox_paas/templates/netbox_paas/nodelogs.html diff --git a/netbox_paas/templates/netbox_cloud_pilot/plugin_disable.html b/netbox_paas/templates/netbox_paas/plugin_disable.html similarity index 100% rename from netbox_paas/templates/netbox_cloud_pilot/plugin_disable.html rename to netbox_paas/templates/netbox_paas/plugin_disable.html diff --git a/netbox_paas/templates/netbox_cloud_pilot/plugin_enable.html b/netbox_paas/templates/netbox_paas/plugin_enable.html similarity index 100% rename from netbox_paas/templates/netbox_cloud_pilot/plugin_enable.html rename to netbox_paas/templates/netbox_paas/plugin_enable.html diff --git a/netbox_paas/templates/netbox_cloud_pilot/plugin_uninstall.html b/netbox_paas/templates/netbox_paas/plugin_uninstall.html similarity index 100% rename from netbox_paas/templates/netbox_cloud_pilot/plugin_uninstall.html rename to netbox_paas/templates/netbox_paas/plugin_uninstall.html diff --git a/netbox_paas/templates/netbox_cloud_pilot/plugins_store.html b/netbox_paas/templates/netbox_paas/plugins_store.html similarity index 100% rename from netbox_paas/templates/netbox_cloud_pilot/plugins_store.html rename to netbox_paas/templates/netbox_paas/plugins_store.html