proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 03:53:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10935 from anlancs/zebra-mh-esi-warning

Browse Source 
zebra: adjust the warnings for ESI of evpn-mh
This commit is contained in:
Donatas Abraitis 2022-04-13 15:45:07 +03:00 committed by GitHub
commit cd876f8a78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bgpd/bgp_evpn_vty.c
View File

@ -3867,13 +3867,13 @@ DEFUN (bgp_evpn_advertise_type5,
if (!(afi == AFI_IP || afi == AFI_IP6)) {
vty_out(vty,
"%%only ipv4 or ipv6 address families are supported\n");
"%% Only ipv4 or ipv6 address families are supported\n");
return CMD_WARNING;
}
if (safi != SAFI_UNICAST) {
vty_out(vty,
"%%only ipv4 unicast or ipv6 unicast are supported\n");
"%% Only ipv4 unicast or ipv6 unicast are supported\n");
return CMD_WARNING;
}
@ -4058,13 +4058,13 @@ DEFUN (no_bgp_evpn_advertise_type5,
if (!(afi == AFI_IP || afi == AFI_IP6)) {
vty_out(vty,
"%%only ipv4 or ipv6 address families are supported\n");
"%% Only ipv4 or ipv6 address families are supported\n");
return CMD_WARNING;
}
if (safi != SAFI_UNICAST) {
vty_out(vty,
"%%only ipv4 unicast or ipv6 unicast are supported\n");
"%% Only ipv4 unicast or ipv6 unicast are supported\n");
return CMD_WARNING;
}

11
zebra/zebra_evpn_mh.c
View File

@ -3359,7 +3359,8 @@ DEFPY(zebra_evpn_es_sys_mac,
ret = zebra_evpn_es_sys_mac_update(zif, &mac->eth_addr);
if (ret == -1) {
vty_out(vty, "%%ESI already exists on a different interface\n");
vty_out(vty,
"%% ESI already exists on a different interface\n");
return CMD_WARNING;
}
}
@ -3392,7 +3393,8 @@ DEFPY(zebra_evpn_es_id,
ret = zebra_evpn_es_type0_esi_update(zif, zero_esi);
if (ret == -1) {
vty_out(vty, "%%Failed to clear ES local id\n");
vty_out(vty,
"%% Failed to clear ES local id or ESI name\n");
return CMD_WARNING;
}
} else {
@ -3404,13 +3406,14 @@ DEFPY(zebra_evpn_es_id,
if (esi_str) {
if (!str_to_esi(esi_str, &esi)) {
vty_out(vty, "%% Malformed ESI\n");
vty_out(vty, "%% Malformed ESI name\n");
return CMD_WARNING;
}
ret = zebra_evpn_es_type0_esi_update(zif, &esi);
} else {
if (!es_lid) {
vty_out(vty, "%%Specify local ES ID\n");
vty_out(vty,
"%% Specify ES local id or ESI name\n");
return CMD_WARNING;
}
ret = zebra_evpn_es_lid_update(zif, es_lid);