Updating dependencies and allowing for Napalm 3.x.

networktocode · Nov 18, 2020 · 31bbdd4 · 31bbdd4
1 parent 1d26790
commit 31bbdd4
Show file tree

Hide file tree

Showing 7 changed files with 623 additions and 466 deletions.
diff --git a/.pylintrc b/.pylintrc
diff --git a/development/base_configuration.py b/development/base_configuration.py
@@ -43,19 +43,19 @@
         "PORT": int(os.environ.get("REDIS_PORT", 6379)),
         "PASSWORD": os.environ.get("REDIS_PASSWORD", ""),
         "DATABASE": 1,
-        "DEFAULT_TIMEOUT": 300,
         "SSL": bool(os.environ.get("REDIS_SSL", False)),
     },
     "tasks": {
         "HOST": os.environ.get("REDIS_HOST", "redis"),
         "PORT": int(os.environ.get("REDIS_PORT", 6379)),
         "PASSWORD": os.environ.get("REDIS_PASSWORD", ""),
         "DATABASE": 0,
-        "DEFAULT_TIMEOUT": 300,
         "SSL": bool(os.environ.get("REDIS_SSL", False)),
     },
 }
 
+RQ_DEFAULT_TIMEOUT = 300
+
 
 #########################
 #                       #
@@ -179,11 +179,11 @@
 
 # Remote authentication support
 REMOTE_AUTH_ENABLED = False
-REMOTE_AUTH_BACKEND = "utilities.auth_backends.RemoteUserBackend"
+REMOTE_AUTH_BACKEND = "netbox.authentication.RemoteUserBackend"
 REMOTE_AUTH_HEADER = "HTTP_REMOTE_USER"
 REMOTE_AUTH_AUTO_CREATE_USER = True
 REMOTE_AUTH_DEFAULT_GROUPS = []
-REMOTE_AUTH_DEFAULT_PERMISSIONS = []
+REMOTE_AUTH_DEFAULT_PERMISSIONS = {}
 
 # 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

diff --git a/development/netbox_v2.8.3/configuration.py b/development/netbox_v2.8.3/configuration.py
@@ -2,3 +2,7 @@
 from .base_configuration import *  # pylint: disable=relative-beyond-top-level, wildcard-import
 
 # Overrides specific to this version go here
+REMOTE_AUTH_BACKEND = "utilities.auth_backends.RemoteUserBackend"
+REMOTE_AUTH_DEFAULT_PERMISSIONS = []
+REDIS["caching"]["DEFAULT_TIMEOUT"] = 300  # pylint: disable=undefined-variable
+REDIS["tasks"]["DEFAULT_TIMEOUT"] = 300  # pylint: disable=undefined-variable
diff --git a/netbox_onboarding/tests/test_api.py b/netbox_onboarding/tests/test_api.py
@@ -11,7 +11,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User  # pylint: disable=imported-auth-user
 from django.test import TestCase
 from django.urls import reverse
 from rest_framework import status