Removed deprecated NETBOX_USERNAME and NETBOX_PASSWORD configuration parameters

docs/configuration/optional-settings.md

@@ -191,14 +191,6 @@ The amount of time (in seconds) to wait for NAPALM to connect to a device.
 
 ---
 
-## NETBOX_USERNAME (Deprecated)
-
-## NETBOX_PASSWORD (Deprecated)
-
-These settings have been deprecated and will be removed in NetBox v2.2. Please use `NAPALM_USERNAME` and `NAPALM_PASSWORD` instead.
-
----
-
 ## PAGINATE_COUNT
 
 Default: 50

netbox/netbox/settings.py

@@ -52,8 +52,6 @@ NAPALM_USERNAME = getattr(configuration, 'NAPALM_USERNAME', '')
 NAPALM_PASSWORD = getattr(configuration, 'NAPALM_PASSWORD', '')
 NAPALM_TIMEOUT = getattr(configuration, 'NAPALM_TIMEOUT', 30)
 NAPALM_ARGS = getattr(configuration, 'NAPALM_ARGS', {})
-NETBOX_USERNAME = getattr(configuration, 'NETBOX_USERNAME', '')  # Deprecated
-NETBOX_PASSWORD = getattr(configuration, 'NETBOX_PASSWORD', '')  # Deprecated
 PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50)
 PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False)
 SHORT_DATE_FORMAT = getattr(configuration, 'SHORT_DATE_FORMAT', 'Y-m-d')
@@ -64,19 +62,6 @@ TIME_ZONE = getattr(configuration, 'TIME_ZONE', 'UTC')
 
 CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
 
-# Check for deprecated configuration parameters
-config_logger = logging.getLogger('configuration')
-config_logger.addHandler(logging.StreamHandler())
-config_logger.setLevel(logging.WARNING)
-if NETBOX_USERNAME:
-    config_logger.warning('NETBOX_USERNAME is deprecated and will be removed in v2.2. Please use NAPALM_USERNAME instead.')
-    if not NAPALM_USERNAME:
-        NAPALM_USERNAME = NETBOX_USERNAME
-if NETBOX_PASSWORD:
-    config_logger.warning('NETBOX_PASSWORD is deprecated and will be removed in v2.2. Please use NAPALM_PASSWORD instead.')
-    if not NAPALM_PASSWORD:
-        NAPALM_PASSWORD = NETBOX_PASSWORD
-
 # Attempt to import LDAP configuration if it has been defined
 LDAP_IGNORE_CERT_ERRORS = False
 try:

netbox/templates/home.html

@@ -1,14 +1,6 @@
 {% extends '_base.html' %}
 
 {% block content %}
-{% if settings.NETBOX_USERNAME or settings.NETBOX_PASSWORD %}
-    <div class="alert alert-warning alert-dismissable" role="alert">
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-        </button>
-        <strong>Warning:</strong> The <code>NETBOX_USERNAME</code> and <code>NETBOX_PASSWORD</code> configuration parameters have been deprecated. Please replace them in configuration.py with <code>NAPALM_USERNAME</code> and <code>NAPALM_PASSWORD</code>.
-    </div>
-{% endif %}
 {% include 'search_form.html' %}
 <div class="row">
     <div class="col-sm-6 col-md-4">