From: Weiguo Li Date: Tue, 19 Jul 2022 14:31:57 +0000 (+0800) Subject: bgpd: Fixup some MAC address token cli syntax X-Git-Tag: base_8.4~197^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=47714bd21df057231d754eba2cec170d032d488a;p=mirror%2Ffrr.git bgpd: Fixup some MAC address token cli syntax MAC address token YY:YY:YY:YY:YY:YY is deprecated, use X:X:X:X:X:X instead. Signed-off-by: Weiguo Li --- diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c index 35a76e7836..5061913205 100644 --- a/bgpd/rfapi/rfapi.c +++ b/bgpd/rfapi/rfapi.c @@ -3081,7 +3081,7 @@ DEFUN (debug_rfapi_register_vn_un, DEFUN (debug_rfapi_register_vn_un_l2o, debug_rfapi_register_vn_un_l2o_cmd, - "debug rfapi-dev register vn un prefix lifetime SECONDS macaddr YY:YY:YY:YY:YY:YY lni (0-16777215)", + "debug rfapi-dev register vn un prefix lifetime SECONDS macaddr X:X:X:X:X:X lni (0-16777215)", DEBUG_STR DEBUG_RFAPI_STR "rfapi_register\n" @@ -3309,7 +3309,7 @@ DEFUN (debug_rfapi_query_vn_un, DEFUN (debug_rfapi_query_vn_un_l2o, debug_rfapi_query_vn_un_l2o_cmd, - "debug rfapi-dev query vn un lni LNI target YY:YY:YY:YY:YY:YY", + "debug rfapi-dev query vn un lni LNI target X:X:X:X:X:X", DEBUG_STR DEBUG_RFAPI_STR "rfapi_query\n" diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index b95bace0d1..57cb015d89 100644 --- a/bgpd/rfapi/rfapi_vty.c +++ b/bgpd/rfapi/rfapi_vty.c @@ -2515,7 +2515,7 @@ DEFUN (add_vnc_prefix, ************************************************************************/ DEFUN (add_vnc_mac_vni_prefix_cost_life, add_vnc_mac_vni_prefix_cost_life_cmd, - "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn un prefix cost (0-255) lifetime (1-4294967295)", + "add vnc mac X:X:X:X:X:X virtual-network-identifier (1-4294967295) vn un prefix cost (0-255) lifetime (1-4294967295)", "Add registration\n" "VNC Information\n" "Add/modify mac address information\n" @@ -2545,7 +2545,7 @@ DEFUN (add_vnc_mac_vni_prefix_cost_life, DEFUN (add_vnc_mac_vni_prefix_life, add_vnc_mac_vni_prefix_life_cmd, - "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn un prefix lifetime (1-4294967295)", + "add vnc mac X:X:X:X:X:X virtual-network-identifier (1-4294967295) vn un prefix lifetime (1-4294967295)", "Add registration\n" "VNC Information\n" "Add/modify mac address information\n" @@ -2572,7 +2572,7 @@ DEFUN (add_vnc_mac_vni_prefix_life, DEFUN (add_vnc_mac_vni_prefix_cost, add_vnc_mac_vni_prefix_cost_cmd, - "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn un prefix cost (0-255)", + "add vnc mac X:X:X:X:X:X virtual-network-identifier (1-4294967295) vn un prefix cost (0-255)", "Add registration\n" "VNC Information\n" "Add/modify mac address information\n" @@ -2598,7 +2598,7 @@ DEFUN (add_vnc_mac_vni_prefix_cost, DEFUN (add_vnc_mac_vni_prefix, add_vnc_mac_vni_prefix_cmd, - "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn un prefix ", + "add vnc mac X:X:X:X:X:X virtual-network-identifier (1-4294967295) vn un prefix ", "Add registration\n" "VNC Information\n" "Add/modify mac address information\n" @@ -2622,7 +2622,7 @@ DEFUN (add_vnc_mac_vni_prefix, DEFUN (add_vnc_mac_vni_cost_life, add_vnc_mac_vni_cost_life_cmd, - "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn un cost (0-255) lifetime (1-4294967295)", + "add vnc mac X:X:X:X:X:X virtual-network-identifier (1-4294967295) vn un cost (0-255) lifetime (1-4294967295)", "Add registration\n" "VNC Information\n" "Add/modify mac address information\n" @@ -2649,7 +2649,7 @@ DEFUN (add_vnc_mac_vni_cost_life, DEFUN (add_vnc_mac_vni_cost, add_vnc_mac_vni_cost_cmd, - "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn un cost (0-255)", + "add vnc mac X:X:X:X:X:X virtual-network-identifier (1-4294967295) vn un cost (0-255)", "Add registration\n" "VNC Information\n" "Add/modify mac address information\n" @@ -2673,7 +2673,7 @@ DEFUN (add_vnc_mac_vni_cost, DEFUN (add_vnc_mac_vni_life, add_vnc_mac_vni_life_cmd, - "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn un lifetime (1-4294967295)", + "add vnc mac X:X:X:X:X:X virtual-network-identifier (1-4294967295) vn un lifetime (1-4294967295)", "Add registration\n" "VNC Information\n" "Add/modify mac address information\n" @@ -2698,7 +2698,7 @@ DEFUN (add_vnc_mac_vni_life, DEFUN (add_vnc_mac_vni, add_vnc_mac_vni_cmd, - "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn un ", + "add vnc mac X:X:X:X:X:X virtual-network-identifier (1-4294967295) vn un ", "Add registration\n" "VNC Information\n" "Add/modify mac address information\n" @@ -3749,7 +3749,7 @@ DEFUN (clear_vnc_prefix_all, */ DEFUN (clear_vnc_mac_vn_un, clear_vnc_mac_vn_un_cmd, - "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X> un <*|A.B.C.D|X:X::X:X>", + "clear vnc mac <*|X:X:X:X:X:X> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X> un <*|A.B.C.D|X:X::X:X>", "clear\n" "VNC Information\n" "Clear mac registration information\n" @@ -3782,7 +3782,7 @@ DEFUN (clear_vnc_mac_vn_un, DEFUN (clear_vnc_mac_un_vn, clear_vnc_mac_un_vn_cmd, - "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X> vn <*|A.B.C.D|X:X::X:X>", + "clear vnc mac <*|X:X:X:X:X:X> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X> vn <*|A.B.C.D|X:X::X:X>", "clear\n" "VNC Information\n" "Clear mac registration information\n" @@ -3815,7 +3815,7 @@ DEFUN (clear_vnc_mac_un_vn, DEFUN (clear_vnc_mac_un, clear_vnc_mac_un_cmd, - "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X>", + "clear vnc mac <*|X:X:X:X:X:X> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X>", "clear\n" "VNC Information\n" "Clear mac registration information\n" @@ -3844,7 +3844,7 @@ DEFUN (clear_vnc_mac_un, DEFUN (clear_vnc_mac_vn, clear_vnc_mac_vn_cmd, - "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X>", + "clear vnc mac <*|X:X:X:X:X:X> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X>", "clear\n" "VNC Information\n" "Clear mac registration information\n" @@ -3873,7 +3873,7 @@ DEFUN (clear_vnc_mac_vn, DEFUN (clear_vnc_mac_all, clear_vnc_mac_all_cmd, - "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> *", + "clear vnc mac <*|X:X:X:X:X:X> virtual-network-identifier <*|(1-4294967295)> *", "clear\n" "VNC Information\n" "Clear mac registration information\n" @@ -3903,7 +3903,7 @@ DEFUN (clear_vnc_mac_all, DEFUN (clear_vnc_mac_vn_un_prefix, clear_vnc_mac_vn_un_prefix_cmd, - "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X> un <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M>", + "clear vnc mac <*|X:X:X:X:X:X> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X> un <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M>", "clear\n" "VNC Information\n" "Clear mac registration information\n" @@ -3940,7 +3940,7 @@ DEFUN (clear_vnc_mac_vn_un_prefix, DEFUN (clear_vnc_mac_un_vn_prefix, clear_vnc_mac_un_vn_prefix_cmd, - "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X> vn <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M> prefix <*|A.B.C.D/M|X:X::X:X/M>", + "clear vnc mac <*|X:X:X:X:X:X> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X> vn <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M> prefix <*|A.B.C.D/M|X:X::X:X/M>", "clear\n" "VNC Information\n" "Clear mac registration information\n" @@ -3981,7 +3981,7 @@ DEFUN (clear_vnc_mac_un_vn_prefix, DEFUN (clear_vnc_mac_un_prefix, clear_vnc_mac_un_prefix_cmd, - "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M>", + "clear vnc mac <*|X:X:X:X:X:X> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M>", "clear\n" "VNC Information\n" "Clear mac registration information\n" @@ -4014,7 +4014,7 @@ DEFUN (clear_vnc_mac_un_prefix, DEFUN (clear_vnc_mac_vn_prefix, clear_vnc_mac_vn_prefix_cmd, - "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M>", + "clear vnc mac <*|X:X:X:X:X:X> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M>", "clear\n" "VNC Information\n" "Clear mac registration information\n" @@ -4047,7 +4047,7 @@ DEFUN (clear_vnc_mac_vn_prefix, DEFUN (clear_vnc_mac_all_prefix, clear_vnc_mac_all_prefix_cmd, - "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> prefix <*|A.B.C.D/M|X:X::X:X/M>", + "clear vnc mac <*|X:X:X:X:X:X> virtual-network-identifier <*|(1-4294967295)> prefix <*|A.B.C.D/M|X:X::X:X/M>", "clear\n" "VNC Information\n" "Clear mac registration information\n" @@ -4395,13 +4395,15 @@ static void rfapi_show_registrations(struct vty *vty, DEFUN (vnc_show_registrations_pfx, vnc_show_registrations_pfx_cmd, - "show vnc registrations []", + "show vnc registrations []", SHOW_STR VNC_SHOW_STR "List active prefix registrations\n" + "Limit output to a particualr IPV4 address\n" "Limit output to a particular IPv4 prefix\n" + "Limit output to a particualr IPV6 address\n" "Limit output to a particular IPv6 prefix\n" - "Limit output to a particular IPv6 address\n") + "Limit output to a particular MAC address\n") { struct prefix p; struct prefix *p_addr = NULL; @@ -4421,7 +4423,7 @@ DEFUN (vnc_show_registrations_pfx, DEFUN (vnc_show_registrations_some_pfx, vnc_show_registrations_some_pfx_cmd, - "show vnc registrations []", + "show vnc registrations []", SHOW_STR VNC_SHOW_STR "List active prefix registrations\n" @@ -4430,9 +4432,11 @@ DEFUN (vnc_show_registrations_some_pfx, "show only imported prefixes\n" "show only local registrations\n" "show only remote registrations\n" - "Limit output to a particular prefix or address\n" - "Limit output to a particular prefix or address\n" - "Limit output to a particular prefix or address\n") + "Limit output to a particualr IPV4 address\n" + "Limit output to a particular IPv4 prefix\n" + "Limit output to a particualr IPV6 address\n" + "Limit output to a particular IPv6 prefix\n" + "Limit output to a particular MAC address\n") { struct prefix p; struct prefix *p_addr = NULL; @@ -4482,13 +4486,15 @@ DEFUN (vnc_show_registrations_some_pfx, DEFUN (vnc_show_responses_pfx, vnc_show_responses_pfx_cmd, - "show vnc responses []", + "show vnc responses []", SHOW_STR VNC_SHOW_STR "List recent query responses\n" + "Limit output to a particualr IPV4 address\n" "Limit output to a particular IPv4 prefix\n" + "Limit output to a particualr IPV6 address\n" "Limit output to a particular IPv6 prefix\n" - "Limit output to a particular IPv6 address\n" ) + "Limit output to a particular MAC address\n" ) { struct prefix p; struct prefix *p_addr = NULL; @@ -4513,15 +4519,17 @@ DEFUN (vnc_show_responses_pfx, DEFUN (vnc_show_responses_some_pfx, vnc_show_responses_some_pfx_cmd, - "show vnc responses []", + "show vnc responses []", SHOW_STR VNC_SHOW_STR "List recent query responses\n" "show only active query responses\n" "show only removed query responses\n" + "Limit output to a particualr IPV4 address\n" "Limit output to a particular IPv4 prefix\n" + "Limit output to a particualr IPV6 address\n" "Limit output to a particular IPv6 prefix\n" - "Limit output to a particular IPV6 address\n") + "Limit output to a particular MAC address\n") { struct prefix p; struct prefix *p_addr = NULL; @@ -4565,13 +4573,15 @@ DEFUN (vnc_show_responses_some_pfx, DEFUN (show_vnc_queries_pfx, show_vnc_queries_pfx_cmd, - "show vnc queries []", + "show vnc queries []", SHOW_STR VNC_SHOW_STR "List active queries\n" - "Limit output to a particular IPv4 prefix or address\n" + "Limit output to a particualr IPV4 address\n" + "Limit output to a particular IPv4 prefix\n" + "Limit output to a particualr IPV6 address\n" "Limit output to a particular IPv6 prefix\n" - "Limit output to a particualr IPV6 address\n") + "Limit output to a particualr MAC address\n") { struct prefix pfx; struct prefix *p = NULL;