openstack/horizon
Code Issues Proposed changes

Merge "Launch Instance: Creating new volume for image snapshot"

Browse Source
This commit is contained in:
Jenkins 2016-11-16 11:10:13 +00:00 committed by Gerrit Code Review
commit e6647d4a0a
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -638,6 +638,7 @@
setFinalSpecBootImageToVolume(finalSpec);
break;
case bootSourceTypes.INSTANCE_SNAPSHOT:
setFinalSpecBootImageToVolume(finalSpec);
break;
case bootSourceTypes.VOLUME:
setFinalSpecBootFromVolumeDevice(finalSpec, 'vol');

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

@ -916,7 +916,17 @@
model.newInstanceSpec.source[0].id = 'imAnID';
var finalSpec = model.createInstance();
expect(finalSpec.source_id).toBe('imAnID');
var expectedBlockDevice = [{
device_name: 'volTestName',
source_type: 'image',
destination_type: 'volume',
delete_on_termination: true,
uuid: 'imAnID',
boot_index: '0',
volume_size: 10
}];
expect(finalSpec.block_device_mapping_v2).toEqual(expectedBlockDevice);
});
it('should handle source type of "volume_snapshot"', function() {

3
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js
View File

@ -401,7 +401,8 @@
function updateBootSourceSelection(selectedSource) {
ctrl.currentBootSource = selectedSource;
if ((selectedSource === bootSourceTypes.IMAGE) && $scope.model.volumeBootable) {
if ((selectedSource === bootSourceTypes.IMAGE ||
selectedSource === bootSourceTypes.INSTANCE_SNAPSHOT) && $scope.model.volumeBootable) {
$scope.model.newInstanceSpec.vol_create = true;
} else {
$scope.model.newInstanceSpec.vol_create = false;

3
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.html
View File

@ -22,7 +22,8 @@
</div>
</div>
<div ng-if="model.newInstanceSpec.source_type.type === 'image' &&
<div ng-if="(model.newInstanceSpec.source_type.type === 'image' ||
model.newInstanceSpec.source_type.type === 'snapshot') &&
model.allowCreateVolumeFromImage">
<div class="col-xs-6">
<div class="form-group">