Skip to content

Commit f34817d

Browse files
author
nniehoff
authored
Merge pull request #114 from networktocode/nn-napalm3
Update to Napalm version 3.2.0
2 parents 1d26790 + 31bbdd4 commit f34817d

File tree

7 files changed

+623
-466
lines changed

7 files changed

+623
-466
lines changed

.pylintrc

-26
This file was deleted.

development/base_configuration.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@
4343
"PORT": int(os.environ.get("REDIS_PORT", 6379)),
4444
"PASSWORD": os.environ.get("REDIS_PASSWORD", ""),
4545
"DATABASE": 1,
46-
"DEFAULT_TIMEOUT": 300,
4746
"SSL": bool(os.environ.get("REDIS_SSL", False)),
4847
},
4948
"tasks": {
5049
"HOST": os.environ.get("REDIS_HOST", "redis"),
5150
"PORT": int(os.environ.get("REDIS_PORT", 6379)),
5251
"PASSWORD": os.environ.get("REDIS_PASSWORD", ""),
5352
"DATABASE": 0,
54-
"DEFAULT_TIMEOUT": 300,
5553
"SSL": bool(os.environ.get("REDIS_SSL", False)),
5654
},
5755
}
5856

57+
RQ_DEFAULT_TIMEOUT = 300
58+
5959

6060
#########################
6161
# #
@@ -179,11 +179,11 @@
179179

180180
# Remote authentication support
181181
REMOTE_AUTH_ENABLED = False
182-
REMOTE_AUTH_BACKEND = "utilities.auth_backends.RemoteUserBackend"
182+
REMOTE_AUTH_BACKEND = "netbox.authentication.RemoteUserBackend"
183183
REMOTE_AUTH_HEADER = "HTTP_REMOTE_USER"
184184
REMOTE_AUTH_AUTO_CREATE_USER = True
185185
REMOTE_AUTH_DEFAULT_GROUPS = []
186-
REMOTE_AUTH_DEFAULT_PERMISSIONS = []
186+
REMOTE_AUTH_DEFAULT_PERMISSIONS = {}
187187

188188
# This determines how often the GitHub API is called to check the latest release of NetBox. Must be at least 1 hour.
189189
RELEASE_CHECK_TIMEOUT = 24 * 3600

development/netbox_v2.8.3/configuration.py

+4
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
from .base_configuration import * # pylint: disable=relative-beyond-top-level, wildcard-import
33

44
# Overrides specific to this version go here
5+
REMOTE_AUTH_BACKEND = "utilities.auth_backends.RemoteUserBackend"
6+
REMOTE_AUTH_DEFAULT_PERMISSIONS = []
7+
REDIS["caching"]["DEFAULT_TIMEOUT"] = 300 # pylint: disable=undefined-variable
8+
REDIS["tasks"]["DEFAULT_TIMEOUT"] = 300 # pylint: disable=undefined-variable

netbox_onboarding/tests/test_api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
See the License for the specific language governing permissions and
1212
limitations under the License.
1313
"""
14-
from django.contrib.auth.models import User
14+
from django.contrib.auth.models import User # pylint: disable=imported-auth-user
1515
from django.test import TestCase
1616
from django.urls import reverse
1717
from rest_framework import status

0 commit comments

Comments
 (0)