openstack
/
horizon
Code Issues Proposed changes

Merge "Fix Unable to use multiattach volume as boot for new server"

This commit is contained in:
Zuul 2021-07-28 16:14:49 +00:00 committed by Gerrit Code Review
parent 0f8a42cf63 64fe0abb65
commit a97253bda7
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/api/microversions.py
View File

@ -29,12 +29,12 @@ LOG = logging.getLogger(__name__)
MICROVERSION_FEATURES = {
"nova": {
"locked_attribute": ["2.9", "2.42"],
"instance_description": ["2.19", "2.42"],
"instance_description": ["2.19", "2.60"],
"remote_console_mks": ["2.8", "2.53"],
"servergroup_soft_policies": ["2.15", "2.60"],
"servergroup_user_info": ["2.13", "2.60"],
"multiattach": ["2.60"],
"auto_allocated_network": ["2.37", "2.42"],
"auto_allocated_network": ["2.37", "2.60"],
"key_types": ["2.2", "2.9"],
"key_type_list": ["2.9"],
},

3
openstack_dashboard/api/nova.py
View File

@ -411,7 +411,8 @@ def server_create(request, name, image, flavor, key_name, user_data,
availability_zone=None, instance_count=1, admin_pass=None,
disk_config=None, config_drive=None, meta=None,
scheduler_hints=None, description=None):
microversion = get_microversion(request, ("instance_description",
microversion = get_microversion(request, ("multiattach",
"instance_description",
"auto_allocated_network"))
nova_client = _nova.novaclient(request, version=microversion)

2
openstack_dashboard/test/unit/api/test_nova.py
View File

@ -784,7 +784,7 @@ class ComputeApiTests(test.APIMockTestCase):
self.assertIsInstance(ret, api.nova.Server)
self.mock_get_microversion.assert_called_once_with(
mock.sentinel.request, ('instance_description',
mock.sentinel.request, ('multiattach', 'instance_description',
'auto_allocated_network'))
self.mock_novaclient.assert_called_once_with(
mock.sentinel.request, version=mock.sentinel.microversion)