NOTE(elod.illes):
* conflicts in servers.py and test_server_actions.py are due to bug
fixing patch I25eff0271c856a8d3e83867b448e1dec6f6732ab is not
backported to stable/train
* api.py conflict is due to Ic2ad1468d31b7707b7f8f2b845a9cf47d9d076d5
is part of a feature introduced in Ussuri
* modification of test_compute_api.py is also required due to patch
I25eff0271c856a8d3e83867b448e1dec6f6732ab is not backported and
another patch, Ide8eb9e09d22f20165474d499ef0524aefc67854, that
cannot be backported to stable/train
Change-Id: I7f93cfd18f948134c9cb429dea55740d2cf97994
Closes-Bug: #1489304
(cherry picked from commit 10e9a9b9fc62a3cf72c3717e3621ed95d3cf5519)
(cherry picked from commit bcbeae2c605f4ab4ad805dddccac802928a180b6)
Reviewed: https:/ /review. opendev. org/748558 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=683005df39c bb825ff0702cd91 773ad16d7b3998
Committed: https:/
Submitter: Zuul
Branch: stable/train
commit 683005df39cbb82 5ff0702cd91773a d16d7b3998
Author: sunhao <suha9102@163.com>
Date: Wed Jun 10 10:26:49 2020 +0800
Add checks for volume status when rebuilding
When rebuilding, we should only allow detaching
the volume with 'in-use' status, volume in status
such as 'retyping' should not allowed.
Conflicts:
nova/api/ openstack/ compute/ servers. py
nova/compute/ api.py
nova/tests/ unit/api/ openstack/ compute/ test_server_ actions. py
nova/tests/ unit/compute/ test_compute_ api.py
Modified:
NOTE( elod.illes) : actions. py are due to bug 8d3e83867b448e1 dec6f6732ab is not 07b7f8f2b845a9c f47d9d076d5 1c856a8d3e83867 b448e1dec6f6732 ab is not backported and 0165474d499ef05 24aefc67854, that
* conflicts in servers.py and test_server_
fixing patch I25eff0271c856a
backported to stable/train
* api.py conflict is due to Ic2ad1468d31b77
is part of a feature introduced in Ussuri
* modification of test_compute_api.py is also required due to patch
I25eff027
another patch, Ide8eb9e09d22f2
cannot be backported to stable/train
Change-Id: I7f93cfd18f9481 34c9cb429dea557 40d2cf97994 f72c3717e3621ed 95d3cf5519) 4ad805dddccac80 2928a180b6)
Closes-Bug: #1489304
(cherry picked from commit 10e9a9b9fc62a3c
(cherry picked from commit bcbeae2c605f4ab