)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"886db13c061ddfe4f80a021cefa260063846cf67","unresolved":true,"context_lines":[{"line_number":28,"context_line":""},{"line_number":29,"context_line":"Closes-Bug: #1942329"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"Conflicts:"},{"line_number":32,"context_line":"    nova/network/neutron.py"},{"line_number":33,"context_line":"    nova/objects/pci_device.py"},{"line_number":34,"context_line":"    nova/tests/fixtures/libvirt.py"},{"line_number":35,"context_line":"    nova/tests/unit/network/test_neutron.py"},{"line_number":36,"context_line":"    nova/tests/unit/virt/libvirt/test_host.py"},{"line_number":37,"context_line":"    nova/virt/fake.py"},{"line_number":38,"context_line":"    nova/virt/libvirt/host.py"},{"line_number":39,"context_line":""},{"line_number":40,"context_line":"Most of the conlficts are due to the lack of the vpd feature"},{"line_number":41,"context_line":"and I83a128a260acdd8bf78fede566af6881b8b82a9c"},{"line_number":42,"context_line":""},{"line_number":43,"context_line":"the addtional unit tests in test_neutron and test_compute_mgr"},{"line_number":44,"context_line":"are form the vpd feature but have been modified to drop assertions"},{"line_number":45,"context_line":"related to the vpd feature while keeping the assertions related"},{"line_number":46,"context_line":"to SRIOV PF MAC adress binding."},{"line_number":47,"context_line":""},{"line_number":48,"context_line":"Change-Id: Iad5e70b43a65c076134e1874cb8e75d1ba214fde"},{"line_number":49,"context_line":"(cherry picked from commit cd03bbc1c33e33872594cf002f0e7011ab8ea047)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"8838d699_15c19497","line":46,"range":{"start_line":31,"start_character":0,"end_line":46,"end_character":31},"updated":"2023-10-11 12:15:19.000000000","message":"From L31 to L46 this is not relevant for wallaby version as far as I understand, though there are other conflicts.","commit_id":"db8a31594c9154ab487fd2990e6d95a0d8c9a184"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"5d7764ba65eba5c096b4ea86c6e649659e4f71e0","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"9df3792f_011173df","updated":"2022-11-24 18:01:41.000000000","message":"other than the unit test failure this look good to me","commit_id":"11f3e0a23cfae48c36d254fca587fafae88d21b7"},{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"2e290ba118821660e99ff7ce24ba3de176c844f1","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"aee8671f_990d6e97","updated":"2023-10-11 11:49:15.000000000","message":"actully +1 since i actully backported this not gibi","commit_id":"db8a31594c9154ab487fd2990e6d95a0d8c9a184"}],"nova/network/neutron.py":[{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"b9cc0db97bbfa307cee740b15f23cdce309dd4e6","unresolved":true,"context_lines":[{"line_number":664,"context_line":"            # NOTE: We\u0027re doing this to remove the binding information"},{"line_number":665,"context_line":"            # for the physical device but don\u0027t want to overwrite the other"},{"line_number":666,"context_line":"            # information in the binding profile."},{"line_number":667,"context_line":"            for profile_key in ("},{"line_number":668,"context_line":"                \u0027pci_vendor_info\u0027, \u0027pci_slot\u0027,"},{"line_number":669,"context_line":"                constants.ALLOCATION, \u0027device_mac_address\u0027"},{"line_number":670,"context_line":"            ):"},{"line_number":671,"context_line":"                if profile_key in port_profile:"},{"line_number":672,"context_line":"                    del port_profile[profile_key]"},{"line_number":673,"context_line":"            port_req_body[\u0027port\u0027][constants.BINDING_PROFILE] \u003d port_profile"}],"source_content_type":"text/x-python","patch_set":3,"id":"4ae8d96d_b18069a8","line":670,"range":{"start_line":667,"start_character":7,"end_line":670,"end_character":14},"updated":"2023-10-11 11:48:11.000000000","message":"ack so here we dropped arq_uuid because we do not have cyborg integration in wallaby","commit_id":"db8a31594c9154ab487fd2990e6d95a0d8c9a184"}],"nova/tests/unit/network/test_neutron.py":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"1cf5a78f75428c2063edc5d8a7f03b434b892531","unresolved":true,"context_lines":[{"line_number":4635,"context_line":"            \u0027new-host\u0027)"},{"line_number":4636,"context_line":""},{"line_number":4637,"context_line":"    @mock.patch("},{"line_number":4638,"context_line":"        \u0027nova.network.neutron.API.has_extended_resource_request_extension\u0027,"},{"line_number":4639,"context_line":"        new\u003dmock.Mock(return_value\u003dFalse),"},{"line_number":4640,"context_line":"    )"},{"line_number":4641,"context_line":"    @mock.patch.object(pci_whitelist.Whitelist, \u0027get_devspec\u0027)"}],"source_content_type":"text/x-python","patch_set":1,"id":"39e8976b_586ce8dc","line":4638,"updated":"2022-11-24 18:01:26.000000000","message":"This causing the unit test failure, see my explanation in the previous patch in the series.","commit_id":"11f3e0a23cfae48c36d254fca587fafae88d21b7"},{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"1fa5fd52bfca27b4df64cd6225aa43b7d61eb92b","unresolved":true,"context_lines":[{"line_number":4635,"context_line":"            \u0027new-host\u0027)"},{"line_number":4636,"context_line":""},{"line_number":4637,"context_line":"    @mock.patch("},{"line_number":4638,"context_line":"        \u0027nova.network.neutron.API.has_extended_resource_request_extension\u0027,"},{"line_number":4639,"context_line":"        new\u003dmock.Mock(return_value\u003dFalse),"},{"line_number":4640,"context_line":"    )"},{"line_number":4641,"context_line":"    @mock.patch.object(pci_whitelist.Whitelist, \u0027get_devspec\u0027)"}],"source_content_type":"text/x-python","patch_set":1,"id":"5230d9c4_589bf0cb","line":4638,"in_reply_to":"39e8976b_586ce8dc","updated":"2022-11-24 18:24:13.000000000","message":"i need to doble check but i might just be able to drop this decorator\n\ni dont think i call this function in this patch and it was added as part fo the qos feature in xena so noting on wallaby shoudl be using it either.\n\nso i might be able to make this simpler","commit_id":"11f3e0a23cfae48c36d254fca587fafae88d21b7"},{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"b4809abb6c8bb06b4bc89d3e67a2c44b6befd81d","unresolved":true,"context_lines":[{"line_number":4635,"context_line":"            \u0027new-host\u0027)"},{"line_number":4636,"context_line":""},{"line_number":4637,"context_line":"    @mock.patch("},{"line_number":4638,"context_line":"        \u0027nova.network.neutron.API.has_extended_resource_request_extension\u0027,"},{"line_number":4639,"context_line":"        new\u003dmock.Mock(return_value\u003dFalse),"},{"line_number":4640,"context_line":"    )"},{"line_number":4641,"context_line":"    @mock.patch.object(pci_whitelist.Whitelist, \u0027get_devspec\u0027)"}],"source_content_type":"text/x-python","patch_set":1,"id":"b0f29165_c168caca","line":4638,"in_reply_to":"5230d9c4_589bf0cb","updated":"2022-11-24 19:12:20.000000000","message":"ya i cna just remove the decorator and then i can drop the previous commit\nso thats what im going to do.","commit_id":"11f3e0a23cfae48c36d254fca587fafae88d21b7"}],"nova/tests/unit/virt/libvirt/fakelibvirt.py":[{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"b9cc0db97bbfa307cee740b15f23cdce309dd4e6","unresolved":true,"context_lines":[{"line_number":298,"context_line":"        self, dev_type, bus, slot, function, iommu_group, numa_node, *,"},{"line_number":299,"context_line":"        vf_ratio\u003dNone, multiple_gpu_types\u003dFalse,"},{"line_number":300,"context_line":"        parent\u003dNone, vend_id\u003dNone, vend_name\u003dNone, prod_id\u003dNone,"},{"line_number":301,"context_line":"        prod_name\u003dNone, driver_name\u003dNone, mac_address\u003dNone,"},{"line_number":302,"context_line":"    ):"},{"line_number":303,"context_line":"        \"\"\"Populate pci devices"},{"line_number":304,"context_line":""}],"source_content_type":"text/x-python","patch_set":3,"id":"de278964_3232ebb2","line":301,"updated":"2023-10-11 11:48:11.000000000","message":"so the fixture moved between wallaby and xena so thes changes are form \nhttps://review.opendev.org/c/openstack/nova/+/864933/5/nova/tests/fixtures/libvirt.py#302","commit_id":"db8a31594c9154ab487fd2990e6d95a0d8c9a184"},{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"b9cc0db97bbfa307cee740b15f23cdce309dd4e6","unresolved":true,"context_lines":[{"line_number":2124,"context_line":"        self.useFixture(fixtures.MockPatch("},{"line_number":2125,"context_line":"            \u0027nova.pci.utils.get_mac_by_pci_address\u0027,"},{"line_number":2126,"context_line":"            new\u003dself.fake_get_mac_by_pci_address))"},{"line_number":2127,"context_line":""},{"line_number":2128,"context_line":"        # libvirt calls out to sysfs to get the vfs ID during macvtap plug"},{"line_number":2129,"context_line":"        self.useFixture(fixtures.MockPatch("},{"line_number":2130,"context_line":"            \u0027nova.pci.utils.get_vf_num_by_pci_address\u0027, return_value\u003d1))"}],"source_content_type":"text/x-python","patch_set":3,"id":"83b04af3_b99ea0d8","line":2127,"updated":"2023-10-11 11:48:11.000000000","message":"these all look correct to me based on \nhttps://review.opendev.org/c/openstack/nova/+/864933/5/nova/tests/fixtures/libvirt.py","commit_id":"db8a31594c9154ab487fd2990e6d95a0d8c9a184"}]}