Skip to content

Commit 4303308

Browse files
authored
[staticroutebfd] fix ipv6 letter case issue (#15765)
*use lower case for IPv6 address as internal key and bfd session key. fixes #15764 Why I did it *staticroutebfd uses the IPv6 address string as a key to create bfd session and cache the bfd sessions using it as a key. When the IPv6 address string has uppercase letter in the static route nexthop list, the string with uppercase letter key is stored in the cache, but the BFD STATE_DB uses lowercase for IPv6 address, so when the staticroutebfd get the bfd state event, it cannot find the bfd session in its local cache because of the letter case.
1 parent cb3ee65 commit 4303308

File tree

2 files changed

+84
-0
lines changed

2 files changed

+84
-0
lines changed

src/sonic-bgpcfgd/staticroutebfd/main.py

+8
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ def static_route_split_key(key):
6666
:param key: key to split
6767
:return: valid, vrf name extracted from the key, ip prefix extracted from the key
6868
"""
69+
if key is None or len(key) == 0:
70+
return False, "", ""
71+
6972
l = tuple(key.split('|'))
7073

7174
if len(l) == 1:
@@ -376,6 +379,11 @@ def static_route_set_handler(self, key, data):
376379
log_err("invalid ip prefix for static route: ", key)
377380
return True
378381

382+
#use lower case if there is letter in IPv6 address string
383+
if 'nexthop' in data:
384+
nh = data['nexthop']
385+
data['nexthop'] = nh.lower()
386+
379387
arg_list = lambda v: [x.strip() for x in v.split(',')] if len(v.strip()) != 0 else None
380388
bfd_field = arg_list(data['bfd']) if 'bfd' in data else ["false"]
381389

src/sonic-bgpcfgd/tests/test_static_rt_bfd.py

+76
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,82 @@ def intf_setup(dut):
9494
{},
9595
{}
9696
)
97+
set_del_test(dut, "intf",
98+
"SET",
99+
("if1|2603:10E2:400:1::1/64",{}
100+
),
101+
{},
102+
{}
103+
)
104+
set_del_test(dut, "intf",
105+
"SET",
106+
("if2|2603:10E2:400:2::1/64",{}
107+
),
108+
{},
109+
{}
110+
)
111+
set_del_test(dut, "intf",
112+
"SET",
113+
("if3|2603:10E2:400:3::1/64",{}
114+
),
115+
{},
116+
{}
117+
)
118+
119+
def test_set_del_ipv6():
120+
dut = constructor()
121+
intf_setup(dut)
122+
123+
set_del_test(dut, "srt",
124+
"SET",
125+
("2603:10e2:400::4/128", {
126+
"bfd": "true",
127+
"ifname": "if1, if2, if3",
128+
"nexthop": "2603:10E2:400:1::2,2603:10E2:400:2::2,2603:10e2:400:3::2"
129+
}),
130+
{
131+
"set_default:default:2603:10e2:400:1::2" : {'multihop': 'true', 'rx_interval': '50', 'tx_interval': '50', 'multiplier': '3', 'local_addr': '2603:10E2:400:1::1'},
132+
"set_default:default:2603:10e2:400:2::2" : {'multihop': 'true', 'rx_interval': '50', 'tx_interval': '50', 'multiplier': '3', 'local_addr': '2603:10E2:400:2::1'},
133+
"set_default:default:2603:10e2:400:3::2" : {'multihop': 'true', 'rx_interval': '50', 'tx_interval': '50', 'multiplier': '3', 'local_addr': '2603:10E2:400:3::1'}
134+
},
135+
{}
136+
)
137+
138+
set_del_test(dut, "bfd",
139+
"SET",
140+
("2603:10e2:400:1::2", {
141+
"state": "Up"
142+
}),
143+
{},
144+
{'set_default:2603:10e2:400::4/128': {'nexthop': '2603:10e2:400:1::2', 'ifname': 'if1', 'nexthop-vrf': 'default', 'expiry': 'false'}}
145+
)
146+
set_del_test(dut, "bfd",
147+
"SET",
148+
("2603:10e2:400:2::2", {
149+
"state": "Up"
150+
}),
151+
{},
152+
{'set_default:2603:10e2:400::4/128': {'nexthop': '2603:10e2:400:1::2,2603:10e2:400:2::2', 'ifname': 'if1,if2', 'nexthop-vrf': 'default,default', 'expiry': 'false'}}
153+
)
154+
set_del_test(dut, "bfd",
155+
"SET",
156+
("2603:10e2:400:3::2", {
157+
"state": "Up"
158+
}),
159+
{},
160+
{'set_default:2603:10e2:400::4/128': {'nexthop': '2603:10e2:400:1::2,2603:10e2:400:2::2,2603:10e2:400:3::2', 'ifname': 'if1,if2,if3', 'nexthop-vrf': 'default,default,default', 'expiry': 'false'}}
161+
)
162+
163+
set_del_test(dut, "srt",
164+
"DEL",
165+
("2603:10e2:400::4/128", { }),
166+
{
167+
"del_default:default:2603:10e2:400:1::2" : {},
168+
"del_default:default:2603:10e2:400:2::2" : {},
169+
"del_default:default:2603:10e2:400:3::2" : {}
170+
},
171+
{'del_default:2603:10e2:400::4/128': { }}
172+
)
97173

98174
def test_set_del():
99175
dut = constructor()

0 commit comments

Comments
 (0)