Added support for Netbox 3.6 (#19)

netbox-community · Sep 8, 2023 · ea4c4de · ea4c4de
1 parent a9b6b96
commit ea4c4de
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.5 (2023-09-08)
+
+* Fix for NetBox 3.6.0
+
 ## 0.1.4 (2023-08-18)
 
 * Fix for NetBox 3.5.8

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ The features the plugin provides should be listed here.
 |----------------|----------------|
 |     3.5        |      0.1.0     |
 |     3.5.8      |      0.1.4     |
-
+|     3.6.0 >      |      0.1.5     |
 ## Installation
 
 For adding to a NetBox Docker setup see

diff --git a/netbox_napalm_plugin/__init__.py b/netbox_napalm_plugin/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = """Arthur Hanson"""
 __email__ = "[email protected]"
-__version__ = "0.1.4"
+__version__ = "0.1.5"
 
 
 from extras.plugins import PluginConfig
@@ -22,7 +22,7 @@ class NapalmPlatformConfig(PluginConfig):
         'NAPALM_ARGS': {},
     }
     min_version = '3.5.0-dev'
-    max_version = '3.5.99'
+    max_version = '3.6.99'
 
 
 config = NapalmPlatformConfig
diff --git a/netbox_napalm_plugin/api/views.py b/netbox_napalm_plugin/api/views.py
@@ -35,10 +35,12 @@ def napalm(self, request, pk):
             )
         if device.platform is None:
             raise ServiceUnavailable("No platform is configured for this device.")
-        if (
-            not hasattr(device.platform, "napalm")
-            or not device.platform.napalm.napalm_driver
-        ):
+        # Checks to see if NapalmPlatform object exists
+        if not NapalmPlatformConfig.objects.filter(platform=device.platform).exists():
+            raise ServiceUnavailable(
+                f"No NAPALM Platform Mapping is configured for this device's platform: {device.platform}."
+            )
+        if NapalmPlatformConfig.objects.get(platform=device.platform).napalm_driver == "":
             raise ServiceUnavailable(
                 f"No NAPALM driver is configured for this device's platform: {device.platform}."
             )
@@ -75,11 +77,11 @@ def napalm(self, request, pk):
 
         # Validate the configured driver
         try:
-            driver = napalm.get_network_driver(device.platform.napalm_driver)
+            driver = napalm.get_network_driver(NapalmPlatformConfig.objects.get(platform=device.platform).napalm_driver)
         except ModuleImportError:
             raise ServiceUnavailable(
                 "NAPALM driver for platform {} not found: {}.".format(
-                    device.platform, device.platform.napalm_driver
+                    device.platform, NapalmPlatformConfig.objects.get(platform=device.platform).napalm_driver
                 )
             )
 
@@ -94,9 +96,8 @@ def napalm(self, request, pk):
         password = get_plugin_config('netbox_napalm_plugin', 'NAPALM_PASSWORD')
         timeout = get_plugin_config('netbox_napalm_plugin', 'NAPALM_TIMEOUT')
         optional_args = get_plugin_config('netbox_napalm_plugin', 'NAPALM_ARGS').copy()
-        if device.platform.napalm_args is not None:
-            optional_args.update(device.platform.napalm_args)
-
+        if NapalmPlatformConfig.objects.get(platform=device.platform).napalm_args is not None:
+            optional_args.update(NapalmPlatformConfig.objects.get(platform=device.platform).napalm_args)
         # Update NAPALM parameters according to the request headers
         for header in request.headers:
             if header[:9].lower() != "x-napalm-":

diff --git a/netbox_napalm_plugin/project-static/package.json b/netbox_napalm_plugin/project-static/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netbox_napalm_plugin",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Napalm Plugin for NetBox",
   "main": "index.js",
   "author": "Arthur Hanson",

diff --git a/setup.cfg b/setup.cfg
@@ -30,7 +30,7 @@ python =
     3.8: py38, format, lint, build
 
 [bumpversion]
-current_version = 0.1.4
+current_version = 0.1.5
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
@@ -32,6 +32,6 @@
     packages=find_packages(include=['netbox_napalm_plugin', 'netbox_napalm_plugin.*']),
     test_suite='tests',
     url='https://github.com/netbox-community/netbox-napalm',
-    version='0.1.4',
+    version='0.1.5',
     zip_safe=False,
 )