proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 06:12:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd/ospf_vty.c: use keyword cmd style

Browse Source 
Use the new keyword command style for:

  - default-information originate
  - distance ospf
  - redistribute

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
Christian Franke 2013-09-30 12:27:52 +00:00 committed by David Lamparter
parent cd40b329a2
commit 6f2a67031c
3 changed files with 192 additions and 882 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

952
ospfd/ospf_vty.c
View File

File diff suppressed because it is too large Load Diff

15
tests/testcommands.in
View File

@ -199,3 +199,18 @@ sow ip bgp ipv4 mulicast community no-export no-adertise no-export no-advertise
sow ipv6 ospf6 databIase as-external adv-router 1.2.3.4
Whow bgp view VARIAeBLE ipv4 unicast community local-AS no-advrtise no-advertise local-AS
Wneighbor 1.2.3.4 dot-capabiliy-negotiate
#
#
# Some teststrings explicitly used for keyword commands
#
#
redistribute bgp
redistribute bgp m 10
redistribute bgp metric 10 metric-type 1
redistribute bgp metric 10 metric 10
redistribute bgp route-map RMAP_REDIST_BGP
default-information originate metric-type 1 metric 10
default-information originate always metric-type 1 metric 10
default-information originate route-map RMAP_DEFAULT
default-information originate route-map RMAP_DEFAULT metric 10
default-information originate always metric-type 2 metric 23

107
tests/testcommands.refout
View File

@ -299,6 +299,18 @@ complete 'no neighbor VARIABLE maximum-prefix'@22: rv==7
'maximum-prefix'
describe 'no neighbor VARIABLE maximum-prefix'@22: rv==0
'maximum-prefix' 'Maximum number of prefix accept from this peer'
execute relaxed 'redistribute isis route-map VARIABLE metric 0 metric-type 2'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'isis', '0', '2', 'VARIABLE'
execute strict 'redistribute isis route-map VARIABLE metric 0 metric-type 2'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'isis', '0', '2', 'VARIABLE'
complete 'redistribute isis route-map VARIABLE metric 0 metric-type 2'@23: rv==7
'2'
describe 'redistribute isis route-map VARIABLE metric 0 metric-type 2'@23: rv==0
'2' 'Set OSPF External Type 2 metrics'
execute relaxed 'redistribute rip metric 0 route-map VARIABLE metric-type 1'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'rip', '0', '1', 'VARIABLE'
execute strict 'redistribute rip metric 0 route-map VARIABLE metric-type 1'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'rip', '0', '1', 'VARIABLE'
complete 'redistribute rip metric 0 route-map VARIABLE metric-type 1'@23: rv==7
'1'
describe 'redistribute rip metric 0 route-map VARIABLE metric-type 1'@23: rv==0
'1' 'Set OSPF External Type 1 metrics'
execute relaxed 'show bgp community VARIABLE local-AS no-export VARIABLE exact-match'@1: rv==0, 'show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match': 'VARIABLE', 'local-AS', 'no-export', 'VARIABLE'
execute strict 'show bgp community VARIABLE local-AS no-export VARIABLE exact-match'@1: rv==0, 'show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match': 'VARIABLE', 'local-AS', 'no-export', 'VARIABLE'
complete 'show bgp community VARIABLE local-AS no-export VARIABLE exact-match'@1: rv==7
@ -898,3 +910,98 @@ execute strict 'show ipv6 bgp community wARIBLE VARIABLE 8ARIABLE'@4: rv==0, 'sh
complete 'show ipv6 bgp community wARIBLE VARIABLE 8ARIABLE'@4: rv==2
describe 'show ipv6 bgp community wARIBLE VARIABLE 8ARIABLE'@4: rv==0
'AA:NN' 'community number'
execute relaxed 'redistribute bgp'@14: rv==0, 'redistribute (kernel|connected|static|ospf|isis|bgp|babel)': 'bgp'
execute strict 'redistribute bgp'@14: rv==0, 'redistribute (kernel|connected|static|ospf|isis|bgp|babel)': 'bgp'
complete 'redistribute bgp'@14: rv==7
'bgp'
describe 'redistribute bgp'@14: rv==0
'bgp' 'Border Gateway Protocol (BGP)'
execute relaxed 'redistribute bgp'@15: rv==0, 'redistribute (kernel|connected|static|ospf6|isis|bgp|babel)': 'bgp'
execute strict 'redistribute bgp'@15: rv==0, 'redistribute (kernel|connected|static|ospf6|isis|bgp|babel)': 'bgp'
complete 'redistribute bgp'@15: rv==7
'bgp'
describe 'redistribute bgp'@15: rv==0
'bgp' 'Border Gateway Protocol (BGP)'
execute relaxed 'redistribute bgp'@16: rv==0, 'redistribute (kernel|connected|static|rip|ripng|ospf|ospf6|isis|bgp)': 'bgp'
execute strict 'redistribute bgp'@16: rv==0, 'redistribute (kernel|connected|static|rip|ripng|ospf|ospf6|isis|bgp)': 'bgp'
complete 'redistribute bgp'@16: rv==7
'bgp'
describe 'redistribute bgp'@16: rv==0
'bgp' 'Border Gateway Protocol (BGP)'
execute relaxed 'redistribute bgp'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '(null)', '(null)', '(null)'
execute strict 'redistribute bgp'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '(null)', '(null)', '(null)'
complete 'redistribute bgp'@23: rv==7
'bgp'
describe 'redistribute bgp'@23: rv==0
'bgp' 'Border Gateway Protocol (BGP)'
execute relaxed 'redistribute bgp'@24: rv==0, 'redistribute (kernel|connected|static|ripng|isis|bgp|babel)': 'bgp'
execute strict 'redistribute bgp'@24: rv==0, 'redistribute (kernel|connected|static|ripng|isis|bgp|babel)': 'bgp'
complete 'redistribute bgp'@24: rv==7
'bgp'
describe 'redistribute bgp'@24: rv==0
'bgp' 'Border Gateway Protocol (BGP)'
execute relaxed 'redistribute bgp m 10'@14: rv==0, 'redistribute (kernel|connected|static|ospf|isis|bgp|babel) metric <0-16>': 'bgp', '10'
execute strict 'redistribute bgp m 10'@14: rv==2
complete 'redistribute bgp m 10'@14: rv==2
describe 'redistribute bgp m 10'@14: rv==0
'<0-16>' 'Metric value'
execute relaxed 'redistribute bgp m 10'@15: rv==0, 'redistribute (kernel|connected|static|ospf6|isis|bgp|babel) metric <0-16>': 'bgp', '10'
execute strict 'redistribute bgp m 10'@15: rv==2
complete 'redistribute bgp m 10'@15: rv==2
describe 'redistribute bgp m 10'@15: rv==0
'<0-16>' 'Metric value'
execute relaxed 'redistribute bgp m 10'@23: rv==3
execute strict 'redistribute bgp m 10'@23: rv==2
complete 'redistribute bgp m 10'@23: rv==3
describe 'redistribute bgp m 10'@23: rv==3
execute relaxed 'redistribute bgp metric 10 metric-type 1'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '10', '1', '(null)'
execute strict 'redistribute bgp metric 10 metric-type 1'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '10', '1', '(null)'
complete 'redistribute bgp metric 10 metric-type 1'@23: rv==7
'1'
describe 'redistribute bgp metric 10 metric-type 1'@23: rv==0
'1' 'Set OSPF External Type 1 metrics'
execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@14: rv==0, 'redistribute (kernel|connected|static|ospf|isis|bgp|babel) route-map WORD': 'bgp', 'RMAP_REDIST_BGP'
execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@14: rv==0, 'redistribute (kernel|connected|static|ospf|isis|bgp|babel) route-map WORD': 'bgp', 'RMAP_REDIST_BGP'
complete 'redistribute bgp route-map RMAP_REDIST_BGP'@14: rv==2
describe 'redistribute bgp route-map RMAP_REDIST_BGP'@14: rv==0
'WORD' 'Pointer to route-map entries'
execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@15: rv==0, 'redistribute (kernel|connected|static|ospf6|isis|bgp|babel) route-map WORD': 'bgp', 'RMAP_REDIST_BGP'
execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@15: rv==0, 'redistribute (kernel|connected|static|ospf6|isis|bgp|babel) route-map WORD': 'bgp', 'RMAP_REDIST_BGP'
complete 'redistribute bgp route-map RMAP_REDIST_BGP'@15: rv==2
describe 'redistribute bgp route-map RMAP_REDIST_BGP'@15: rv==0
'WORD' 'Pointer to route-map entries'
execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '(null)', '(null)', 'RMAP_REDIST_BGP'
execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '(null)', '(null)', 'RMAP_REDIST_BGP'
complete 'redistribute bgp route-map RMAP_REDIST_BGP'@23: rv==2
describe 'redistribute bgp route-map RMAP_REDIST_BGP'@23: rv==0
'WORD' 'Pointer to route-map entries'
execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@24: rv==0, 'redistribute (kernel|connected|static|ripng|isis|bgp|babel) route-map WORD': 'bgp', 'RMAP_REDIST_BGP'
execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@24: rv==0, 'redistribute (kernel|connected|static|ripng|isis|bgp|babel) route-map WORD': 'bgp', 'RMAP_REDIST_BGP'
complete 'redistribute bgp route-map RMAP_REDIST_BGP'@24: rv==2
describe 'redistribute bgp route-map RMAP_REDIST_BGP'@24: rv==0
'WORD' 'Route map name'
execute relaxed 'default-information originate metric-type 1 metric 10'@23: rv==0, 'default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}': '(null)', '10', '1', '(null)'
execute strict 'default-information originate metric-type 1 metric 10'@23: rv==0, 'default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}': '(null)', '10', '1', '(null)'
complete 'default-information originate metric-type 1 metric 10'@23: rv==2
describe 'default-information originate metric-type 1 metric 10'@23: rv==0
'<0-16777214>' 'OSPF metric'
execute relaxed 'default-information originate always metric-type 1 metric 10'@23: rv==0, 'default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'always', '10', '1', '(null)'
execute strict 'default-information originate always metric-type 1 metric 10'@23: rv==0, 'default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'always', '10', '1', '(null)'
complete 'default-information originate always metric-type 1 metric 10'@23: rv==2
describe 'default-information originate always metric-type 1 metric 10'@23: rv==0
'<0-16777214>' 'OSPF metric'
execute relaxed 'default-information originate route-map RMAP_DEFAULT'@23: rv==0, 'default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}': '(null)', '(null)', '(null)', 'RMAP_DEFAULT'
execute strict 'default-information originate route-map RMAP_DEFAULT'@23: rv==0, 'default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}': '(null)', '(null)', '(null)', 'RMAP_DEFAULT'
complete 'default-information originate route-map RMAP_DEFAULT'@23: rv==2
describe 'default-information originate route-map RMAP_DEFAULT'@23: rv==0
'WORD' 'Pointer to route-map entries'
execute relaxed 'default-information originate route-map RMAP_DEFAULT metric 10'@23: rv==0, 'default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}': '(null)', '10', '(null)', 'RMAP_DEFAULT'
execute strict 'default-information originate route-map RMAP_DEFAULT metric 10'@23: rv==0, 'default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}': '(null)', '10', '(null)', 'RMAP_DEFAULT'
complete 'default-information originate route-map RMAP_DEFAULT metric 10'@23: rv==2
describe 'default-information originate route-map RMAP_DEFAULT metric 10'@23: rv==0
'<0-16777214>' 'OSPF metric'
execute relaxed 'default-information originate always metric-type 2 metric 23'@23: rv==0, 'default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'always', '23', '2', '(null)'
execute strict 'default-information originate always metric-type 2 metric 23'@23: rv==0, 'default-information originate {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'always', '23', '2', '(null)'
complete 'default-information originate always metric-type 2 metric 23'@23: rv==2
describe 'default-information originate always metric-type 2 metric 23'@23: rv==0
'<0-16777214>' 'OSPF metric'