Removes unnecessary bandit skips, updates tests, updates logic in onb…

…oard.py
networktocode · Jul 9, 2020 · b956726 · b956726
1 parent 95b0ebf
commit b956726
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/.bandit.yml b/.bandit.yml
@@ -1,4 +1,2 @@
 ---
-skips: 
-  - "B101"
-  - "B601"
+skips: []
diff --git a/netbox_onboarding/onboard.py b/netbox_onboarding/onboard.py
@@ -175,11 +175,8 @@ def guess_netmiko_device_type(self, **kwargs):
 
         logging.info("INFO device type is %s", guessed_device_type)
 
-        # Get the platform map from the PLUGIN SETTINGS
-        platform_map = PLUGIN_SETTINGS.get("platform_map", {})
-
-        # Return the result of doing a check_netmiko_conversion
-        return self.check_netmiko_conversion(guessed_device_type, platform_map)
+        # Get the platform map from the PLUGIN SETTINGS, Return the result of doing a check_netmiko_conversion
+        return self.check_netmiko_conversion(guessed_device_type, platform_map=PLUGIN_SETTINGS.get("platform_map", {}))
 
     def get_platform_slug(self):
         """Get platform slug in netmiko format (ie cisco_ios, cisco_xr etc)."""

diff --git a/netbox_onboarding/tests/test_onboard.py b/netbox_onboarding/tests/test_onboard.py
@@ -242,18 +242,18 @@ def test_platform_map(self):
         #
 
         # Test Cisco_ios
-        self.assertEqual(self.ndk1.check_netmiko_conversion("cisco-ios", test_platform_map=platform_map), "ios")
+        self.assertEqual(self.ndk1.check_netmiko_conversion("cisco-ios", platform_map=platform_map), "ios")
         # Test Arista EOS
-        self.assertEqual(self.ndk1.check_netmiko_conversion("arista_eos", test_platform_map=platform_map), "eos")
+        self.assertEqual(self.ndk1.check_netmiko_conversion("arista_eos", platform_map=platform_map), "eos")
         # Test cisco_nxos
-        self.assertEqual(self.ndk1.check_netmiko_conversion("cisco_nxos", test_platform_map=platform_map), "cisco-nxos")
+        self.assertEqual(self.ndk1.check_netmiko_conversion("cisco_nxos", platform_map=platform_map), "cisco-nxos")
 
         #
         # Test Negative assertion
         #
 
         # Test a non-converting item
         self.assertEqual(
-            self.ndk1.check_netmiko_conversion("cisco-device-platform", test_platform_map=platform_map),
+            self.ndk1.check_netmiko_conversion("cisco-device-platform", platform_map=platform_map),
             "cisco-device-platform",
         )