From 4abc5c37af2f6928ff3a899855134b26c97a50c2 Mon Sep 17 00:00:00 2001 From: Francois Clad Date: Thu, 1 Feb 2018 14:51:33 +0100 Subject: srv6: minor CLI modifications 'sr steer [...] via sr policy [...]' -> 'sr steer [...] via [...]' 'show sr steering policies' -> 'show sr steering-policies' 'clear sr localsid counters' -> 'clear sr localsid-counters' Change-Id: I0efbf38753a4bd0b7fba8cd08250e136e8e55199 Signed-off-by: Francois Clad --- src/vnet/srv6/sr_localsid.c | 4 ++-- src/vnet/srv6/sr_localsid.md | 2 +- src/vnet/srv6/sr_steering.c | 13 ++++++------- src/vnet/srv6/sr_steering.md | 10 +++++----- 4 files changed, 14 insertions(+), 15 deletions(-) (limited to 'src/vnet') diff --git a/src/vnet/srv6/sr_localsid.c b/src/vnet/srv6/sr_localsid.c index 09b242346af..c90a265ef0a 100755 --- a/src/vnet/srv6/sr_localsid.c +++ b/src/vnet/srv6/sr_localsid.c @@ -575,8 +575,8 @@ clear_sr_localsid_counters_command_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_CLI_COMMAND (clear_sr_localsid_counters_command, static) = { - .path = "clear sr localsid counters", - .short_help = "clear sr localsid counters", + .path = "clear sr localsid-counters", + .short_help = "clear sr localsid-counters", .function = clear_sr_localsid_counters_command_fn, }; /* *INDENT-ON* */ diff --git a/src/vnet/srv6/sr_localsid.md b/src/vnet/srv6/sr_localsid.md index 340af4a31b0..fbc7ef827e6 100644 --- a/src/vnet/srv6/sr_localsid.md +++ b/src/vnet/srv6/sr_localsid.md @@ -55,4 +55,4 @@ The contents of the 'My LocalSID Table' is shown with: The traffic counters can be reset with: - vpp# clear sr localsid counters + vpp# clear sr localsid-counters diff --git a/src/vnet/srv6/sr_steering.c b/src/vnet/srv6/sr_steering.c index cf4e81abfd4..a888fea9fda 100755 --- a/src/vnet/srv6/sr_steering.c +++ b/src/vnet/srv6/sr_steering.c @@ -399,11 +399,10 @@ sr_steer_policy_command_fn (vlib_main_t * vm, unformat_input_t * input, &sw_if_index)) traffic_type = SR_STEER_L2; else if (!sr_policy_set - && unformat (input, "via sr policy index %d", - &sr_policy_index)) + && unformat (input, "via index %d", &sr_policy_index)) sr_policy_set = 1; else if (!sr_policy_set - && unformat (input, "via sr policy bsid %U", + && unformat (input, "via bsid %U", unformat_ip6_address, &bsid)) sr_policy_set = 1; else if (fib_table == (u32) ~ 0 @@ -465,8 +464,8 @@ sr_steer_policy_command_fn (vlib_main_t * vm, unformat_input_t * input, /* *INDENT-OFF* */ VLIB_CLI_COMMAND (sr_steer_policy_command, static) = { .path = "sr steer", - .short_help = "sr steer (del) [l3 |l2 ]" - "via sr policy [index |bsid ]" + .short_help = "sr steer (del) [l3 |l2 ] " + "via [index |bsid ] " "(fib-table )", .long_help = "\tSteer a L2 or L3 traffic through an existing SR policy.\n" @@ -531,8 +530,8 @@ show_sr_steering_policies_command_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_sr_steering_policies_command, static) = { - .path = "show sr steering policies", - .short_help = "show sr steering policies", + .path = "show sr steering-policies", + .short_help = "show sr steering-policies", .function = show_sr_steering_policies_command_fn, }; /* *INDENT-ON* */ diff --git a/src/vnet/srv6/sr_steering.md b/src/vnet/srv6/sr_steering.md index 7e91892e0bc..ca5cc7b6c7a 100644 --- a/src/vnet/srv6/sr_steering.md +++ b/src/vnet/srv6/sr_steering.md @@ -4,11 +4,11 @@ To steer packets in Transit into an SR policy (T.Insert, T.Encaps and T.Encaps.L2 behaviors), the user needs to create an 'sr steering policy'. - sr steer l3 2001::/64 via sr policy index 1 - sr steer l3 2001::/64 via sr policy bsid cafe::1 - sr steer l3 2001::/64 via sr policy bsid cafe::1 fib-table 3 - sr steer l3 10.0.0.0/16 via sr policy bsid cafe::1 - sr steer l2 TenGE0/1/0 via sr policy bsid cafe::1 + sr steer l3 2001::/64 via index 1 + sr steer l3 2001::/64 via bsid cafe::1 + sr steer l3 2001::/64 via bsid cafe::1 fib-table 3 + sr steer l3 10.0.0.0/16 via bsid cafe::1 + sr steer l2 TenGE0/1/0 via bsid cafe::1 Disclaimer: The T.Encaps.L2 will steer L2 frames into an SR Policy. Notice that creating an SR steering policy for L2 frames will actually automatically *put the interface into promiscous mode*. -- cgit 1.2.3-korg