Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vlan][dhcp_relay] Fix error while delete vlan #2987

Merged
merged 2 commits into from
Sep 20, 2023

Conversation

yaqiangz
Copy link
Contributor

@yaqiangz yaqiangz commented Sep 20, 2023

MSFT work item: 25218076

Why I did

Use static str to run_command would encounter error because change in this PR: #2718.

How I did it

Change command from static str to list.

How to verify it

  1. UT passed
  2. Build whl and install in testbed.
  3. Init vlan config:
admin@hostname:~$ show vlan bri
+-----------+-----------------+------------+----------------+-------------+
|   VLAN ID | IP Address      | Ports      | Port Tagging   | Proxy ARP   |
+===========+=================+============+================+=============+
|      1000 | 192.168.0.1/24  | Ethernet0  | untagged       | disabled    |
|           | fc02:1000::1/64 | Ethernet1  | untagged       |             |
|           |                 | Ethernet2  | untagged       |             |
|           |                 | Ethernet3  | untagged       |             |
|           |                 | Ethernet4  | untagged       |             |
|           |                 | Ethernet5  | untagged       |             |
|           |                 | Ethernet6  | untagged       |             |
|           |                 | Ethernet7  | untagged       |             |
|           |                 | Ethernet8  | untagged       |             |
|           |                 | Ethernet9  | untagged       |             |
|           |                 | Ethernet10 | untagged       |             |
|           |                 | Ethernet11 | untagged       |             |
|           |                 | Ethernet12 | untagged       |             |
|           |                 | Ethernet13 | untagged       |             |
|           |                 | Ethernet14 | untagged       |             |
|           |                 | Ethernet15 | untagged       |             |
|           |                 | Ethernet16 | untagged       |             |
|           |                 | Ethernet17 | untagged       |             |
|           |                 | Ethernet18 | untagged       |             |
|           |                 | Ethernet19 | untagged       |             |
|           |                 | Ethernet20 | untagged       |             |
|           |                 | Ethernet21 | untagged       |             |
|           |                 | Ethernet22 | untagged       |             |
|           |                 | Ethernet23 | untagged       |             |
|           |                 | Ethernet24 | untagged       |             |
|           |                 | Ethernet25 | untagged       |             |
|           |                 | Ethernet26 | untagged       |             |
|           |                 | Ethernet27 | untagged       |             |
|           |                 | Ethernet28 | untagged       |             |
|           |                 | Ethernet29 | untagged       |             |
|           |                 | Ethernet30 | untagged       |             |
|           |                 | Ethernet31 | untagged       |             |
|           |                 | Ethernet32 | untagged       |             |
|           |                 | Ethernet33 | untagged       |             |
|           |                 | Ethernet34 | untagged       |             |
|           |                 | Ethernet35 | untagged       |             |
|           |                 | Ethernet36 | untagged       |             |
|           |                 | Ethernet37 | untagged       |             |
|           |                 | Ethernet38 | untagged       |             |
|           |                 | Ethernet39 | untagged       |             |
|           |                 | Ethernet40 | untagged       |             |
|           |                 | Ethernet41 | untagged       |             |
|           |                 | Ethernet42 | untagged       |             |
|           |                 | Ethernet43 | untagged       |             |
|           |                 | Ethernet44 | untagged       |             |
|           |                 | Ethernet45 | untagged       |             |
+-----------+-----------------+------------+----------------+-------------+
  1. Remove all members and interface ips of Vlan1000
  2. del Vlan1000 and error no happen and dhcp_relay container restarted as expected.

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

@yaqiangz yaqiangz merged commit 3df1f18 into sonic-net:master Sep 20, 2023
4 checks passed
@yaqiangz
Copy link
Contributor Author

yaqiangz commented Sep 20, 2023

@StormLiangMS Could you pls help to backport, msft work item No is 25218076

StormLiangMS pushed a commit that referenced this pull request Sep 21, 2023
Why I did
Use static str to run_command would encounter error because change in this PR: #2718.

How I did it
Change command from static str to list.

How to verify it
UT passed.
Build whl and install in testbed.

Signed-off-by: Yaqiang Zhu <[email protected]>
JunhongMao pushed a commit to JunhongMao/sonic-utilities that referenced this pull request Oct 4, 2023
Why I did
Use static str to run_command would encounter error because change in this PR: sonic-net#2718.

How I did it
Change command from static str to list.

How to verify it
UT passed.
Build whl and install in testbed.

Signed-off-by: Yaqiang Zhu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants