From: Matej Sramcik Date: Thu, 19 Oct 2023 08:08:12 +0000 (+0200) Subject: Replace whitelist with allowlist X-Git-Tag: v4.0.9~19 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=commitdiff_plain;h=cd4596a8b653a5ee080081da53c52988102f74ff Replace whitelist with allowlist Replaced all usages of whitelist as its considered non-technical term with allowlist. JIRA: NETCONF-1185 Change-Id: Id6f827ae1b1fb4c2c3e52e69ec2c60ab3c19b25d Signed-off-by: Matej Sramcik (cherry picked from commit 169d7d71cb8c5f90bb7a10ebd68cc51569ce504d) --- diff --git a/docs/user-guide.rst b/docs/user-guide.rst index e0789997b4..360db69181 100644 --- a/docs/user-guide.rst +++ b/docs/user-guide.rst @@ -883,9 +883,9 @@ Configure device to connect over SSH protocol Netconf Call Home Server uses device provided SSH server key (host key) to identify device. The pairing of name and server key is configured in ``/odl-netconf-callhome-server:netconf-callhome-server/allowed-devices``. -This list is colloquially called a whitelist. +This list is colloquially called a allowlist. -If the Call-Home Server finds the SSH host key in the whitelist, it continues +If the Call-Home Server finds the SSH host key in the allowlist, it continues to negotiate a NETCONF connection over an SSH session. If the SSH host key is not found, the connection between the Call Home server and the device is dropped immediately. In either case, the device that connects to the Call home server @@ -1144,7 +1144,7 @@ available for network management. Rogue Devices ''''''''''''' -Devices which are not on the whitelist might try to connect to the Call-Home Server. In +Devices which are not on the allowlist might try to connect to the Call-Home Server. In these cases, the server will keep a record by instantiating an operational device. There will be no corresponding config device for these rogues. They can be identified readily because their device id, rather than being user-supplied, will be of the form diff --git a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallhomeStatusReporter.java b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallhomeStatusReporter.java index b3ca407ef2..fb09da6015 100644 --- a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallhomeStatusReporter.java +++ b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallhomeStatusReporter.java @@ -291,7 +291,7 @@ final class CallhomeStatusReporter implements DataTreeChangeListener, Stat return rxTransaction.read(LogicalDatastoreType.OPERATIONAL, IetfZeroTouchCallHomeServerProvider.ALL_DEVICES) .get().orElse(null); } catch (ExecutionException | InterruptedException e) { - LOG.error("Error trying to read the whitelist devices", e); + LOG.error("Error trying to read the allowlist devices", e); return null; } } @@ -313,7 +313,7 @@ final class CallhomeStatusReporter implements DataTreeChangeListener, Stat keyString = device.getSshHostKey(); } if (keyString == null) { - LOG.info("Whitelist device {} does not have a host key, skipping it", device.getUniqueId()); + LOG.info("Allowlist device {} does not have a host key, skipping it", device.getUniqueId()); continue; } @@ -334,7 +334,7 @@ final class CallhomeStatusReporter implements DataTreeChangeListener, Stat } } - LOG.error("No match found for the failed auth device (should have been filtered by whitelist). Key: {}", + LOG.error("No match found for the failed auth device (should have been filtered by allowlist). Key: {}", sshKey); } diff --git a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/IetfZeroTouchCallHomeServerProvider.java b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/IetfZeroTouchCallHomeServerProvider.java index 1bf3100a60..48faf7b740 100644 --- a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/IetfZeroTouchCallHomeServerProvider.java +++ b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/IetfZeroTouchCallHomeServerProvider.java @@ -177,7 +177,7 @@ public class IetfZeroTouchCallHomeServerProvider implements AutoCloseable, DataT readAndUpdateStatus(confDevice); } } catch (ExecutionException | InterruptedException e) { - LOG.error("Error trying to read the whitelist devices", e); + LOG.error("Error trying to read the allowlist devices", e); } }