x
/
kloudbuster
Code Issues Proposed changes

support "re-format config files" in UI 

Change-Id: If58ae536b917c19766c23fa7710186ecc5f5b39b
This commit is contained in:
Xin 2016-03-31 13:03:27 -07:00
parent 998d99fc9d
commit 827cba987a
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kb_server/public/ui/scripts/scripts.js
View File

File diff suppressed because one or more lines are too long

5
kb_web/app/scripts/controllers/run_storage.js
View File

@ -106,11 +106,6 @@ angular.module('kbWebApp')
var deferred = $q.defer();
if($scope.status==="READY") {
$scope.config.server.number_tenants = 1;
$scope.config.server.routers_per_tenant = 1;
$scope.config.server.networks_per_router = 1;
$scope.config.server.secgroups_per_network = 1;
kbCookie.setConfig($scope.config);
$scope.chaCon = {"kb_cfg": {}};
$scope.chaCon.kb_cfg = kbCookie.getConfig();

6
kb_web/app/views/config_storage.html
View File

@ -62,7 +62,7 @@
<div class="panel panel-default" style="margin: 0">
<div class="panel-body">
<h6>Volume Types Used for Storage Test:</h6>
<md-radio-group ng-model="config.client.storage_target">
<md-radio-group ng-model="config.client.storage_stage_configs.target">
<md-radio-button value="volume" class="md-primary" style="display: inline">Cinder Volume (Block Storage)</md-radio-button>
<md-radio-button value="ephemeral" class="md-primary" style="display: inline" >Ephemeral Volume</md-radio-button>
</md-radio-group>
@ -71,7 +71,7 @@
<md-input-container class="col-md-12">
<label>Volume Size (GB)</label>
<input type="number" min="1" max="999" step="1" name="disk_size"
id="disk_size" ng-model="config.client.disk_size"
id="disk_size" ng-model="config.client.storage_stage_configs.disk_size"
ng-pattern="/^[1-9][0-9]{0,2}$/i" required style="text-align:left;"/>
<div ng-messages="general.disk_size.$error" ng-if="general.disk_size.$dirty">
@ -90,7 +90,7 @@
<md-input-container class="col-md-12">
<label>Storage Test IO File Size (GB)</label>
<input type="number" min="1" max="999" step="1" name="io_file_size"
id="io_file_size" ng-model="config.client.io_file_size"
id="io_file_size" ng-model="config.client.storage_stage_configs.io_file_size"
ng-pattern="/^[1-9][0-9]{0,2}$/i" required style="text-align:left;"/>
<div ng-messages="general.io_file_size.$error" ng-if="general.io_file_size.$dirty">

8
kb_web/app/views/run_storage.html
View File

@ -66,12 +66,12 @@
<md-content layout-padding style="padding:0">
<md-input-container class="col-md-12">
<label>Max VM</label>
<input type="number" min="1" max="999" step="1" id="server_vms_per_network"
ng-model="config.server.vms_per_network" name="server_vms_per_network"
<input type="number" min="1" max="999" step="1" id="storage_stage_configs_vm_count"
ng-model="config.client.storage_stage_configs.vm_count" name="storage_stage_configs_vm_count"
ng-pattern="/^[1-9][0-9]{0,2}$/i" required style="text-align:left;"/>
<div ng-messages="interactive_staging_settings.server_vms_per_network.$error"
ng-if="interactive_staging_settings.server_vms_per_network.$dirty">
<div ng-messages="interactive_staging_settings.storage_stage_configs_vm_count.$error"
ng-if="interactive_staging_settings.storage_stage_configs_vm_count.$dirty">
<div ng-message="required" style="text-align:left;">This field is required</div>
<div ng-message="pattern" style="text-align:left;">Must be a number between 1 and 999</div>
</div>