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

[202205][submodule] Advance sonic-utilities pointer #12134

Closed

Conversation

stephenxs
Copy link
Collaborator

Advance submodule head for sonic-utilities

87942836 [202205] Fix typo in platform_sfputil_helper.is_rj45_port (sonic-net/sonic-utilities#2374) (sonic-net/sonic-utilities#2380)

Signed-off-by: Stephen Sun [email protected]

Why I did it

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205

Description for the changelog

Ensure to add label/tag for the feature raised. example - PR#2174 where, Generic Config and Update feature has been labelled as GCU.

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

87942836 [202205] Fix typo in platform_sfputil_helper.is_rj45_port (sonic-net#2374) (sonic-net#2380)

Signed-off-by: Stephen Sun <[email protected]>
@stephenxs stephenxs requested a review from lguohan as a code owner September 21, 2022 00:20
@liat-grozovik liat-grozovik changed the title [202205][submodule] Advance submodule head for sonic-utilities [202205][submodule] Advance sonic-utilities pointer Sep 21, 2022
@stephenxs
Copy link
Collaborator Author

Failed due to some security related issue which is not related to the PR. retrying.

2022-09-21T04:51:39.4830394Z =================================== FAILURES ===================================
2022-09-21T04:51:39.4833013Z ________________ TestFaultHandling.test_link_flap[256_XPN_SCI] _________________
2022-09-21T04:51:39.4833884Z 
2022-09-21T04:51:39.4835014Z self = <tests.macsec.test_macsec.TestFaultHandling instance at 0x7ff3f045b280>
2022-09-21T04:51:39.4837378Z duthost = <MultiAsicSonicHost vlab-02>
2022-09-21T04:51:39.4840853Z ctrl_links = defaultdict(<type 'dict'>, {u'Ethernet0': {'host': <SonicHost VM0100>, 'name':...5': {'host': <SonicHost VM0101>, 'name': u'ARISTA02T1', 'port': u'Ethernet2'}})
2022-09-21T04:51:39.4841708Z 
2022-09-21T04:51:39.4842327Z     @pytest.mark.disable_loganalyzer
2022-09-21T04:51:39.4843338Z     def test_link_flap(self, duthost, ctrl_links):
2022-09-21T04:51:39.4845019Z         # Only pick one link for link flap test
2022-09-21T04:51:39.4846170Z         assert ctrl_links
2022-09-21T04:51:39.4847324Z         port_name, nbr = ctrl_links.items()[0]
2022-09-21T04:51:39.4848908Z         nbr_eth_port = get_eth_ifname(
2022-09-21T04:51:39.4850100Z             nbr["host"], nbr["port"])
2022-09-21T04:51:39.4851316Z         _, _, _, dut_egress_sa_table_orig, dut_ingress_sa_table_orig = get_appl_db(
2022-09-21T04:51:39.4852127Z             duthost, port_name, nbr["host"], nbr["port"])
2022-09-21T04:51:39.4852671Z     
2022-09-21T04:51:39.4853205Z         # Flap < 6 seconds
2022-09-21T04:51:39.4854214Z         # Not working on eos neighbour
2022-09-21T04:51:39.4855477Z         if not isinstance(nbr["host"], EosHost):
2022-09-21T04:51:39.4857274Z             # Rekey may happen during the following assertions, so we need to get the SA tables again
2022-09-21T04:51:39.4858026Z             retry = 3
2022-09-21T04:51:39.4858516Z             while retry > 0:
2022-09-21T04:51:39.4859441Z                 retry -= 1
2022-09-21T04:51:39.4859898Z                 try:
2022-09-21T04:51:39.4860572Z                     nbr["host"].shell("ifconfig {} down && sleep 1 && ifconfig {} up".format(
2022-09-21T04:51:39.4862708Z                         nbr_eth_port, nbr_eth_port))
2022-09-21T04:51:39.4864489Z                     _, _, _, dut_egress_sa_table_new, dut_ingress_sa_table_new = get_appl_db(
2022-09-21T04:51:39.4865995Z                         duthost, port_name, nbr["host"], nbr["port"])
2022-09-21T04:51:39.4867918Z                     assert dut_egress_sa_table_orig == dut_egress_sa_table_new
2022-09-21T04:51:39.4869484Z                     assert dut_ingress_sa_table_orig == dut_ingress_sa_table_new
2022-09-21T04:51:39.4870542Z                     break
2022-09-21T04:51:39.4871167Z                 except AssertionError as e:
2022-09-21T04:51:39.4871668Z                     if retry == 0:
2022-09-21T04:51:39.4872083Z                         raise e
2022-09-21T04:51:39.4872768Z                 dut_egress_sa_table_orig, dut_ingress_sa_table_orig = dut_egress_sa_table_new, dut_ingress_sa_table_new
2022-09-21T04:51:39.4873399Z     
2022-09-21T04:51:39.4873794Z         # Flap > 6 seconds but < 90 seconds
2022-09-21T04:51:39.4874533Z         if isinstance(nbr["host"], EosHost):
2022-09-21T04:51:39.4874983Z             nbr["host"].shutdown(nbr_eth_port)
2022-09-21T04:51:39.4875362Z             sleep(TestFaultHandling.MKA_TIMEOUT)
2022-09-21T04:51:39.4875730Z             nbr["host"].no_shutdown(nbr_eth_port)
2022-09-21T04:51:39.4876049Z         else:
2022-09-21T04:51:39.4876403Z             nbr["host"].shell("ifconfig {} down && sleep {} && ifconfig {} up".format(
2022-09-21T04:51:39.4876898Z                 nbr_eth_port, TestFaultHandling.MKA_TIMEOUT, nbr_eth_port))
2022-09-21T04:51:39.4877350Z     
2022-09-21T04:51:39.4877667Z         def check_new_mka_session():
2022-09-21T04:51:39.4878266Z             _, _, _, dut_egress_sa_table_new, dut_ingress_sa_table_new = get_appl_db(
2022-09-21T04:51:39.4879008Z                 duthost, port_name, nbr["host"], nbr["port"])
2022-09-21T04:51:39.4879601Z             assert dut_egress_sa_table_new
2022-09-21T04:51:39.4880026Z             assert dut_ingress_sa_table_new
2022-09-21T04:51:39.4880456Z             assert dut_egress_sa_table_orig != dut_egress_sa_table_new
2022-09-21T04:51:39.4880919Z             assert dut_ingress_sa_table_orig != dut_ingress_sa_table_new
2022-09-21T04:51:39.4881297Z             return True
2022-09-21T04:51:39.4881636Z >       assert wait_until(30, 5, 2, check_new_mka_session)
2022-09-21T04:51:39.4881999Z E       AssertionError
2022-09-21T04:51:39.4882133Z 
2022-09-21T04:51:39.4882720Z _          = {'Null': 'Null'}
2022-09-21T04:51:39.4883145Z check_new_mka_session = <function check_new_mka_session at 0x7ff3f071d650>
2022-09-21T04:51:39.4884242Z ctrl_links = defaultdict(<type 'dict'>, {u'Ethernet0': {'host': <SonicHost VM0100>, 'name':...5': {'host': <SonicHost VM0101>, 'name': u'ARISTA02T1', 'port': u'Ethernet2'}})
2022-09-21T04:51:39.4885640Z dut_egress_sa_table_new = {0: {'auth_key': '2788124B3B2E179ABE299A20A30382CC', 'next_pn': '1', 'sak': '5A1A368017A02F7BAFC34A45D6E56518AF231146972A7A995F05EBBECDE6E101', 'salt': 'F34F54F5E7544A8DF6F61B58', ...}}
2022-09-21T04:51:39.4887134Z dut_egress_sa_table_orig = {0: {'auth_key': '2788124B3B2E179ABE299A20A30382CC', 'next_pn': '1', 'sak': '5A1A368017A02F7BAFC34A45D6E56518AF231146972A7A995F05EBBECDE6E101', 'salt': 'F34F54F5E7544A8DF6F61B58', ...}}
2022-09-21T04:51:39.4888901Z dut_ingress_sa_table_new = {0: {'active': 'true', 'auth_key': '2788124B3B2E179ABE299A20A30382CC', 'lowest_acceptable_pn': '1', 'sak': '5A1A368017A02F7BAFC34A45D6E56518AF231146972A7A995F05EBBECDE6E101', ...}}
2022-09-21T04:51:39.4891310Z dut_ingress_sa_table_orig = {0: {'active': 'true', 'auth_key': '2788124B3B2E179ABE299A20A30382CC', 'lowest_acceptable_pn': '1', 'sak': '5A1A368017A02F7BAFC34A45D6E56518AF231146972A7A995F05EBBECDE6E101', ...}}
2022-09-21T04:51:39.4893066Z duthost    = <MultiAsicSonicHost vlab-02>
2022-09-21T04:51:39.4893968Z nbr        = {'host': <SonicHost VM0100>, 'name': u'ARISTA01T1', 'port': u'Ethernet1'}
2022-09-21T04:51:39.4894896Z nbr_eth_port = 'eth1'
2022-09-21T04:51:39.4896123Z port_name  = 'Ethernet0'
2022-09-21T04:51:39.4896673Z retry      = 2
2022-09-21T04:51:39.4897456Z self       = <tests.macsec.test_macsec.TestFaultHandling instance at 0x7ff3f045b280>
2022-09-21T04:51:39.4897970Z 
2022-09-21T04:51:39.4898555Z macsec/test_macsec.py:324: AssertionError
2022-09-21T04:51:39.4899355Z =============================== warnings summary ===============================

@qiluo-msft qiluo-msft requested a review from yxieca September 21, 2022 22:13
@yxieca
Copy link
Contributor

yxieca commented Sep 21, 2022

@stephenxs sorry didn't notice this PR earlier. #12149 contained this change as well.

@stephenxs
Copy link
Collaborator Author

@stephenxs sorry didn't notice this PR earlier. #12149 contained this change as well.

No problem. I'll close this one then.

@stephenxs stephenxs closed this Sep 22, 2022
@stephenxs stephenxs deleted the 202205-submodule-update branch September 22, 2022 23:21
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.

4 participants