Repository: airavata-php-gateway Updated Branches: refs/heads/develop 68b8d9e85 -> e113a9014
node, cpu counts should be configurable only via queues Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/e113a901 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e113a901 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e113a901 Branch: refs/heads/develop Commit: e113a90143e4390b67c3248fe0bc256e6cc9781d Parents: 68b8d9e Author: scnakandala <[email protected]> Authored: Mon May 22 15:06:35 2017 -0400 Committer: scnakandala <[email protected]> Committed: Mon May 22 15:06:35 2017 -0400 ---------------------------------------------------------------------- app/controllers/ComputeResourceController.php | 8 ++-- app/views/partials/deployment-block.blade.php | 30 +++++++-------- .../partials/experiment-queue-block.blade.php | 6 +-- app/views/resource/edit.blade.php | 40 ++++++++++---------- app/views/resource/view.blade.php | 40 ++++++++++---------- 5 files changed, 60 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e113a901/app/controllers/ComputeResourceController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ComputeResourceController.php b/app/controllers/ComputeResourceController.php index afbdaa5..6ecf79c 100755 --- a/app/controllers/ComputeResourceController.php +++ b/app/controllers/ComputeResourceController.php @@ -95,10 +95,10 @@ class ComputeResourceController extends BaseController $computeDescription->ipAddresses = array_unique(array_filter(Input::get("ips"))); $computeDescription->resourceDescription = Input::get("description"); $computeDescription->maxMemoryPerNode = Input::get("maxMemoryPerNode"); - $computeDescription->cpusPerNode = Input::get("cpusPerNode"); - $computeDescription->defaultNodeCount = Input::get("defaultNodeCount"); - $computeDescription->defaultCPUCount = Input::get("defaultCPUCount"); - $computeDescription->defaultWalltime = Input::get("defaultWalltime"); +// $computeDescription->cpusPerNode = Input::get("cpusPerNode"); +// $computeDescription->defaultNodeCount = Input::get("defaultNodeCount"); +// $computeDescription->defaultCPUCount = Input::get("defaultCPUCount"); +// $computeDescription->defaultWalltime = Input::get("defaultWalltime"); //var_dump( $computeDescription); exit; $computeResource = CRUtilities::register_or_update_compute_resource($computeDescription, true); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e113a901/app/views/partials/deployment-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/deployment-block.blade.php b/app/views/partials/deployment-block.blade.php index 58b3aa5..fdd7479 100644 --- a/app/views/partials/deployment-block.blade.php +++ b/app/views/partials/deployment-block.blade.php @@ -143,18 +143,18 @@ </div> <button type="button" class="btn btn-default control-label add-postJobCommand hide">Add Post Job Command</button> </div> -<div class="form-group"> - <label class="control-label">Default Node Count</label> - <input type="number" min="0" class="form-control" value="@if( isset( $deploymentObject)){{$deploymentObject->defaultNodeCount}}@endif" - required readonly maxlength="30" name="defaultNodeCount"/> -</div> -<div class="form-group"> - <label class="control-label">Default CPU Count</label> - <input type="number" min="0" class="form-control" value="@if( isset( $deploymentObject)){{$deploymentObject->defaultCPUCount}}@endif" - required readonly maxlength="30" name="defaultCPUCount"/> -</div> -<div class="form-group"> - <label class="control-label">Default Walltime</label> - <input type="number" min="0" class="form-control" value="@if( isset( $deploymentObject)){{$deploymentObject->defaultWalltime}}@endif" - required readonly maxlength="30" name="defaultWalltime"/> -</div> \ No newline at end of file +{{--<div class="form-group">--}} + {{--<label class="control-label">Default Node Count</label>--}} + {{--<input type="number" min="0" class="form-control" value="@if( isset( $deploymentObject)){{$deploymentObject->defaultNodeCount}}@endif"--}} + {{--required readonly maxlength="30" name="defaultNodeCount"/>--}} +{{--</div>--}} +{{--<div class="form-group">--}} + {{--<label class="control-label">Default CPU Count</label>--}} + {{--<input type="number" min="0" class="form-control" value="@if( isset( $deploymentObject)){{$deploymentObject->defaultCPUCount}}@endif"--}} + {{--required readonly maxlength="30" name="defaultCPUCount"/>--}} +{{--</div>--}} +{{--<div class="form-group">--}} + {{--<label class="control-label">Default Walltime</label>--}} + {{--<input type="number" min="0" class="form-control" value="@if( isset( $deploymentObject)){{$deploymentObject->defaultWalltime}}@endif"--}} + {{--required readonly maxlength="30" name="defaultWalltime"/>--}} +{{--</div>--}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e113a901/app/views/partials/experiment-queue-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/experiment-queue-block.blade.php b/app/views/partials/experiment-queue-block.blade.php index cd7b679..d5bc931 100644 --- a/app/views/partials/experiment-queue-block.blade.php +++ b/app/views/partials/experiment-queue-block.blade.php @@ -85,9 +85,6 @@ {{--</div>--}} </div> - -{{--@section('scripts')--}} -{{--@parent--}} <script> //To work with experiment edit (Not Ajax) $( document ).ready(function() { @@ -242,5 +239,4 @@ }); } }); -</script> -{{--@stop--}} \ No newline at end of file +</script> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e113a901/app/views/resource/edit.blade.php ---------------------------------------------------------------------- diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php index ff0cf7b..8f47741 100644 --- a/app/views/resource/edit.blade.php +++ b/app/views/resource/edit.blade.php @@ -83,26 +83,26 @@ <input type="number" min="0" class="form-control" value="{{ $computeResource->maxMemoryPerNode }}" maxlength="30" name="maxMemoryPerNode"/> </div> - <div class="form-group"> - <label class="control-label">CPUs Per Node</label> - <input type="number" min="0" class="form-control" value="{{ $computeResource->cpusPerNode }}" - maxlength="30" name="cpusPerNode"/> - </div> - <div class="form-group"> - <label class="control-label">Default Node Count</label> - <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultNodeCount }}" - maxlength="30" name="defaultNodeCount"/> - </div> - <div class="form-group"> - <label class="control-label">Default CPU Count</label> - <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultCPUCount }}" - maxlength="30" name="defaultCPUCount"/> - </div> - <div class="form-group"> - <label class="control-label">Default Walltime</label> - <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultWalltime }}" - maxlength="30" name="defaultWalltime"/> - </div> + {{--<div class="form-group">--}} + {{--<label class="control-label">CPUs Per Node</label>--}} + {{--<input type="number" min="0" class="form-control" value="{{ $computeResource->cpusPerNode }}"--}} + {{--maxlength="30" name="cpusPerNode"/>--}} + {{--</div>--}} + {{--<div class="form-group">--}} + {{--<label class="control-label">Default Node Count</label>--}} + {{--<input type="number" min="0" class="form-control" value="{{ $computeResource->defaultNodeCount }}"--}} + {{--maxlength="30" name="defaultNodeCount"/>--}} + {{--</div>--}} + {{--<div class="form-group">--}} + {{--<label class="control-label">Default CPU Count</label>--}} + {{--<input type="number" min="0" class="form-control" value="{{ $computeResource->defaultCPUCount }}"--}} + {{--maxlength="30" name="defaultCPUCount"/>--}} + {{--</div>--}} + {{--<div class="form-group">--}} + {{--<label class="control-label">Default Walltime</label>--}} + {{--<input type="number" min="0" class="form-control" value="{{ $computeResource->defaultWalltime }}"--}} + {{--maxlength="30" name="defaultWalltime"/>--}} + {{--</div>--}} <div class="form-group"> <input type="submit" class="btn btn-primary" name="step1" value="Save changes"/> </div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e113a901/app/views/resource/view.blade.php ---------------------------------------------------------------------- diff --git a/app/views/resource/view.blade.php b/app/views/resource/view.blade.php index 6e34d23..12200d2 100644 --- a/app/views/resource/view.blade.php +++ b/app/views/resource/view.blade.php @@ -82,26 +82,26 @@ <input readonly type="number" min="0" class="form-control" value="{{ $computeResource->maxMemoryPerNode }}" maxlength="30" name="maxMemoryPerNode"/> </div> - <div class="form-group"> - <label class="control-label">CPUs Per Node</label> - <input type="number" min="0" class="form-control" value="{{ $computeResource->cpusPerNode }}" - maxlength="30" name="cpusPerNode"/> - </div> - <div class="form-group"> - <label class="control-label">Default Node Count</label> - <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultNodeCount }}" - maxlength="30" name="defaultNodeCount"/> - </div> - <div class="form-group"> - <label class="control-label">Default CPU Count</label> - <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultCPUCount }}" - maxlength="30" name="defaultCPUCount"/> - </div> - <div class="form-group"> - <label class="control-label">Default Walltime</label> - <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultWalltime }}" - maxlength="30" name="defaultWalltime"/> - </div> + {{--<div class="form-group">--}} + {{--<label class="control-label">CPUs Per Node</label>--}} + {{--<input type="number" min="0" class="form-control" value="{{ $computeResource->cpusPerNode }}"--}} + {{--maxlength="30" name="cpusPerNode"/>--}} + {{--</div>--}} + {{--<div class="form-group">--}} + {{--<label class="control-label">Default Node Count</label>--}} + {{--<input type="number" min="0" class="form-control" value="{{ $computeResource->defaultNodeCount }}"--}} + {{--maxlength="30" name="defaultNodeCount"/>--}} + {{--</div>--}} + {{--<div class="form-group">--}} + {{--<label class="control-label">Default CPU Count</label>--}} + {{--<input type="number" min="0" class="form-control" value="{{ $computeResource->defaultCPUCount }}"--}} + {{--maxlength="30" name="defaultCPUCount"/>--}} + {{--</div>--}} + {{--<div class="form-group">--}} + {{--<label class="control-label">Default Walltime</label>--}} + {{--<input type="number" min="0" class="form-control" value="{{ $computeResource->defaultWalltime }}"--}} + {{--maxlength="30" name="defaultWalltime"/>--}} + {{--</div>--}} </form> </div>
