Merge "Follow up for Ie991d4b53e9bb5e7ec26da99219178ab7695abf6"
This commit is contained in:
commit
0163b9bfb5
@ -1928,11 +1928,10 @@ class SchedulerReportClient(object):
|
|||||||
|
|
||||||
Note that this call moves the current allocation from the source
|
Note that this call moves the current allocation from the source
|
||||||
consumer to the target consumer. If parallel update happens on either
|
consumer to the target consumer. If parallel update happens on either
|
||||||
or both consumers during this call then Placement will detect that and
|
consumer during this call then Placement will detect that and
|
||||||
this code will re-read the new state of the consumers and retry the
|
this code will raise AllocationMoveFailed. If you want to move a known
|
||||||
operation. If you want to move a known piece of allocation from source
|
piece of allocation from source to target then this function might not
|
||||||
to target then this function might not be what you want as it always
|
be what you want as it always moves what source has in Placement.
|
||||||
moves what source has in Placement.
|
|
||||||
|
|
||||||
:param context: The security context
|
:param context: The security context
|
||||||
:param source_consumer_uuid: the UUID of the consumer from which
|
:param source_consumer_uuid: the UUID of the consumer from which
|
||||||
|
@ -4576,7 +4576,7 @@ class ConsumerGenerationConflictTest(
|
|||||||
|
|
||||||
post = {'revertResize': None}
|
post = {'revertResize': None}
|
||||||
self.api.post_server_action(server['id'], post)
|
self.api.post_server_action(server['id'], post)
|
||||||
server = self._wait_for_state_change(self.api, server, 'ERROR',)
|
server = self._wait_for_state_change(self.api, server, 'ERROR')
|
||||||
|
|
||||||
self.assertEqual(1, mock_post.call_count)
|
self.assertEqual(1, mock_post.call_count)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user