[config] Fix config int add incorrect ip #1414

d-dashkov · 2021-02-09T10:48:30Z

- What I did
Added checking if the IP address is correct or return error.
fixes sonic-net/sonic-buildimage#6693
fixes sonic-net/sonic-buildimage#6776

- How I did it
Added function that check correctness of IP address and mask.

- How to verify it

config interface ip add Ethernet44 1000.000.000.001/24
Error: 'ip_addr' is not valid.

config interface ip add Ethernet40 100.0.0.10/35
Error: ip mask is not valid.

config interface ip add Vlan200 3000::001/200
Error: ip mask is not valid.

In some cases it will fix the IP and everything will work fine:

config interface ip add Ethernet44 100.000.000.001/24
show runningconfiguration all | grep Ethernet44
"Ethernet44|100.0.0.1/24": {}

config interface ip add Vlan200 3000::001/64
show runningconfiguration all | grep Vlan200
"Vlan200|3001::1/64": {}

config interface ip add Ethernet40 100.0.0.10/024
show runningconfiguration all | grep Ethernet40
"Ethernet40|100.0.0.10/24": {}

- New command output (if the output of a command-line utility has changed)
In case of wrong IP:

Error: 'ip_addr' is not valid.

In case of wrong mask:

Error: ip mask is not valid.

Signed-off-by: d-dashkov <[email protected]>

prsunny · 2021-02-16T21:57:50Z

config/main.py

+
+    try:
+        ip_addr = str(ipaddress.IPv4Address(split_ip_mask[0]))
+    except ipaddress.AddressValueError:


This doesn't look good to me (catching as exception for IPv6 address).

I agree. Suggest using ipaddress.ip_address() and checking whether the type of the result is IPv4Address or IPv6Address

prsunny · 2021-02-16T22:00:02Z

config/main.py

@@ -2656,6 +2675,8 @@ def add(ctx, interface_name, ip_addr, gw):
        if '/' not in ip_addr:
            ip_addr = str(net)

+        ip_addr = validate_ip_address(ctx, ip_addr)


Not sure if you want to call this "validate". Since this is for IPv6, why dont we just call if address is v6 and update the leading zeros?

This function is not only for IPv6, it checks the range of digits for v4 and v6 IP addresses and additionally removes leading zeros.

@d-dashkov it seems to me the validation is only on the mast for ipv4 and ipv6. in this case we can do the following

rename the function to validate_ip_mask

add more validation points so it can be generic function.

I refactored the code, and now all IP checking has been moved to my separate function and the try-except construct has been removed from the add and remove ip interface functions. So now it is a generic function that returns the IP string without leading zeros, or False if something is wrong.

Signed-off-by: d-dashkov <[email protected]>

lguohan · 2021-02-17T16:43:51Z

adding unit test for those fixes?

d-dashkov · 2021-02-17T16:53:05Z

@lguohan, ok, I will provide unit tests for this fix

Signed-off-by: d-dashkov <[email protected]>

liat-grozovik · 2021-03-15T16:55:21Z

@prsunny and @jleveque any further comments? it will be nice to have these fixes in 202012 as well. Do you agree to add the label?

Signed-off-by: d-dashkov <[email protected]>

dprital · 2021-05-25T21:40:01Z

@d-dashkov are you about to fix the conflicts so this PR will be able to be approved ?

d-dashkov · 2021-05-25T21:54:00Z

@d-dashkov are you about to fix the conflicts so this PR will be able to be approved ?

Yep, tomorrow I will rename function to validate_ip_mask as suggested Liat. Will that be enough or do you need something else from my side to resolve conflict

…t_ip

Signed-off-by: d-dashkov <[email protected]>

dprital · 2021-06-03T16:38:30Z

Is this PR planned to be cherry picked to 202012 ?

* Added ip and mask check to config int Signed-off-by: d-dashkov <[email protected]>

dprital · 2021-06-15T15:14:23Z

@prsunny - Can you please merge also to 202012 ?

* Added ip and mask check to config int Signed-off-by: d-dashkov <[email protected]>

[portsorch] add buffer drop FC group [bitmap_vnet] Fix VNET route priority issue (sonic-net#1421) [vnet] Maintain the reference count of the nexthop when creating a vn… (sonic-net#1414) [intfsorch] Retrieve Port object before setting NAT zone on router interfaces. (sonic-net#1372)

d-dashkov added 4 commits February 9, 2021 11:57

Added ip check to config int

7b88217

Signed-off-by: d-dashkov <[email protected]>

Fixed checking the correct mask

5f25663

Signed-off-by: d-dashkov <[email protected]>

Added checking to config ip del

9e22c2c

Signed-off-by: d-dashkov <[email protected]>

Refactored validation function

3f287f7

Signed-off-by: d-dashkov <[email protected]>

d-dashkov changed the title ~~[config]Fix config int add incorrect ip~~ [config] Fix config int add incorrect ip Feb 9, 2021

Updated for IPv6

cb3cba1

Signed-off-by: d-dashkov <[email protected]>

d-dashkov mentioned this pull request Feb 16, 2021

Inability to remove IPv6 address. IPv6 address is assigned on interface with leading zeros although all leading zeros were omitted when IPv6 was being assigned using CLI command. sonic-net/sonic-buildimage#6776

Closed

prsunny reviewed Feb 16, 2021

View reviewed changes

prsunny requested review from jleveque and arlakshm February 16, 2021 22:00

Replaced exeption

d8d8d2e

Signed-off-by: d-dashkov <[email protected]>

Added UT for ip config

9361fb6

Signed-off-by: d-dashkov <[email protected]>

d-dashkov requested a review from prsunny February 22, 2021 22:15

d-dashkov added 4 commits March 22, 2021 16:57

Refactored ip functions

98d7843

Signed-off-by: d-dashkov <[email protected]>

Updated mask validation and UT

b9d0d48

Signed-off-by: d-dashkov <[email protected]>

Made function generic

2aa389f

Signed-off-by: d-dashkov <[email protected]>

Fixed UT

0c39c0f

Signed-off-by: d-dashkov <[email protected]>

d-dashkov requested a review from liat-grozovik March 22, 2021 19:00

Fixed ipv6 mask

3d1abff

Signed-off-by: d-dashkov <[email protected]>

d-dashkov mentioned this pull request Apr 13, 2021

[config]Static routes to config_db #1534

Merged

d-dashkov added 4 commits May 26, 2021 17:08

Merge remote-tracking branch 'source/master' into fix_config_incorrec…

21640b4

…t_ip

Rename function

72f3696

Signed-off-by: d-dashkov <[email protected]>

Fix tests

31cc683

Signed-off-by: d-dashkov <[email protected]>

Update logic and tests

78f5c13

Signed-off-by: d-dashkov <[email protected]>

prsunny approved these changes May 27, 2021

View reviewed changes

prsunny merged commit 56db162 into sonic-net:master Jun 2, 2021

gitsabari pushed a commit to gitsabari/sonic-utilities that referenced this pull request Jun 15, 2021

[config] Fix config int add incorrect ip (sonic-net#1414)

967c2ce

* Added ip and mask check to config int Signed-off-by: d-dashkov <[email protected]>

liat-grozovik added the Request for 202012 Branch label Jun 15, 2021

qiluo-msft pushed a commit that referenced this pull request Jun 16, 2021

[config] Fix config int add incorrect ip (#1414)

d5af9d6

* Added ip and mask check to config int Signed-off-by: d-dashkov <[email protected]>

qiluo-msft added the Included in 202012 Branch label Jun 16, 2021

This was referenced Jul 7, 2021

Fixed IP validation in "config interface ip add/remove" #1709

Merged

[vlan] multiple test cases fail sonic-net/sonic-buildimage#8111

Closed

raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-utilities that referenced this pull request Aug 10, 2021

[config] Fix config int add incorrect ip (sonic-net#1414)

3baa61b

* Added ip and mask check to config int Signed-off-by: d-dashkov <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[config] Fix config int add incorrect ip #1414

[config] Fix config int add incorrect ip #1414

d-dashkov commented Feb 9, 2021 •

edited

Loading

prsunny Feb 16, 2021

jleveque Feb 16, 2021

d-dashkov Feb 16, 2021

prsunny Feb 16, 2021

d-dashkov Feb 16, 2021 •

edited

Loading

liat-grozovik Mar 21, 2021

d-dashkov Mar 22, 2021

lguohan commented Feb 17, 2021

d-dashkov commented Feb 17, 2021

liat-grozovik commented Mar 15, 2021

dprital commented May 25, 2021

d-dashkov commented May 25, 2021

dprital commented Jun 3, 2021

dprital commented Jun 15, 2021

[config] Fix config int add incorrect ip #1414

[config] Fix config int add incorrect ip #1414

Conversation

d-dashkov commented Feb 9, 2021 • edited Loading

prsunny Feb 16, 2021

Choose a reason for hiding this comment

jleveque Feb 16, 2021

Choose a reason for hiding this comment

d-dashkov Feb 16, 2021

Choose a reason for hiding this comment

prsunny Feb 16, 2021

Choose a reason for hiding this comment

d-dashkov Feb 16, 2021 • edited Loading

Choose a reason for hiding this comment

liat-grozovik Mar 21, 2021

Choose a reason for hiding this comment

d-dashkov Mar 22, 2021

Choose a reason for hiding this comment

lguohan commented Feb 17, 2021

d-dashkov commented Feb 17, 2021

liat-grozovik commented Mar 15, 2021

dprital commented May 25, 2021

d-dashkov commented May 25, 2021

dprital commented Jun 3, 2021

dprital commented Jun 15, 2021

d-dashkov commented Feb 9, 2021 •

edited

Loading

d-dashkov Feb 16, 2021 •

edited

Loading