)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"766921ea0d3ffba55eccbf3fbf8166786a688b1f","unresolved":true,"context_lines":[{"line_number":20,"context_line":"and considers other migrations in-progress as well."},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"Conflicts:"},{"line_number":23,"context_line":"    nova/tests/unit/compute/test_compute_mgr.py"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Cherry-picked pulled many non-related newer unit tests."},{"line_number":26,"context_line":"Cleaned those up and adjusted:"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"6153b5cb_920236a7","line":23,"updated":"2021-07-09 02:25:39.000000000","message":"NOTE: Conflicts are because the following changes are not in Stein:\n\n  * Ia00277ac8a68a635db85f9e0ce2c6d8df396e0d8 (Set migrate_data.vifs only when using multiple port bindings)\n  * I3c917796cb30d11e7db1e235ac1625d2a743aaa2 (NUMA live migration support)\n  * I2f3434f06489d8b6cb80933bcb1ea1e841049ba5 (Support migrating SRIOV port with bandwidth)\n  * I292a0e2d840bbf657ba6d0932f9a3decbcb2778f ([FUP] Follow-up patch for SR-IOV live migration)\n  * I734cc01dce13f9e75a16639faf890ddb1661b7eb (SR-IOV Live migration indirect port support)","commit_id":"377b55015b028f6e510a694c60a1cf5c51d6eda7"}],"nova/compute/manager.py":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"766921ea0d3ffba55eccbf3fbf8166786a688b1f","unresolved":true,"context_lines":[{"line_number":2248,"context_line":"        to get scheduler hints."},{"line_number":2249,"context_line":"        \"\"\""},{"line_number":2250,"context_line":"        hints \u003d {}"},{"line_number":2251,"context_line":"        if request_spec is not None and \u0027scheduler_hints\u0027 in request_spec:"},{"line_number":2252,"context_line":"            hints \u003d request_spec.scheduler_hints"},{"line_number":2253,"context_line":"        if not hints:"},{"line_number":2254,"context_line":"            hints \u003d filter_properties.get(\u0027scheduler_hints\u0027) or {}"}],"source_content_type":"text/x-python","patch_set":1,"id":"94db9f83_08a6d758","line":2251,"updated":"2021-07-09 02:25:39.000000000","message":"\"\u0027scheduler_hints\u0027 in request_spec\" will TypeError with a mock.sentinel object.","commit_id":"377b55015b028f6e510a694c60a1cf5c51d6eda7"},{"author":{"_account_id":14567,"name":"Rodrigo Barbieri","email":"rodrigo.barbieri2010@gmail.com","username":"ganso"},"change_message_id":"8e9f144af4739b28aa8acb95291322abb4cacf4d","unresolved":true,"context_lines":[{"line_number":2248,"context_line":"        to get scheduler hints."},{"line_number":2249,"context_line":"        \"\"\""},{"line_number":2250,"context_line":"        hints \u003d {}"},{"line_number":2251,"context_line":"        if request_spec is not None and \u0027scheduler_hints\u0027 in request_spec:"},{"line_number":2252,"context_line":"            hints \u003d request_spec.scheduler_hints"},{"line_number":2253,"context_line":"        if not hints:"},{"line_number":2254,"context_line":"            hints \u003d filter_properties.get(\u0027scheduler_hints\u0027) or {}"}],"source_content_type":"text/x-python","patch_set":1,"id":"c384c1f1_6d1c6975","line":2251,"in_reply_to":"94db9f83_08a6d758","updated":"2021-07-09 18:24:37.000000000","message":"exactly, this is why test_prep_resize_errors_migration will raise exception in the wrong place since I added a _get_scheduler_hints in prep_resize. The test itself does not fail (in master and other branches newer than stein), but I will rewrite it to work correctly.","commit_id":"377b55015b028f6e510a694c60a1cf5c51d6eda7"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"766921ea0d3ffba55eccbf3fbf8166786a688b1f","unresolved":true,"context_lines":[{"line_number":4694,"context_line":"                context, instance, fields.NotificationPhase.START,"},{"line_number":4695,"context_line":"                instance_type)"},{"line_number":4696,"context_line":"            try:"},{"line_number":4697,"context_line":"                scheduler_hints \u003d self._get_scheduler_hints(filter_properties,"},{"line_number":4698,"context_line":"                                                            request_spec)"},{"line_number":4699,"context_line":"                # Error out if this host cannot accept the new instance due"},{"line_number":4700,"context_line":"                # to anti-affinity. At this point the migration is already"}],"source_content_type":"text/x-python","patch_set":1,"id":"86b114d6_1c767995","line":4697,"range":{"start_line":4697,"start_character":39,"end_line":4697,"end_character":59},"updated":"2021-07-09 02:25:39.000000000","message":"Note to reviewers: this is related to the change in the unit test to use a real RequestSpec object.","commit_id":"377b55015b028f6e510a694c60a1cf5c51d6eda7"}],"nova/tests/unit/compute/test_compute_mgr.py":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"766921ea0d3ffba55eccbf3fbf8166786a688b1f","unresolved":true,"context_lines":[{"line_number":2924,"context_line":"        side_effect\u003dexception.InstanceGroupNotFound(group_uuid\u003d\u0027\u0027)))"},{"line_number":2925,"context_line":"    def test_check_can_live_migrate_destination_fail(self):"},{"line_number":2926,"context_line":"        self.assertRaises("},{"line_number":2927,"context_line":"            test.TestingException,"},{"line_number":2928,"context_line":"            self._test_check_can_live_migrate_destination,"},{"line_number":2929,"context_line":"            do_raise\u003dTrue)"},{"line_number":2930,"context_line":""},{"line_number":2931,"context_line":"    @mock.patch.object(compute_utils, \u0027add_instance_fault_from_exc\u0027)"},{"line_number":2932,"context_line":"    def test_check_can_live_migrate_destination_fail_group_policy("}],"source_content_type":"text/x-python","patch_set":1,"id":"c8606526_a9a17199","line":2929,"range":{"start_line":2927,"start_character":12,"end_line":2929,"end_character":26},"updated":"2021-07-09 02:25:39.000000000","message":"Unrelated change.","commit_id":"377b55015b028f6e510a694c60a1cf5c51d6eda7"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"3ea027b5e20dfdd01659d42ef7500126ba262ffd","unresolved":true,"context_lines":[{"line_number":2924,"context_line":"        side_effect\u003dexception.InstanceGroupNotFound(group_uuid\u003d\u0027\u0027)))"},{"line_number":2925,"context_line":"    def test_check_can_live_migrate_destination_fail(self):"},{"line_number":2926,"context_line":"        self.assertRaises("},{"line_number":2927,"context_line":"            test.TestingException,"},{"line_number":2928,"context_line":"            self._test_check_can_live_migrate_destination,"},{"line_number":2929,"context_line":"            do_raise\u003dTrue)"},{"line_number":2930,"context_line":""},{"line_number":2931,"context_line":"    @mock.patch.object(compute_utils, \u0027add_instance_fault_from_exc\u0027)"},{"line_number":2932,"context_line":"    def test_check_can_live_migrate_destination_fail_group_policy("}],"source_content_type":"text/x-python","patch_set":1,"id":"7620cb9a_50e8c48b","line":2929,"range":{"start_line":2927,"start_character":12,"end_line":2929,"end_character":26},"in_reply_to":"0e798e58_90eadf9b","updated":"2021-07-09 18:52:53.000000000","message":"In my view, the cherry-pick didn\u0027t move the spacing, it merge conflicted with it. But it is just spacing, so I\u0027m not attempting to block about it.","commit_id":"377b55015b028f6e510a694c60a1cf5c51d6eda7"},{"author":{"_account_id":14567,"name":"Rodrigo Barbieri","email":"rodrigo.barbieri2010@gmail.com","username":"ganso"},"change_message_id":"8e9f144af4739b28aa8acb95291322abb4cacf4d","unresolved":true,"context_lines":[{"line_number":2924,"context_line":"        side_effect\u003dexception.InstanceGroupNotFound(group_uuid\u003d\u0027\u0027)))"},{"line_number":2925,"context_line":"    def test_check_can_live_migrate_destination_fail(self):"},{"line_number":2926,"context_line":"        self.assertRaises("},{"line_number":2927,"context_line":"            test.TestingException,"},{"line_number":2928,"context_line":"            self._test_check_can_live_migrate_destination,"},{"line_number":2929,"context_line":"            do_raise\u003dTrue)"},{"line_number":2930,"context_line":""},{"line_number":2931,"context_line":"    @mock.patch.object(compute_utils, \u0027add_instance_fault_from_exc\u0027)"},{"line_number":2932,"context_line":"    def test_check_can_live_migrate_destination_fail_group_policy("}],"source_content_type":"text/x-python","patch_set":1,"id":"0e798e58_90eadf9b","line":2929,"range":{"start_line":2927,"start_character":12,"end_line":2929,"end_character":26},"in_reply_to":"c8606526_a9a17199","updated":"2021-07-09 18:24:37.000000000","message":"Indeed unrelated but the cherry-pick moved the spacing so I kept it.","commit_id":"377b55015b028f6e510a694c60a1cf5c51d6eda7"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"766921ea0d3ffba55eccbf3fbf8166786a688b1f","unresolved":true,"context_lines":[{"line_number":9320,"context_line":""},{"line_number":9321,"context_line":"        reportclient \u003d self.compute.reportclient"},{"line_number":9322,"context_line":""},{"line_number":9323,"context_line":"        @mock.patch.object(self.compute, \u0027_reschedule\u0027)"},{"line_number":9324,"context_line":"        @mock.patch.object(self.compute, \u0027_prep_resize\u0027)"},{"line_number":9325,"context_line":"        def doit(mock_pr, mock_r):"},{"line_number":9326,"context_line":"            # Mock the resource tracker, but keep the report client"}],"source_content_type":"text/x-python","patch_set":1,"id":"1c646c4f_c3f2c8a4","line":9323,"updated":"2021-07-09 02:25:39.000000000","message":"Note to reviewers: in Train, the _reschedule_resize_or_reraise method is mocked here instead of _reschedule and it\u0027s mocked to raise TestingException.\n\nHere though, since _get_scheduler_hints raises \"TypeError: argument of type \u0027_SentinelObject\u0027 is not iterable\" when the sentinel is used, it skips the call to _prep_resize and so TestingException doesn\u0027t get raised. A real RequestSpec object is needed to prevent TypeError and get to _prep_resize so TestingException will be raised.\n\nThe same bug actually exists in Train too but it\u0027s covered up by the fact that _reschedule_resize_or_reraise has been mocked to raise TestingException as well, so the assertRaises(TestingException) still passes.","commit_id":"377b55015b028f6e510a694c60a1cf5c51d6eda7"},{"author":{"_account_id":14567,"name":"Rodrigo Barbieri","email":"rodrigo.barbieri2010@gmail.com","username":"ganso"},"change_message_id":"8e9f144af4739b28aa8acb95291322abb4cacf4d","unresolved":true,"context_lines":[{"line_number":9320,"context_line":""},{"line_number":9321,"context_line":"        reportclient \u003d self.compute.reportclient"},{"line_number":9322,"context_line":""},{"line_number":9323,"context_line":"        @mock.patch.object(self.compute, \u0027_reschedule\u0027)"},{"line_number":9324,"context_line":"        @mock.patch.object(self.compute, \u0027_prep_resize\u0027)"},{"line_number":9325,"context_line":"        def doit(mock_pr, mock_r):"},{"line_number":9326,"context_line":"            # Mock the resource tracker, but keep the report client"}],"source_content_type":"text/x-python","patch_set":1,"id":"be0b843d_86ee0a72","line":9323,"in_reply_to":"1c646c4f_c3f2c8a4","updated":"2021-07-09 18:24:37.000000000","message":"thank you for the detailed explanation! \u003d)","commit_id":"377b55015b028f6e510a694c60a1cf5c51d6eda7"}]}