Skip to content

[tests] if no ptf host in testbed.csv get it from inventory#1159

Merged
liat-grozovik merged 1 commit intosonic-net:masterfrom
stepanblyschak:fix-ptfhost-fixture
Oct 16, 2019
Merged

[tests] if no ptf host in testbed.csv get it from inventory#1159
liat-grozovik merged 1 commit intosonic-net:masterfrom
stepanblyschak:fix-ptfhost-fixture

Conversation

@stepanblyschak
Copy link
Copy Markdown
Contributor

@stepanblyschak stepanblyschak commented Oct 15, 2019 •
edited
Loading

Signed-off-by: Stepan Blyschak [email protected]

Description of PR

Summary:
Fixes # (issue)

02:08:09         "ansible_adhoc = <function init_host_mgr at 0x7f19ecd395f0>", 
02:08:09         "testbed = {'comment': 'Mellanox MTBC testbed', 'dut': 'mtbc-sonic-03-2700', 'group-name': 'vm-t1', 'ptf_image_name': 'docker-ptf-mlnx', ...}", 
02:08:09         "", 
02:08:09         "    @pytest.fixture(scope='module')", 
02:08:09         "    def ptfadapter(ansible_adhoc, testbed):", 
02:08:09         "        \"\"\"return ptf test adapter object.", 
02:08:09         "        The fixture is module scope, because usually there is not need to", 
02:08:09         "        restart PTF nn agent and reinitialize data plane thread on every", 
02:08:09         "        test class or test function/method. Session scope should also be Ok,", 
02:08:09         "        however if something goes really wrong in one test module it is safer", 
02:08:09         "        to restart PTF before proceeding running other test modules", 
02:08:09         "        \"\"\"", 
02:08:09         "    ", 
02:08:09         ">       ptfhost = AnsibleHost(ansible_adhoc, testbed['ptf'])", 
02:08:09         "E       KeyError: 'ptf'",

Type of change

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

Approach

How did you do it?

Get ptf_host from inventory

How did you verify/test it?

Run test with pdb and access ptf_host when no ptf in testbed.csv

Any platform specific information?

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

Documentation

liat-grozovik
liat-grozovik approved these changes Oct 15, 2019
View reviewed changes
Copy link
Copy Markdown
Collaborator

@liat-grozovik liat-grozovik left a comment

Choose a reason for hiding this comment

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

please add more information in the commit message itself.
i am missing bug description as for sure you are fixing some issue found

@stepanblyschak stepanblyschak force-pushed the fix-ptfhost-fixture branch 2 times, most recently from c93136a to 69c8d42 Compare October 15, 2019 16:04
[tests] if no ptf host in testbed.csv get it from inventory
d681980 
Fix when no ptf in testbed.csv then try to parse it from inventory

Signed-off-by: Stepan Blyschak <[email protected]>
@liat-grozovik
Copy link
Copy Markdown
Collaborator

liat-grozovik commented Oct 16, 2019

@stepanblyschak should this fix be merged to 201811? if so, need to set label.

@liat-grozovik liat-grozovik merged commit 2737970 into sonic-net:master Oct 16, 2019
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@Yakiv-Huryk
[202205][submodule] advance sonic-sairedis pointer (sonic-net#13237)
49b91ef 
Update sonic-sairedis submodule pointer to include the following:

0994449 [asan] suppress the static variable leaks (sonic-net#1085) (sonic-net#1159)
6fc86a9 Switch to using stock gcovr 5.2 (sonic-net#1174) (sonic-net#1190)
e7ded51 Create fabric ports for switch_type fabric (sonic-net#1189)
f498261 * Add Voqs to Virtual Switch (sonic-net#1162)

Signed-off-by: Yakiv Huryk <[email protected]>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@yxieca
[201811][swss] advance swss sub-module head (sonic-net#4037)
a5827f3 
Submodule src/sonic-swss 49aff5da..e237e12d:
  > [aclorch] Validate that provided IN/OUT_PORTS are physical interfaces (sonic-net#1156)
  > Teamd :: fix for cleaning up the teamd processes correctly on teamd docker stop (sonic-net#1159)

Signed-off-by: Ying Xie <[email protected]>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@judyjoseph
Update sonic-platform-common with following commits
c95a9d1 
 1d3a810 [python coverage] fix result color bar (sonic-net#202)
 3f7b359 Add a template function that returns list of asics on module (sonic-net#185)
 abc2709 Fix decode error when parsing EEPROM fields (sonic-net#199)
 789b41e Load interval from thermal_policy.json (sonic-net#178)
 540ed1c Fix Xcvrd crash due to invalid key access in type_of_media_interface, host_electrical_interface, connector_dict (sonic-net#206)
 716caf8 Unifying the platform api for get_pcie_aer_stats with PcieBase (sonic-net#197)

Update sonic-utilities with following commit

 3f3974e [show priority-group drop counters] Add user info output when user want to check PG counters and polling are disabled (sonic-net#1678)
 16606de Global and Interface commands for IPv6 Link local address enhancements (sonic-net#1159)
arawat-nexthop pushed a commit to nexthop-ai/sonic-mgmt that referenced this pull request Apr 9, 2026
@abhishek-nexthop
NOS-5432: Update show pfcwd stat to show pfcwd stats (sonic-net#1159)
fb73baf 
<!--
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.
-->
Update to full command to avoid multiple match error.
Summary:
Fixes # (issue)

### Type of change

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

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


### Back port request
- [ ] 202505
- [ ] 202511

### Approach
#### What is the motivation for this PR?
Broken testcases 

#### How did you do it?
Updated to full command

#### How did you verify/test it?
Ran the corresponding test

#### Any platform specific information?
N/A

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

### Documentation
<!--
(If it's a new feature, new test case)
Did you update documentation/Wiki relevant to your implementation?
Link to the wiki page?
-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wangxin wangxin wangxin approved these changes

@nazariig nazariig nazariig approved these changes

@liat-grozovik liat-grozovik liat-grozovik approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@stepanblyschak @liat-grozovik @wangxin @nazariig