proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-03 19:26:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quagga: make check is broken with addpath changes

Browse Source 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Ticket: CM-8472

The first as-path is what the original as-path for the test, the second
is what the as-path should look like once all confed SETs and SEQs have
been removed. At the time the test was written quagga did not correctly
remove confed SETs and SEQs but whoever wrote the test didn't notice
this and assumed that the behavior they were seeing was correct so used
that output to populate the second as-path.

Now that we do correctly remove the confed parts these tests fail. So
the fix is to update the second as-path for these two tests so that they
no longer contain any confed SETs/SEQs.
This commit is contained in:
Daniel Walton 2015-12-11 21:12:56 +00:00
parent d50b5bdd74
commit 3ffe142a3a
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_updgrp.c
View File

@ -1577,8 +1577,11 @@ update_bgp_group_free (struct bgp *bgp)
AF_FOREACH (afid)
{
hash_free(bgp->update_groups[afid]);
bgp->update_groups[afid] = NULL;
if (bgp->update_groups[afid])
{
hash_free(bgp->update_groups[afid]);
bgp->update_groups[afid] = NULL;
}
}
}

8
bgpd/bgpd.c
View File

@ -2977,8 +2977,12 @@ bgp_free (struct bgp *bgp)
list_delete (bgp->group);
list_delete (bgp->peer);
hash_free(bgp->peerhash);
bgp->peerhash = NULL;
if (bgp->peerhash)
{
hash_free(bgp->peerhash);
bgp->peerhash = NULL;
}
if (bgp->name)
XFREE(MTYPE_BGP, bgp->name);

10
tests/aspath_test.c
View File

@ -134,7 +134,7 @@ static struct test_segment {
{ 0x4,0x3, 0x01,0xc8, 0x00,0x7b, 0x03,0x15 },
8,
{ "[123,456,789]",
"[123,456,789]",
"",
0, 1, NOT_ALL_PRIVATE, 123, 1, NULL_ASN },
},
{ /* 9 */
@ -672,12 +672,12 @@ static struct tests {
},
{ &test_segments[8], &test_segments[9],
{ "[123,456,789] (123 456 789) [111,222] 8722 {4196,48658}",
"[123,456,789] (123 456 789) [111,222] 8722 {4196,48658}",
"8722 {4196,48658}",
2, 5, NOT_ALL_PRIVATE, 456, 1, NULL_ASN },
},
{ &test_segments[9], &test_segments[8],
{ "(123 456 789) [111,222] 8722 {4196,48658} [123,456,789]",
"8722 {4196,48658} [123,456,789]",
"8722 {4196,48658}",
2, 5, NOT_ALL_PRIVATE, 48658, 1, NULL_ASN },
},
{ &test_segments[14], &test_segments[11],
@ -969,8 +969,8 @@ validate (struct aspath *as, const struct test_spec *sp)
{
failed++;
fails++;
printf ("confed_del: %s\n", aspath_print (asconfeddel));
printf ("should be: %s\n", sp->shouldbe_delete_confed);
printf ("as-path minus confeds is: %s\n", aspath_print (asconfeddel));
printf ("as-path minus confeds should be: %s\n", sp->shouldbe_delete_confed);
}
/* aspath_str2aspath test */
if ((aspath_print (asstr) == NULL && sp->shouldbe != NULL)

3
tests/bgp_mpath_test.c
View File

@ -104,9 +104,6 @@ bgp_create_fake (as_t *as, const char *name)
bgp->group = list_new ();
//bgp->group->cmp = (int (*)(void *, void *)) peer_group_cmp;
bgp->rsclient = list_new ();
//bgp->rsclient->cmp = (int (*)(void*, void*)) peer_cmp;
for (afi = AFI_IP; afi < AFI_MAX; afi++)
for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++)
{