Change the field type of flavor
Change the field type of flavor from input to select box. User can select flavor without specifying manually. Change-Id: I6dfb2a567d39cf621c545ce43272a3b691029817
This commit is contained in:
parent
8a6330d1f5
commit
312a5742ea
@ -34,10 +34,11 @@
|
|||||||
<translate>Master Flavor</translate>
|
<translate>Master Flavor</translate>
|
||||||
<span class="hz-icon-required fa fa-asterisk"></span>
|
<span class="hz-icon-required fa fa-asterisk"></span>
|
||||||
</label>
|
</label>
|
||||||
<input name="template-master-flavor-id" type="text" class="form-control" id="template-master-flavor-id"
|
<select class="form-control"
|
||||||
ng-model="model.newTemplateSpec.master_flavor_id"
|
ng-model="model.newTemplateSpec.master_flavor_id"
|
||||||
ng-required="true"
|
ng-required="true"
|
||||||
placeholder="{$ 'Flavor ID of Master Node.'|translate $}">
|
ng-options="flavor.id as flavor.id + ':' + flavor.name for flavor in ctrl.flavors">
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
@ -58,10 +59,11 @@
|
|||||||
<translate>Worker Flavor</translate>
|
<translate>Worker Flavor</translate>
|
||||||
<span class="hz-icon-required fa fa-asterisk"></span>
|
<span class="hz-icon-required fa fa-asterisk"></span>
|
||||||
</label>
|
</label>
|
||||||
<input name="template-worker-flavor-id" type="text" class="form-control" id="template-worker-flavor-id"
|
<select class="form-control"
|
||||||
ng-model="model.newTemplateSpec.worker_flavor_id"
|
ng-model="model.newTemplateSpec.worker_flavor_id"
|
||||||
ng-required="true"
|
ng-required="true"
|
||||||
placeholder="{$ 'Flavor ID of Worker Node.'|translate $}">
|
ng-options="flavor.id as flavor.id + ':' + flavor.name for flavor in ctrl.flavors">
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
|
@ -29,12 +29,14 @@
|
|||||||
createTemplateSpecController.$inject = [
|
createTemplateSpecController.$inject = [
|
||||||
'$scope',
|
'$scope',
|
||||||
'horizon.framework.util.i18n.gettext',
|
'horizon.framework.util.i18n.gettext',
|
||||||
'horizon.app.core.openstack-service-api.neutron'
|
'horizon.app.core.openstack-service-api.neutron',
|
||||||
|
'horizon.app.core.openstack-service-api.nova'
|
||||||
];
|
];
|
||||||
|
|
||||||
function createTemplateSpecController($scope, gettext, neutron) {
|
function createTemplateSpecController($scope, gettext, neutron, nova) {
|
||||||
var ctrl = this;
|
var ctrl = this;
|
||||||
ctrl.networks = [];
|
ctrl.networks = [];
|
||||||
|
ctrl.flavors = [];
|
||||||
|
|
||||||
ctrl.templateVersionOptions = [
|
ctrl.templateVersionOptions = [
|
||||||
{ label: gettext('1.6.0'), value: '1.6.0' }
|
{ label: gettext('1.6.0'), value: '1.6.0' }
|
||||||
@ -44,11 +46,16 @@
|
|||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
neutron.getNetworks().success(onGetNetworks);
|
neutron.getNetworks().success(onGetNetworks);
|
||||||
|
nova.getFlavors().success(onGetFlavors);
|
||||||
}
|
}
|
||||||
|
|
||||||
function onGetNetworks(response) {
|
function onGetNetworks(response) {
|
||||||
ctrl.networks = response.items;
|
ctrl.networks = response.items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function onGetFlavors(response) {
|
||||||
|
ctrl.flavors = response.items;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user