Merge pull request #705 from netbox-community/develop

Release 1.6.0

Author: tobiasge

.github/workflows/push.yml

@@ -46,7 +46,6 @@ jobs:
         - ./build.sh develop
         docker_from:
         - '' # use the default of the build script
-        - alpine:edge
       fail-fast: false
     runs-on: ubuntu-latest
     name: Builds new NetBox Docker Images

Dockerfile

@@ -97,7 +97,7 @@ WORKDIR /opt/netbox/netbox
 RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \
       && chown -R unit:root media /opt/unit/ \
       && chmod -R g+w media /opt/unit/ \
-      && cd /opt/netbox/ && /opt/netbox/venv/bin/python -m mkdocs build \
+      && cd /opt/netbox/ && SECRET_KEY="dummy" /opt/netbox/venv/bin/python -m mkdocs build \
           --config-file /opt/netbox/mkdocs.yml --site-dir /opt/netbox/netbox/project-static/docs/ \
       && SECRET_KEY="dummy" /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py collectstatic --no-input
 

README.md

@@ -1 +1 @@
-1.5.1
+1.6.0

VERSION

@@ -147,6 +147,9 @@ def _read_secret(secret_name, default = None):
 # by anonymous users. List models in the form `<app>.<model>`. Add '*' to this list to exempt all models.
 EXEMPT_VIEW_PERMISSIONS = list(filter(None, environ.get('EXEMPT_VIEW_PERMISSIONS', '').split(' ')))
 
+# Enable GraphQL API.
+GRAPHQL_ENABLED = environ.get('GRAPHQL_ENABLED', 'True').lower() == 'true'
+
 # Enable custom logging. Please see the Django documentation for detailed guidance on configuring custom logs:
 #   https://docs.djangoproject.com/en/stable/topics/logging/
 LOGGING = {}

configuration/configuration.py

@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   netbox: &netbox
-    image: netboxcommunity/netbox:${VERSION-v3.1-1.5.1}
+    image: netboxcommunity/netbox:${VERSION-v3.1-1.6.0}
     depends_on:
     - postgres
     - redis

docker-compose.yml

@@ -14,6 +14,7 @@ EMAIL_USERNAME=netbox
 # EMAIL_USE_SSL and EMAIL_USE_TLS are mutually exclusive, i.e. they can't both be `true`!
 EMAIL_USE_SSL=false
 EMAIL_USE_TLS=false
+GRAPHQL_ENABLED=true
 HOUSEKEEPING_INTERVAL=86400
 MAX_PAGE_SIZE=1000
 MEDIA_ROOT=/opt/netbox/netbox/media

env/netbox.env

@@ -0,0 +1,7 @@
+# - asn: 1
+#   rir: RFC1918
+#   tenant: tenant1
+# - asn: 2
+#   rir: RFC4193 ULA
+# - asn: 3
+#   rir: RFC3849

initializers/asns.yml

@@ -3,23 +3,20 @@
 #   region: Downtown
 #   status: active
 #   facility: Amsterdam 1
-#   asn: 12345
 #   custom_field_data:
 #     text_field: Description for AMS1
 # - name: AMS 2
 #   slug: ams2
 #   region: Downtown
 #   status: active
 #   facility: Amsterdam 2
-#   asn: 54321
 #   custom_field_data:
 #     text_field: Description for AMS2
 # - name: AMS 3
 #   slug: ams3
 #   region: Suburbs
 #   status: active
 #   facility: Amsterdam 3
-#   asn: 67890
 #   tenant: tenant1
 #   custom_field_data:
 #     text_field: Description for AMS3
@@ -28,7 +25,6 @@
 #   region: Singapore
 #   status: active
 #   facility: Singapore 1
-#   asn: 09876
 #   tenant: tenant2
 #   custom_field_data:
 #     text_field: Description for SING1

initializers/sites.yml

@@ -1,5 +1,6 @@
-napalm==3.3.1
-ruamel.yaml==0.17.17
-django-auth-ldap==3.0.0
-google-crc32c==1.3.0
+django-auth-ldap==4.0.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.12.3
+google-crc32c==1.3.0
+napalm==3.3.1
+ruamel.yaml==0.17.21
+tzdata==2021.5

requirements-container.txt

@@ -0,0 +1,33 @@
+import sys
+
+from ipam.models import ASN, RIR
+from startup_script_utils import load_yaml
+from tenancy.models import Tenant
+
+asns = load_yaml("/opt/netbox/initializers/asns.yml")
+
+if asns is None:
+    sys.exit()
+
+required_assocs = {"rir": (RIR, "name")}
+
+optional_assocs = {"tenant": (Tenant, "name")}
+
+for params in asns:
+    for assoc, details in required_assocs.items():
+        model, field = details
+        query = {field: params.pop(assoc)}
+
+        params[assoc] = model.objects.get(**query)
+
+    for assoc, details in optional_assocs.items():
+        if assoc in params:
+            model, field = details
+            query = {field: params.pop(assoc)}
+
+            params[assoc] = model.objects.get(**query)
+
+    asn, created = ASN.objects.get_or_create(**params)
+
+    if created:
+        print(f"🔡 Created ASN {asn.asn}")

startup_scripts/015_object_permissions.py renamed to startup_scripts/020_object_permissions.py

@@ -52,6 +52,7 @@
                     params["assigned_object_id"] = Interface.objects.get(**query).id
             else:
                 query = {field: params.pop(assoc)}
+
                 params[assoc] = model.objects.get(**query)
 
     ip_address, created = IPAddress.objects.get_or_create(**params)