Graceful Restart capability can support VPN IPv4 labeled unicast address
family. Test this capability within OPEN message. The preserve
forwarding state bit is also set for this address family.
Signed-off-by: Julien Courtat <julien.courtat@6wind.com>
---
tests/bgp_capability_test.c | 11 +++++++----
tests/bgpd.tests/testbgpcap.exp | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/bgp_capability_test.c b/tests/bgp_capability_test.c
index a381351..0207706 100644
--- a/tests/bgp_capability_test.c
+++ b/tests/bgp_capability_test.c
@@ -133,11 +133,11 @@ static struct test_segment mp_segments[] =
},
/* 8 */
{ "MP6",
- "MP IP4/MPLS-laveled VPN",
+ "MP IP4/MPLS-labeled VPN",
{ CAPABILITY_CODE_MP, 0x4, 0x0, 0x1, 0x0, 0x80 },
6, SHOULD_PARSE, 0,
1, AFI_IP, SAFI_MPLS_LABELED_VPN, VALID_AFI,
- },
+ },
/* 10 */
{ "MP8",
"MP unknown AFI/SAFI",
@@ -324,7 +324,7 @@ static struct test_segment misc_segments[] =
},
{ "GR",
"GR capability",
- { /* hdr */ CAPABILITY_CODE_RESTART, 0xe,
+ { /* hdr */ CAPABILITY_CODE_RESTART, 0x12,
/* R-bit, time */ 0xf1, 0x12,
/* afi */ 0x0, 0x1,
/* safi */ 0x1,
@@ -335,8 +335,11 @@ static struct test_segment misc_segments[] =
/* afi */ 0x0, 0x2,
/* safi */ 0x2,
/* flags */ 0x1,
+ /* afi */ 0x0, 0x1,
+ /* safi */ 0x80,
+ /* flags */ 0x80,
},
- 16, SHOULD_PARSE,
+ 20, SHOULD_PARSE,
},
{ "GR-short",
"GR capability, but header length too short",
diff --git a/tests/bgpd.tests/testbgpcap.exp b/tests/bgpd.tests/testbgpcap.exp
index 2572623..ea517da 100644
--- a/tests/bgpd.tests/testbgpcap.exp
+++ b/tests/bgpd.tests/testbgpcap.exp
@@ -12,7 +12,7 @@ simpletest "MPv6: MP IPv6/Uni"
simpletest "MP2: MP IP/Multicast"
simpletest "MP3: MP IP6/MPLS-labeled VPN"
simpletest "MP5: MP IP6/MPLS-VPN"
-simpletest "MP6: MP IP4/MPLS-laveled VPN"
+simpletest "MP6: MP IP4/MPLS-labeled VPN"
simpletest "MP8: MP unknown AFI/SAFI"
simpletest "MP-short: MP IP4/Unicast, length too short (< minimum)"
simpletest "MP-overflow: MP IP4/Unicast, length too long"
--
2.1.4
_______________________________________________
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev
family. Test this capability within OPEN message. The preserve
forwarding state bit is also set for this address family.
Signed-off-by: Julien Courtat <julien.courtat@6wind.com>
---
tests/bgp_capability_test.c | 11 +++++++----
tests/bgpd.tests/testbgpcap.exp | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/bgp_capability_test.c b/tests/bgp_capability_test.c
index a381351..0207706 100644
--- a/tests/bgp_capability_test.c
+++ b/tests/bgp_capability_test.c
@@ -133,11 +133,11 @@ static struct test_segment mp_segments[] =
},
/* 8 */
{ "MP6",
- "MP IP4/MPLS-laveled VPN",
+ "MP IP4/MPLS-labeled VPN",
{ CAPABILITY_CODE_MP, 0x4, 0x0, 0x1, 0x0, 0x80 },
6, SHOULD_PARSE, 0,
1, AFI_IP, SAFI_MPLS_LABELED_VPN, VALID_AFI,
- },
+ },
/* 10 */
{ "MP8",
"MP unknown AFI/SAFI",
@@ -324,7 +324,7 @@ static struct test_segment misc_segments[] =
},
{ "GR",
"GR capability",
- { /* hdr */ CAPABILITY_CODE_RESTART, 0xe,
+ { /* hdr */ CAPABILITY_CODE_RESTART, 0x12,
/* R-bit, time */ 0xf1, 0x12,
/* afi */ 0x0, 0x1,
/* safi */ 0x1,
@@ -335,8 +335,11 @@ static struct test_segment misc_segments[] =
/* afi */ 0x0, 0x2,
/* safi */ 0x2,
/* flags */ 0x1,
+ /* afi */ 0x0, 0x1,
+ /* safi */ 0x80,
+ /* flags */ 0x80,
},
- 16, SHOULD_PARSE,
+ 20, SHOULD_PARSE,
},
{ "GR-short",
"GR capability, but header length too short",
diff --git a/tests/bgpd.tests/testbgpcap.exp b/tests/bgpd.tests/testbgpcap.exp
index 2572623..ea517da 100644
--- a/tests/bgpd.tests/testbgpcap.exp
+++ b/tests/bgpd.tests/testbgpcap.exp
@@ -12,7 +12,7 @@ simpletest "MPv6: MP IPv6/Uni"
simpletest "MP2: MP IP/Multicast"
simpletest "MP3: MP IP6/MPLS-labeled VPN"
simpletest "MP5: MP IP6/MPLS-VPN"
-simpletest "MP6: MP IP4/MPLS-laveled VPN"
+simpletest "MP6: MP IP4/MPLS-labeled VPN"
simpletest "MP8: MP unknown AFI/SAFI"
simpletest "MP-short: MP IP4/Unicast, length too short (< minimum)"
simpletest "MP-overflow: MP IP4/Unicast, length too long"
--
2.1.4
_______________________________________________
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev