openstack
/
horizon
Code Issues Proposed changes

Merge "Not implicitly set vol_device_name to vda"

This commit is contained in:
Zuul 2019-03-28 15:44:30 +00:00 committed by Gerrit Code Review
parent cae432ab58 4788c4d2f5
commit 52d85539c7
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
View File

@ -773,11 +773,9 @@
function setFinalSpecBootImageToVolume(finalSpec) { function setFinalSpecBootImageToVolume(finalSpec) {
if (finalSpec.vol_create) { if (finalSpec.vol_create) {
// Specify null to get Autoselection (not empty string) // Specify null to get Autoselection (not empty string)
var deviceName = finalSpec.vol_device_name ? finalSpec.vol_device_name : null;
finalSpec.block_device_mapping_v2 = []; finalSpec.block_device_mapping_v2 = [];
finalSpec.block_device_mapping_v2.push( finalSpec.block_device_mapping_v2.push(
{ {
'device_name': deviceName,
'source_type': bootSourceTypes.IMAGE, 'source_type': bootSourceTypes.IMAGE,
'destination_type': bootSourceTypes.VOLUME, 'destination_type': bootSourceTypes.VOLUME,
'delete_on_termination': finalSpec.vol_delete_on_instance_delete, 'delete_on_termination': finalSpec.vol_delete_on_instance_delete,

17
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js
View File

@ -914,7 +914,6 @@
it('sets volume options appropriately', function() { it('sets volume options appropriately', function() {
expect(model.newInstanceSpec.vol_create).toBe(false); expect(model.newInstanceSpec.vol_create).toBe(false);
expect(model.newInstanceSpec.vol_device_name).toBe('vda');
expect(model.newInstanceSpec.vol_delete_on_instance_delete).toBe(false); expect(model.newInstanceSpec.vol_delete_on_instance_delete).toBe(false);
expect(model.newInstanceSpec.vol_size).toBe(1); expect(model.newInstanceSpec.vol_size).toBe(1);
}); });
@ -937,7 +936,6 @@
model.newInstanceSpec.scheduler_hints = {}; model.newInstanceSpec.scheduler_hints = {};
model.newInstanceSpec.vol_create = true; model.newInstanceSpec.vol_create = true;
model.newInstanceSpec.vol_delete_on_instance_delete = true; model.newInstanceSpec.vol_delete_on_instance_delete = true;
model.newInstanceSpec.vol_device_name = "volTestName";
model.newInstanceSpec.vol_size = 10; model.newInstanceSpec.vol_size = 10;
model.newInstanceSpec.server_groups = []; model.newInstanceSpec.server_groups = [];
@ -973,7 +971,6 @@
it('should set final spec in format required for Block Device Mapping v2', function() { it('should set final spec in format required for Block Device Mapping v2', function() {
var finalSpec = model.createInstance(); var finalSpec = model.createInstance();
var expectedBlockDevice = [{ var expectedBlockDevice = [{
device_name: 'volTestName',
source_type: 'image', source_type: 'image',
destination_type: 'volume', destination_type: 'volume',
delete_on_termination: true, delete_on_termination: true,
@ -1005,8 +1002,6 @@
model.newInstanceSpec.vol_delete_on_instance_delete = 'yep'; model.newInstanceSpec.vol_delete_on_instance_delete = 'yep';
var finalSpec = model.createInstance(); var finalSpec = model.createInstance();
expect(finalSpec.block_device_mapping.volTestName)
.toBe('imAnID:vol::yep');
expect(finalSpec.source_id).toBe(''); expect(finalSpec.source_id).toBe('');
}); });
@ -1016,7 +1011,6 @@
var finalSpec = model.createInstance(); var finalSpec = model.createInstance();
var expectedBlockDevice = [{ var expectedBlockDevice = [{
device_name: 'volTestName',
source_type: 'image', source_type: 'image',
destination_type: 'volume', destination_type: 'volume',
delete_on_termination: true, delete_on_termination: true,
@ -1034,8 +1028,6 @@
model.newInstanceSpec.vol_delete_on_instance_delete = 'yep'; model.newInstanceSpec.vol_delete_on_instance_delete = 'yep';
var finalSpec = model.createInstance(); var finalSpec = model.createInstance();
expect(finalSpec.block_device_mapping.volTestName)
.toBe('imAnID:snap::yep');
expect(finalSpec.source_id).toBe(''); expect(finalSpec.source_id).toBe('');
}); });
@ -1092,15 +1084,6 @@
expect(finalSpec.nics).toEqual(finalNetworks); expect(finalSpec.nics).toEqual(finalNetworks);
}); });
it('provides null for device_name when falsy', function() {
model.newInstanceSpec.source_type.type = 'image';
model.newInstanceSpec.vol_device_name = false;
model.newInstanceSpec.vol_create = true;
var finalSpec = model.createInstance();
expect(finalSpec.block_device_mapping_v2[0].device_name).toBeNull();
});
it('should not have meta property if no metadata specified', function() { it('should not have meta property if no metadata specified', function() {
metadata = {}; metadata = {};