[ptf]: Stop ptf portchannel to fix the remove-topo issue#4248
Merged
ganglyu merged 5 commits intosonic-net:masterfrom Sep 14, 2021
ganglyu:ptf_portchannel
Merged
[ptf]: Stop ptf portchannel to fix the remove-topo issue#4248ganglyu merged 5 commits intosonic-net:masterfrom ganglyu:ptf_portchannel
ganglyu merged 5 commits intosonic-net:masterfrom
ganglyu:ptf_portchannel
Conversation
Stop ptf portchannel during 'testbed-cli.sh remove-topo'. Signed-off-by: Gang Lv <ganglv@microsoft.com>
qiluo-msft
reviewed
Sep 14, 2021
| @@ -0,0 +1,30 @@ | |||
| --- | |||
Contributor
There was a problem hiding this comment.
This file is almost same as ptf_portchannel.yml, except the bottom task. Could you parameterize ptf_portchannel.yml to support both start (default) and stop cmd?
Collaborator
There was a problem hiding this comment.
You can refer to https://github.com/Azure/sonic-mgmt/blob/master/ansible/roles/vm_set/tasks/remove_topo.yml#L20
The idea is to pass in a variable with name like ptf_portchannel_action while calling playbook ptf_portchannel.yml.
Value of the variable can be start during add-topo and stop during remove-topo. Then update the ptf_portchannel.yml playbook to act differently according to value of the variable.
Signed-off-by: Gang Lv <ganglv@microsoft.com>
qiluo-msft
approved these changes
Sep 14, 2021
wangxin
reviewed
Sep 14, 2021
| - name: Control PTF portchannel | ||
| ptf_portchannel: | ||
| cmd: "start" | ||
| cmd: "{{ptf_portchannel_action}}" |
Collaborator
There was a problem hiding this comment.
The common practice is to have a whitespace between the variable name for better readability, like {{ ptf_portchannel_action }}.
Signed-off-by: Gang Lv <ganglv@microsoft.com>
… into ptf_portchannel
qiluo-msft
approved these changes
Sep 14, 2021
wangxin
added a commit
to wangxin/sonic-mgmt
that referenced
this pull request
Sep 16, 2021
PR sonic-net#4248 updated the playbook ptf_portchannel.yml to accept variable "ptf_portchannel_action". Another playbook renumber_topo.yml calling the ptf_portchannel.yml was not updated to pass down the variable. This cause issue variable "ptf_portchannel_action" undefined while run "testbed-cli.sh restart-ptf". The change is to update the renumber_topo.yml to include the ptf_portchannel.yml with variable. Also added a stop to stop portchannel in PTF before removing PTF docker. Signed-off-by: Xin Wang <xiwang5@microsoft.com>
4 tasks
Blueve
pushed a commit
that referenced
this pull request
Sep 16, 2021
…4286) PR #4248 updated the playbook ptf_portchannel.yml to accept variable "ptf_portchannel_action". Another playbook renumber_topo.yml calling the ptf_portchannel.yml was not updated to pass down the variable. This cause issue variable "ptf_portchannel_action" undefined while run "testbed-cli.sh restart-ptf". The change is to update the renumber_topo.yml to include the ptf_portchannel.yml with variable. Also added a stop to stop portchannel in PTF before removing PTF docker. Signed-off-by: Xin Wang <xiwang5@microsoft.com>
vmittal-msft
pushed a commit
to vmittal-msft/sonic-mgmt
that referenced
this pull request
Sep 28, 2021
…onic-net#4286) PR sonic-net#4248 updated the playbook ptf_portchannel.yml to accept variable "ptf_portchannel_action". Another playbook renumber_topo.yml calling the ptf_portchannel.yml was not updated to pass down the variable. This cause issue variable "ptf_portchannel_action" undefined while run "testbed-cli.sh restart-ptf". The change is to update the renumber_topo.yml to include the ptf_portchannel.yml with variable. Also added a stop to stop portchannel in PTF before removing PTF docker. Signed-off-by: Xin Wang <xiwang5@microsoft.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Signed-off-by: Gang Lv ganglv@microsoft.com
Description of PR
Summary:
Fixes # (issue)
Type of change
Back port request
Approach
What is the motivation for this PR?
If add-topo process started ptf portchannel, remove-topo process would be blocked while removing vlan port.
The solution is to stop ptf portchannel before removing vlan port.
How did you do it?
Add stop_ptf_portchannel.yml to stop portchannel interface.
How did you verify/test it?
Test run remove-topo and add-topo on both VS setup and physical setup.
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation