diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b580b7..4adfb50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,3 +1,4 @@ +--- name: CI on: diff --git a/configuration/configuration.py b/configuration/configuration.py index 1ebd734..353d9d6 100644 --- a/configuration/configuration.py +++ b/configuration/configuration.py @@ -10,6 +10,7 @@ from os.path import abspath, dirname # For reference see https://netbox.readthedocs.io/en/stable/configuration/ # Based on https://github.com/netbox-community/netbox/blob/master/netbox/netbox/configuration.example.py + # Read secret from file def _read_secret(secret_name, default=None): try: diff --git a/docker-compose.yml b/docker-compose.yml index 0b78731..cc89ee5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,4 @@ +--- version: '3.4' services: @@ -23,7 +24,7 @@ services: redis: image: redis:6-alpine command: - - sh - - -c # this is to evaluate the $REDIS_PASSWORD from the env - - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose + - sh + - -c # this is to evaluate the $REDIS_PASSWORD from the env + - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose env_file: env/redis.env diff --git a/netbox_acls/templates/netbox_acls/accesslist.html b/netbox_acls/templates/netbox_acls/accesslist.html index 86a8083..bd4f003 100644 --- a/netbox_acls/templates/netbox_acls/accesslist.html +++ b/netbox_acls/templates/netbox_acls/accesslist.html @@ -20,6 +20,7 @@
Access List
+ diff --git a/netbox_acls/templates/netbox_acls/aclextendedrule.html b/netbox_acls/templates/netbox_acls/aclextendedrule.html index 47c4ad3..d4abbdf 100644 --- a/netbox_acls/templates/netbox_acls/aclextendedrule.html +++ b/netbox_acls/templates/netbox_acls/aclextendedrule.html @@ -7,6 +7,7 @@
ACL Extended Rule
Access List
Type {{ object.get_type_display }}
+
ACL Extended Rule
Access List @@ -32,6 +33,7 @@
Details
+ diff --git a/netbox_acls/templates/netbox_acls/aclinterfaceassignment.html b/netbox_acls/templates/netbox_acls/aclinterfaceassignment.html index 4cabeb0..606f99e 100644 --- a/netbox_acls/templates/netbox_acls/aclinterfaceassignment.html +++ b/netbox_acls/templates/netbox_acls/aclinterfaceassignment.html @@ -8,6 +8,7 @@
ACL Interface Assignment
Details
Remark {{ object.get_remark_display|placeholder }}
+
Host
Host diff --git a/netbox_acls/templates/netbox_acls/aclstandardrule.html b/netbox_acls/templates/netbox_acls/aclstandardrule.html index 4a83b3c..c8e2562 100644 --- a/netbox_acls/templates/netbox_acls/aclstandardrule.html +++ b/netbox_acls/templates/netbox_acls/aclstandardrule.html @@ -7,6 +7,7 @@
ACL Standard Rule
+
ACL Standard Rule
Access List @@ -32,6 +33,7 @@
Details
+ diff --git a/netbox_acls/tests/test_api.py b/netbox_acls/tests/test_api.py index f01a687..afbd4fa 100644 --- a/netbox_acls/tests/test_api.py +++ b/netbox_acls/tests/test_api.py @@ -1,11 +1,12 @@ from dcim.models import Device, DeviceRole, DeviceType, Interface, Manufacturer, Site from django.contrib.contenttypes.models import ContentType from django.urls import reverse -from netbox_acls.choices import * -from netbox_acls.models import * from rest_framework import status from utilities.testing import APITestCase, APIViewTestCases +from netbox_acls.choices import * +from netbox_acls.models import * + class AppTest(APITestCase): def test_root(self):
Details
Remark {{ object.get_remark_display|placeholder }}