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

Remove test reset check for GCU test #5005

Merged
merged 3 commits into from
Jan 26, 2022
Merged

Conversation

wen587
Copy link
Contributor

@wen587 wen587 commented Jan 24, 2022

Description of PR

Summary: Remove test reset check for GCU test cause GCU feature will take care of it
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 201911

Approach

What is the motivation for this PR?

Dhcp_relay test: Remove reset check and rollback instead of reload. Use MACRO for each setup. Add try catch for each test to ensure checkpoint is removed after test.
Syslog test: Rename function. Setup code restructure. No logical change.

How did you do it?

Remove code related

How did you verify/test it?

Run test of sonic-mgmt/tests/generic_config_updater/test_dhcp_relay.py on KVM

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@wen587 wen587 requested a review from qiluo-msft January 24, 2022 08:39
@@ -188,7 +219,7 @@ def dhcp_severs_by_vlanid(duthost, vlanid):
root 73 1 0 06:39 pts/0 00:00:00 /usr/sbin/dhcrelay -d -m discard -a %h:%p %P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan1000 -iu Vlan100 -iu PortChannel0001 -iu PortChannel0002 -iu PortChannel0003 -iu PortChannel0004 192.0.0.1 192.0.0.2 192.0.0.3 192.0.0.4
"""
cmds = "docker exec dhcp_relay supervisorctl status | grep ^dhcp-relay \
Copy link
Contributor

@qiluo-msft qiluo-msft Jan 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grep

combine 2 grep into one? #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do

syslog_config_cleanup(duthost, cfg_facts)

if init_syslog_config == CONFIG_ADD_DEFAULT:
if init_syslog_config == CONFIG_CLEANUP:
Copy link
Contributor

@qiluo-msft qiluo-msft Jan 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CONFIG_CLEANUP

There are lots of code changes not listed in PR description. Could you list all the motivations?

We would like to understand if any is refactoring, or fixing something. #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated PR motivation. Please have a look. Thanks

@wen587 wen587 marked this pull request as ready for review January 25, 2022 05:03
@wen587 wen587 requested a review from a team as a code owner January 25, 2022 05:03
@wen587 wen587 merged commit 422982d into sonic-net:master Jan 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants