[caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration #95

vdahiya12 · 2023-12-08T00:28:14Z

Work item tracking

Microsoft ADO (number only):
26211097

This PR fixes #82 where a corner case is not covered, if vlan address of DUT is not network address.
Basically a src IP is added to the SNAT rule so that only packets originating from ToR with src IP as vlan IP get natted by the rule and change the src IP to LoopBack IP

For multiple vlan IP's only the vlan address coming from configuration is picked as the vlan address and not the network address.

We consider a case where there are multiple vlan IP's are example in such format :

Vlan705                 10.131.113.17/28     up/up         N/A                   N/A
Vlan805                 10.131.111.129/26    up/up         N/A                   N/A

  "VLAN_INTERFACE": {
        "Vlan705|10.131.113.17/28": {},
        "Vlan805|10.131.111.129/26": {},

In such a case we expect iptables rules should be :

target     prot opt source               destination         
SNAT       all  --  10.131.113.17        10.131.113.19        to:10.212.64.1
SNAT       all  --  10.131.111.129       10.131.111.131       to:10.212.64.1

where soc_ip's are such :

10.131.111.131, 10.131.113.19

Before this change the souce IP of the vlan is not correctly picked in the iptables rule

for DualToR Active-active configuration Signed-off-by: vaibhav-dahiya <[email protected]>

Signed-off-by: vaibhav-dahiya <[email protected]>

prsunny

Please add an example of the issue and config in the description.

prsunny · 2023-12-08T01:23:33Z

scripts/caclmgrd

@@ -54,8 +54,10 @@ def get_ipv4_networks_from_interface_table(table, intf_name):
            iface_name, iface_cidr = key
            if iface_name.startswith(intf_name):
                ip_ntwrk = ipaddress.ip_network(iface_cidr, strict=False)
-                if isinstance(ip_ntwrk, ipaddress.IPv4Network):
-                    addresses.append(ip_ntwrk)
+                ip_str = iface_cidr.split("/")[0]


Could you check if this works if there are secondary IPs in Vlan? Like two or three different IPs in the same Vlan?

Works as intended, added in description

Signed-off-by: vaibhav-dahiya <[email protected]>

zjswhhh · 2023-12-08T21:51:04Z

Please add an example of the issue and config in the description.

+1

vdahiya12 · 2023-12-12T01:18:43Z

Please add an example of the issue and config in the description.

added

zjswhhh

lgtm

…ess for DualToR Active-active configuration (sonic-net#95) * [caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration Signed-off-by: vaibhav-dahiya <[email protected]> * fix UT Signed-off-by: vaibhav-dahiya <[email protected]> * add all Signed-off-by: vaibhav-dahiya <[email protected]> * add test Signed-off-by: vaibhav-dahiya <[email protected]> * add ut Signed-off-by: vaibhav-dahiya <[email protected]> * add Tests Signed-off-by: vaibhav-dahiya <[email protected]> * add changes Signed-off-by: vaibhav-dahiya <[email protected]> * fix typo Signed-off-by: vaibhav-dahiya <[email protected]> * add vals Signed-off-by: vaibhav-dahiya <[email protected]> --------- Signed-off-by: vaibhav-dahiya <[email protected]>

mssonicbld · 2023-12-15T13:51:06Z

Cherry-pick PR to 202305: #97

StormLiangMS · 2023-12-15T13:51:10Z

@vdahiya12 could you update ADO in the description?

…ess for DualToR Active-active configuration (#95) * [caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration Signed-off-by: vaibhav-dahiya <[email protected]> * fix UT Signed-off-by: vaibhav-dahiya <[email protected]> * add all Signed-off-by: vaibhav-dahiya <[email protected]> * add test Signed-off-by: vaibhav-dahiya <[email protected]> * add ut Signed-off-by: vaibhav-dahiya <[email protected]> * add Tests Signed-off-by: vaibhav-dahiya <[email protected]> * add changes Signed-off-by: vaibhav-dahiya <[email protected]> * fix typo Signed-off-by: vaibhav-dahiya <[email protected]> * add vals Signed-off-by: vaibhav-dahiya <[email protected]> --------- Signed-off-by: vaibhav-dahiya <[email protected]>

vdahiya12 · 2023-12-19T19:28:07Z

@vdahiya12 could you update ADO in the description?

@StormLiangMS added

…ess for DualToR Active-active configuration (sonic-net#95) * [caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration Signed-off-by: vaibhav-dahiya <[email protected]> * fix UT Signed-off-by: vaibhav-dahiya <[email protected]> * add all Signed-off-by: vaibhav-dahiya <[email protected]> * add test Signed-off-by: vaibhav-dahiya <[email protected]> * add ut Signed-off-by: vaibhav-dahiya <[email protected]> * add Tests Signed-off-by: vaibhav-dahiya <[email protected]> * add changes Signed-off-by: vaibhav-dahiya <[email protected]> * fix typo Signed-off-by: vaibhav-dahiya <[email protected]> * add vals Signed-off-by: vaibhav-dahiya <[email protected]> --------- Signed-off-by: vaibhav-dahiya <[email protected]>

mssonicbld · 2024-11-27T20:42:26Z

Cherry-pick PR to 202311: #189

…ess for DualToR Active-active configuration (#95) * [caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration Signed-off-by: vaibhav-dahiya <[email protected]> * fix UT Signed-off-by: vaibhav-dahiya <[email protected]> * add all Signed-off-by: vaibhav-dahiya <[email protected]> * add test Signed-off-by: vaibhav-dahiya <[email protected]> * add ut Signed-off-by: vaibhav-dahiya <[email protected]> * add Tests Signed-off-by: vaibhav-dahiya <[email protected]> * add changes Signed-off-by: vaibhav-dahiya <[email protected]> * fix typo Signed-off-by: vaibhav-dahiya <[email protected]> * add vals Signed-off-by: vaibhav-dahiya <[email protected]> --------- Signed-off-by: vaibhav-dahiya <[email protected]>

Covers test gap #11436 which is raised to cover this issue sonic-net/sonic-host-services#95. The test will check nat rules and make sure vlan ip to mux cable soc_ip snat is correct, and in the case of multivlan, only vlan ip of the vlan as soc_ip is used.

[caclmgrd][DualToR] Fix a case where vlan address is not network address

fe59a14

for DualToR Active-active configuration Signed-off-by: vaibhav-dahiya <[email protected]>

vdahiya12 changed the title ~~[caclmgrd][DualToR] Fix a case where vlan address is not network addressfor DualToR Active-active configuration~~ [caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration Dec 8, 2023

vdahiya12 requested review from zjswhhh and lolyu December 8, 2023 00:38

vdahiya12 added 3 commits December 8, 2023 00:50

fix UT

7a0fe66

Signed-off-by: vaibhav-dahiya <[email protected]>

add all

74f81b2

Signed-off-by: vaibhav-dahiya <[email protected]>

add test

064dec8

Signed-off-by: vaibhav-dahiya <[email protected]>

prsunny reviewed Dec 8, 2023

View reviewed changes

vdahiya12 added 5 commits December 8, 2023 03:12

add ut

67034f2

Signed-off-by: vaibhav-dahiya <[email protected]>

add Tests

c423025

Signed-off-by: vaibhav-dahiya <[email protected]>

add changes

82495bf

Signed-off-by: vaibhav-dahiya <[email protected]>

fix typo

c5df6c5

Signed-off-by: vaibhav-dahiya <[email protected]>

add vals

d426951

Signed-off-by: vaibhav-dahiya <[email protected]>

zjswhhh approved these changes Dec 12, 2023

View reviewed changes

vdahiya12 merged commit b9600f1 into sonic-net:master Dec 12, 2023
5 checks passed

vdahiya12 added Request for 202305 Branch Request for 202205 Branch labels Dec 12, 2023

mssonicbld added the Cherry Pick Conflict_202205 label Dec 13, 2023

vdahiya12 mentioned this pull request Dec 15, 2023

[caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration sonic-net/sonic-buildimage#17511

Merged

StormLiangMS added the Approved for 202305 Branch label Dec 15, 2023

mssonicbld mentioned this pull request Dec 15, 2023

[action] [PR:95] [caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration (#95) #97

Merged

mssonicbld added the Created PR to 202305 Branch label Dec 15, 2023

mssonicbld added Included in 202305 Branch and removed Created PR to 202305 Branch labels Dec 15, 2023

Xichen96 mentioned this pull request Oct 9, 2024

[dualtor-aa] add test to verify iptables nat rules for mux port sonic-net/sonic-mgmt#14919

Merged

8 tasks

yxieca added Request for 202311 Branch Approved for 202311 Branch labels Nov 27, 2024

mssonicbld mentioned this pull request Nov 27, 2024

[action] [PR:95] [caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration (#95) #189

Merged

mssonicbld added the Created PR to 202311 Branch label Nov 27, 2024

mssonicbld added Included in 202311 Branch and removed Created PR to 202311 Branch labels Nov 27, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration #95

[caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration #95

vdahiya12 commented Dec 8, 2023 •

edited

Loading

prsunny left a comment

prsunny Dec 8, 2023

vdahiya12 Dec 12, 2023

zjswhhh commented Dec 8, 2023

vdahiya12 commented Dec 12, 2023

zjswhhh left a comment

mssonicbld commented Dec 15, 2023

StormLiangMS commented Dec 15, 2023

vdahiya12 commented Dec 19, 2023

mssonicbld commented Nov 27, 2024

[caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration #95

[caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration #95

Conversation

vdahiya12 commented Dec 8, 2023 • edited Loading

Work item tracking

prsunny left a comment

Choose a reason for hiding this comment

prsunny Dec 8, 2023

Choose a reason for hiding this comment

vdahiya12 Dec 12, 2023

Choose a reason for hiding this comment

zjswhhh commented Dec 8, 2023

vdahiya12 commented Dec 12, 2023

zjswhhh left a comment

Choose a reason for hiding this comment

mssonicbld commented Dec 15, 2023

StormLiangMS commented Dec 15, 2023

vdahiya12 commented Dec 19, 2023

mssonicbld commented Nov 27, 2024

vdahiya12 commented Dec 8, 2023 •

edited

Loading