x/kloudbuster
Code Issues Proposed changes

fix vm count error

Browse Source 
Change-Id: Ia1558489405fb8a0aa92dc8c8b5151caae747e6f
This commit is contained in:
Xin 2016-03-31 16:54:13 -07:00
parent e3a28860eb
commit 879b366ac2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -305,7 +305,7 @@ angular.module('kbWebApp')
$scope.setStatus = false;
$scope.stageButton = "Unstage";
$scope.setUnstage = false;
$scope.client_vm_count = $scope.config.server.routers_per_tenant * $scope.config.server.networks_per_router * $scope.config.server.vms_per_network * $scope.config.server.number_tenants;
$scope.client_vm_count = $scope.config.client.storage_stage_configs.vm_count;
//$scope.server_vm_count = $scope.client_vm_count;
$scope.getReport();
$(".loading").addClass("pause");
@ -319,7 +319,7 @@ angular.module('kbWebApp')
$scope.setStatus = true;
$scope.stageButton = "Unstage";
$scope.setUnstage = true;
$scope.client_vm_count = $scope.config.server.routers_per_tenant * $scope.config.server.networks_per_router * $scope.config.server.vms_per_network * $scope.config.server.number_tenants;
$scope.client_vm_count = $scope.config.client.storage_stage_configs.vm_count;
//$scope.server_vm_count = $scope.client_vm_count;
if($scope.config.client.progression.enabled === true) $scope.getReport();
$(".loading").removeClass("pause");
@ -333,7 +333,7 @@ angular.module('kbWebApp')
$scope.setStatus = true;
$scope.stageButton = "Unstage";
$scope.setUnstage = false;
$scope.client_vm_count = $scope.config.server.routers_per_tenant * $scope.config.server.networks_per_router * $scope.config.server.vms_per_network * $scope.config.server.number_tenants;
$scope.client_vm_count = $scope.config.client.storage_stage_configs.vm_count;
//$scope.server_vm_count = $scope.client_vm_count;
$(".loading").addClass("pause");
$scope.statusButton = "btn-danger";
@ -347,7 +347,7 @@ angular.module('kbWebApp')
$scope.setStatus = true;
$scope.stageButton = "Unstage";
$scope.setUnstage = true;
$scope.client_vm_count = $scope.config.server.routers_per_tenant * $scope.config.server.networks_per_router * $scope.config.server.vms_per_network * $scope.config.server.number_tenants;
$scope.client_vm_count = $scope.config.client.storage_stage_configs.vm_count;
//$scope.server_vm_count = $scope.client_vm_count;
$(".loading").removeClass("pause");
$scope.statusButton = "btn-info";