)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"ffd2d6f27d798dce17ba22393a0e5fe30a5f2554","unresolved":false,"context_lines":[{"line_number":28,"context_line":"Conflicts:"},{"line_number":29,"context_line":"    nova/tests/functional/libvirt/test_numa_servers.py"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"NOTE(sean-k-mooney): conflicts are due to minor test differences"},{"line_number":32,"context_line":"and the lack of I80cdc0a33ec27b1389130c22f9c3a8ff69f6b1a0 which"},{"line_number":33,"context_line":"changes the behvior of _wait_for_state_change to be consistent."},{"line_number":34,"context_line":""},{"line_number":35,"context_line":"Closes-Bug: #1763766"},{"line_number":36,"context_line":"Partial-implements: blueprint inplace-rebuild-of-numa-instances"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3fa7e38b_8b19ae88","line":33,"range":{"start_line":31,"start_character":0,"end_line":33,"end_character":63},"updated":"2019-12-15 11:31:14.000000000","message":"Any reason not to backport this and keep this change clean? It looks pretty self contained.","commit_id":"11df1d508ac02f9a060ea8f4c98cf92ff2ebab80"},{"author":{"_account_id":8864,"name":"Artom Lifshitz","email":"notartom@gmail.com","username":"artom"},"change_message_id":"1e99f239747a0c324a59cd22083ee078818b51bb","unresolved":false,"context_lines":[{"line_number":29,"context_line":"    nova/tests/functional/libvirt/test_numa_servers.py"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"NOTE(sean-k-mooney): conflicts are due to minor test differences"},{"line_number":32,"context_line":"and the lack of I80cdc0a33ec27b1389130c22f9c3a8ff69f6b1a0 which"},{"line_number":33,"context_line":"changes the behvior of _wait_for_state_change to be consistent."},{"line_number":34,"context_line":""},{"line_number":35,"context_line":"Closes-Bug: #1763766"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_44a91c8d","line":32,"range":{"start_line":32,"start_character":16,"end_line":32,"end_character":57},"updated":"2019-12-19 16:21:02.000000000","message":"I kind have a bit of a beef with this conflicts explanation. I expected unit tests to fail unless that changeID is worked-around (see later comments), the actual git conflict is because of a4ca0b531cb3eabdeee6aab925220067ebd81172, which removed test_cold_migrate_with_physnet_fails, and thus makes git be confused because this patch appends the new NUMAServersRebuildTests class where test_cold_migrate_with_physnet_fails used to be.","commit_id":"1f2916fbb89bd771cbe3a3e4c135ccea4bdda04b"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"a9c595cfab8cb0f4a3e40809437fd6ce4afb9104","unresolved":false,"context_lines":[{"line_number":29,"context_line":"    nova/tests/functional/libvirt/test_numa_servers.py"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"NOTE(sean-k-mooney): conflicts are due to minor test differences"},{"line_number":32,"context_line":"and the lack of I80cdc0a33ec27b1389130c22f9c3a8ff69f6b1a0 which"},{"line_number":33,"context_line":"changes the behvior of _wait_for_state_change to be consistent."},{"line_number":34,"context_line":""},{"line_number":35,"context_line":"Closes-Bug: #1763766"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_e4504862","line":32,"range":{"start_line":32,"start_character":16,"end_line":32,"end_character":57},"in_reply_to":"3fa7e38b_44a91c8d","updated":"2019-12-19 16:35:08.000000000","message":"Fair point. Done.","commit_id":"1f2916fbb89bd771cbe3a3e4c135ccea4bdda04b"},{"author":{"_account_id":8864,"name":"Artom Lifshitz","email":"notartom@gmail.com","username":"artom"},"change_message_id":"d33f293d45c090b92a44332c67b46ac59e2a0f8d","unresolved":false,"context_lines":[{"line_number":30,"context_line":""},{"line_number":31,"context_line":"NOTE(stephenfin): The new tests added in \u0027test_numa_servers.py\u0027 had to"},{"line_number":32,"context_line":"be modified to use the old-style \u0027_wait_for_state_change\u0027 function,"},{"line_number":33,"context_line":"since change I0c56841d098d3e9d72db65be3143f3c893f0b6ba isn\u0027t present on"},{"line_number":34,"context_line":"\u0027stable/train\u0027 and it\u0027s too large and invasive to justify backporting."},{"line_number":35,"context_line":"In addition, a \u0027super()\u0027 call had to be updated to use the Python 2"},{"line_number":36,"context_line":"compatible \u0027super(ClassName, self)\u0027 style."}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"3fa7e38b_0456c42c","line":33,"range":{"start_line":33,"start_character":13,"end_line":33,"end_character":54},"updated":"2019-12-19 16:45:07.000000000","message":"Isn\u0027t it I80cdc0a33ec27b1389130c22f9c3a8ff69f6b1a0?","commit_id":"39b2227ad757f89b47412c6356aea8bed6dc9416"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"7867bf675864a18a016c47e72de7fdf810406eaf","unresolved":false,"context_lines":[{"line_number":30,"context_line":""},{"line_number":31,"context_line":"NOTE(stephenfin): The new tests added in \u0027test_numa_servers.py\u0027 had to"},{"line_number":32,"context_line":"be modified to use the old-style \u0027_wait_for_state_change\u0027 function,"},{"line_number":33,"context_line":"since change I0c56841d098d3e9d72db65be3143f3c893f0b6ba isn\u0027t present on"},{"line_number":34,"context_line":"\u0027stable/train\u0027 and it\u0027s too large and invasive to justify backporting."},{"line_number":35,"context_line":"In addition, a \u0027super()\u0027 call had to be updated to use the Python 2"},{"line_number":36,"context_line":"compatible \u0027super(ClassName, self)\u0027 style."}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"3fa7e38b_d21cea15","line":33,"range":{"start_line":33,"start_character":13,"end_line":33,"end_character":54},"in_reply_to":"3fa7e38b_0456c42c","updated":"2019-12-19 17:57:00.000000000","message":"Done","commit_id":"39b2227ad757f89b47412c6356aea8bed6dc9416"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"b06fbedd8c6fe36bfa0dc60f3b32501460163321","unresolved":false,"context_lines":[{"line_number":26,"context_line":"in place rebuilds of numa instances is currently not supported."},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"Modifications:"},{"line_number":29,"context_line":"\tnova/tests/functional/libvirt/test_numa_servers.py"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"NOTE(stephenfin): The new tests added in \u0027test_numa_servers.py\u0027 had to"},{"line_number":32,"context_line":"be modified to use the old-style \u0027_wait_for_state_change\u0027 function,"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"3fa7e38b_d8396b40","line":29,"updated":"2019-12-19 20:55:19.000000000","message":"whitespace damage","commit_id":"745de99063bf77704a7f0610fe9e3647257eaa50"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"27ff09d00d436814ed387ba0b9100b79874cb6db","unresolved":false,"context_lines":[{"line_number":26,"context_line":"in place rebuilds of numa instances is currently not supported."},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"Modifications:"},{"line_number":29,"context_line":"\tnova/tests/functional/libvirt/test_numa_servers.py"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"NOTE(stephenfin): The new tests added in \u0027test_numa_servers.py\u0027 had to"},{"line_number":32,"context_line":"be modified to use the old-style \u0027_wait_for_state_change\u0027 function,"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"3fa7e38b_f00f9436","line":29,"in_reply_to":"3fa7e38b_8adb921e","updated":"2019-12-20 14:18:52.000000000","message":"s/Modifications/Conflicts/g and spaces instead of tabs but none of that really matters.","commit_id":"745de99063bf77704a7f0610fe9e3647257eaa50"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"892bd07cbd6fa5461dc19d61896a35eaa82001b4","unresolved":false,"context_lines":[{"line_number":26,"context_line":"in place rebuilds of numa instances is currently not supported."},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"Modifications:"},{"line_number":29,"context_line":"\tnova/tests/functional/libvirt/test_numa_servers.py"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"NOTE(stephenfin): The new tests added in \u0027test_numa_servers.py\u0027 had to"},{"line_number":32,"context_line":"be modified to use the old-style \u0027_wait_for_state_change\u0027 function,"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"3fa7e38b_8adb921e","line":29,"in_reply_to":"3fa7e38b_d8396b40","updated":"2019-12-20 12:10:42.000000000","message":"Intentional (this is what the \u0027Conflicts\u0027 message generated by git looks like and I was mimicking that)","commit_id":"745de99063bf77704a7f0610fe9e3647257eaa50"}],"nova/exception.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"b06fbedd8c6fe36bfa0dc60f3b32501460163321","unresolved":false,"context_lines":[{"line_number":1917,"context_line":""},{"line_number":1918,"context_line":"class ImageNUMATopologyRebuildConflict(Invalid):"},{"line_number":1919,"context_line":"    msg_fmt \u003d _("},{"line_number":1920,"context_line":"        \"An instance\u0027s NUMA typology cannot be changed as part of a rebuild. \""},{"line_number":1921,"context_line":"        \"The image provided is invalid for this instance.\")"},{"line_number":1922,"context_line":""},{"line_number":1923,"context_line":""}],"source_content_type":"text/x-python","patch_set":4,"id":"3fa7e38b_1857035d","line":1920,"range":{"start_line":1920,"start_character":28,"end_line":1920,"end_character":36},"updated":"2019-12-19 20:55:19.000000000","message":"Ugh, this was noted on master but not fixed - would have been nice to fix for backports since it\u0027s a user-facing message.\n\nhttps://review.opendev.org/#/c/687957/11/nova/exception.py\n\nMaybe we should just fix that here? This still hasn\u0027t been fixed on master:\n\nhttps://github.com/openstack/nova/blob/b5a9f852266c8855885c237266c5d5279db10458/nova/exception.py#L1858\n\nSo I guess we could just fix on master and backport that as well with this series.\n\n(later)\n\nOK it\u0027s fixed here:\n\nhttps://review.opendev.org/#/c/698260/1/nova/exception.py\n\nbut that contains other stuff that I\u0027m not sure we want to backport, at least not all of it. I\u0027m a bit hesitant to move this backport forward with a typo like this unless we know we\u0027re going to fix it on stable in a follow up too, otherwise I\u0027m inclined to just fix it here in the backport with a note in the commit message. Thoughts?","commit_id":"745de99063bf77704a7f0610fe9e3647257eaa50"}],"nova/tests/functional/libvirt/test_numa_servers.py":[{"author":{"_account_id":8864,"name":"Artom Lifshitz","email":"notartom@gmail.com","username":"artom"},"change_message_id":"1e99f239747a0c324a59cd22083ee078818b51bb","unresolved":false,"context_lines":[{"line_number":1090,"context_line":"        if server_args:"},{"line_number":1091,"context_line":"            basic_server.update(server_args)"},{"line_number":1092,"context_line":"        server \u003d self.api.post_server({\u0027server\u0027: basic_server})"},{"line_number":1093,"context_line":"        return self._wait_for_state_change(server, \u0027BUILD\u0027)"},{"line_number":1094,"context_line":""},{"line_number":1095,"context_line":"    def _rebuild_server(self, active_server, image_ref):"},{"line_number":1096,"context_line":"        args \u003d {\"rebuild\": {\"imageRef\": image_ref}}"}],"source_content_type":"text/x-python","patch_set":2,"id":"3fa7e38b_44827c01","line":1093,"range":{"start_line":1093,"start_character":52,"end_line":1093,"end_character":57},"updated":"2019-12-19 16:21:02.000000000","message":"This had to be changed to use the old-style _wait_for_state_change()","commit_id":"1f2916fbb89bd771cbe3a3e4c135ccea4bdda04b"},{"author":{"_account_id":8864,"name":"Artom Lifshitz","email":"notartom@gmail.com","username":"artom"},"change_message_id":"1e99f239747a0c324a59cd22083ee078818b51bb","unresolved":false,"context_lines":[{"line_number":1097,"context_line":"        self.api.api_post("},{"line_number":1098,"context_line":"            \u0027servers/%s/action\u0027 % active_server[\u0027id\u0027], args)"},{"line_number":1099,"context_line":"        fake_notifier.wait_for_versioned_notifications(\u0027instance.rebuild.end\u0027)"},{"line_number":1100,"context_line":"        return self._wait_for_state_change(active_server, \u0027REBUILD\u0027)"},{"line_number":1101,"context_line":""},{"line_number":1102,"context_line":"    def test_rebuild_server_with_numa(self):"},{"line_number":1103,"context_line":"        \"\"\"Create a NUMA instance and ensure it can be rebuilt."}],"source_content_type":"text/x-python","patch_set":2,"id":"3fa7e38b_e478482d","line":1100,"range":{"start_line":1100,"start_character":59,"end_line":1100,"end_character":66},"updated":"2019-12-19 16:21:02.000000000","message":"Ditto","commit_id":"1f2916fbb89bd771cbe3a3e4c135ccea4bdda04b"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"b06fbedd8c6fe36bfa0dc60f3b32501460163321","unresolved":false,"context_lines":[{"line_number":32,"context_line":""},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"class NUMAServersTestBase(base.ServersTestBase):"},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"    ADDITIONAL_FILTERS \u003d [\u0027NUMATopologyFilter\u0027]"},{"line_number":37,"context_line":""},{"line_number":38,"context_line":"    def setUp(self):"}],"source_content_type":"text/x-python","patch_set":4,"id":"3fa7e38b_18e5c3a4","side":"PARENT","line":35,"updated":"2019-12-19 20:55:19.000000000","message":"Yeehaw for unrelated changes.","commit_id":"8b766d14cf979cd994d52db71267b93aacee42e8"}]}