[caclmgrd][DualToR] Fix a case where vlan address is not network address for DualToR Active-active configuration #95
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
for DualToR Active-active configuration Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
vdahiya12
changed the title
prsunny
reviewed
Dec 8, 2023
| @@ -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] | |||
There was a problem hiding this comment.
Could you check if this works if there are secondary IPs in Vlan? Like two or three different IPs in the same Vlan?
There was a problem hiding this comment.
Works as intended, added in description
Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
+1 |
added |
mssonicbld
pushed a commit
to mssonicbld/sonic-host-services
that referenced
this pull request
Dec 15, 2023
…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 <vdahiya@microsoft.com> * fix UT Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add all Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add test Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add ut Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add Tests Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add changes Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * fix typo Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add vals Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> --------- Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
|
Cherry-pick PR to 202305: #97 |
|
@vdahiya12 could you update ADO in the description? |
mssonicbld
added
Included in 202305 Branch
and removed
Created PR to 202305 Branch
labels
mssonicbld
pushed a commit
that referenced
this pull request
Dec 15, 2023
…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 <vdahiya@microsoft.com> * fix UT Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add all Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add test Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add ut Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add Tests Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add changes Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * fix typo Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * add vals Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> --------- Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
@StormLiangMS added |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Work item tracking
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 :
In such a case we expect iptables rules should be :
where soc_ip's are such :
Before this change the souce IP of the vlan is not correctly picked in the iptables rule