Reset factory tests #7652

yanaport · 2023-03-06T11:49:51Z

Summary:
Tests for reset factory feature

Type of change

Bug fix
Testbed and Framework(new/improvement)
[X ] Test case(new)

Back port request

201911
202012
202205

Approach

What is the motivation for this PR? Add tests for the reset factory feature

How did you do it? pytest tests

How did you verify/test it? testes on sonic system

Any platform specific information? no

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

Documentation

linux-foundation-easycla · 2023-03-06T11:49:55Z

The committers listed above are authorized under a signed CLA.

✅ login: yanaport (dec021d, 62d183d)
✅ login: qiluo-msft / name: Qi Luo (a0fcbcc)

wangxin · 2023-03-06T11:51:55Z

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed fix end of files.........................................................Failed - hook id: end-of-file-fixer - exit code: 1 - files were modified by this hook Fixing tests/reset_factory/test_reset_factory.py check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/reset_factory/test_reset_factory.py:4:1: F401 'time' imported but unused tests/reset_factory/test_reset_factory.py:281:121: E501 line too long (121 > 120 characters)

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

wangxin · 2023-03-06T12:09:24Z

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Failed - hook id: trailing-whitespace - exit code: 1 - files were modified by this hook Fixing tests/reset_factory/test_reset_factory.py fix end of files.........................................................Failed - hook id: end-of-file-fixer - exit code: 1 - files were modified by this hook Fixing tests/reset_factory/test_reset_factory.py check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 ... [truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

wangxin · 2023-03-06T12:53:24Z

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed fix end of files.........................................................Failed - hook id: end-of-file-fixer - exit code: 1 - files were modified by this hook Fixing tests/reset_factory/test_reset_factory.py check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Failed - hook id: check-ast - exit code: 1 tests/reset_factory/test_reset_factory.py: failed parsing with CPython 3.8.10: Traceback (most recent call last): File "/home/AzDevOps/.cache/pre-commit/repoae0_j77l/py_env-python3/lib/python3.8/site-packages/pre_commit_hooks/check_ast.py", line 21, in main ast.parse(f.read(), filename=filename) File "/usr/lib/python3.8/ast.py", line 47, in parse ... [truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

tests/reset_factory/test_reset_factory.py

wangxin · 2023-03-08T09:53:10Z

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed fix end of files.........................................................Failed - hook id: end-of-file-fixer - exit code: 1 - files were modified by this hook Fixing tests/reset_factory/test_reset_factory.py check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/reset_factory/test_reset_factory.py:281:1: W191 indentation contains tabs tests/reset_factory/test_reset_factory.py:281:1: E101 indentation contains mixed spaces and tabs

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

wangxin · 2023-03-08T09:57:29Z

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed fix end of files.........................................................Failed - hook id: end-of-file-fixer - exit code: 1 - files were modified by this hook Fixing tests/reset_factory/test_reset_factory.py check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Passed

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

mssonicbld · 2023-03-08T10:11:49Z

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed fix end of files.........................................................Failed - hook id: end-of-file-fixer - exit code: 1 - files were modified by this hook Fixing tests/reset_factory/init.py Fixing tests/reset_factory/test_reset_factory.py check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Passed

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

Signed-off-by: Yana Port <[email protected]>

yanaport · 2023-05-07T11:26:58Z

@yxieca Can you please review?

tests/reset_factory/test_reset_factory.py

Signed-off-by: Yana Port <[email protected]>

liat-grozovik · 2023-07-10T14:54:10Z

@yxieca is Semgrep is must? not sure. also, can you please help to merge?

#### Why I did it Support reset factory in Sonic OS [Reset Factory HLD](sonic-net/SONiC#1231) [Sonic-mgmt tests](sonic-net/sonic-mgmt#7652) #### How I did it - Added new script "/usr/bin/reset-factory" * It generates a new config_db.json files with factory configurations * It clears system files and logs * It removes all docker containers on system except database * It clears non-default users and restores default users password - Dump the default users info to a new file during build "/etc/sonic/default_users.json" - Supported new type "Keep-basic" in "config-setup factory" - Add new conf file for config-setup "/etc/config-setup/config-setup.conf #### How to verify it - Run reset-factory script with all types: < none | keep-all-config | only-config | keep-basic > - Run config-setup factory with parameters < none | keep-basic > #### Description for the changelog Support reset factory in Sonic OS #### Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

yxieca · 2023-07-12T23:44:50Z

/azp run Semgrep

azure-pipelines · 2023-07-12T23:44:55Z

No pipelines are associated with this pull request.

yxieca · 2023-07-12T23:45:08Z

/azp run

azure-pipelines · 2023-07-12T23:45:17Z

Azure Pipelines successfully started running 1 pipeline(s).

yxieca · 2023-07-12T23:51:32Z

@yanaport please fill the PR comments template.

qiluo-msft · 2023-07-16T18:47:19Z

@yxieca is Semgrep is must? not sure. also, can you please help to merge?

Yes, please merge latest master to trigger the semgrep checker. It is enabled by below commit:

fd488dadd 2023-06-19 | add semgrep (#8663) [Mai Bui]

#### Why I did it Support reset factory in Sonic OS [Reset Factory HLD](sonic-net/SONiC#1231) [Sonic-mgmt tests](sonic-net/sonic-mgmt#7652) #### How I did it - Added new script "/usr/bin/reset-factory" * It generates a new config_db.json files with factory configurations * It clears system files and logs * It removes all docker containers on system except database * It clears non-default users and restores default users password - Dump the default users info to a new file during build "/etc/sonic/default_users.json" - Supported new type "Keep-basic" in "config-setup factory" - Add new conf file for config-setup "/etc/config-setup/config-setup.conf #### How to verify it - Run reset-factory script with all types: < none | keep-all-config | only-config | keep-basic > - Run config-setup factory with parameters < none | keep-basic > #### Description for the changelog Support reset factory in Sonic OS #### Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

Meir-renford · 2023-10-02T09:11:31Z

We will run the test in upcoming week and will update.

bingwang-ms · 2023-11-01T01:55:55Z

@yanaport The test is failing with error message. Can you take a look?

  File "/azp/_work/9/s/tests/reset_factory/test_reset_factory.py", line 46, in test_reset_factory_only_config
    reset_factory(duthosts, localhost, ONLY_CONFIG)
  File "/azp/_work/9/s/tests/reset_factory/test_reset_factory.py", line 88, in reset_factory
    reset_factory_start_time = datetime.strptime(date_time_str.split(" ", 1)[1], '%d %b %Y %H:%M:%S %p %Z')
  File "/usr/lib/python3.8/_strptime.py", line 568, in _strptime_datetime
    tt, fraction, gmtoff_fraction = _strptime(data_string, format)
  File "/usr/lib/python3.8/_strptime.py", line 349, in _strptime
    raise ValueError("time data %r does not match format %r" %
ValueError: time data 'Oct 26 02:05:36 UTC 2023' does not match format '%d %b %Y %H:%M:%S %p %Z'

StormLiangMS · 2023-12-20T06:43:53Z

hi @yanaport this test case will break the mgmt interface and leave the DUT in a bad status, can't be reachable, we skipped this test case, and filed #11103, pls have this issue fixed. And have you tested this before commit?

StormLiangMS · 2023-12-20T06:44:34Z

@liat-grozovik for vis.

yanaport force-pushed the reset_factory branch from fdc8a76 to 9ec9a8d Compare March 6, 2023 12:08

yanaport force-pushed the reset_factory branch from 9ec9a8d to 4f3a1eb Compare March 6, 2023 12:52

yanaport force-pushed the reset_factory branch from 4f3a1eb to 26a0d98 Compare March 6, 2023 12:54

ppikh reviewed Mar 7, 2023

View reviewed changes

tests/reset_factory/test_reset_factory.py Outdated Show resolved Hide resolved

yanaport force-pushed the reset_factory branch from 26a0d98 to fc692c0 Compare March 8, 2023 09:52

yanaport force-pushed the reset_factory branch from fc692c0 to bac3fe5 Compare March 8, 2023 09:56

yanaport force-pushed the reset_factory branch from bac3fe5 to 940cfdd Compare March 8, 2023 10:10

yanaport force-pushed the reset_factory branch from 940cfdd to 3f8587d Compare March 8, 2023 10:22

Reset factory tests

dec021d

Signed-off-by: Yana Port <[email protected]>

yanaport force-pushed the reset_factory branch from 3f8587d to dec021d Compare March 20, 2023 13:17

This was referenced Mar 21, 2023

Support Reset factory sonic-net/sonic-buildimage#14105

Merged

Reset factory hld sonic-net/SONiC#1231

Merged

zhangyanzhao requested review from wangxin and bpar9 May 8, 2023 05:09

qiluo-msft reviewed May 30, 2023

View reviewed changes

tests/reset_factory/test_reset_factory.py Outdated Show resolved Hide resolved

Global variables were removed

62d183d

Signed-off-by: Yana Port <[email protected]>

qiluo-msft approved these changes Jun 19, 2023

View reviewed changes

liat-grozovik approved these changes Jul 10, 2023

View reviewed changes

Merge branch 'master' into reset_factory

a0fcbcc

qiluo-msft merged commit 8e144ac into sonic-net:master Oct 22, 2023

roy-sror mentioned this pull request Apr 10, 2024

SONiC 202311 release notes sonic-net/SONiC#1589

Merged

roy-sror mentioned this pull request May 29, 2024

Update the quality of some feature in the release note sonic-net/SONiC#1693

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reset factory tests #7652

Reset factory tests #7652

yanaport commented Mar 6, 2023 •

edited

Loading

linux-foundation-easycla bot commented Mar 6, 2023 •

edited

Loading

wangxin commented Mar 6, 2023

wangxin commented Mar 6, 2023

wangxin commented Mar 6, 2023

wangxin commented Mar 8, 2023

wangxin commented Mar 8, 2023

mssonicbld commented Mar 8, 2023

yanaport commented May 7, 2023

liat-grozovik commented Jul 10, 2023

yxieca commented Jul 12, 2023

azure-pipelines bot commented Jul 12, 2023

yxieca commented Jul 12, 2023

azure-pipelines bot commented Jul 12, 2023

yxieca commented Jul 12, 2023

qiluo-msft commented Jul 16, 2023

Meir-renford commented Oct 2, 2023

bingwang-ms commented Nov 1, 2023

StormLiangMS commented Dec 20, 2023

StormLiangMS commented Dec 20, 2023

Reset factory tests #7652

Reset factory tests #7652

Conversation

yanaport commented Mar 6, 2023 • edited Loading

Type of change

Back port request

Approach

What is the motivation for this PR? Add tests for the reset factory feature

How did you do it? pytest tests

How did you verify/test it? testes on sonic system

Any platform specific information? no

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

Documentation

linux-foundation-easycla bot commented Mar 6, 2023 • edited Loading

wangxin commented Mar 6, 2023

wangxin commented Mar 6, 2023

wangxin commented Mar 6, 2023

wangxin commented Mar 8, 2023

wangxin commented Mar 8, 2023

mssonicbld commented Mar 8, 2023

yanaport commented May 7, 2023

liat-grozovik commented Jul 10, 2023

yxieca commented Jul 12, 2023

azure-pipelines bot commented Jul 12, 2023

yxieca commented Jul 12, 2023

azure-pipelines bot commented Jul 12, 2023

yxieca commented Jul 12, 2023

qiluo-msft commented Jul 16, 2023

Meir-renford commented Oct 2, 2023

bingwang-ms commented Nov 1, 2023

StormLiangMS commented Dec 20, 2023

StormLiangMS commented Dec 20, 2023

yanaport commented Mar 6, 2023 •

edited

Loading

linux-foundation-easycla bot commented Mar 6, 2023 •

edited

Loading