)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":8313,"name":"Lajos Katona","display_name":"lajoskatona","email":"katonalala@gmail.com","username":"elajkat","status":"Ericsson Software Technology"},"change_message_id":"f384d62b2d7c6c14f9a6942dafd7191391fea78a","unresolved":true,"context_lines":[{"line_number":14,"context_line":"Co-authored-by: archiephan \u003cchungphan7819@gmail.com\u003e"},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"Closes-Bug: #1939723"},{"line_number":17,"context_line":"Change-Id: Iebce0929e3e68ac5be0acaf5cdac4f5833cb9f2f"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"d05b3755_163790bd","line":17,"updated":"2023-02-24 08:35:58.000000000","message":"Please add the cherry-picked line to make it clear that this is really a cherry-pick even if just partial cherry-pick\nIf there were conflicts please highlight those also","commit_id":"0eddbfc3c88f1e6bb4b982181b85921dad4a3553"},{"author":{"_account_id":33795,"name":"nikhil kshirsagar","email":"nikhil.kshirsagar@canonical.com","username":"nkshirsagar"},"change_message_id":"42d52eb0f5188410eba801a2d4bf6471e01e8114","unresolved":true,"context_lines":[{"line_number":14,"context_line":"Co-authored-by: archiephan \u003cchungphan7819@gmail.com\u003e"},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"Closes-Bug: #1939723"},{"line_number":17,"context_line":"Change-Id: Iebce0929e3e68ac5be0acaf5cdac4f5833cb9f2f"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"a22329bd_0e7c84ff","line":17,"in_reply_to":"d05b3755_163790bd","updated":"2023-02-27 05:34:34.000000000","message":"ack, I have added the cherry-pick line. The conflicts are detailed below,\n\n```\nroot@nikhil:/home/nikhil/Downloads/patch/neutron# git fetch https://review.opendev.org/openstack/neutron refs/changes/28/816328/10 \u0026\u0026 git cherry-pick FETCH_HEAD\nFrom https://review.opendev.org/openstack/neutron\n * branch                  refs/changes/28/816328/10 -\u003e FETCH_HEAD\nAuto-merging neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py\nAuto-merging neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py\nCONFLICT (content): Merge conflict in neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py\nerror: could not apply 4511290b72... [OVN] Fix port disable security dead when run neutron-ovn-db-sync-util\nhint: After resolving the conflicts, mark them with\nhint: \"git add/rm \u003cpathspec\u003e\", then run\nhint: \"git cherry-pick --continue\".\nhint: You can instead skip this commit with \"git cherry-pick --skip\".\nhint: To abort and get back to the state before \"git cherry-pick\",\nhint: run \"git cherry-pick --abort\".\n\n\nroot@nikhil:/home/nikhil/Downloads/patch/neutron# git diff neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py\ndiff --cc neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py\nindex 73224455e2,8f4aa35c97..0000000000\n--- a/neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py\n+++ b/neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py\n@@@ -3416,8 -3329,9 +3421,13 @@@ class TestOVNMechanismDriverSecurityGro\n              req \u003d self.new_update_request(\u0027ports\u0027, data, p[\u0027id\u0027])\n              req.get_response(self.api)\n  \n+             # Default neutron_pg_drop, 2 security group\n              self.assertEqual(\n++\u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD\n +                2, self.mech_driver._nb_ovn.pg_add_ports.call_count)\n++\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n+                 3, self.mech_driver.nb_ovn.pg_add_ports.call_count)\n++\u003e\u003e\u003e\u003e\u003e\u003e\u003e 4511290b72 ([OVN] Fix port disable security dead when run neutron-ovn-db-sync-util)\n  \n      def test_update_sg_change_rule(self):\n          with self.network() as n, self.subnet(n):\n\n```","commit_id":"0eddbfc3c88f1e6bb4b982181b85921dad4a3553"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":8313,"name":"Lajos Katona","display_name":"lajoskatona","email":"katonalala@gmail.com","username":"elajkat","status":"Ericsson Software Technology"},"change_message_id":"f384d62b2d7c6c14f9a6942dafd7191391fea78a","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"bbb19c0c_8488416f","updated":"2023-02-24 08:35:58.000000000","message":"Thanks for the backport, I have mostly formal questions","commit_id":"0eddbfc3c88f1e6bb4b982181b85921dad4a3553"},{"author":{"_account_id":33795,"name":"nikhil kshirsagar","email":"nikhil.kshirsagar@canonical.com","username":"nkshirsagar"},"change_message_id":"42d52eb0f5188410eba801a2d4bf6471e01e8114","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":4,"id":"52c5e581_65abd80c","updated":"2023-02-27 05:34:34.000000000","message":"thanks for the review comments!","commit_id":"942a7cd47cab0d2f65e295ce230a322e2277e9f5"},{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"f724cd27bf2ee75bcfff0d1d6dcd0b10540a6e7f","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"a98b054d_06818f71","updated":"2023-03-01 15:22:32.000000000","message":"It looks like https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/875786 was effective for ussuri gate! Clean backport and Victoria is merged","commit_id":"b01ad2fa0913b087a7e8151eca7417b1d9b978ab"},{"author":{"_account_id":33795,"name":"nikhil kshirsagar","email":"nikhil.kshirsagar@canonical.com","username":"nkshirsagar"},"change_message_id":"3e40fe56342252a32765b22731c644769e5fda97","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":5,"id":"930276c1_cd1e505a","updated":"2023-03-01 07:51:22.000000000","message":"recheck","commit_id":"b01ad2fa0913b087a7e8151eca7417b1d9b978ab"},{"author":{"_account_id":1131,"name":"Brian Haley","email":"haleyb.dev@gmail.com","username":"brian-haley"},"change_message_id":"762544704be43370412308f7fc52e42d4a59da17","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"0dc1fd7c_f429e6e4","updated":"2023-02-27 16:48:32.000000000","message":"recheck FT\n\nIt doesn\u0027t look like the Ussuri gate is particularly healthy at the moment either based on other patches","commit_id":"b01ad2fa0913b087a7e8151eca7417b1d9b978ab"}],"neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py":[{"author":{"_account_id":8313,"name":"Lajos Katona","display_name":"lajoskatona","email":"katonalala@gmail.com","username":"elajkat","status":"Ericsson Software Technology"},"change_message_id":"f384d62b2d7c6c14f9a6942dafd7191391fea78a","unresolved":true,"context_lines":[{"line_number":3423,"context_line":""},{"line_number":3424,"context_line":"            # Default neutron_pg_drop, 2 security group"},{"line_number":3425,"context_line":"            self.assertEqual("},{"line_number":3426,"context_line":"                3, self.mech_driver.nb_ovn.pg_add_ports.call_count)"},{"line_number":3427,"context_line":""},{"line_number":3428,"context_line":"    def test_update_sg_change_rule(self):"},{"line_number":3429,"context_line":"        with self.network() as n, self.subnet(n):"}],"source_content_type":"text/x-python","patch_set":1,"id":"28750240_7e339238","line":3426,"updated":"2023-02-24 08:35:58.000000000","message":"why not _nb_ovn?","commit_id":"0eddbfc3c88f1e6bb4b982181b85921dad4a3553"},{"author":{"_account_id":33795,"name":"nikhil kshirsagar","email":"nikhil.kshirsagar@canonical.com","username":"nkshirsagar"},"change_message_id":"42d52eb0f5188410eba801a2d4bf6471e01e8114","unresolved":true,"context_lines":[{"line_number":3423,"context_line":""},{"line_number":3424,"context_line":"            # Default neutron_pg_drop, 2 security group"},{"line_number":3425,"context_line":"            self.assertEqual("},{"line_number":3426,"context_line":"                3, self.mech_driver.nb_ovn.pg_add_ports.call_count)"},{"line_number":3427,"context_line":""},{"line_number":3428,"context_line":"    def test_update_sg_change_rule(self):"},{"line_number":3429,"context_line":"        with self.network() as n, self.subnet(n):"}],"source_content_type":"text/x-python","patch_set":1,"id":"4ffc3e7e_bdf3a773","line":3426,"in_reply_to":"28750240_7e339238","updated":"2023-02-27 05:34:34.000000000","message":"yup, corrected.","commit_id":"0eddbfc3c88f1e6bb4b982181b85921dad4a3553"}]}