Skip to content

[pytest/test_drop_counters.py] Fixed IGMP test case#1624

Merged
daall merged 7 commits intosonic-net:masterfrom
yvolynets-mlnx:drop_count_igmp_fix
May 21, 2020
Merged

[pytest/test_drop_counters.py] Fixed IGMP test case#1624
daall merged 7 commits intosonic-net:masterfrom
yvolynets-mlnx:drop_count_igmp_fix

Conversation

@yvolynets-mlnx
Copy link
Contributor

@yvolynets-mlnx yvolynets-mlnx commented Apr 29, 2020

Signed-off-by: Yuriy Volynets [email protected]

Description of PR

Summary:
Fixes # (issue) Fixed IGMP test case, updated packets creation.

Type of change

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

Approach

How did you do it?

  • Updated packets creation for IGMP v1 and v2, by using "scapy" library instead of using HEX
  • Skipped "IGMP membership report" verification when packets are received on DUT VLAN interfaces

How did you verify/test it?

Tested on the local setup

Any platform specific information?

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

Documentation

@yvolynets-mlnx
FIxed IGMP test case
95137b0 
Signed-off-by: Yuriy Volynets <[email protected]>
nazariig
nazariig reviewed Apr 29, 2020
View reviewed changes
nazariig
nazariig reviewed Apr 29, 2020
View reviewed changes
nazariig
nazariig reviewed Apr 29, 2020
View reviewed changes
@volodymyrsamotiy volodymyrsamotiy requested a review from daall May 5, 2020 14:49
@yvolynets-mlnx yvolynets-mlnx changed the title [pytest] Fixed IGMP test case in test_drop_counters [pytest/test_drop_counters.py] Fixed IGMP test case May 5, 2020
daall
daall reviewed May 7, 2020
View reviewed changes
@yxieca
Copy link
Collaborator

yxieca commented May 12, 2020

@yvolynets-mlnx can you solve the merge conflict?

@liat-grozovik
Copy link
Collaborator

liat-grozovik commented May 19, 2020

@daall and @yxieca any further notes or we can move forward and merge it?
without the fix we still have nightly regression failures.

@daall
Copy link
Contributor

daall commented May 19, 2020

@daall and @yxieca any further notes or we can move forward and merge it?
without the fix we still have nightly regression failures.

@liat-grozovik there are still merge conflicts. We can't do anything with this PR until those are fixed.

@liat-grozovik
Copy link
Collaborator

liat-grozovik commented May 19, 2020 via email

@yvolynets-mlnx
Copy link
Contributor Author

yvolynets-mlnx commented May 20, 2020

@daall and @yxieca any further notes or we can move forward and merge it?
without the fix we still have nightly regression failures.

@liat-grozovik there are still merge conflicts. We can't do anything with this PR until those are fixed.

Fixed merge conflicts.

yxieca
yxieca reviewed May 21, 2020
View reviewed changes
tests/drop_counters/test_drop_counters.py
eth_layer = Ether(src=ports_info["src_mac"], dst=ethernet_dst)
ip_layer = IP(src=pkt_fields["ipv4_src"], )
igmp_layer = igmp_types[igmp_version][msg_type]
assert igmp_layer.igmpize(ip=ip_layer, ether=eth_layer), "Can't create IGMP packet"
Copy link
Collaborator

@yxieca yxieca May 21, 2020

Choose a reason for hiding this comment

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

minor issue. please use pytest_assert instead. There are known issue with assert.

yxieca
yxieca approved these changes May 21, 2020
View reviewed changes
Copy link
Collaborator

@yxieca yxieca left a comment

Choose a reason for hiding this comment

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

With minor comment.

@daall daall merged commit b175f8f into sonic-net:master May 21, 2020
shlomibitton pushed a commit to Junchao-Mellanox/sonic-mgmt that referenced this pull request Jul 12, 2020
Squashed commit of the following:
5e7f7a8 
commit d79d500
Author: Xin Wang <[email protected]>
Date:   Sat May 23 11:31:48 2020 +0800

    Fix acl testing for new t1 routes (sonic-net#1688)

    The t1 and t1-lag routes have been changed after replacing static
    routes on VM with exabgp announced routes. This caused the acl
    testing failed. This PR is to fix this issue reported in sonic-net#1603.

    Changes:
    1. Update the acl rules template to use new IP addresses
    2. Update the acl script to use new IP addresses

    Signed-off-by: Xin Wang <[email protected]>

commit c84e699
Author: yvolynets-mlnx <[email protected]>
Date:   Sat May 23 04:41:19 2020 +0300

    [pytest/ntp] Minor fix for NTP test case. (sonic-net#1698)

    Added verification of 'wait_until' result, to easier understand test case failure reason.

    Signed-off-by: Yuriy Volynets <[email protected]>

commit 441ddfa
Author: Vitaliy Senchyshyn <[email protected]>
Date:   Sat May 23 00:40:02 2020 +0300

    [wr_arp][pytest] Fixed wr_arp test (sonic-net#1695)

    * [wr_arp] Fixed wr_arp test

    Signed-off-by: Vitaliy Senchyshyn <[email protected]>

    * Make show ip protocol command working for different sonic images

    * Fixed review comments

    * Made records variable a class memeber

    * Fixed DIP taking from ip route show for sonic master

commit abdb746
Author: Xin Wang <[email protected]>
Date:   Fri May 22 18:45:56 2020 +0800

    [pytest/fib]: Fix the issue of using wrong port announcing IPv6 routes (sonic-net#1697)

    I used wrong port for announcing IPv6 routes in PR sonic-net#1692. This PR is to fix that issue.

    Signed-off-by: Xin Wang <[email protected]>

commit 9e52bba
Author: lguohan <[email protected]>
Date:   Fri May 22 03:45:14 2020 -0700

    [pytest/snmp_cpu]: query nproc when ansible facts does not have vcpu info (sonic-net#1693)

    sometimes, ansible facts does not gather vcpu information. in this case, use nproc to query the cpu number directly.

    Signed-off-by: Guohan Lu <[email protected]>

commit b175f8f
Author: yvolynets-mlnx <[email protected]>
Date:   Fri May 22 02:49:30 2020 +0300

    [pytest/test_drop_counters.py] Fixed IGMP test case (sonic-net#1624)

    Signed-off-by: Yuriy Volynets <[email protected]>

commit 208d02a
Author: Xin Wang <[email protected]>
Date:   Fri May 22 00:23:19 2020 +0800

    Announce vips routes for bgp_multipath_relax testing (sonic-net#1692)

    Previously the vips routes were statically configured in the VMs for
    bgp_multipath_relax testing. After the change of announcing
    routes from exabgp in PTF to VMs, the vips routes were missing.
    The bgp_multipath_relax testing depends on the vips routes failed.

    This change is to announce the vips routes to VMs  that have the
    vips routes configuration. The functions in the fib fixture definition
    file were refactored a little bit.

    Signed-off-by: Xin Wang <[email protected]>

commit 6d7498f
Author: yvolynets-mlnx <[email protected]>
Date:   Thu May 21 11:38:08 2020 +0300

    Fixed fib tests: test_hash_ipv4/test_hash_ipv6 (sonic-net#1683)

    Fixes sonic-net#1679

    Signed-off-by: Yuriy Volynets <[email protected]>

commit f17471c
Author: Neetha John <[email protected]>
Date:   Wed May 20 15:53:44 2020 -0700

    Qos SAI test restructure (sonic-net#1682)

    * Qos SAI test restructure

    Signed-off-by: Neetha John <[email protected]>

commit 87f3a23
Author: Joe LeVeque <[email protected]>
Date:   Wed May 20 10:42:22 2020 -0700

    [pytest][cacl] Remove unused 'testbed_devices' from parameters (sonic-net#1689)

commit bd6e135
Author: Ying Xie <[email protected]>
Date:   Wed May 20 08:11:55 2020 -0700

    [reload config] redirect reload config output to /dev/null (sonic-net#1687)

    config reload command will restart interface-config service, which
    will reset eth0. Which will reset the connection issues config
    reload if the output is coming to stdio/stderr. It in turn could
    cause the pytest to stuck for long time.

    Signed-off-by: Ying Xie <[email protected]>

Signed-off-by: Stepan Blyschak <[email protected]>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@daall
[submodule][202012]: Update sonic-swss and sonic-utilities submodules (…
9b73492 
…sonic-net#6701)

sonic-swss:
- [Mux] Route handling based on mux status, kernel tunnel support (sonic-net#1615)
- Reduce noise during frequent route update (sonic-net#1624)
- Changed Error log to Notice log during FDB flush notification after VLAN delete (sonic-net#1618)
- [PortsOrch] Add reference counting to ports for ACL bindings (sonic-net#1614)
- [crm]: Ignore unsupported/non-implemented switch attributes (sonic-net#1613)
- [Mux] Fix repeating logs in case of tunnel creation fail (sonic-net#1610)

sonic-utilities:
- [config reload]: Restart mux container (sonic-net#1401)
- [storyteller] Enhance the storyteller utility (sonic-net#1400)
- [show] Fix int status when portchannel is in the system (sonic-net#1376)
- [config][show] cli support for retrieving ber, eye-info and configuring prbs, loopback on Y-cable  (sonic-net#1386)
- Skip route check for tun0 interfaces (sonic-net#1399)
- do not parse stderr to get correct routing stack (sonic-net#1398)
- [storyteller] allow storyteller to work on downloaded logs (sonic-net#1388)
- [show] Run fwutil with sudo (sonic-net#1364)

Signed-off-by: Danny Allen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nazariig nazariig nazariig left review comments

@yxieca yxieca yxieca approved these changes

@volodymyrsamotiy volodymyrsamotiy Awaiting requested review from volodymyrsamotiy

@liat-grozovik liat-grozovik Awaiting requested review from liat-grozovik

+1 more reviewer

@daall daall daall approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@yvolynets-mlnx @yxieca @liat-grozovik @daall @nazariig