summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-09-15 13:35:57 +0200
committerChristian Poessinger <christian@poessinger.com>2019-09-20 21:28:53 +0200
commitfcc97a25da94f02e4be1c9b077020490334516c2 (patch)
treed419db55aa9068a5173519461af5a6a90070517f
parentfc7685dcbb47a4f80a3e554efa8f60799009151b (diff)
downloadvyos-1x-fcc97a25da94f02e4be1c9b077020490334516c2.tar.gz
vyos-1x-fcc97a25da94f02e4be1c9b077020490334516c2.zip
Revert "ethernet: T1637: only list supported link speeds for completion helper"
This reverts commit d6a6daaf1d7ed0f1ff2e53490972e0cf11fff000.
-rw-r--r--interface-definitions/interfaces-ethernet.xml29
1 files changed, 26 insertions, 3 deletions
diff --git a/interface-definitions/interfaces-ethernet.xml b/interface-definitions/interfaces-ethernet.xml
index 14a6ff095..a2de4aeb3 100644
--- a/interface-definitions/interfaces-ethernet.xml
+++ b/interface-definitions/interfaces-ethernet.xml
@@ -337,15 +337,38 @@
</leafNode>
<leafNode name="speed">
<properties>
- <help>Link speed in MBit/s</help>
+ <help>Link speed</help>
<completionHelp>
- <list>auto</list>
- <script>/sbin/ethtool $VAR(../@) | sed -n '/Supported ports/{:a;n;/Supported pause frame use/b;p;ba}' | sed -s 's/Supported link modes://' | sed -e 's/[[:space:]]*//' | sed 's/[^0-9]*//g'</script>
+ <list>auto 10 100 1000 2500 5000 10000</list>
</completionHelp>
<valueHelp>
<format>auto</format>
<description>Auto negotiation (default)</description>
</valueHelp>
+ <valueHelp>
+ <format>10</format>
+ <description>10 Mbit/sec</description>
+ </valueHelp>
+ <valueHelp>
+ <format>100</format>
+ <description>100 Mbit/sec</description>
+ </valueHelp>
+ <valueHelp>
+ <format>1000</format>
+ <description>1 Gbit/sec</description>
+ </valueHelp>
+ <valueHelp>
+ <format>2500</format>
+ <description>2.5 Gbit/sec</description>
+ </valueHelp>
+ <valueHelp>
+ <format>5000</format>
+ <description>5 Gbit/sec</description>
+ </valueHelp>
+ <valueHelp>
+ <format>10000</format>
+ <description>10 Gbit/sec</description>
+ </valueHelp>
<constraint>
<regex>(auto|10|100|1000|2500|5000|10000)</regex>
</constraint>