Follow up for specifying az to unshelve

Because of the 'availability_zone' was required in microversion 2.77,
so in v2.77, the 'availability_zone' is True. The logical of
https://review.opendev.org/#/c/663851/43/nova/api/openstack/compute/shelve.py@90
is duplicated and redundant, so remove it.

Change-Id: I4618e4a08465c12daae793ec4ade2712e43637aa
This commit is contained in:
zhangbailin 2019-08-29 08:33:25 +08:00 committed by Brin Zhang
parent 9903c8c068
commit 25074cbe6c
2 changed files with 4 additions and 4 deletions

View File

@ -996,5 +996,6 @@ through ``GET /servers/{server_id}/os-instance-actions`` and
2.77
----
API microversion 2.77 adds support for specifying availability zone when
unshelving a shelved offloaded server.

View File

@ -87,10 +87,9 @@ class ShelveController(wsgi.Controller):
new_az = None
unshelve_dict = body['unshelve']
if unshelve_dict and 'availability_zone' in unshelve_dict:
support_az = api_version_request.is_supported(req, '2.77')
if support_az:
new_az = unshelve_dict['availability_zone']
support_az = api_version_request.is_supported(req, '2.77')
if support_az and unshelve_dict:
new_az = unshelve_dict['availability_zone']
# We could potentially move this check to conductor and avoid the
# extra API call to neutron when we support move operations with ports