x
/
kloudbuster
Code Issues Proposed changes

Merge "update WEB UI for ephemeral storage"

This commit is contained in:
Jenkins 2016-03-23 18:15:34 +00:00 committed by Gerrit Code Review
parent b5b3628fce acca672a72
commit 3b2ea4b1b4
6 changed files with 65 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

2
kb_server/public/ui/styles/main.css
View File

File diff suppressed because one or more lines are too long

1
kb_web/app/scripts/controllers/login.js
View File

@ -202,7 +202,6 @@ angular.module('kbWebApp')
$scope.runCon = {"credentials": {}, kb_cfg: "", "storage_mode": $scope.storage_mode}; $scope.runCon = {"credentials": {}, kb_cfg: "", "storage_mode": $scope.storage_mode};
//console.log($scope.credentials); //console.log($scope.credentials);
$scope.runCon.credentials = $scope.credentials; $scope.runCon.credentials = $scope.credentials;
kbCookie.setCredentials($scope.credentials); kbCookie.setCredentials($scope.credentials);

4
kb_web/app/styles/main.css
View File

@ -130,6 +130,10 @@ md-input-container{
padding-bottom:5px; padding-bottom:5px;
} }
div[ng-messages]{
min-height: 5px;
}
td.ng-binding.ng-scope { td.ng-binding.ng-scope {
padding:3px; padding:3px;
} }

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

@ -59,23 +59,36 @@
</md-input-container> </md-input-container>
</md-content> </md-content>
<md-content layout-padding> <div class="panel panel-default" style="margin: 0">
<md-input-container class="col-md-12"> <div class="panel-body">
<label>Volume Size (GB)</label> <h6>Volume Types Used for Storage Test:</h6>
<input type="number" min="1" max="999" step="1" name="volume_size" <md-radio-group ng-model="config.client.storage_target">
id="volume_size" ng-model="config.client.volume_size" <md-radio-button value="volume" class="md-primary" style="display: inline">Cinder Volume (Block Storage)</md-radio-button>
ng-pattern="/^[1-9][0-9]{0,2}$/i" required style="text-align:left;"/> <md-radio-button value="ephemeral" class="md-primary" style="display: inline" >Ephemeral Volume</md-radio-button>
</md-radio-group>
<md-content layout-padding>
<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"
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">
<div ng-message="required" style="padding-right: 0;">This field is required</div>
<div ng-message="pattern" style="padding-right: 0;">Must be a number between 1 and 999</div>
</div>
</md-input-container>
</md-content>
</div>
</div>
<div ng-messages="general.volume_size.$error" ng-if="general.volume_size.$dirty">
<div ng-message="required" style="padding-right: 0;">This field is required</div>
<div ng-message="pattern" style="padding-right: 0;">Must be a number between 1 and 999</div>
</div>
</md-input-container>
</md-content>
<md-content layout-padding> <md-content layout-padding>
<md-input-container class="col-md-12"> <md-input-container class="col-md-12">
<label>IO File Size (GiB)</label> <label>Storage Test IO File Size (GB)</label>
<input type="number" min="1" max="999" step="1" name="io_file_size" <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.io_file_size"
ng-pattern="/^[1-9][0-9]{0,2}$/i" required style="text-align:left;"/> ng-pattern="/^[1-9][0-9]{0,2}$/i" required style="text-align:left;"/>
@ -84,6 +97,7 @@
<div ng-message="required" style="padding-right: 0;">This field is required</div> <div ng-message="required" style="padding-right: 0;">This field is required</div>
<div ng-message="pattern" style="padding-right: 0;">Must be a number between 1 and 999</div> <div ng-message="pattern" style="padding-right: 0;">Must be a number between 1 and 999</div>
</div> </div>
</md-input-container> </md-input-container>
</md-content> </md-content>
<div class="panel panel-default"> <div class="panel panel-default">
@ -92,7 +106,7 @@
<div class="panel-body"> <div class="panel-body">
<md-content layout-padding> <md-content layout-padding>
<md-input-container class="col-md-4"> <md-input-container class="col-md-6">
<label>vCPUs</label> <label>vCPUs</label>
<input type="number" min="1" max="999" step="1" name="client_vcpus" <input type="number" min="1" max="999" step="1" name="client_vcpus"
id="client_vcpus" ng-model="config.client.flavor.vcpus" ng-pattern="/^[1-9][0-9]{0,2}$/i" id="client_vcpus" ng-model="config.client.flavor.vcpus" ng-pattern="/^[1-9][0-9]{0,2}$/i"
@ -103,7 +117,7 @@
<div ng-message="pattern" style="padding-right: 0;">Must be a number between 1 and 999</div> <div ng-message="pattern" style="padding-right: 0;">Must be a number between 1 and 999</div>
</div> </div>
</md-input-container> </md-input-container>
<md-input-container class="col-md-4"> <md-input-container class="col-md-6">
<label>RAM (MB)</label> <label>RAM (MB)</label>
<input type="number" min="0" max="" step="128" name="client_ram" id="client_ram" <input type="number" min="0" max="" step="128" name="client_ram" id="client_ram"
ng-model="config.client.flavor.ram" ng-pattern="/^[0-9]*$/i" required ng-model="config.client.flavor.ram" ng-pattern="/^[0-9]*$/i" required
@ -114,18 +128,33 @@
<div ng-message="pattern" style="padding-right: 0;">Must be a number no less than 0</div> <div ng-message="pattern" style="padding-right: 0;">Must be a number no less than 0</div>
</div> </div>
</md-input-container> </md-input-container>
<md-input-container class="col-md-4">
<label>DISK (GB)</label>
<input type="number" min="0" max="" step="" name="client_disk" id="client_disk"
ng-model="config.client.flavor.disk" ng-pattern="/^[0-9]*$/i" required
style="text-align:left;"/>
<div ng-messages="general.client_disk.$error" ng-if="general.client_disk.$dirty" role="alert">
<div ng-message="required" style="padding-right: 0;">This field is required</div>
<div ng-message="pattern" style="padding-right: 0;">Must be a number no less than 0</div>
</div>
</md-input-container>
</md-content> </md-content>
<div class="panel panel-default" style="margin: 0">
<div class="panel-body">
<md-radio-group ng-model="choose_disk_size" ng-init="choose_disk_size=0">
<md-radio-button value="0" ng-click="config.client.flavor.disk=20" class="md-primary" style="margin:5px">Use default root disk size</md-radio-button>
<md-radio-button value="1" class="md-primary" style="margin:5px">Use specific root disk size</md-radio-button>
</md-radio-group>
<md-content layout-padding ng-if="choose_disk_size==1">
<md-input-container>
<label>Root Disk Size (GB)</label>
<input type="number" min="1" max="" step="" name="client_disk" id="client_disk"
ng-model="config.client.flavor.disk" ng-pattern="/^[1-9][0-9]*$/i" required
style="text-align:left;"/>
<div ng-messages="general.client_disk.$error" role="alert">
<div ng-message="required" style="padding-right: 0;">This field is required</div>
<div ng-message="pattern" style="padding-right: 0;">Must be a number no less than 1</div>
</div>
</md-input-container>
</md-content>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -180,7 +209,7 @@
ng-model="config.client.storage_tool_configs[$index]['description']" required ng-model="config.client.storage_tool_configs[$index]['description']" required
style="text-align:left;"/> style="text-align:left;"/>
<div ng-messages="server[$index+'+description'].$error" ng-if="server[$index+'+description'].$dirty"> <div ng-messages="server[$index+'+description'].$error">
<div ng-message="required" style="padding-right: 0;">This field is required</div> <div ng-message="required" style="padding-right: 0;">This field is required</div>
</div> </div>
</md-input-container> </md-input-container>

6
kloudbuster/cfg.scale.yaml
View File

@ -165,7 +165,7 @@ client:
# Memory for the flavor in MB # Memory for the flavor in MB
ram: 2048 ram: 2048
# Size of local disk in GB # Size of local disk in GB
disk: 0 disk: 20
# Traffic shaping - VM Placement hint # Traffic shaping - VM Placement hint
# Availability zone to use for clients in the client cloud # Availability zone to use for clients in the client cloud
@ -287,9 +287,9 @@ client:
# Volumes size in GB for each VM # Volumes size in GB for each VM
# #
# Note: Will effect only in storage testing. # Note: Will effect only in storage testing.
disk_size: 1 disk_size: 20
# The size of the test file for running IO tests in GiB. Must be less or # The size of the test file for running IO tests in GB. Must be less or
# equal than disk_size. # equal than disk_size.
# #
# Note: Due to the unit calculation difference and the overhead of the # Note: Due to the unit calculation difference and the overhead of the