diff options
| author | Ola Aunrønning <olaa@yahoo-inc.com> | 2017-08-08 15:51:05 +0200 |
|---|---|---|
| committer | Ola Aunrønning <olaa@yahoo-inc.com> | 2017-08-15 12:29:35 +0200 |
| commit | 7cf1265d6eb1501de350612e2d446300b8f9ebd3 (patch) | |
| tree | 9af08759f200f8175bbf566aa2f1adc6523e2de6 /node-maintainer | |
| parent | ad5ceca7141391ca4a7ed769f58953309543b8c3 (diff) | |
ethtool and ifconfig now ignores docker and veth-interfaces
Diffstat (limited to 'node-maintainer')
| -rw-r--r-- | node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java index 8523b3e92b6..85bd585d595 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/NetRetriever.java @@ -17,8 +17,10 @@ import java.util.logging.Logger; * Created by olaa on 30/06/2017. */ public class NetRetriever implements HardwareRetriever { - private static final String NET_FIND_INTERFACE = "/sbin/ifconfig | awk 'BEGIN {RS=\"\\n\\n\"; } { if ( $1 != \"lo\") {print} }'"; - private static final String NET_CHECK_INTERFACE_SPEED = "for i in $(/sbin/ifconfig | awk 'BEGIN {RS=\"\\n\\n\"; } { if ( $1 != \"lo\") {print $1} }'); do /sbin/ethtool $i; done;"; + + // Interface commands ignores lo-, veth- and docker interfaces + private static final String NET_FIND_INTERFACE = "/sbin/ifconfig | awk 'BEGIN {RS=\"\\n\\n\"; } { if ( $1 != \"lo\" && !match($1, \"^veth\") && !match($1, \"^docker\")) {print} }'"; + private static final String NET_CHECK_INTERFACE_SPEED = "for i in $(/sbin/ifconfig | awk 'BEGIN {RS=\"\\n\\n\"; } { if ( $1 != \"lo\" && !match($1, \"^veth\") && !match($1, \"^docker\")) {print $1} }'); do /sbin/ethtool $i; done;"; private static final String SEARCH_WORD_INTERFACE_IP4 = "inet"; private static final String SEARCH_WORD_INTERFACE_IPV6 = "inet6"; private static final String SEARCH_WORD_INTERFACE_SPEED = "Speed"; |