Skip to content

[logAnalyzer] Fix the issue that variables are not overridden as expected#844

Merged
lguohan merged 1 commit intosonic-net:masterfrom
wangxin:la-no-include-vars-pr
Mar 28, 2019
Merged

[logAnalyzer] Fix the issue that variables are not overridden as expected#844
lguohan merged 1 commit intosonic-net:masterfrom
wangxin:la-no-include-vars-pr

Conversation

@wangxin
Copy link
Copy Markdown
Collaborator

@wangxin wangxin commented Mar 26, 2019

Description of PR

Summary:
Fixes # (issue)

PR #831 does not fully fix the issue introduced by PR #822. Ansible's
include_vars module could not override variable value previous defined
by set_fact. Variables in vars/run_config_test_vars.yml may still have
old value.

The change is to avoid using include_vars. The variables defined in
run_config_test_vars.yml are moved into script
run_command_with_log_analyzer.yml. The vars files are deleted.

The same change is made to other scripts using the same pattern.

Type of change

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

Approach

How did you do it?

Moved the variables defined in vars/run_config_test_vars.yml into run_command_with_log_analyzer.yml.
Deleted file var/run_config_test_vars.yml.
Did the same change to other scripts uing the same pattern.

How did you verify/test it?

Tested on Mellanox platform.

Any platform specific information?

No

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

Documentation

…cted

PR #831 does not fully fix the issue introduced by PR #822. Ansible's
include_vars module could not override variable value previous defined
by set_fact. Variables in vars/run_config_test_vars.yml may still have
old value.

The change is to avoid using include_vars. The variables defined in
run_config_test_vars.yml are moved into script
run_command_with_log_analyzer.yml. The vars files are deleted.

The same change is made to other scripts using the same pattern.

Signed-off-by: Xin Wang <xinw@mellanox.com>
@wendani wendani self-requested a review March 26, 2019 15:46
@lguohan lguohan merged commit 6ca0c45 into sonic-net:master Mar 28, 2019
yxieca pushed a commit that referenced this pull request Mar 28, 2019
…cted (#844)

PR #831 does not fully fix the issue introduced by PR #822. Ansible's
include_vars module could not override variable value previous defined
by set_fact. Variables in vars/run_config_test_vars.yml may still have
old value.

The change is to avoid using include_vars. The variables defined in
run_config_test_vars.yml are moved into script
run_command_with_log_analyzer.yml. The vars files are deleted.

The same change is made to other scripts using the same pattern.

Signed-off-by: Xin Wang <xinw@mellanox.com>
@wangxin wangxin deleted the la-no-include-vars-pr branch May 24, 2019 03:33
auspham pushed a commit to auspham/sonic-mgmt that referenced this pull request Feb 3, 2026
…Ubuntu 24.04 (sonic-net#844)

<!--
Please make sure you've read and understood our contributing guidelines;
https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md

Please provide following information to help code review process a bit easier:
-->
### Description of PR
<!--
- Please include a summary of the change and which issue is fixed.
- Please also include relevant motivation and context. Where should reviewer start? background context?
- List any dependencies that are required for this change.
-->

Summary:
Fixes # (issue)

### Type of change

<!--
- Fill x for your type of change.
- e.g.
- [x] Bug fix
-->

- [ ] Bug fix
- [ ] Testbed and Framework(new/improvement)
- [ ] New Test case
 - [ ] Skipped for non-supported platforms
- [ ] Test case improvement

### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505

### Approach
#### What is the motivation for this PR?
The base class defined in ansible/devutil/devices/ansible_hosts.py hit issue with loading plugin if run in docker-sonic-mgmt based on Ubuntu 24.04. Consequently, the upgrade_sonic.py script won't work.

#### How did you do it?
This change fixed the plugin loading issue by calling init_plugin_loader() in ansible_hosts.py file.

#### How did you verify/test it?
This change was tested in docker-sonic-mgmt based on both Ubuntu 20.04 and 24.04.

#### Any platform specific information?

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

### Documentation
<!--
(If it's a new feature, new test case)
Did you update documentation/Wiki relevant to your implementation?
Link to the wiki page?
-->
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
[filter-fdb] Check VLAN Presence When Filter FDB (sonic-net#957)
[mellanox] enable watchdog before fast-reboot (sonic-net#844)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
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.

6 participants