Improved NetBox 'version attribute' handling

Author: mzbroch

.travis.yml

@@ -5,12 +5,11 @@ python:
 - '3.7'
 - '3.8'
 env:
-# Each version of NetBox listed here must have a corresponding directory/configuration file 
-# under development/netbox_<NETBOX_VER>/configuration.py
+# Each version of NetBox listed here uses configuration stored in development/configuration.py
   matrix:
   - NETBOX_VER=v2.8.9
   - NETBOX_VER=v2.9.11
-  - NETBOX_VER=v2.10.1
+  - NETBOX_VER=v2.10.2
 # Encrypted value for PYPI_TOKEN, this secret has been generated with the following command
 #   travis encrypt PYPI_TOKEN=<value> --add env.global --com
 # Might need to update it once the repo is publish (travis-ci.org vs travis-ci.com)

development/configuration.py

@@ -1,10 +1,16 @@
 """NetBox configuration."""
 import os
 from distutils.util import strtobool
+from packaging import version
 from django.core.exceptions import ImproperlyConfigured
 from .settings import VERSION  # pylint: disable=relative-beyond-top-level
 
 
+NETBOX_RELEASE_CURRENT = version.parse(VERSION)
+NETBOX_RELEASE_28 = version.parse("2.8")
+NETBOX_RELEASE_29 = version.parse("2.9")
+NETBOX_RELEASE_211 = version.parse("2.11")
+
 # Enforce required configuration parameters
 for key in [
     "ALLOWED_HOSTS",
@@ -32,7 +38,13 @@ def is_truthy(arg):
     """
     if isinstance(arg, bool):
         return arg
-    return bool(strtobool(arg))
+
+    try:
+        bool_val = strtobool(arg)
+    except ValueError:
+        raise ImproperlyConfigured(f"Unexpected variable value: {arg}")  # pylint: disable=raise-missing-from
+
+    return bool(bool_val)
 
 
 # For reference see http://netbox.readthedocs.io/en/latest/configuration/mandatory-settings/
@@ -59,7 +71,7 @@ def is_truthy(arg):
     "PASSWORD": os.environ["POSTGRES_PASSWORD"],
     # PostgreSQL password
     "HOST": os.environ["POSTGRES_HOST"],  # Database server
-    "PORT": 5432 if not os.environ.get("POSTGRES_PORT", False) else int(os.environ["POSTGRES_PORT"]),  # Database port
+    "PORT": 5432 if "POSTGRES_PORT" not in os.environ else int(os.environ["POSTGRES_PORT"]),  # Database port
 }
 
 # This key is used for secure generation of random numbers and strings. It must never be exposed outside of this file.
@@ -88,14 +100,14 @@ def is_truthy(arg):
     },
 }
 
-if VERSION.startswith("2.8."):
+if NETBOX_RELEASE_28 < NETBOX_RELEASE_CURRENT < NETBOX_RELEASE_29:
     # NetBox 2.8.x Specific Settings
     REDIS["caching"]["DEFAULT_TIMEOUT"] = 300
     REDIS["tasks"]["DEFAULT_TIMEOUT"] = 300
-elif VERSION.startswith("2.9.") or VERSION.startswith("2.10."):
+elif NETBOX_RELEASE_CURRENT < NETBOX_RELEASE_211:
     RQ_DEFAULT_TIMEOUT = 300
 else:
-    raise ImproperlyConfigured(f"Version {VERSION} of NetBox is unsupported at this time.")
+    raise ImproperlyConfigured(f"Version {NETBOX_RELEASE_CURRENT} of NetBox is unsupported at this time.")
 
 #########################
 #                       #
@@ -232,15 +244,15 @@ def is_truthy(arg):
 REMOTE_AUTH_AUTO_CREATE_USER = True
 REMOTE_AUTH_DEFAULT_GROUPS = []
 
-if VERSION.startswith("2.8."):
+if NETBOX_RELEASE_28 < NETBOX_RELEASE_CURRENT < NETBOX_RELEASE_29:
     # NetBox 2.8.x Specific Settings
     REMOTE_AUTH_BACKEND = "utilities.auth_backends.RemoteUserBackend"
     REMOTE_AUTH_DEFAULT_PERMISSIONS = []
-elif VERSION.startswith("2.9.") or VERSION.startswith("2.10."):
+elif NETBOX_RELEASE_CURRENT < NETBOX_RELEASE_211:
     REMOTE_AUTH_BACKEND = "netbox.authentication.RemoteUserBackend"
     REMOTE_AUTH_DEFAULT_PERMISSIONS = {}
 else:
-    raise ImproperlyConfigured(f"Version {VERSION} of NetBox is unsupported at this time.")
+    raise ImproperlyConfigured(f"Version {NETBOX_RELEASE_CURRENT} of NetBox is unsupported at this time.")
 
 # This determines how often the GitHub API is called to check the latest release of NetBox. Must be at least 1 hour.
 RELEASE_CHECK_TIMEOUT = 24 * 3600

netbox_onboarding/release.py

@@ -19,3 +19,4 @@
 NETBOX_RELEASE_28 = version.parse("2.8")
 NETBOX_RELEASE_29 = version.parse("2.9")
 NETBOX_RELEASE_210 = version.parse("2.10")
+NETBOX_RELEASE_211 = version.parse("2.11")

netbox_onboarding/views.py

@@ -57,7 +57,7 @@ class ReleaseMixinOnboardingTaskFeedBulkImportView(PermissionRequiredMixin, Bulk
         permission_required = "netbox_onboarding.add_onboardingtask"
 
 
-elif NETBOX_RELEASE_29 < NETBOX_RELEASE_CURRENT < NETBOX_RELEASE_210:
+elif NETBOX_RELEASE_29 <= NETBOX_RELEASE_CURRENT < NETBOX_RELEASE_210:
     from utilities.views import ObjectView, BulkDeleteView, BulkImportView, ObjectEditView, ObjectListView
 
     class ReleaseMixinOnboardingTaskView(ObjectView):
@@ -76,7 +76,7 @@ class ReleaseMixinOnboardingTaskFeedBulkImportView(BulkImportView):
         """Release Mixin View for bulk-importing a CSV file to create OnboardingTasks."""
 
 
-else:
+elif NETBOX_RELEASE_CURRENT >= NETBOX_RELEASE_210:
     from netbox.views import generic
 
     # ObjectView, BulkDeleteView, BulkImportView, ObjectEditView, ObjectListView