Merge "Fix Launch Instance without Cinder"
This commit is contained in:
commit
57140ceb6f
|
@ -182,7 +182,7 @@
|
||||||
source_type: null,
|
source_type: null,
|
||||||
source: [],
|
source: [],
|
||||||
// REQUIRED for JS logic
|
// REQUIRED for JS logic
|
||||||
vol_create: true,
|
vol_create: false,
|
||||||
// May be null
|
// May be null
|
||||||
vol_device_name: 'vda',
|
vol_device_name: 'vda',
|
||||||
vol_delete_on_instance_delete: false,
|
vol_delete_on_instance_delete: false,
|
||||||
|
|
|
@ -814,7 +814,7 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
it('sets volume options appropriately', function() {
|
it('sets volume options appropriately', function() {
|
||||||
expect(model.newInstanceSpec.vol_create).toBe(true);
|
expect(model.newInstanceSpec.vol_create).toBe(false);
|
||||||
expect(model.newInstanceSpec.vol_device_name).toBe('vda');
|
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);
|
||||||
|
|
|
@ -401,7 +401,11 @@
|
||||||
|
|
||||||
function updateBootSourceSelection(selectedSource) {
|
function updateBootSourceSelection(selectedSource) {
|
||||||
ctrl.currentBootSource = selectedSource;
|
ctrl.currentBootSource = selectedSource;
|
||||||
$scope.model.newInstanceSpec.vol_create = true;
|
if ((selectedSource === bootSourceTypes.IMAGE) && $scope.model.volumeBootable) {
|
||||||
|
$scope.model.newInstanceSpec.vol_create = true;
|
||||||
|
} else {
|
||||||
|
$scope.model.newInstanceSpec.vol_create = false;
|
||||||
|
}
|
||||||
$scope.model.newInstanceSpec.vol_delete_on_instance_delete = false;
|
$scope.model.newInstanceSpec.vol_delete_on_instance_delete = false;
|
||||||
changeBootSource(selectedSource);
|
changeBootSource(selectedSource);
|
||||||
validateBootSourceType();
|
validateBootSourceType();
|
||||||
|
|
|
@ -229,12 +229,12 @@
|
||||||
var tableKeys = ['available', 'allocated',
|
var tableKeys = ['available', 'allocated',
|
||||||
'displayedAvailable', 'displayedAllocated'];
|
'displayedAvailable', 'displayedAllocated'];
|
||||||
|
|
||||||
it('updates the scope appropriately', function() {
|
it('updates the scope appropriately, without Cinder available', function() {
|
||||||
var selSource = 'image';
|
var selSource = 'image';
|
||||||
ctrl.updateBootSourceSelection(selSource);
|
ctrl.updateBootSourceSelection(selSource);
|
||||||
|
|
||||||
expect(ctrl.currentBootSource).toEqual('image');
|
expect(ctrl.currentBootSource).toEqual('image');
|
||||||
expect(scope.model.newInstanceSpec.vol_create).toBe(true);
|
expect(scope.model.newInstanceSpec.vol_create).toBe(false);
|
||||||
expect(scope.model.newInstanceSpec.vol_delete_on_instance_delete).toBe(false);
|
expect(scope.model.newInstanceSpec.vol_delete_on_instance_delete).toBe(false);
|
||||||
|
|
||||||
// check table data
|
// check table data
|
||||||
|
@ -244,6 +244,16 @@
|
||||||
expect(ctrl.tableBodyCells.length).toBeGreaterThan(0);
|
expect(ctrl.tableBodyCells.length).toBeGreaterThan(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('updates the scope appropriately, with Cinder available', function() {
|
||||||
|
scope.model.volumeBootable = true;
|
||||||
|
var selSource = 'image';
|
||||||
|
ctrl.updateBootSourceSelection(selSource);
|
||||||
|
|
||||||
|
expect(ctrl.currentBootSource).toEqual('image');
|
||||||
|
expect(scope.model.newInstanceSpec.vol_create).toBe(true);
|
||||||
|
expect(scope.model.newInstanceSpec.vol_delete_on_instance_delete).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
it('should broadcast event when boot source changes', function() {
|
it('should broadcast event when boot source changes', function() {
|
||||||
spyOn(scope, '$broadcast');
|
spyOn(scope, '$broadcast');
|
||||||
scope.$apply();
|
scope.$apply();
|
||||||
|
|
Loading…
Reference in New Issue