Rename NATted to NATed

5 files changed, 9 insertions, 9 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java
index 6fc9472a30e..9b9a5bf35d4 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java
@@ -46,7 +46,7 @@ public interface Docker {
         Map<String, Object> getBlkioStats();
     }
 
-    default boolean networkNATted() {
+    default boolean networkNATed() {
         return false;
     }
 
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
index e180dcffe47..c4413de24f9 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
@@ -139,7 +139,7 @@ public class DockerImpl implements Docker {
     }
 
     @Override
-    public boolean networkNATted() {
+    public boolean networkNATed() {
         return config.networkNATted();
     }
 
diff --git a/docker-api/src/main/resources/configdefinitions/docker.def b/docker-api/src/main/resources/configdefinitions/docker.def
index 20b156a9a6d..b4585318cd8 100644
--- a/docker-api/src/main/resources/configdefinitions/docker.def
+++ b/docker-api/src/main/resources/configdefinitions/docker.def
@@ -15,4 +15,4 @@ readTimeoutMillis int default = 1800000 # 30 min
 isRunningLocally bool default = false
 imageGCMinTimeToLiveMinutes int default = 45
 
-networkNATted bool default = false
+networkNATed bool default = false
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
index f27f3badd24..4c23c0d9493 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
@@ -119,7 +119,7 @@ public class DockerOperationsImpl implements DockerOperations {
                     .withAddCapability("SYS_PTRACE") // Needed for gcore, pstack etc.
                     .withAddCapability("SYS_ADMIN"); // Needed for perf
 
-            if (!docker.networkNATted()) {
+            if (!docker.networkNATed()) {
                 logger.info("Network not nated - setting up with specific ip address on a macvlan");
                 command.withIpAddress(nodeInetAddress);
                 command.withNetworkMode(DockerImpl.DOCKER_CUSTOM_MACVLAN_NETWORK_NAME);
@@ -146,7 +146,7 @@ public class DockerOperationsImpl implements DockerOperations {
             command.create();
 
             if (isIPv6) {
-                if (!docker.networkNATted()) {
+                if (!docker.networkNATed()) {
                     docker.connectContainerToNetwork(containerName, "bridge");
                 }
 
@@ -154,7 +154,7 @@ public class DockerOperationsImpl implements DockerOperations {
                 setupContainerNetworkConnectivity(containerName, nodeInetAddress);
             } else {
                 docker.startContainer(containerName);
-                if (docker.networkNATted()) {
+                if (docker.networkNATed()) {
                     setupContainerNetworkConnectivity(containerName, nodeInetAddress);
                 }
             }
@@ -178,7 +178,7 @@ public class DockerOperationsImpl implements DockerOperations {
         logger.info("Deleting container " + containerName.asString());
         docker.deleteContainer(containerName);
 
-        if (docker.networkNATted()) {
+        if (docker.networkNATed()) {
             logger.info("Delete iptables NAT rules for " + containerName.asString());
             try {
                 InetAddress nodeInetAddress = environment.getInetAddressForHost(nodeSpec.hostname);
@@ -231,7 +231,7 @@ public class DockerOperationsImpl implements DockerOperations {
      * Setup iptables NAT rules and add entry in /etc/hosts for node-admin (resolve container hostnames to private ip)
      */
     private void setupContainerNetworkConnectivity(ContainerName containerName, InetAddress externalAddress) throws IOException {
-        if (docker.networkNATted()) {
+        if (docker.networkNATed()) {
             insertNAT(containerName, externalAddress);
         } else {
             InetAddress hostDefaultGateway = DockerNetworkCreator.getDefaultGatewayLinux(true);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
index 12d84a05750..d0149be2747 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
@@ -177,7 +177,7 @@ public class NodePrioritizer {
             if (node.type() == NodeType.host && node.state() == Node.State.active) {
                 boolean conflictingCluster = false;
                 NodeList list = new NodeList(allNodes);
-                 NodeList childrenWithSameApp = list.childNodes(node).owner(appId);
+                NodeList childrenWithSameApp = list.childNodes(node).owner(appId);
                 for (Node child : childrenWithSameApp.asList()) {
                     // Look for nodes from the same cluster
                     if (child.allocation().get().membership().cluster().id().equals(clusterSpec.id())) {