From 05493e5cc92cafc633cd0a083b194af27f618f81 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 7 Jul 2009 11:00:56 -0700 Subject: Make bonding operational mode consistent with ethernet Clone existing ethernet operational mode commands into bonding. Move old 'show interfaces bonding' to 'show interfaces bonding slaves' etc. Bug 4640 and others --- templates/show/interfaces/bonding/detail/node.def | 2 ++ templates/show/interfaces/bonding/node.def | 2 +- templates/show/interfaces/bonding/node.tag/brief/node.def | 2 ++ templates/show/interfaces/bonding/node.tag/capture/not/node.def | 2 +- templates/show/interfaces/bonding/node.tag/capture/not/port/node.def | 2 +- .../interfaces/bonding/node.tag/capture/not/port/node.tag/node.def | 2 +- templates/show/interfaces/bonding/node.tag/capture/port/node.def | 2 +- .../show/interfaces/bonding/node.tag/capture/port/node.tag/node.def | 2 +- templates/show/interfaces/bonding/node.tag/node.def | 3 --- templates/show/interfaces/bonding/node.tag/slaves/node.def | 3 +++ .../show/interfaces/bonding/node.tag/vif/node.tag/capture/node.def | 2 +- .../interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.def | 2 +- .../bonding/node.tag/vif/node.tag/capture/not/port/node.tag/node.def | 2 +- .../interfaces/bonding/node.tag/vif/node.tag/capture/port/node.def | 2 +- .../bonding/node.tag/vif/node.tag/capture/port/node.tag/node.def | 2 +- templates/show/interfaces/bonding/slaves/node.def | 2 ++ templates/show/interfaces/bonding/statistics/node.def | 2 ++ 17 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 templates/show/interfaces/bonding/detail/node.def create mode 100644 templates/show/interfaces/bonding/node.tag/brief/node.def delete mode 100644 templates/show/interfaces/bonding/node.tag/node.def create mode 100644 templates/show/interfaces/bonding/node.tag/slaves/node.def create mode 100644 templates/show/interfaces/bonding/slaves/node.def create mode 100644 templates/show/interfaces/bonding/statistics/node.def (limited to 'templates/show/interfaces') diff --git a/templates/show/interfaces/bonding/detail/node.def b/templates/show/interfaces/bonding/detail/node.def new file mode 100644 index 0000000..4de3dcf --- /dev/null +++ b/templates/show/interfaces/bonding/detail/node.def @@ -0,0 +1,2 @@ +help: Show detailed bonding interface information +run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=bonding --action=show diff --git a/templates/show/interfaces/bonding/node.def b/templates/show/interfaces/bonding/node.def index da85752..200971a 100644 --- a/templates/show/interfaces/bonding/node.def +++ b/templates/show/interfaces/bonding/node.def @@ -1,2 +1,2 @@ help: Show bonding interface information -run: ${vyatta_bindir}/vyatta-show-bonding.pl --brief +run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=bonding --action=show-brief diff --git a/templates/show/interfaces/bonding/node.tag/brief/node.def b/templates/show/interfaces/bonding/node.tag/brief/node.def new file mode 100644 index 0000000..d4ae884 --- /dev/null +++ b/templates/show/interfaces/bonding/node.tag/brief/node.def @@ -0,0 +1,2 @@ +help: Show summary of the specified bonding interface information +run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief diff --git a/templates/show/interfaces/bonding/node.tag/capture/not/node.def b/templates/show/interfaces/bonding/node.tag/capture/not/node.def index 5896bc8..3fbb818 100644 --- a/templates/show/interfaces/bonding/node.tag/capture/not/node.def +++ b/templates/show/interfaces/bonding/node.tag/capture/not/node.def @@ -1 +1 @@ -help: Show captured traffic excluding the specified bonding interface +help: Show captured traffic excluding the specified bonding interface port diff --git a/templates/show/interfaces/bonding/node.tag/capture/not/port/node.def b/templates/show/interfaces/bonding/node.tag/capture/not/port/node.def index 5896bc8..3fbb818 100644 --- a/templates/show/interfaces/bonding/node.tag/capture/not/port/node.def +++ b/templates/show/interfaces/bonding/node.tag/capture/not/port/node.def @@ -1 +1 @@ -help: Show captured traffic excluding the specified bonding interface +help: Show captured traffic excluding the specified bonding interface port diff --git a/templates/show/interfaces/bonding/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/bonding/node.tag/capture/not/port/node.tag/node.def index 61079d5..c8e76aa 100644 --- a/templates/show/interfaces/bonding/node.tag/capture/not/port/node.tag/node.def +++ b/templates/show/interfaces/bonding/node.tag/capture/not/port/node.tag/node.def @@ -1,3 +1,3 @@ -help: Show captured traffic excluding the specified bonding interface +help: Show captured traffic excluding the specified bonding interface port run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$8" 1 allowed: echo -n '<1-65535>' diff --git a/templates/show/interfaces/bonding/node.tag/capture/port/node.def b/templates/show/interfaces/bonding/node.tag/capture/port/node.def index 0870adc..e7c3b56 100644 --- a/templates/show/interfaces/bonding/node.tag/capture/port/node.def +++ b/templates/show/interfaces/bonding/node.tag/capture/port/node.def @@ -1 +1 @@ -help: Show captured traffic on specified bonding interface +help: Show captured traffic on specified bonding interface port diff --git a/templates/show/interfaces/bonding/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/bonding/node.tag/capture/port/node.tag/node.def index 8029ba2..296ba4c 100644 --- a/templates/show/interfaces/bonding/node.tag/capture/port/node.tag/node.def +++ b/templates/show/interfaces/bonding/node.tag/capture/port/node.tag/node.def @@ -1,3 +1,3 @@ -help: Show captured traffic on specified bonding interface +help: Show captured traffic on specified bonding interface port run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$7" 0 allowed: echo -n '<1-65535>' diff --git a/templates/show/interfaces/bonding/node.tag/node.def b/templates/show/interfaces/bonding/node.tag/node.def deleted file mode 100644 index c2f1349..0000000 --- a/templates/show/interfaces/bonding/node.tag/node.def +++ /dev/null @@ -1,3 +0,0 @@ -help: Show specified bonding interface information -allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show bonding -run: ${vyatta_bindir}/vyatta-show-bonding.pl "$4" diff --git a/templates/show/interfaces/bonding/node.tag/slaves/node.def b/templates/show/interfaces/bonding/node.tag/slaves/node.def new file mode 100644 index 0000000..c2f1349 --- /dev/null +++ b/templates/show/interfaces/bonding/node.tag/slaves/node.def @@ -0,0 +1,3 @@ +help: Show specified bonding interface information +allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show bonding +run: ${vyatta_bindir}/vyatta-show-bonding.pl "$4" diff --git a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/node.def index 4fb959c..4cb7173 100644 --- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/node.def +++ b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/node.def @@ -1,2 +1,2 @@ -help: Show captured traffic on specified bonding interface +help: Show captured traffic on specified bonding virtual interface run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6" diff --git a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.def index 5896bc8..aef8d8b 100644 --- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.def +++ b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.def @@ -1 +1 @@ -help: Show captured traffic excluding the specified bonding interface +help: Show captured traffic excluding the specified bonding virtual interface port diff --git a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.tag/node.def index 7e62321..496f21c 100644 --- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.tag/node.def +++ b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.tag/node.def @@ -1,3 +1,3 @@ -help: Show captured traffic excluding the specified bonding interface +help: Show captured traffic excluding the specified bonding interface port run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6" "${10}" 1 allowed: echo -n '<1-65535>' diff --git a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.def index 0870adc..5e07aa5 100644 --- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.def +++ b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.def @@ -1 +1 @@ -help: Show captured traffic on specified bonding interface +help: Show captured traffic on specified bonding virtual interface port diff --git a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.tag/node.def index a9a13cf..304b4e3 100644 --- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.tag/node.def +++ b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.tag/node.def @@ -1,3 +1,3 @@ -help: Show captured traffic on specified bonding interface +help: Show captured traffic on specified bonding virtual interface port run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6" "$9" 0 allowed: echo -n '<1-65535>' diff --git a/templates/show/interfaces/bonding/slaves/node.def b/templates/show/interfaces/bonding/slaves/node.def new file mode 100644 index 0000000..da85752 --- /dev/null +++ b/templates/show/interfaces/bonding/slaves/node.def @@ -0,0 +1,2 @@ +help: Show bonding interface information +run: ${vyatta_bindir}/vyatta-show-bonding.pl --brief diff --git a/templates/show/interfaces/bonding/statistics/node.def b/templates/show/interfaces/bonding/statistics/node.def new file mode 100644 index 0000000..5e94c8d --- /dev/null +++ b/templates/show/interfaces/bonding/statistics/node.def @@ -0,0 +1,2 @@ +help: Show detailed ethernet interface information +run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=bonding --action=statistics -- cgit v1.2.3