Skip to content

Conversation

bbezak
Copy link
Member

@bbezak bbezak commented Dec 28, 2022

Conflicts resolved:

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py:
added 'from neutron.objects import ports as ports_obj' as does upstream

neutron/objects/ports.py:
removed '@db_api.CONTEXT_READER' as it is not existing in yoga (openstack@eeb918e)

In check_baremetal_ports_dhcp_options, the ports need to be retrieved based on the VNIC type. The VNIC type is stored in "ml2_port_bindings" table, not "ports" table. Because the ML2Plugin get_ports method can filter only by "ports" database register fields, it is needed to retrieve those ports using a custom database query and then use the plugin method to retrieve the ports, converted to dictionaries and the extensions processed.

Closes-Bug: #1979643
Change-Id: Iab227d9de75e4b1b927043ce27bdc346066478e8 (cherry picked from commit b497ad1)

@bbezak bbezak requested a review from mnasiadka December 28, 2022 11:08
@bbezak bbezak requested a review from a team as a code owner December 28, 2022 11:08
@bbezak
Copy link
Member Author

bbezak commented Dec 28, 2022

In ``check_baremetal_ports_dhcp_options``, the ports need to be
retrieved based on the VNIC type. The VNIC type is stored in
"ml2_port_bindings" table, not "ports" table.  Because the ML2Plugin
``get_ports`` method can filter only by "ports" database register
fields, it is needed to retrieve those ports using a custom database
query and then use the plugin method to retrieve the ports, converted
to dictionaries and the extensions processed.

Closes-Bug: #1979643
Change-Id: Iab227d9de75e4b1b927043ce27bdc346066478e8
(cherry picked from commit b497ad1)
@bbezak bbezak force-pushed the backport-bug-fix-1979643 branch from 55430c1 to ce7a692 Compare December 28, 2022 12:31
@bbezak
Copy link
Member Author

bbezak commented Dec 28, 2022

fixed indent from previous sync

======
Totals

Ran: 20023 tests in 1748.0326 sec.

  • Passed: 18454
  • Skipped: 1569
  • Expected Fail: 0
  • Unexpected Success: 0
  • Failed: 0
    Sum of execute time for each test: 6822.1185 sec.

==============
Worker Balance

  • Worker 0 (5003 tests) => 0:28:32.804212
  • Worker 1 (5008 tests) => 0:28:04.441201
  • Worker 2 (5007 tests) => 0:29:07.884838
  • Worker 3 (5005 tests) => 0:28:22.581658
    ___________________________________________________________________________________________________ summary ____________________________________________________________________________________________________
    py38: commands succeeded
    congratulations :)

@bbezak bbezak changed the title Filter the ports by VNIC type Filter the ports by VNIC type and Fix availability zones changes check Dec 29, 2022
@bbezak bbezak changed the title Filter the ports by VNIC type and Fix availability zones changes check Filter the ports by VNIC type and Fix availability zones changes check Dec 29, 2022
@bbezak bbezak force-pushed the backport-bug-fix-1979643 branch from 9603654 to 61cd541 Compare January 3, 2023 09:18
@bbezak
Copy link
Member Author

bbezak commented Jan 3, 2023

fetched recent upstream version of https://review.opendev.org/c/openstack/neutron/+/868746

@bbezak bbezak force-pushed the backport-bug-fix-1979643 branch from 61cd541 to ce7a692 Compare January 4, 2023 09:31
@bbezak bbezak changed the title Filter the ports by VNIC type and Fix availability zones changes check Filter the ports by VNIC type Jan 4, 2023
@bbezak
Copy link
Member Author

bbezak commented Jan 4, 2023

removed ttps://review.opendev.org/c/openstack/neutron/+/868746, as it will be fetched from upstream with sync

@bbezak
Copy link
Member Author

bbezak commented Jan 4, 2023

ready for reviews

@bbezak
Copy link
Member Author

bbezak commented Jan 4, 2023

let's merge it after this got merged - https://review.opendev.org/c/openstack/neutron/+/869112, then we can build new neutron images

@bbezak bbezak merged commit b4b4ac5 into stackhpc/yoga Jan 4, 2023
@bbezak bbezak deleted the backport-bug-fix-1979643 branch January 4, 2023 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants