Make VersionedIpAddress comparable, with IPv6 first.

1 files changed, 7 insertions, 1 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddress.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddress.java
index 987a8909142..4e11b050d38 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddress.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/VersionedIpAddress.java
@@ -9,7 +9,7 @@ import java.net.InetAddress;
 /**
  * @author gjoranv
  */
-public class VersionedIpAddress {
+public class VersionedIpAddress implements Comparable<VersionedIpAddress> {
 
     private final InetAddress address;
     private final IPVersion version;
@@ -46,4 +46,10 @@ public class VersionedIpAddress {
         }
     }
 
+    @Override
+    public int compareTo(VersionedIpAddress o) {
+        int version = version().compareTo(o.version());
+        return (version != 0) ? version : asString().compareTo(o.asString());
+    }
+
 }