Merge pull request #5379 from vespa-engine/smorgrav/more_ip_version

Rename exec to iptablesCmd and add ipCmd

1 files changed, 13 insertions, 8 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPVersion.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPVersion.java
index aac55de6b86..35262739f45 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPVersion.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPVersion.java
@@ -1,22 +1,27 @@
 package com.yahoo.vespa.hosted.node.admin.task.util.network;
 
 /**
- * Strong type IPv4 and IPv6 with the respective iptables executable.
+ * Strong type IPv4 and IPv6 with common executables for ip related commands.
  *
  * @author smorgrav
  */
 public enum IPVersion {
 
-    IPv6("ip6tables"),
-    IPv4("iptables");
+    IPv6("ip6tables", "ip -6"),
+    IPv4("iptables", "ip");
 
-    IPVersion(String exec) {
-        this.exec = exec;
+    IPVersion(String iptablesCmd, String ipCmd) {
+        this.ipCmd = ipCmd;
+        this.iptablesCmd = iptablesCmd;
     }
 
-    private String exec;
+    private String iptablesCmd;
+    private String ipCmd;
 
-    String exec() {
-        return exec;
+    public String iptablesCmd() {
+        return iptablesCmd;
+    }
+    public String ipCmd() {
+        return ipCmd;
     }
 }