)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"179c2f503ebef4f64fb9df89238bc697c761ae96","unresolved":true,"context_lines":[{"line_number":22,"context_line":"NOTE(auniyal):"},{"line_number":23,"context_line":"ovs.py: added _get_qos_type config option"},{"line_number":24,"context_line":"ovsdb_lib.py: updated delete_ovs_vif_port"},{"line_number":25,"context_line":"added funtional test module test_plugin"},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"Closes-Bug: #2017868"},{"line_number":28,"context_line":"Change-Id: Id9ef7074634a0f23d67a4401fa8fca363b51bb43"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":5,"id":"cc4e641b_f6e75c24","line":25,"updated":"2023-06-28 17:29:56.000000000","message":"This note is very sparse and does not explain the reason for the merge conflicts in the above listed files. Usually conflicts are caused by the absence of certain commits in an older branch than exist in the newer branch. So this should say something more like \"NOTE(auniyal): The conflicts are due to change \u003cchange-id\u003e (first line of commit message of conflicting commit) which is not in Yoga.\"\n\nYou can find such changes by looking at the git blame (use github for a visual view), for example: https://github.com/openstack/os-vif/blame/master/vif_plug_ovs/ovs.py During a cherry pick, in the area of code where the conflicts are marked with \"\u003c\u003c\u003c\u003c\u003c\" and \"\u003e\u003e\u003e\u003e\u003e\", you will probably see a commit in the git blame view that is present in Zed but not in Yoga. That would be one of the reasons for the merge conflict and is the type of information you should include in your note.\n\nGoing back to the current note you have, it looks like you are describing differences from the change you are cherry picking (rather than reason for merge conflict). If you had to deviate from the change being cherry picked, it\u0027s good to have a note explaining it, however it would be better to include a bit more information such as the \"why\" behind the differences. For example, why did you need to update delete_ovs_vif_port? The note should not only contain the \"what\" but also the \"why\" behind differences from the change being cherry picked.","commit_id":"57df00f746c9faf5416b02160fdfa277bc4ca388"},{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"e874b8b419956e1e0cafdaa1c7b3c635780d4746","unresolved":true,"context_lines":[{"line_number":22,"context_line":"NOTE(auniyal):"},{"line_number":23,"context_line":"ovs.py: added _get_qos_type config option"},{"line_number":24,"context_line":"ovsdb_lib.py: updated delete_ovs_vif_port"},{"line_number":25,"context_line":"added funtional test module test_plugin"},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"Closes-Bug: #2017868"},{"line_number":28,"context_line":"Change-Id: Id9ef7074634a0f23d67a4401fa8fca363b51bb43"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":5,"id":"01f5c2db_7192c532","line":25,"in_reply_to":"cc4e641b_f6e75c24","updated":"2023-06-29 07:56:08.000000000","message":"thanks Mel, it was very helpful, updated commit msg.\nonly difference is I did not added braces because I thought it will look better if there are many change-ids\nchanges:\n   change-id: commit-msg-first-line","commit_id":"57df00f746c9faf5416b02160fdfa277bc4ca388"},{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"e874b8b419956e1e0cafdaa1c7b3c635780d4746","unresolved":true,"context_lines":[{"line_number":30,"context_line":"   vif_plug_ovs/tests/functional/base.py "},{"line_number":31,"context_line":"   manually added _del_bridge and _check_bridge from change I7d834a0c31c801e96002f42f86409ba274c234e6"},{"line_number":32,"context_line":"   because they were required to pass added functional tests."},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"Closes-Bug: #2017868"},{"line_number":35,"context_line":"Change-Id: Id9ef7074634a0f23d67a4401fa8fca363b51bb43"},{"line_number":36,"context_line":"(cherry picked from commit c0d101aa81cff200e1db2a0746598b72e26748e4)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":6,"id":"1ebc5010_c1fc1c13","line":33,"updated":"2023-06-29 07:56:08.000000000","message":"@Sean, I could have added these 2 methods in test_plugin.py instead of base.py.\nI had doubt in this but decided to add here, so they can be used/imported in future from base itself. \nplease let me know if this need change.","commit_id":"34e507d0c86639554b9a29dfaf15cab73e1b08b6"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"179c2f503ebef4f64fb9df89238bc697c761ae96","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"8b976ea4_ef7e0eac","updated":"2023-06-28 17:29:56.000000000","message":"IMHO the backport note here is very light on information.","commit_id":"57df00f746c9faf5416b02160fdfa277bc4ca388"},{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"969d753138f211efad86417f5e2462467604a1d4","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"32a6346e_1d56f0f5","updated":"2023-06-27 16:37:44.000000000","message":"recheck os-vif-ovs-iptables failed for functional test\nopenstack-tox-functional-ovs-with-sudo failed with \"DBConnectionError\"","commit_id":"57df00f746c9faf5416b02160fdfa277bc4ca388"},{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"8d488432d43f792c5e140afec8295e1c8c579f41","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"32d601db_acfe219e","updated":"2023-06-27 15:58:31.000000000","message":"recheck test_create_ovs_vif_port_with_default_qos failed with index error","commit_id":"57df00f746c9faf5416b02160fdfa277bc4ca388"},{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"4b20af84703e93a1b8c6934b287e626a3ac11565","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"81a9272f_8ca94653","updated":"2023-06-28 10:34:15.000000000","message":"recheck test_ovsdb_lib","commit_id":"57df00f746c9faf5416b02160fdfa277bc4ca388"},{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"f7efaebcba7c7fbc4f5c459b0d755bde833b58a9","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"93b9235e_7cc76b66","updated":"2023-06-29 10:07:26.000000000","message":"recheck tempest tests failed https://storage.gra.cloud.ovh.net/v1/AUTH_dcaab5e32b234d56b626f72581e3644c/zuul_opendev_logs_349/886710/7/check/os-vif-ovs-iptables/349bf5d/testr_results.html\n\nunrelated","commit_id":"cb8c2104e0505bad020738b17a9c69b7558cadab"}],"vif_plug_ovs/tests/functional/test_plugin.py":[{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"f9945d62a0c0743c0bd5a6010b35d536c834c8b8","unresolved":false,"context_lines":[{"line_number":57,"context_line":"                         \u0027peer\u0027, \u0027name\u0027, peer)"},{"line_number":58,"context_line":"    elif \u0027dummy\u0027 \u003d\u003d dev_type:"},{"line_number":59,"context_line":"        run_privileged(\u0027ip\u0027, \u0027link\u0027, \u0027add\u0027, device, \u0027type\u0027, dev_type)"},{"line_number":60,"context_line":"    # ensure that the device exists to prevent racing with other ip commands"},{"line_number":61,"context_line":"    for _ in range(10):"},{"line_number":62,"context_line":"        if exist_device(device):"},{"line_number":63,"context_line":"            return"}],"source_content_type":"text/x-python","patch_set":1,"id":"1bcb8150_d99f3330","line":60,"updated":"2023-06-22 05:54:55.000000000","message":"this failed sometimes not always, somehow same link was present already\n\nRTNETLINK answers: File exists","commit_id":"00bd38a042b5665c24344eb746d51225961426ad"},{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"f9945d62a0c0743c0bd5a6010b35d536c834c8b8","unresolved":true,"context_lines":[{"line_number":67,"context_line":"def del_device(device):"},{"line_number":68,"context_line":"    if exist_device(device):"},{"line_number":69,"context_line":"        run_privileged(\u0027ip\u0027, \u0027link\u0027, \u0027del\u0027, device)"},{"line_number":70,"context_line":""},{"line_number":71,"context_line":""},{"line_number":72,"context_line":"class TestOVSPlugin(testscenarios.WithScenarios,"},{"line_number":73,"context_line":"                    base.VifPlugOvsBaseFunctionalTestCase):"}],"source_content_type":"text/x-python","patch_set":1,"id":"bb2a75ec_4acad8d4","line":70,"updated":"2023-06-22 05:54:55.000000000","message":"locally this failed for me, not always, but for more than once with\n`Command: ip link del qos-port-vsctl\nExit code: 2\nStdout: \u0027\u0027\nStderr: \u0027RTNETLINK answers: Operation not supported\\n\u0027`\n\nso I have doubt in this if this will pass in gate on first attempt","commit_id":"00bd38a042b5665c24344eb746d51225961426ad"},{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"4b20af84703e93a1b8c6934b287e626a3ac11565","unresolved":false,"context_lines":[{"line_number":67,"context_line":"def del_device(device):"},{"line_number":68,"context_line":"    if exist_device(device):"},{"line_number":69,"context_line":"        run_privileged(\u0027ip\u0027, \u0027link\u0027, \u0027del\u0027, device)"},{"line_number":70,"context_line":""},{"line_number":71,"context_line":""},{"line_number":72,"context_line":"class TestOVSPlugin(testscenarios.WithScenarios,"},{"line_number":73,"context_line":"                    base.VifPlugOvsBaseFunctionalTestCase):"}],"source_content_type":"text/x-python","patch_set":1,"id":"433bd124_763dc7a9","line":70,"in_reply_to":"bb2a75ec_4acad8d4","updated":"2023-06-28 10:34:15.000000000","message":"Done","commit_id":"00bd38a042b5665c24344eb746d51225961426ad"}]}