tests: fix warnings related to afi/safi constants

[mirror_frr.git] / tests / bgpd / test_capability.c

diff --git a/tests/bgpd/test_capability.c b/tests/bgpd/test_capability.c
index 3d5518f3b7b618b0cce5560eb62b8574c58d513c..69f5afb992b077c75b3eca72717c77fdac0df42f 100644 (file)
--- a/tests/bgpd/test_capability.c
+++ b/tests/bgpd/test_capability.c
@@ -63,8 +63,8 @@ static struct test_segment {
 
        /* AFI/SAFI validation */
        int validate_afi;
-       afi_t afi;
-       safi_t safi;
+       iana_afi_t afi;
+       iana_safi_t safi;
 #define VALID_AFI 1
 #define INVALID_AFI 0
        int afi_valid;
@@ -113,8 +113,8 @@ static struct test_segment mp_segments[] = {
                SHOULD_PARSE,
                0,
                1,
-               AFI_IP,
-               SAFI_UNICAST,
+               IANA_AFI_IPV4,
+               IANA_SAFI_UNICAST,
                VALID_AFI,
        },
        {
@@ -125,8 +125,8 @@ static struct test_segment mp_segments[] = {
                SHOULD_PARSE,
                0,
                1,
-               AFI_IP6,
-               SAFI_UNICAST,
+               IANA_AFI_IPV6,
+               IANA_SAFI_UNICAST,
                VALID_AFI,
        },
        /* 5 */
@@ -138,8 +138,8 @@ static struct test_segment mp_segments[] = {
                SHOULD_PARSE,
                0,
                1,
-               AFI_IP,
-               SAFI_MULTICAST,
+               IANA_AFI_IPV4,
+               IANA_SAFI_MULTICAST,
                VALID_AFI,
        },
        /* 6 */
@@ -151,7 +151,7 @@ static struct test_segment mp_segments[] = {
                SHOULD_PARSE,
                0,
                1,
-               AFI_IP6,
+               IANA_AFI_IPV6,
                IANA_SAFI_MPLS_VPN,
                VALID_AFI,
        },
@@ -164,7 +164,7 @@ static struct test_segment mp_segments[] = {
                SHOULD_PARSE,
                0,
                1,
-               AFI_IP6,
+               IANA_AFI_IPV6,
                IANA_SAFI_MPLS_VPN,
                VALID_AFI,
        },
@@ -177,7 +177,7 @@ static struct test_segment mp_segments[] = {
                SHOULD_PARSE,
                0,
                1,
-               AFI_IP,
+               IANA_AFI_IPV4,
                IANA_SAFI_MPLS_VPN,
                VALID_AFI,
        },
@@ -211,8 +211,8 @@ static struct test_segment mp_segments[] = {
                SHOULD_ERR,
                0,
                1,
-               AFI_IP,
-               SAFI_UNICAST,
+               IANA_AFI_IPV4,
+               IANA_SAFI_UNICAST,
                VALID_AFI,
        },
        {NULL, NULL, {0}, 0, 0}};
@@ -844,8 +844,7 @@ static void parse_test(struct peer *peer, struct test_segment *t, int type)
                safi_t safi;
 
                /* Convert AFI, SAFI to internal values, check. */
-               if (bgp_map_afi_safi_iana2int(afi_int2iana(t->afi), t->safi,
-                                             &afi, &safi)) {
+               if (bgp_map_afi_safi_iana2int(t->afi, t->safi, &afi, &safi)) {
                        if (t->afi_valid == VALID_AFI)
                                failed++;
                }