diff --git a/.devcontainer/Dockerfile-plugin_dev b/.devcontainer/Dockerfile-plugin_dev index feb7683..87008c6 100644 --- a/.devcontainer/Dockerfile-plugin_dev +++ b/.devcontainer/Dockerfile-plugin_dev @@ -1,4 +1,4 @@ -ARG VARIANT=latest +ARG VARIANT=v3.2-2.1.0 FROM netboxcommunity/netbox:${VARIANT} @@ -21,7 +21,7 @@ ARG USER_GID=$USER_UID RUN useradd -md /home/vscode -s /usr/bin/zsh -u $USER_UID $USERNAME \ && usermod -aG sudo $USERNAME \ && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \ - && mkdir /opt/netbox/netbox/netbox-access-lists \ + && mkdir /opt/netbox/netbox/netbox-acls \ && chown $USERNAME:$USERNAME /opt/netbox /etc/netbox /opt/unit -R USER $USERNAME @@ -32,7 +32,7 @@ RUN wget --quiet https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/inst COPY .bashrc /home/vscode/.bashrc COPY .zshrc /home/vscode/.zshrc -WORKDIR /opt/netbox/netbox/netbox-access-lists +WORKDIR /opt/netbox/netbox/netbox-acls USER root diff --git a/.devcontainer/configuration/plugins.py b/.devcontainer/configuration/plugins.py index 681eb40..8ad3634 100644 --- a/.devcontainer/configuration/plugins.py +++ b/.devcontainer/configuration/plugins.py @@ -5,9 +5,9 @@ # See https://github.com/netbox-community/netbox-docker/wiki/Using-Netbox-Plugins PLUGINS = [ - "netbox_access_lists", + "netbox_acls", ] PLUGINS_CONFIG = { - "netbox_access_lists": {}, + "netbox_acls": {}, } diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 648d8ef..97d5acf 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,8 +8,8 @@ "docker-compose.override.yml" ], "service": "netbox", - //"workspaceMount": "source=${localWorkspaceFolder},target=/opt/netbox/netbox/netbox-access-lists,type=bind,consistency=cached", - "workspaceFolder": "/opt/netbox/netbox/netbox-access-lists", + //"workspaceMount": "source=${localWorkspaceFolder},target=/opt/netbox/netbox/netbox-acls,type=bind,consistency=cached", + "workspaceFolder": "/opt/netbox/netbox/netbox-acls", "overrideCommand":false, diff --git a/.devcontainer/docker-compose.override.yml b/.devcontainer/docker-compose.override.yml index 49e1618..e8a1145 100644 --- a/.devcontainer/docker-compose.override.yml +++ b/.devcontainer/docker-compose.override.yml @@ -7,6 +7,6 @@ services: ports: - 8000:8080 volumes: - - ../:/opt/netbox/netbox/netbox-access-lists + - ../:/opt/netbox/netbox/netbox-acls - ~/.gitconfig:/home/vscode/.gitconfig:z,ro - ~/.ssh:/home/vscode/.ssh diff --git a/.devcontainer/env/netbox.env b/.devcontainer/env/netbox.env index 65849ae..ee71174 100644 --- a/.devcontainer/env/netbox.env +++ b/.devcontainer/env/netbox.env @@ -19,4 +19,5 @@ SUPERUSER_API_TOKEN=0123456789abcdef0123456789abcdef01234567 SUPERUSER_EMAIL=admin@example.com SUPERUSER_NAME=admin SUPERUSER_PASSWORD=admin +STARTUP_SCRIPTS=false WEBHOOKS_ENABLED=true diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 2c36883..a88d335 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -11,11 +11,11 @@ body: installation. - Check the release notes: - https://github.com/ryanmerolle/netbox-access-lists/releases + https://github.com/ryanmerolle/netbox-acls/releases - Look through the issues already resolved: - https://github.com/ryanmerolle/netbox-access-lists/issues?q=is%3Aclosed + https://github.com/ryanmerolle/netbox-acls/issues?q=is%3Aclosed - Post to Github Discussions if you need setup or usage help that is not a bug: - https://github.com/ryanmerolle/netbox-access-lists/discussions + https://github.com/ryanmerolle/netbox-acls/discussions - Join the `#netbox` channel on our Slack: https://join.slack.com/t/netdev-community/shared_invite/zt-mtts8g0n-Sm6Wutn62q_M4OdsaIycrQ diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 934c0a7..bdf4f10 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,10 +2,10 @@ blank_issues_enabled: false contact_links: #- name: 📕 Plugin Documentation - # url: https://netbox-access-lists.readthedocs.io + # url: https://netbox-acls.readthedocs.io # about: "Please refer to the documentation before raising a bug or feature request." - name: 📖 Contributing Policy - url: https://github.com/ryanmerolle/netbox-access-lists/blob/dev/CONTRIBUTING.md + url: https://github.com/ryanmerolle/netbox-acls/blob/dev/CONTRIBUTING.md about: "Please read through our contributing policy before opening an issue or pull request" - name: 💬 Community Slack url: https://netdev.chat/ diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index ecf8ae4..a388992 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -10,7 +10,7 @@ body: **NOTE:** This form is only for submitting well-formed proposals to extend or modify NetBox in some way. If you're trying to solve a problem but can't figure out how, or if you still need time to work on the details of a proposed new feature, please start a - [discussion](https://github.com/ryanmerolle/netbox-access-lists/discussions) instead. + [discussion](https://github.com/ryanmerolle/netbox-acls/discussions) instead. - type: input attributes: label: NetBox version diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 177b898..9cf3305 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/ryanmerolle/netbox-access-lists/releases). +of NetBox or this plugin [latest stable version](https://github.com/ryanmerolle/netbox-acls/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/ryanmerolle/netbox-access-lists/issues) +* Next, check the GitHub [issues list](https://github.com/ryanmerolle/netbox-acls/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/ryanmerolle/netbox-access-lists/issues) +* First, check the GitHub [issues list](https://github.com/ryanmerolle/netbox-acls/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/MANIFEST.in b/MANIFEST.in index 7404b76..beb736b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ include README.md include LICENSE -recursive-include netbox_access_lists/templates * -recursive-include netbox_access_lists/static * +recursive-include netbox_acls/templates * +recursive-include netbox_acls/static * diff --git a/Makefile b/Makefile index d3fc3e4..41ad785 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -PLUGIN_NAME=netbox_access_lists -REPO_PATH=/opt/netbox/netbox/netbox-access-lists +PLUGIN_NAME=netbox_acls +REPO_PATH=/opt/netbox/netbox/netbox-acls VENV_PY_PATH=/opt/netbox/venv/bin/python3 NETBOX_MANAGE_PATH=/opt/netbox/netbox/manage.py VERFILE=./version.py @@ -16,7 +16,7 @@ help: # #.PHONY: cleanup ## Clean associated docker resources. #cleanup: -# -docker-compose -p netbox-access-lists_devcontainer rm -fv +# -docker-compose -p netbox-acls_devcontainer rm -fv ################## # PLUGIN DEV # @@ -27,7 +27,7 @@ help: .PHONY: nbshell ## Run nbshell nbshell: ${VENV_PY_PATH} ${NETBOX_MANAGE_PATH} nbshell - from netbox_access_lists.models import * + from netbox_acls.models import * .PHONY: setup ## Copy plugin settings. Setup NetBox plugin. setup: diff --git a/README.md b/README.md index 45505b2..992119c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# netbox-access-lists +# netbox-acls A NetBox plugin for Access List management @@ -30,13 +30,13 @@ For adding to a NetBox Docker setup see While this is still in development and not yet on pypi you can install with pip: ```bash -pip install git+https://github.com/ryanmerolle/netbox-access-lists.git@dev +pip install git+https://github.com/ryanmerolle/netbox-acls.git@dev ``` or by adding to your `local_requirements.txt` or `plugin_requirements.txt` (netbox-docker): ```bash -git+https://github.com/ryanmerolle/netbox-access-lists.git@dev +git+https://github.com/ryanmerolle/netbox-acls.git@dev ``` Enable the plugin in `/opt/netbox/netbox/netbox/configuration.py`, @@ -44,11 +44,11 @@ Enable the plugin in `/opt/netbox/netbox/netbox/configuration.py`, ```python PLUGINS = [ - 'netbox_access_lists' + 'netbox_acls' ] PLUGINS_CONFIG = { - "netbox_access_lists": {}, + "netbox_acls": {}, } ``` diff --git a/netbox_access_lists/__init__.py b/netbox_acls/__init__.py similarity index 89% rename from netbox_access_lists/__init__.py rename to netbox_acls/__init__.py index e973cea..2c7d7af 100644 --- a/netbox_access_lists/__init__.py +++ b/netbox_acls/__init__.py @@ -6,7 +6,7 @@ from extras.plugins import PluginConfig class NetBoxAccessListsConfig(PluginConfig): - name = "netbox_access_lists" + name = "netbox_acls" verbose_name = "Access Lists" description = "Manage simple ACLs in NetBox" version = "1.0.0" diff --git a/netbox_access_lists/api/__init__.py b/netbox_acls/api/__init__.py similarity index 100% rename from netbox_access_lists/api/__init__.py rename to netbox_acls/api/__init__.py diff --git a/netbox_access_lists/api/nested_serializers.py b/netbox_acls/api/nested_serializers.py similarity index 87% rename from netbox_access_lists/api/nested_serializers.py rename to netbox_acls/api/nested_serializers.py index 8d80dde..6b7e05e 100644 --- a/netbox_access_lists/api/nested_serializers.py +++ b/netbox_acls/api/nested_serializers.py @@ -27,7 +27,7 @@ class NestedAccessListSerializer(WritableNestedSerializer): """ url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_access_lists-api:accesslist-detail", + view_name="plugins-api:netbox_acls-api:accesslist-detail", ) class Meta: @@ -45,7 +45,7 @@ class NestedACLInterfaceAssignmentSerializer(WritableNestedSerializer): """ url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_access_lists-api:aclinterfaceassignment-detail", + view_name="plugins-api:netbox_acls-api:aclinterfaceassignment-detail", ) class Meta: @@ -63,7 +63,7 @@ class NestedACLStandardRuleSerializer(WritableNestedSerializer): """ url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_access_lists-api:aclstandardrule-detail", + view_name="plugins-api:netbox_acls-api:aclstandardrule-detail", ) class Meta: @@ -81,7 +81,7 @@ class NestedACLExtendedRuleSerializer(WritableNestedSerializer): """ url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_access_lists-api:aclextendedrule-detail", + view_name="plugins-api:netbox_acls-api:aclextendedrule-detail", ) class Meta: diff --git a/netbox_access_lists/api/serializers.py b/netbox_acls/api/serializers.py similarity index 97% rename from netbox_access_lists/api/serializers.py rename to netbox_acls/api/serializers.py index 7443d13..10d9cb7 100644 --- a/netbox_access_lists/api/serializers.py +++ b/netbox_acls/api/serializers.py @@ -7,7 +7,7 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from drf_yasg.utils import swagger_serializer_method from ipam.api.serializers import NestedPrefixSerializer -from netbox.api.fields import ContentTypeField +from netbox.api import ContentTypeField from netbox.api.serializers import NetBoxModelSerializer from rest_framework import serializers from utilities.api import get_serializer_for_model @@ -51,7 +51,7 @@ class AccessListSerializer(NetBoxModelSerializer): """ url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_access_lists-api:accesslist-detail", + view_name="plugins-api:netbox_acls-api:accesslist-detail", ) rule_count = serializers.IntegerField(read_only=True) assigned_object_type = ContentTypeField( @@ -133,7 +133,7 @@ class ACLInterfaceAssignmentSerializer(NetBoxModelSerializer): """ url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_access_lists-api:aclinterfaceassignment-detail", + view_name="plugins-api:netbox_acls-api:aclinterfaceassignment-detail", ) access_list = NestedAccessListSerializer() assigned_object_type = ContentTypeField( @@ -223,7 +223,7 @@ class ACLStandardRuleSerializer(NetBoxModelSerializer): """ url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_access_lists-api:aclstandardrule-detail", + view_name="plugins-api:netbox_acls-api:aclstandardrule-detail", ) access_list = NestedAccessListSerializer() source_prefix = NestedPrefixSerializer( @@ -283,7 +283,7 @@ class ACLExtendedRuleSerializer(NetBoxModelSerializer): """ url = serializers.HyperlinkedIdentityField( - view_name="plugins-api:netbox_access_lists-api:aclextendedrule-detail", + view_name="plugins-api:netbox_acls-api:aclextendedrule-detail", ) access_list = NestedAccessListSerializer() source_prefix = NestedPrefixSerializer( diff --git a/netbox_access_lists/api/urls.py b/netbox_acls/api/urls.py similarity index 93% rename from netbox_access_lists/api/urls.py rename to netbox_acls/api/urls.py index dd6853f..3d292f8 100644 --- a/netbox_access_lists/api/urls.py +++ b/netbox_acls/api/urls.py @@ -6,7 +6,7 @@ from netbox.api.routers import NetBoxRouter from . import views -app_name = "netbox_access_list" +app_name = "netbox_acls" router = NetBoxRouter() router.register("access-lists", views.AccessListViewSet) diff --git a/netbox_access_lists/api/views.py b/netbox_acls/api/views.py similarity index 100% rename from netbox_access_lists/api/views.py rename to netbox_acls/api/views.py diff --git a/netbox_access_lists/choices.py b/netbox_acls/choices.py similarity index 100% rename from netbox_access_lists/choices.py rename to netbox_acls/choices.py diff --git a/netbox_access_lists/constants.py b/netbox_acls/constants.py similarity index 100% rename from netbox_access_lists/constants.py rename to netbox_acls/constants.py diff --git a/netbox_access_lists/filtersets.py b/netbox_acls/filtersets.py similarity index 100% rename from netbox_access_lists/filtersets.py rename to netbox_acls/filtersets.py diff --git a/netbox_access_lists/forms/__init__.py b/netbox_acls/forms/__init__.py similarity index 100% rename from netbox_access_lists/forms/__init__.py rename to netbox_acls/forms/__init__.py diff --git a/netbox_access_lists/forms/bulk_edit.py b/netbox_acls/forms/bulk_edit.py similarity index 100% rename from netbox_access_lists/forms/bulk_edit.py rename to netbox_acls/forms/bulk_edit.py diff --git a/netbox_access_lists/forms/filtersets.py b/netbox_acls/forms/filtersets.py similarity index 100% rename from netbox_access_lists/forms/filtersets.py rename to netbox_acls/forms/filtersets.py diff --git a/netbox_access_lists/forms/models.py b/netbox_acls/forms/models.py similarity index 100% rename from netbox_access_lists/forms/models.py rename to netbox_acls/forms/models.py diff --git a/netbox_access_lists/graphql.py b/netbox_acls/graphql.py similarity index 100% rename from netbox_access_lists/graphql.py rename to netbox_acls/graphql.py diff --git a/netbox_access_lists/migrations/0001_initial.py b/netbox_acls/migrations/0001_initial.py similarity index 98% rename from netbox_access_lists/migrations/0001_initial.py rename to netbox_acls/migrations/0001_initial.py index 32b0717..9a530ce 100644 --- a/netbox_access_lists/migrations/0001_initial.py +++ b/netbox_acls/migrations/0001_initial.py @@ -99,7 +99,7 @@ class Migration(migrations.Migration): models.ForeignKey( on_delete=django.db.models.deletion.PROTECT, related_name="aclinterfaceassignment", - to="netbox_access_lists.accesslist", + to="netbox_acls.accesslist", ), ), ("direction", models.CharField(max_length=100)), @@ -171,7 +171,7 @@ class Migration(migrations.Migration): models.ForeignKey( on_delete=django.db.models.deletion.CASCADE, related_name="aclstandardrules", - to="netbox_access_lists.accesslist", + to="netbox_acls.accesslist", ), ), ("index", models.PositiveIntegerField()), @@ -228,7 +228,7 @@ class Migration(migrations.Migration): models.ForeignKey( on_delete=django.db.models.deletion.CASCADE, related_name="aclstandardrules", - to="netbox_access_lists.accesslist", + to="netbox_acls.accesslist", ), ), ("index", models.PositiveIntegerField()), diff --git a/netbox_access_lists/migrations/__init__.py b/netbox_acls/migrations/__init__.py similarity index 100% rename from netbox_access_lists/migrations/__init__.py rename to netbox_acls/migrations/__init__.py diff --git a/netbox_access_lists/models/__init__.py b/netbox_acls/models/__init__.py similarity index 100% rename from netbox_access_lists/models/__init__.py rename to netbox_acls/models/__init__.py diff --git a/netbox_access_lists/models/access_list_rules.py b/netbox_acls/models/access_list_rules.py similarity index 96% rename from netbox_access_lists/models/access_list_rules.py rename to netbox_acls/models/access_list_rules.py index aa978e8..e08063b 100644 --- a/netbox_access_lists/models/access_list_rules.py +++ b/netbox_acls/models/access_list_rules.py @@ -88,7 +88,7 @@ class ACLStandardRule(ACLRule): The method is a Django convention; although not strictly required, it conveniently returns the absolute URL for any particular object. """ - return reverse("plugins:netbox_access_lists:aclstandardrule", args=[self.pk]) + return reverse("plugins:netbox_acls:aclstandardrule", args=[self.pk]) class Meta(ACLRule.Meta): """ @@ -146,7 +146,7 @@ class ACLExtendedRule(ACLRule): The method is a Django convention; although not strictly required, it conveniently returns the absolute URL for any particular object. """ - return reverse("plugins:netbox_access_lists:aclextendedrule", args=[self.pk]) + return reverse("plugins:netbox_acls:aclextendedrule", args=[self.pk]) def get_protocol_color(self): return ACLProtocolChoices.colors.get(self.protocol) diff --git a/netbox_access_lists/models/access_lists.py b/netbox_acls/models/access_lists.py similarity index 97% rename from netbox_access_lists/models/access_lists.py rename to netbox_acls/models/access_lists.py index c7df970..e4946e0 100644 --- a/netbox_access_lists/models/access_lists.py +++ b/netbox_acls/models/access_lists.py @@ -73,7 +73,7 @@ class AccessList(NetBoxModel): The method is a Django convention; although not strictly required, it conveniently returns the absolute URL for any particular object. """ - return reverse("plugins:netbox_access_lists:accesslist", args=[self.pk]) + return reverse("plugins:netbox_acls:accesslist", args=[self.pk]) def get_default_action_color(self): return ACLActionChoices.colors.get(self.default_action) @@ -135,7 +135,7 @@ class ACLInterfaceAssignment(NetBoxModel): it conveniently returns the absolute URL for any particular object. """ return reverse( - "plugins:netbox_access_lists:aclinterfaceassignment", + "plugins:netbox_acls:aclinterfaceassignment", args=[self.pk], ) diff --git a/netbox_access_lists/navigation.py b/netbox_acls/navigation.py similarity index 74% rename from netbox_access_lists/navigation.py rename to netbox_acls/navigation.py index 7680c17..0346a69 100644 --- a/netbox_access_lists/navigation.py +++ b/netbox_acls/navigation.py @@ -11,7 +11,7 @@ from utilities.choices import ButtonColorChoices accesslist_buttons = [ PluginMenuButton( - link="plugins:netbox_access_lists:accesslist_add", + link="plugins:netbox_acls:accesslist_add", title="Add", icon_class="mdi mdi-plus-thick", color=ButtonColorChoices.GREEN, @@ -20,7 +20,7 @@ accesslist_buttons = [ aclstandardrule_butons = [ PluginMenuButton( - link="plugins:netbox_access_lists:aclstandardrule_add", + link="plugins:netbox_acls:aclstandardrule_add", title="Add", icon_class="mdi mdi-plus-thick", color=ButtonColorChoices.GREEN, @@ -29,7 +29,7 @@ aclstandardrule_butons = [ aclextendedrule_butons = [ PluginMenuButton( - link="plugins:netbox_access_lists:aclextendedrule_add", + link="plugins:netbox_acls:aclextendedrule_add", title="Add", icon_class="mdi mdi-plus-thick", color=ButtonColorChoices.GREEN, @@ -38,7 +38,7 @@ aclextendedrule_butons = [ accesslistassignment_buttons = [ PluginMenuButton( - link="plugins:netbox_access_lists:aclinterfaceassignment_add", + link="plugins:netbox_acls:aclinterfaceassignment_add", title="Add", icon_class="mdi mdi-plus-thick", color=ButtonColorChoices.GREEN, @@ -51,24 +51,24 @@ accesslistassignment_buttons = [ menu_items = ( PluginMenuItem( - link="plugins:netbox_access_lists:accesslist_list", + link="plugins:netbox_acls:accesslist_list", link_text="Access Lists", buttons=accesslist_buttons, ), # Comment out Standard Access List rule to force creation in the ACL view PluginMenuItem( - link="plugins:netbox_access_lists:aclstandardrule_list", + link="plugins:netbox_acls:aclstandardrule_list", link_text="ACL Standard Rules", buttons=aclstandardrule_butons, ), # Comment out Extended Access List rule to force creation in the ACL view PluginMenuItem( - link="plugins:netbox_access_lists:aclextendedrule_list", + link="plugins:netbox_acls:aclextendedrule_list", link_text="ACL Extended Rules", buttons=aclextendedrule_butons, ), PluginMenuItem( - link="plugins:netbox_access_lists:aclinterfaceassignment_list", + link="plugins:netbox_acls:aclinterfaceassignment_list", link_text="ACL Interface Assignments", buttons=accesslistassignment_buttons, ), diff --git a/netbox_access_lists/tables.py b/netbox_acls/tables.py similarity index 94% rename from netbox_access_lists/tables.py rename to netbox_acls/tables.py index 6146997..8552d78 100644 --- a/netbox_access_lists/tables.py +++ b/netbox_acls/tables.py @@ -50,7 +50,7 @@ class AccessListTable(NetBoxTable): verbose_name="Rule Count", ) tags = columns.TagColumn( - url_name="plugins:netbox_access_lists:accesslist_list", + url_name="plugins:netbox_acls:accesslist_list", ) class Meta(NetBoxTable.Meta): @@ -99,7 +99,7 @@ class ACLInterfaceAssignmentTable(NetBoxTable): verbose_name="Assigned Interface", ) tags = columns.TagColumn( - url_name="plugins:netbox_access_lists:aclinterfaceassignment_list", + url_name="plugins:netbox_acls:aclinterfaceassignment_list", ) class Meta(NetBoxTable.Meta): @@ -136,7 +136,7 @@ class ACLStandardRuleTable(NetBoxTable): ) action = ChoiceFieldColumn() tags = columns.TagColumn( - url_name="plugins:netbox_access_lists:aclstandardrule_list", + url_name="plugins:netbox_acls:aclstandardrule_list", ) class Meta(NetBoxTable.Meta): @@ -177,7 +177,7 @@ class ACLExtendedRuleTable(NetBoxTable): ) action = ChoiceFieldColumn() tags = columns.TagColumn( - url_name="plugins:netbox_access_lists:aclextendedrule_list", + url_name="plugins:netbox_acls:aclextendedrule_list", ) protocol = ChoiceFieldColumn() diff --git a/netbox_access_lists/template_content.py b/netbox_acls/template_content.py similarity index 100% rename from netbox_access_lists/template_content.py rename to netbox_acls/template_content.py diff --git a/netbox_access_lists/templates/inc/assigned_host/access_lists.html b/netbox_acls/templates/inc/assigned_host/access_lists.html similarity index 67% rename from netbox_access_lists/templates/inc/assigned_host/access_lists.html rename to netbox_acls/templates/inc/assigned_host/access_lists.html index 48e984a..9738fa9 100644 --- a/netbox_access_lists/templates/inc/assigned_host/access_lists.html +++ b/netbox_acls/templates/inc/assigned_host/access_lists.html @@ -6,7 +6,7 @@ {% include 'inc/assigned_host/assigned_access_lists.html' %}
- + Add Access List
diff --git a/netbox_access_lists/templates/inc/assigned_host/assigned_access_lists.html b/netbox_acls/templates/inc/assigned_host/assigned_access_lists.html similarity index 100% rename from netbox_access_lists/templates/inc/assigned_host/assigned_access_lists.html rename to netbox_acls/templates/inc/assigned_host/assigned_access_lists.html diff --git a/netbox_access_lists/templates/inc/assigned_interface/access_lists.html b/netbox_acls/templates/inc/assigned_interface/access_lists.html similarity index 63% rename from netbox_access_lists/templates/inc/assigned_interface/access_lists.html rename to netbox_acls/templates/inc/assigned_interface/access_lists.html index 046da49..165b0bf 100644 --- a/netbox_access_lists/templates/inc/assigned_interface/access_lists.html +++ b/netbox_acls/templates/inc/assigned_interface/access_lists.html @@ -6,7 +6,7 @@ {% include 'inc/assigned_interface/assigned_access_lists.html' %}
- + Assign Access List
diff --git a/netbox_access_lists/templates/inc/assigned_interface/assigned_access_lists.html b/netbox_acls/templates/inc/assigned_interface/assigned_access_lists.html similarity index 100% rename from netbox_access_lists/templates/inc/assigned_interface/assigned_access_lists.html rename to netbox_acls/templates/inc/assigned_interface/assigned_access_lists.html diff --git a/netbox_access_lists/templates/netbox_access_lists/accesslist.html b/netbox_acls/templates/netbox_acls/accesslist.html similarity index 75% rename from netbox_access_lists/templates/netbox_access_lists/accesslist.html rename to netbox_acls/templates/netbox_acls/accesslist.html index dcb9d92..d66538b 100644 --- a/netbox_access_lists/templates/netbox_access_lists/accesslist.html +++ b/netbox_acls/templates/netbox_acls/accesslist.html @@ -2,24 +2,24 @@ {% load render_table from django_tables2 %} {% block breadcrumbs %} -
  • Access Lists
    • +
  • Access Lists
    • {% endblock %} {% block controls %}
    - {% if perms.netbox_access_lists.change_policy %} + {% if perms.netbox_acls.change_policy %} {% if object.type == 'extended' %} - + {% elif object.type == 'standard' %} - + {% endif %} Rule - + Edit {% endif %} - {% if perms.netbox_access_lists.delete_policy %} - + {% if perms.netbox_acls.delete_policy %} + Delete {% endif %} @@ -34,7 +34,7 @@ {% endblock tab_items %} {% if perms.extras.view_objectchange %} {% endif %} diff --git a/netbox_access_lists/templates/netbox_access_lists/accesslist_edit.html b/netbox_acls/templates/netbox_acls/accesslist_edit.html similarity index 100% rename from netbox_access_lists/templates/netbox_access_lists/accesslist_edit.html rename to netbox_acls/templates/netbox_acls/accesslist_edit.html diff --git a/netbox_access_lists/templates/netbox_access_lists/aclextendedrule.html b/netbox_acls/templates/netbox_acls/aclextendedrule.html similarity index 100% rename from netbox_access_lists/templates/netbox_access_lists/aclextendedrule.html rename to netbox_acls/templates/netbox_acls/aclextendedrule.html diff --git a/netbox_access_lists/templates/netbox_access_lists/aclinterfaceassignment.html b/netbox_acls/templates/netbox_acls/aclinterfaceassignment.html similarity index 78% rename from netbox_access_lists/templates/netbox_access_lists/aclinterfaceassignment.html rename to netbox_acls/templates/netbox_acls/aclinterfaceassignment.html index 984af0a..ad16c6b 100644 --- a/netbox_access_lists/templates/netbox_access_lists/aclinterfaceassignment.html +++ b/netbox_acls/templates/netbox_acls/aclinterfaceassignment.html @@ -2,17 +2,17 @@ {% load render_table from django_tables2 %} {% block breadcrumbs %} -
  • ACL Interface Assignments
    • +
  • ACL Interface Assignments
    • {% endblock %} {% block controls %}
    - {% if perms.netbox_access_lists.change_policy %} - + {% if perms.netbox_acls.change_policy %} + Edit {% endif %} - {% if perms.netbox_access_lists.delete_policy %} - + {% if perms.netbox_acls.delete_policy %} + Delete {% endif %} @@ -27,7 +27,7 @@ {% endblock tab_items %} {% if perms.extras.view_objectchange %} {% endif %} diff --git a/netbox_access_lists/templates/netbox_access_lists/aclinterfaceassignment_edit.html b/netbox_acls/templates/netbox_acls/aclinterfaceassignment_edit.html similarity index 100% rename from netbox_access_lists/templates/netbox_access_lists/aclinterfaceassignment_edit.html rename to netbox_acls/templates/netbox_acls/aclinterfaceassignment_edit.html diff --git a/netbox_access_lists/templates/netbox_access_lists/aclstandardrule.html b/netbox_acls/templates/netbox_acls/aclstandardrule.html similarity index 100% rename from netbox_access_lists/templates/netbox_access_lists/aclstandardrule.html rename to netbox_acls/templates/netbox_acls/aclstandardrule.html diff --git a/netbox_access_lists/urls.py b/netbox_acls/urls.py similarity index 100% rename from netbox_access_lists/urls.py rename to netbox_acls/urls.py diff --git a/netbox_access_lists/version.py b/netbox_acls/version.py similarity index 100% rename from netbox_access_lists/version.py rename to netbox_acls/version.py diff --git a/netbox_access_lists/views.py b/netbox_acls/views.py similarity index 97% rename from netbox_access_lists/views.py rename to netbox_acls/views.py index c2ad663..df1eae8 100644 --- a/netbox_access_lists/views.py +++ b/netbox_acls/views.py @@ -79,7 +79,7 @@ class AccessListEditView(generic.ObjectEditView): queryset = models.AccessList.objects.all() form = forms.AccessListForm - template_name = "netbox_access_lists/accesslist_edit.html" + template_name = "netbox_acls/accesslist_edit.html" class AccessListDeleteView(generic.ObjectDeleteView): @@ -127,7 +127,7 @@ class ACLInterfaceAssignmentEditView(generic.ObjectEditView): queryset = models.ACLInterfaceAssignment.objects.all() form = forms.ACLInterfaceAssignmentForm - template_name = "netbox_access_lists/aclinterfaceassignment_edit.html" + template_name = "netbox_acls/aclinterfaceassignment_edit.html" class ACLInterfaceAssignmentDeleteView(generic.ObjectDeleteView): diff --git a/setup.py b/setup.py index 7503863..a13ecd2 100644 --- a/setup.py +++ b/setup.py @@ -24,13 +24,13 @@ from setuptools import find_packages, setup # setup( - name="netbox-access-lists", - version="1.1.0", - # version=get_version("netbox_access_lists/version.py"), + name="netbox-acls", + version="1.0.0", + # version=get_version("netbox_acls/version.py"), description="A NetBox plugin for Access List management", # long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/ryanmerolle/netbox-access-lists", + url="https://github.com/ryanmerolle/netbox-acls", install_requires=[], packages=find_packages(), include_package_data=True,