You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/03/01 20:20:40 UTC
[01/15] airavata-php-gateway git commit: adding gateway usage
reporting flags
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master 1e839a718 -> ce1305584
adding gateway usage reporting flags
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/ac388435
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ac388435
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ac388435
Branch: refs/heads/master
Commit: ac388435e9fbfd5b80dd9ceded74b59ed412e1eb
Parents: c047e65
Author: smarru <sm...@apache.org>
Authored: Tue Feb 23 15:36:33 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Tue Feb 23 15:36:33 2016 -0500
----------------------------------------------------------------------
.../Model/AppCatalog/ComputeResource/Types.php | 69 ++++++++++++++++++++
.../Model/AppCatalog/GatewayProfile/Types.php | 23 +++++++
2 files changed, 92 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ac388435/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 00f7e6c..5b79870 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -1716,6 +1716,18 @@ class ComputeResourceDescription {
* @var int
*/
public $maxMemoryPerNode = null;
+ /**
+ * @var bool
+ */
+ public $gatewayUsageReporting = null;
+ /**
+ * @var string
+ */
+ public $gatewayUsageModuleLoadCommand = null;
+ /**
+ * @var string
+ */
+ public $gatewayUsageExecutable = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -1795,6 +1807,18 @@ class ComputeResourceDescription {
'var' => 'maxMemoryPerNode',
'type' => TType::I32,
),
+ 12 => array(
+ 'var' => 'gatewayUsageReporting',
+ 'type' => TType::BOOL,
+ ),
+ 13 => array(
+ 'var' => 'gatewayUsageModuleLoadCommand',
+ 'type' => TType::STRING,
+ ),
+ 14 => array(
+ 'var' => 'gatewayUsageExecutable',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -1831,6 +1855,15 @@ class ComputeResourceDescription {
if (isset($vals['maxMemoryPerNode'])) {
$this->maxMemoryPerNode = $vals['maxMemoryPerNode'];
}
+ if (isset($vals['gatewayUsageReporting'])) {
+ $this->gatewayUsageReporting = $vals['gatewayUsageReporting'];
+ }
+ if (isset($vals['gatewayUsageModuleLoadCommand'])) {
+ $this->gatewayUsageModuleLoadCommand = $vals['gatewayUsageModuleLoadCommand'];
+ }
+ if (isset($vals['gatewayUsageExecutable'])) {
+ $this->gatewayUsageExecutable = $vals['gatewayUsageExecutable'];
+ }
}
}
@@ -1996,6 +2029,27 @@ class ComputeResourceDescription {
$xfer += $input->skip($ftype);
}
break;
+ case 12:
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->gatewayUsageReporting);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 13:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayUsageModuleLoadCommand);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 14:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayUsageExecutable);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -2137,6 +2191,21 @@ class ComputeResourceDescription {
$xfer += $output->writeI32($this->maxMemoryPerNode);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayUsageReporting !== null) {
+ $xfer += $output->writeFieldBegin('gatewayUsageReporting', TType::BOOL, 12);
+ $xfer += $output->writeBool($this->gatewayUsageReporting);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayUsageModuleLoadCommand !== null) {
+ $xfer += $output->writeFieldBegin('gatewayUsageModuleLoadCommand', TType::STRING, 13);
+ $xfer += $output->writeString($this->gatewayUsageModuleLoadCommand);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayUsageExecutable !== null) {
+ $xfer += $output->writeFieldBegin('gatewayUsageExecutable', TType::STRING, 14);
+ $xfer += $output->writeString($this->gatewayUsageExecutable);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ac388435/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index 46f89a0..37e7837 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -486,6 +486,10 @@ class GatewayResourceProfile {
* @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
*/
public $storagePreferences = null;
+ /**
+ * @var string
+ */
+ public $usageReportingGatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -516,6 +520,10 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
),
+ 5 => array(
+ 'var' => 'usageReportingGatewayId',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -531,6 +539,9 @@ class GatewayResourceProfile {
if (isset($vals['storagePreferences'])) {
$this->storagePreferences = $vals['storagePreferences'];
}
+ if (isset($vals['usageReportingGatewayId'])) {
+ $this->usageReportingGatewayId = $vals['usageReportingGatewayId'];
+ }
}
}
@@ -603,6 +614,13 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
+ case 5:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->usageReportingGatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -660,6 +678,11 @@ class GatewayResourceProfile {
}
$xfer += $output->writeFieldEnd();
}
+ if ($this->usageReportingGatewayId !== null) {
+ $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 5);
+ $xfer += $output->writeString($this->usageReportingGatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
[05/15] airavata-php-gateway git commit: Disabling checkboxes in
gateway admins' ui.
Posted by sc...@apache.org.
Disabling checkboxes in gateway admins' ui.
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/614145e7
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/614145e7
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/614145e7
Branch: refs/heads/master
Commit: 614145e77e8aba5951082b92f85235dd46db039c
Parents: 3d565f9
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Feb 26 10:47:15 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Feb 26 10:47:15 2016 -0500
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 2 +-
public/js/script.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/614145e7/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 7662426..362989a 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -312,7 +312,7 @@
function disableInputs( elem){
elem.find("input").each( function( i,e){
- if( $(e).attr("type")=='submit' || $(e).attr("type")=='button' )
+ if( $(e).attr("type")=='submit' || $(e).attr("type")=='button' || $(e).attr("type")=='checkbox')
$(e).attr("disabled", "true");
else
$(e).prop("readonly", "true");
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/614145e7/public/js/script.js
----------------------------------------------------------------------
diff --git a/public/js/script.js b/public/js/script.js
index d00547f..ae697c2 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -19,7 +19,7 @@ function getAccodrionCode()
function disableInputs( elem){
elem.find("input").each( function( i,e){
- if( $(e).attr("type")=='submit' || $(e).attr("type")=='button' )
+ if( $(e).attr("type")=='submit' || $(e).attr("type")=='button' || $(e).attr("type")=='checkbox' )
$(e).attr("disabled", "true");
else
$(e).prop("readonly", "true");
[08/15] airavata-php-gateway git commit: fixing a typo
Posted by sc...@apache.org.
fixing a typo
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/ac25081d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ac25081d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ac25081d
Branch: refs/heads/master
Commit: ac25081db9c78c08aa4cf7c807dd25d3b299b753
Parents: a228f19
Author: smarru <sm...@apache.org>
Authored: Fri Feb 26 12:45:39 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Feb 26 12:45:39 2016 -0500
----------------------------------------------------------------------
.../Model/AppCatalog/ComputeResource/Types.php | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ac25081d/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
index f99923d..64a406c 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -249,7 +249,7 @@ class ResourceJobManager {
/**
* @var array
*/
- public $parallalisimPrefix = null;
+ public $parallelismPrefix = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -283,7 +283,7 @@ class ResourceJobManager {
),
),
6 => array(
- 'var' => 'parallalisimPrefix',
+ 'var' => 'parallelismPrefix',
'type' => TType::MAP,
'ktype' => TType::I32,
'vtype' => TType::STRING,
@@ -312,8 +312,8 @@ class ResourceJobManager {
if (isset($vals['jobManagerCommands'])) {
$this->jobManagerCommands = $vals['jobManagerCommands'];
}
- if (isset($vals['parallalisimPrefix'])) {
- $this->parallalisimPrefix = $vals['parallalisimPrefix'];
+ if (isset($vals['parallelismPrefix'])) {
+ $this->parallelismPrefix = $vals['parallelismPrefix'];
}
}
}
@@ -387,7 +387,7 @@ class ResourceJobManager {
break;
case 6:
if ($ftype == TType::MAP) {
- $this->parallalisimPrefix = array();
+ $this->parallelismPrefix = array();
$_size7 = 0;
$_ktype8 = 0;
$_vtype9 = 0;
@@ -398,7 +398,7 @@ class ResourceJobManager {
$val13 = '';
$xfer += $input->readI32($key12);
$xfer += $input->readString($val13);
- $this->parallalisimPrefix[$key12] = $val13;
+ $this->parallelismPrefix[$key12] = $val13;
}
$xfer += $input->readMapEnd();
} else {
@@ -456,15 +456,15 @@ class ResourceJobManager {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->parallalisimPrefix !== null) {
- if (!is_array($this->parallalisimPrefix)) {
+ if ($this->parallelismPrefix !== null) {
+ if (!is_array($this->parallelismPrefix)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('parallalisimPrefix', TType::MAP, 6);
+ $xfer += $output->writeFieldBegin('parallelismPrefix', TType::MAP, 6);
{
- $output->writeMapBegin(TType::I32, TType::STRING, count($this->parallalisimPrefix));
+ $output->writeMapBegin(TType::I32, TType::STRING, count($this->parallelismPrefix));
{
- foreach ($this->parallalisimPrefix as $kiter16 => $viter17)
+ foreach ($this->parallelismPrefix as $kiter16 => $viter17)
{
$xfer += $output->writeI32($kiter16);
$xfer += $output->writeString($viter17);
[03/15] airavata-php-gateway git commit: Gateway usage reporting
feature added.
Posted by sc...@apache.org.
Gateway usage reporting feature added.
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/0b2aa107
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/0b2aa107
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/0b2aa107
Branch: refs/heads/master
Commit: 0b2aa107e6192a6d1a4d2ac8259cf6451d056401
Parents: 282e5b2
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Wed Feb 24 14:14:26 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Wed Feb 24 14:14:26 2016 -0500
----------------------------------------------------------------------
app/controllers/ComputeResourceController.php | 18 ++++++++++
.../compute-resource-preferences.blade.php | 13 +++++++
app/views/resource/edit.blade.php | 38 +++++++++++++++++++-
public/css/bootstrap.min.css | 6 +++-
public/js/script.js | 16 +++++++++
5 files changed, 89 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0b2aa107/app/controllers/ComputeResourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ComputeResourceController.php b/app/controllers/ComputeResourceController.php
index b930367..d258c2d 100755
--- a/app/controllers/ComputeResourceController.php
+++ b/app/controllers/ComputeResourceController.php
@@ -168,6 +168,24 @@ class ComputeResourceController extends BaseController
$computeResource = CRUtilities::register_or_update_compute_resource($computeDescription, true);
return 1; //currently done by ajax.
+ } else if (Input::get("cr-edit") == "enableReporting") {
+ $inputs = Input::all();
+ $computeDescription = CRUtilities::get_compute_resource(Input::get("crId"));
+ //var_dump( $computeDescription); exit;
+ if( isset( $inputs["gatewayUsageReporting"]) && $inputs["gatewayUsageReporting"] == 1){
+ $computeDescription->gatewayUsageReporting = true;
+ $computeDescription->gatewayUsageModuleLoadCommand = $inputs["gatewayUsageModuleLoadCommand"];
+ $computeDescription->gatewayUsageExecutable = $inputs["gatewayUsageExecutable"];
+
+ }
+ else{
+ $computeDescription->gatewayUsageReporting = false;
+ $computeDescription->gatewayUsageModuleLoadCommand = null;
+ $computeDescription->gatewayUsageExecutable = null;
+ }
+ //var_dump( $computeDescription); exit;
+ $computeResource = CRUtilities::register_or_update_compute_resource($computeDescription, true);
+ $tabName = "#tab-reporting";
}
return Redirect::to("cr/edit?crId=" . Input::get("crId") . $tabName);
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0b2aa107/app/views/partials/compute-resource-preferences.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/compute-resource-preferences.blade.php b/app/views/partials/compute-resource-preferences.blade.php
index b31cb25..63413c2 100644
--- a/app/views/partials/compute-resource-preferences.blade.php
+++ b/app/views/partials/compute-resource-preferences.blade.php
@@ -105,6 +105,19 @@
-->
</div>
</div>
+
+@if( isset( $computeResource->gatewayUsageReporting ) && $computeResource->gatewayUsageReporting == true)
+<div class="form-group">
+ <label class="control-label col-md-3">Gateway Id for Usage Reporting</label>
+
+ <div class="col-md-9">
+ <input type="text" name="allocationProjectNumber" class="form-control"
+ value="@if( isset( $preferences) ) {{$preferences->usageReportingGatewayId }}@endif"/>
+ <small>Enter Id of the Gateway using this resource if it requires reporting its usage back to the resource.</small>
+ </div>
+</div>
+@endif
+
@if(Session::has("admin"))
<div class="form-group text-center">
<input type="submit" class="btn btn-primary" value="Set preferences"/>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0b2aa107/app/views/resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php
index 1d44e3e..ee90041 100644
--- a/app/views/resource/edit.blade.php
+++ b/app/views/resource/edit.blade.php
@@ -14,7 +14,7 @@
<div id="page-wrapper">
<div class="container-fluid">
-<div class="col-md-offset-2 col-md-8 compute-resource-properties">
+<div class="col-md-offset-1 col-md-10 compute-resource-properties">
<input type="hidden" class="base-url" value="{{URL::to('/')}}"/>
@@ -34,6 +34,7 @@
<li><a href="#tab-filesystem" data-toggle="tab">FileSystem</a></li>
<li><a href="#tab-jobSubmission" data-toggle="tab">Job Submission Interfaces</a></li>
<li><a href="#tab-dataMovement" data-toggle="tab">Data Movement Interfaces</a></li>
+ <li><a href="#tab-reporting" data-toggle="tab">Reporting</a></li>
</ul>
</div>
@@ -510,6 +511,41 @@
</div>
+<div class="tab-pane" id="tab-reporting">
+
+ <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
+ <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
+ <input type="hidden" name="cr-edit" value="enableReporting"/>
+
+ <div class="form-group required">
+ <div class="checkbox">
+ <input type="checkbox" name="gatewayUsageReporting" class="enable-gateway-check" @if( $computeResource->gatewayUsageReporting == true) checked value="1" @else value="0" @endif>
+ <label class="control-label">Enable Gateway Usage Reporting</label>
+ </div>
+
+ </div>
+
+ <div class="gateway-commands">
+ <div class="form-group required">
+ <label class="control-label">Gateway Module Load Command</label>
+ <input class="form-control hostName" name="gatewayUsageModuleLoadCommand" value="{{ $computeResource->gatewayUsageModuleLoadCommand }}" maxlength="100"
+ name="hostname" required="required" @if( $computeResource->gatewayUsageReporting != true) disabled @endif/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Gateway Usage Executable</label>
+ <input class="form-control hostName" name="gatewayUsageExecutable" value="{{ $computeResource->gatewayUsageExecutable }}" maxlength="100"
+ name="hostname" required="required" @if( $computeResource->gatewayUsageReporting != true) disabled @endif/>
+ </div>
+ </div>
+ <div class="form-group">
+ <input type="submit" class="btn btn-primary" value="Save changes"/>
+ </div>
+
+ </form>
+
+</div>
+
+
</div>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0b2aa107/public/css/bootstrap.min.css
----------------------------------------------------------------------
diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css
index 382fb66..9be6b94 100644
--- a/public/css/bootstrap.min.css
+++ b/public/css/bootstrap.min.css
@@ -58,4 +58,8 @@ body{
.navbar{
margin-bottom: 0;
-}
\ No newline at end of file
+}
+
+.tab-content>.tab-pane {
+ margin-top: 10%;
+ }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0b2aa107/public/js/script.js
----------------------------------------------------------------------
diff --git a/public/js/script.js b/public/js/script.js
index 6f013df..d00547f 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -344,5 +344,21 @@ $(document).ready( function(){
});
+ $(".enable-gateway-check").change( function(){
+ var reportingCheckbox = this;
+ if( reportingCheckbox.checked ){
+ $(reportingCheckbox).val(1);
+ $(".gateway-commands").find("input").each( function( i,e){
+ $(e).removeAttr("disabled");
+ $(e).removeAttr("readonly");
+ });
+ }
+ else{
+ $(reportingCheckbox).val(0);
+ disableInputs( $(".gateway-commands"));
+ }
+
+ })
+
});
\ No newline at end of file
[10/15] airavata-php-gateway git commit: fixing variable names
Posted by sc...@apache.org.
fixing variable names
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/20458c65
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/20458c65
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/20458c65
Branch: refs/heads/master
Commit: 20458c65f25380b5f5f2fa0268d1348418fdb555
Parents: 196d309
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Feb 26 15:06:45 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Feb 26 15:06:45 2016 -0500
----------------------------------------------------------------------
app/libraries/CRUtilities.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/20458c65/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index 1bd3701..2aa0fd6 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -146,7 +146,7 @@ class CRUtilities
"pushMonitoringEndpoint" => $inputs["pushMonitoringEndpoint"],
"jobManagerBinPath" => $inputs["jobManagerBinPath"],
"jobManagerCommands" => $inputs["jobManagerCommands"],
- "parallalisimPrefix" => $inputs["parallelismPrefix"]
+ "parallelismPrefix" => $inputs["parallelismPrefix"]
));
//$rmId = $jsiObject->resourceJobManager->resourceJobManagerId;
@@ -174,7 +174,7 @@ class CRUtilities
"pushMonitoringEndpoint" => $inputs["pushMonitoringEndpoint"],
"jobManagerBinPath" => $inputs["jobManagerBinPath"],
"jobManagerCommands" => $inputs["jobManagerCommands"],
- "parallalisimPrefix" => $inputs["parallelismPrefix"]
+ "parallelismPrefix" => $inputs["parallelismPrefix"]
));
$sshJobSubmission = new SSHJobSubmission(array
(
@@ -214,7 +214,7 @@ class CRUtilities
"pushMonitoringEndpoint" => $inputs["pushMonitoringEndpoint"],
"jobManagerBinPath" => $inputs["jobManagerBinPath"],
"jobManagerCommands" => $inputs["jobManagerCommands"],
- "parallalisimPrefix" => $inputs["parallelismPrefix"]
+ "parallelismPrefix" => $inputs["parallelismPrefix"]
));
$sshJobSubmission = new SSHJobSubmission(array
(
[04/15] airavata-php-gateway git commit: adding parallelism models
Posted by sc...@apache.org.
adding parallelism models
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/3d565f9c
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3d565f9c
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3d565f9c
Branch: refs/heads/master
Commit: 3d565f9c8877002a1dd8e3b56cf2b4e7f55631bd
Parents: 0b2aa10
Author: smarru <sm...@apache.org>
Authored: Fri Feb 26 10:35:30 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Feb 26 10:35:30 2016 -0500
----------------------------------------------------------------------
.../Model/AppCatalog/AppDeployment/Types.php | 33 ---
.../Model/AppCatalog/ComputeResource/Types.php | 221 ++++++++++++-------
.../Model/AppCatalog/Parallelism/Types.php | 53 +++++
3 files changed, 192 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3d565f9c/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
index ab599e6..29965e7 100644
--- a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
@@ -18,39 +18,6 @@ use Thrift\Exception\TApplicationException;
/**
- * Enumeration of application parallelism supported by Airavata
- *
- * SERIAL:
- * Single processor applications without any parallelization.
- *
- * MPI:
- * Messaging Passing Interface.
- *
- * OPENMP:
- * Shared Memory Implementtaion.
- *
- * OPENMP_MPI:
- * Hybrid Applications.
- *
- */
-final class ApplicationParallelismType {
- const SERIAL = 0;
- const MPI = 1;
- const OPENMP = 2;
- const OPENMP_MPI = 3;
- const CCM = 4;
- const CRAY_MPI = 5;
- static public $__names = array(
- 0 => 'SERIAL',
- 1 => 'MPI',
- 2 => 'OPENMP',
- 3 => 'OPENMP_MPI',
- 4 => 'CCM',
- 5 => 'CRAY_MPI',
- );
-}
-
-/**
* Key Value pairs to be used to set environments
*
* name:
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3d565f9c/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 5b79870..f99923d 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -246,6 +246,10 @@ class ResourceJobManager {
* @var array
*/
public $jobManagerCommands = null;
+ /**
+ * @var array
+ */
+ public $parallalisimPrefix = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -278,6 +282,18 @@ class ResourceJobManager {
'type' => TType::STRING,
),
),
+ 6 => array(
+ 'var' => 'parallalisimPrefix',
+ 'type' => TType::MAP,
+ 'ktype' => TType::I32,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::I32,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -296,6 +312,9 @@ class ResourceJobManager {
if (isset($vals['jobManagerCommands'])) {
$this->jobManagerCommands = $vals['jobManagerCommands'];
}
+ if (isset($vals['parallalisimPrefix'])) {
+ $this->parallalisimPrefix = $vals['parallalisimPrefix'];
+ }
}
}
@@ -366,6 +385,26 @@ class ResourceJobManager {
$xfer += $input->skip($ftype);
}
break;
+ case 6:
+ if ($ftype == TType::MAP) {
+ $this->parallalisimPrefix = array();
+ $_size7 = 0;
+ $_ktype8 = 0;
+ $_vtype9 = 0;
+ $xfer += $input->readMapBegin($_ktype8, $_vtype9, $_size7);
+ for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ {
+ $key12 = 0;
+ $val13 = '';
+ $xfer += $input->readI32($key12);
+ $xfer += $input->readString($val13);
+ $this->parallalisimPrefix[$key12] = $val13;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -407,10 +446,28 @@ class ResourceJobManager {
{
$output->writeMapBegin(TType::I32, TType::STRING, count($this->jobManagerCommands));
{
- foreach ($this->jobManagerCommands as $kiter7 => $viter8)
+ foreach ($this->jobManagerCommands as $kiter14 => $viter15)
+ {
+ $xfer += $output->writeI32($kiter14);
+ $xfer += $output->writeString($viter15);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->parallalisimPrefix !== null) {
+ if (!is_array($this->parallalisimPrefix)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('parallalisimPrefix', TType::MAP, 6);
+ {
+ $output->writeMapBegin(TType::I32, TType::STRING, count($this->parallalisimPrefix));
+ {
+ foreach ($this->parallalisimPrefix as $kiter16 => $viter17)
{
- $xfer += $output->writeI32($kiter7);
- $xfer += $output->writeString($viter8);
+ $xfer += $output->writeI32($kiter16);
+ $xfer += $output->writeString($viter17);
}
}
$output->writeMapEnd();
@@ -954,14 +1011,14 @@ class SSHJobSubmission {
case 7:
if ($ftype == TType::LST) {
$this->batchQueueEmailSenders = array();
- $_size9 = 0;
- $_etype12 = 0;
- $xfer += $input->readListBegin($_etype12, $_size9);
- for ($_i13 = 0; $_i13 < $_size9; ++$_i13)
+ $_size18 = 0;
+ $_etype21 = 0;
+ $xfer += $input->readListBegin($_etype21, $_size18);
+ for ($_i22 = 0; $_i22 < $_size18; ++$_i22)
{
- $elem14 = null;
- $xfer += $input->readString($elem14);
- $this->batchQueueEmailSenders []= $elem14;
+ $elem23 = null;
+ $xfer += $input->readString($elem23);
+ $this->batchQueueEmailSenders []= $elem23;
}
$xfer += $input->readListEnd();
} else {
@@ -1022,9 +1079,9 @@ class SSHJobSubmission {
{
$output->writeListBegin(TType::STRING, count($this->batchQueueEmailSenders));
{
- foreach ($this->batchQueueEmailSenders as $iter15)
+ foreach ($this->batchQueueEmailSenders as $iter24)
{
- $xfer += $output->writeString($iter15);
+ $xfer += $output->writeString($iter24);
}
}
$output->writeListEnd();
@@ -1124,14 +1181,14 @@ class GlobusJobSubmission {
case 3:
if ($ftype == TType::LST) {
$this->globusGateKeeperEndPoint = array();
- $_size16 = 0;
- $_etype19 = 0;
- $xfer += $input->readListBegin($_etype19, $_size16);
- for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
+ $_size25 = 0;
+ $_etype28 = 0;
+ $xfer += $input->readListBegin($_etype28, $_size25);
+ for ($_i29 = 0; $_i29 < $_size25; ++$_i29)
{
- $elem21 = null;
- $xfer += $input->readString($elem21);
- $this->globusGateKeeperEndPoint []= $elem21;
+ $elem30 = null;
+ $xfer += $input->readString($elem30);
+ $this->globusGateKeeperEndPoint []= $elem30;
}
$xfer += $input->readListEnd();
} else {
@@ -1169,9 +1226,9 @@ class GlobusJobSubmission {
{
$output->writeListBegin(TType::STRING, count($this->globusGateKeeperEndPoint));
{
- foreach ($this->globusGateKeeperEndPoint as $iter22)
+ foreach ($this->globusGateKeeperEndPoint as $iter31)
{
- $xfer += $output->writeString($iter22);
+ $xfer += $output->writeString($iter31);
}
}
$output->writeListEnd();
@@ -1903,14 +1960,14 @@ class ComputeResourceDescription {
case 3:
if ($ftype == TType::LST) {
$this->hostAliases = array();
- $_size23 = 0;
- $_etype26 = 0;
- $xfer += $input->readListBegin($_etype26, $_size23);
- for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
+ $_size32 = 0;
+ $_etype35 = 0;
+ $xfer += $input->readListBegin($_etype35, $_size32);
+ for ($_i36 = 0; $_i36 < $_size32; ++$_i36)
{
- $elem28 = null;
- $xfer += $input->readString($elem28);
- $this->hostAliases []= $elem28;
+ $elem37 = null;
+ $xfer += $input->readString($elem37);
+ $this->hostAliases []= $elem37;
}
$xfer += $input->readListEnd();
} else {
@@ -1920,14 +1977,14 @@ class ComputeResourceDescription {
case 4:
if ($ftype == TType::LST) {
$this->ipAddresses = array();
- $_size29 = 0;
- $_etype32 = 0;
- $xfer += $input->readListBegin($_etype32, $_size29);
- for ($_i33 = 0; $_i33 < $_size29; ++$_i33)
+ $_size38 = 0;
+ $_etype41 = 0;
+ $xfer += $input->readListBegin($_etype41, $_size38);
+ for ($_i42 = 0; $_i42 < $_size38; ++$_i42)
{
- $elem34 = null;
- $xfer += $input->readString($elem34);
- $this->ipAddresses []= $elem34;
+ $elem43 = null;
+ $xfer += $input->readString($elem43);
+ $this->ipAddresses []= $elem43;
}
$xfer += $input->readListEnd();
} else {
@@ -1951,15 +2008,15 @@ class ComputeResourceDescription {
case 7:
if ($ftype == TType::LST) {
$this->batchQueues = array();
- $_size35 = 0;
- $_etype38 = 0;
- $xfer += $input->readListBegin($_etype38, $_size35);
- for ($_i39 = 0; $_i39 < $_size35; ++$_i39)
+ $_size44 = 0;
+ $_etype47 = 0;
+ $xfer += $input->readListBegin($_etype47, $_size44);
+ for ($_i48 = 0; $_i48 < $_size44; ++$_i48)
{
- $elem40 = null;
- $elem40 = new \Airavata\Model\AppCatalog\ComputeResource\BatchQueue();
- $xfer += $elem40->read($input);
- $this->batchQueues []= $elem40;
+ $elem49 = null;
+ $elem49 = new \Airavata\Model\AppCatalog\ComputeResource\BatchQueue();
+ $xfer += $elem49->read($input);
+ $this->batchQueues []= $elem49;
}
$xfer += $input->readListEnd();
} else {
@@ -1969,17 +2026,17 @@ class ComputeResourceDescription {
case 8:
if ($ftype == TType::MAP) {
$this->fileSystems = array();
- $_size41 = 0;
- $_ktype42 = 0;
- $_vtype43 = 0;
- $xfer += $input->readMapBegin($_ktype42, $_vtype43, $_size41);
- for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
+ $_size50 = 0;
+ $_ktype51 = 0;
+ $_vtype52 = 0;
+ $xfer += $input->readMapBegin($_ktype51, $_vtype52, $_size50);
+ for ($_i54 = 0; $_i54 < $_size50; ++$_i54)
{
- $key46 = 0;
- $val47 = '';
- $xfer += $input->readI32($key46);
- $xfer += $input->readString($val47);
- $this->fileSystems[$key46] = $val47;
+ $key55 = 0;
+ $val56 = '';
+ $xfer += $input->readI32($key55);
+ $xfer += $input->readString($val56);
+ $this->fileSystems[$key55] = $val56;
}
$xfer += $input->readMapEnd();
} else {
@@ -1989,15 +2046,15 @@ class ComputeResourceDescription {
case 9:
if ($ftype == TType::LST) {
$this->jobSubmissionInterfaces = array();
- $_size48 = 0;
- $_etype51 = 0;
- $xfer += $input->readListBegin($_etype51, $_size48);
- for ($_i52 = 0; $_i52 < $_size48; ++$_i52)
+ $_size57 = 0;
+ $_etype60 = 0;
+ $xfer += $input->readListBegin($_etype60, $_size57);
+ for ($_i61 = 0; $_i61 < $_size57; ++$_i61)
{
- $elem53 = null;
- $elem53 = new \Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface();
- $xfer += $elem53->read($input);
- $this->jobSubmissionInterfaces []= $elem53;
+ $elem62 = null;
+ $elem62 = new \Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface();
+ $xfer += $elem62->read($input);
+ $this->jobSubmissionInterfaces []= $elem62;
}
$xfer += $input->readListEnd();
} else {
@@ -2007,15 +2064,15 @@ class ComputeResourceDescription {
case 10:
if ($ftype == TType::LST) {
$this->dataMovementInterfaces = array();
- $_size54 = 0;
- $_etype57 = 0;
- $xfer += $input->readListBegin($_etype57, $_size54);
- for ($_i58 = 0; $_i58 < $_size54; ++$_i58)
+ $_size63 = 0;
+ $_etype66 = 0;
+ $xfer += $input->readListBegin($_etype66, $_size63);
+ for ($_i67 = 0; $_i67 < $_size63; ++$_i67)
{
- $elem59 = null;
- $elem59 = new \Airavata\Model\Data\Movement\DataMovementInterface();
- $xfer += $elem59->read($input);
- $this->dataMovementInterfaces []= $elem59;
+ $elem68 = null;
+ $elem68 = new \Airavata\Model\Data\Movement\DataMovementInterface();
+ $xfer += $elem68->read($input);
+ $this->dataMovementInterfaces []= $elem68;
}
$xfer += $input->readListEnd();
} else {
@@ -2081,9 +2138,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRING, count($this->hostAliases));
{
- foreach ($this->hostAliases as $iter60)
+ foreach ($this->hostAliases as $iter69)
{
- $xfer += $output->writeString($iter60);
+ $xfer += $output->writeString($iter69);
}
}
$output->writeListEnd();
@@ -2098,9 +2155,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRING, count($this->ipAddresses));
{
- foreach ($this->ipAddresses as $iter61)
+ foreach ($this->ipAddresses as $iter70)
{
- $xfer += $output->writeString($iter61);
+ $xfer += $output->writeString($iter70);
}
}
$output->writeListEnd();
@@ -2125,9 +2182,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRUCT, count($this->batchQueues));
{
- foreach ($this->batchQueues as $iter62)
+ foreach ($this->batchQueues as $iter71)
{
- $xfer += $iter62->write($output);
+ $xfer += $iter71->write($output);
}
}
$output->writeListEnd();
@@ -2142,10 +2199,10 @@ class ComputeResourceDescription {
{
$output->writeMapBegin(TType::I32, TType::STRING, count($this->fileSystems));
{
- foreach ($this->fileSystems as $kiter63 => $viter64)
+ foreach ($this->fileSystems as $kiter72 => $viter73)
{
- $xfer += $output->writeI32($kiter63);
- $xfer += $output->writeString($viter64);
+ $xfer += $output->writeI32($kiter72);
+ $xfer += $output->writeString($viter73);
}
}
$output->writeMapEnd();
@@ -2160,9 +2217,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRUCT, count($this->jobSubmissionInterfaces));
{
- foreach ($this->jobSubmissionInterfaces as $iter65)
+ foreach ($this->jobSubmissionInterfaces as $iter74)
{
- $xfer += $iter65->write($output);
+ $xfer += $iter74->write($output);
}
}
$output->writeListEnd();
@@ -2177,9 +2234,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRUCT, count($this->dataMovementInterfaces));
{
- foreach ($this->dataMovementInterfaces as $iter66)
+ foreach ($this->dataMovementInterfaces as $iter75)
{
- $xfer += $iter66->write($output);
+ $xfer += $iter75->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3d565f9c/app/libraries/Airavata/Model/AppCatalog/Parallelism/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/Parallelism/Types.php b/app/libraries/Airavata/Model/AppCatalog/Parallelism/Types.php
new file mode 100644
index 0000000..e633a53
--- /dev/null
+++ b/app/libraries/Airavata/Model/AppCatalog/Parallelism/Types.php
@@ -0,0 +1,53 @@
+<?php
+namespace Airavata\Model\AppCatalog\Parallelism;
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+
+/**
+ * Enumeration of application parallelism supported by Airavata
+ *
+ * SERIAL:
+ * Single processor applications without any parallelization.
+ *
+ * MPI:
+ * Messaging Passing Interface.
+ *
+ * OPENMP:
+ * Shared Memory Implementtaion.
+ *
+ * OPENMP_MPI:
+ * Hybrid Applications.
+ *
+ */
+final class ApplicationParallelismType {
+ const SERIAL = 0;
+ const MPI = 1;
+ const OPENMP = 2;
+ const OPENMP_MPI = 3;
+ const CCM = 4;
+ const CRAY_MPI = 5;
+ static public $__names = array(
+ 0 => 'SERIAL',
+ 1 => 'MPI',
+ 2 => 'OPENMP',
+ 3 => 'OPENMP_MPI',
+ 4 => 'CCM',
+ 5 => 'CRAY_MPI',
+ );
+}
+
+
[02/15] airavata-php-gateway git commit: moving usage gateway id into
resuorces
Posted by sc...@apache.org.
moving usage gateway id into resuorces
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/282e5b2c
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/282e5b2c
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/282e5b2c
Branch: refs/heads/master
Commit: 282e5b2c427a3e55a85a06e60888a9475181f535
Parents: ac38843
Author: smarru <sm...@apache.org>
Authored: Wed Feb 24 11:48:34 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Wed Feb 24 11:48:34 2016 -0500
----------------------------------------------------------------------
.../Model/AppCatalog/GatewayProfile/Types.php | 46 ++++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/282e5b2c/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index 37e7837..7f0d412 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -90,6 +90,10 @@ class ComputeResourcePreference {
* @var string
*/
public $resourceSpecificCredentialStoreToken = null;
+ /**
+ * @var string
+ */
+ public $usageReportingGatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -130,6 +134,10 @@ class ComputeResourcePreference {
'var' => 'resourceSpecificCredentialStoreToken',
'type' => TType::STRING,
),
+ 10 => array(
+ 'var' => 'usageReportingGatewayId',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -160,6 +168,9 @@ class ComputeResourcePreference {
if (isset($vals['resourceSpecificCredentialStoreToken'])) {
$this->resourceSpecificCredentialStoreToken = $vals['resourceSpecificCredentialStoreToken'];
}
+ if (isset($vals['usageReportingGatewayId'])) {
+ $this->usageReportingGatewayId = $vals['usageReportingGatewayId'];
+ }
}
}
@@ -245,6 +256,13 @@ class ComputeResourcePreference {
$xfer += $input->skip($ftype);
}
break;
+ case 10:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->usageReportingGatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -303,6 +321,11 @@ class ComputeResourcePreference {
$xfer += $output->writeString($this->resourceSpecificCredentialStoreToken);
$xfer += $output->writeFieldEnd();
}
+ if ($this->usageReportingGatewayId !== null) {
+ $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 10);
+ $xfer += $output->writeString($this->usageReportingGatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -486,10 +509,6 @@ class GatewayResourceProfile {
* @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
*/
public $storagePreferences = null;
- /**
- * @var string
- */
- public $usageReportingGatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -520,10 +539,6 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
),
- 5 => array(
- 'var' => 'usageReportingGatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -539,9 +554,6 @@ class GatewayResourceProfile {
if (isset($vals['storagePreferences'])) {
$this->storagePreferences = $vals['storagePreferences'];
}
- if (isset($vals['usageReportingGatewayId'])) {
- $this->usageReportingGatewayId = $vals['usageReportingGatewayId'];
- }
}
}
@@ -614,13 +626,6 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 5:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->usageReportingGatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -678,11 +683,6 @@ class GatewayResourceProfile {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->usageReportingGatewayId !== null) {
- $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 5);
- $xfer += $output->writeString($this->usageReportingGatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
[07/15] airavata-php-gateway git commit: Parallelism Prefixes added
to a job submission interface
Posted by sc...@apache.org.
Parallelism Prefixes added to a job submission interface<not-tested>
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/a228f194
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a228f194
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a228f194
Branch: refs/heads/master
Commit: a228f194629384414b17f4bc7e67fbf5320caf3d
Parents: 454abfc
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Feb 26 12:29:32 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Feb 26 12:29:32 2016 -0500
----------------------------------------------------------------------
app/libraries/CRUtilities.php | 14 ++--
app/views/resource/edit.blade.php | 114 +++++++--------------------------
2 files changed, 33 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a228f194/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index 9c5f349..1bd3701 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -23,6 +23,7 @@ use Airavata\Model\Data\Movement\UnicoreDataMovement;
use Airavata\Model\AppCatalog\ComputeResource\UnicoreJobSubmission;
use Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference;
use Airavata\Model\AppCatalog\GatewayProfile\GatewayResourceProfile;
+use Airavata\Model\AppCatalog\Parallelism\ApplicationParallelismType;
//Gateway Classes
@@ -82,6 +83,7 @@ class CRUtilities
$dmp = new DataMovementProtocol();
$jmc = new JobManagerCommand();
$mm = new MonitorMode();
+ $pt = new ApplicationParallelismType();
return array(
"fileSystemsObject" => $files,
"fileSystems" => $files::$__names,
@@ -94,7 +96,8 @@ class CRUtilities
"dataMovementProtocolsObject" => $dmp,
"dataMovementProtocols" => $dmp::$__names,
"jobManagerCommands" => $jmc::$__names,
- "monitorModes" => $mm::$__names
+ "monitorModes" => $mm::$__names,
+ "parallelismTypes" => $pt::$__names
);
}
@@ -142,7 +145,8 @@ class CRUtilities
"resourceJobManagerType" => $inputs["resourceJobManagerType"],
"pushMonitoringEndpoint" => $inputs["pushMonitoringEndpoint"],
"jobManagerBinPath" => $inputs["jobManagerBinPath"],
- "jobManagerCommands" => $inputs["jobManagerCommands"]
+ "jobManagerCommands" => $inputs["jobManagerCommands"],
+ "parallalisimPrefix" => $inputs["parallelismPrefix"]
));
//$rmId = $jsiObject->resourceJobManager->resourceJobManagerId;
@@ -169,7 +173,8 @@ class CRUtilities
"resourceJobManagerType" => $inputs["resourceJobManagerType"],
"pushMonitoringEndpoint" => $inputs["pushMonitoringEndpoint"],
"jobManagerBinPath" => $inputs["jobManagerBinPath"],
- "jobManagerCommands" => $inputs["jobManagerCommands"]
+ "jobManagerCommands" => $inputs["jobManagerCommands"],
+ "parallalisimPrefix" => $inputs["parallelismPrefix"]
));
$sshJobSubmission = new SSHJobSubmission(array
(
@@ -208,7 +213,8 @@ class CRUtilities
"resourceJobManagerType" => $inputs["resourceJobManagerType"],
"pushMonitoringEndpoint" => $inputs["pushMonitoringEndpoint"],
"jobManagerBinPath" => $inputs["jobManagerBinPath"],
- "jobManagerCommands" => $inputs["jobManagerCommands"]
+ "jobManagerCommands" => $inputs["jobManagerCommands"],
+ "parallalisimPrefix" => $inputs["parallelismPrefix"]
));
$sshJobSubmission = new SSHJobSubmission(array
(
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a228f194/app/views/resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php
index ee90041..6b0c1d4 100644
--- a/app/views/resource/edit.blade.php
+++ b/app/views/resource/edit.blade.php
@@ -223,38 +223,13 @@
</h4>
<input type="hidden" name="jobSubmissionProtocol" value="{{ $selectedJspIndex }}"/>
@if( $selectedJspIndex == $jobSubmissionProtocolsObject::LOCAL)
- <div class="select-resource-manager-type">
- <div class="form-group required">
- <label class="control-label">Select resource manager type</label>
- <select name="resourceJobManagerType" class="form-control selected-resource-manager"
- required="required">
- @foreach( $resourceJobManagerTypes as $index => $rJmT)
- <option value="{{ $index }}"
- @if( $JSI->resourceJobManager->resourceJobManagerType == $index ) selected @endif >{{ $rJmT
- }}</option>
- @endforeach
- </select>
- </div>
- <div class="form-group">
- <label class="control-label">Push Monitoring End Point</label>
- <input type="text" class="form-control" name="pushMonitoringEndpoint"
- value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/>
- </div>
- <div class="form-group">
- <label class="control-label">Job Manager Bin Path</label>
- <input type="text" class="form-control" name="jobManagerBinPath"
- value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/>
- </div>
- <div class="form-group">
- <h3>Job Manager Commands</h3>
- @foreach( $jobManagerCommands as $index => $jmc)
- <label class="control-label">{{ $jmc }}</label>
- <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}"
- value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index] ) ) {{ $JSI->resourceJobManager->jobManagerCommands[$index] }} @endif"/>
- @endforeach
- </select>
- </div>
- </div>
+ @include( 'partials/resource-job-manager', array(
+ "resourceJobManagerTypes" => $resourceJobManagerTypes,
+ "JSI" => $JSI,
+ "jobManagerCommands" => $jobManagerCommands,
+ "parallelismTypes" => $parallelismTypes
+ )
+ )
@elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::SSH || $jobSubmissionProtocolsObject::SSH_FORK)
<div class="form-group required">
<label class="control-label">Select Security Protocol</label>
@@ -287,37 +262,14 @@
</div>
<div class="form-group">
- <div class="select-resource-manager-type">
- <div class="form-group required">
- <label class="control-label">Select resource manager type</label>
- <select name="resourceJobManagerType" class="form-control selected-resource-manager"
- required="required">
- @foreach( $resourceJobManagerTypes as $index => $rJmT)
- <option value="{{ $index }}"
- @if( $JSI->resourceJobManager->resourceJobManagerType == $index ) selected @endif >{{
- $rJmT }}</option>
- @endforeach
- </select>
- </div>
- <div class="form-group">
- <label class="control-label">Push Monitoring End Point</label>
- <input type="text" class="form-control" name="pushMonitoringEndpoint"
- value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/>
- </div>
- <div class="form-group">
- <label class="control-label">Job Manager Bin Path</label>
- <input type="text" class="form-control" name="jobManagerBinPath"
- value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/>
- </div>
- <div class="form-group">
- <h3>Job Manager Commands</h3>
- @foreach( $jobManagerCommands as $index => $jmc)
- <label class="control-label">{{ $jmc }}</label>
- <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}"
- value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index] ) ) {{ $JSI->resourceJobManager->jobManagerCommands[$index] }} @endif"/>
- @endforeach
- </div>
- </div>
+ @include( 'partials/resource-job-manager', array(
+ "resourceJobManagerTypes" => $resourceJobManagerTypes,
+ "JSI" => $JSI,
+ "jobManagerCommands" => $jobManagerCommands,
+ "parallelismTypes" => $parallelismTypes
+ )
+ )
+
</div>
@elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::UNICORE)
@@ -550,32 +502,12 @@
<div class="resource-manager-block hide">
- <div class="select-resource-manager-type">
- <div class="form-group required">
- <label class="control-label">Select resource manager type</label>
- <select name="resourceJobManagerType" class="form-control selected-resource-manager" required="required">
- @foreach( $resourceJobManagerTypes as $index => $rJmT)
- <option value="{{ $index }}">{{ $rJmT }}</option>
- @endforeach
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="control-label">Push Monitoring End Point</label>
- <input type="text" class="form-control" name="pushMonitoringEndpoint"/>
- </div>
- <div class="form-group">
- <label class="control-label">Job Manager Bin Path</label>
- <input type="text" class="form-control" name="jobManagerBinPath"/>
- </div>
- <div class="form-group">
- <h3>Job Manager Commands</h3>
- @foreach( $jobManagerCommands as $index => $jmc)
- <label class="control-label">{{ $jmc }}</label>
- <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}"/>
- @endforeach
- </select>
- </div>
+@include( 'partials/resource-job-manager', array(
+ "resourceJobManagerTypes" => $resourceJobManagerTypes,
+ "jobManagerCommands" => $jobManagerCommands,
+ "parallelismTypes" => $parallelismTypes
+ )
+)
</div>
<div class="ssh-block hide">
@@ -667,8 +599,8 @@
Do you really want to delete this Job Submission Interface ?
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-danger danger">Delete</button>
+ <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div>
</form>
@@ -691,8 +623,8 @@
Do you really want to delete this Data Movement Interface ?
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-danger danger">Delete</button>
+ <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
[06/15] airavata-php-gateway git commit: Changing flow of viewing
resources directly to editable ui.
Posted by sc...@apache.org.
Changing flow of viewing resources directly to editable ui.
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/454abfcb
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/454abfcb
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/454abfcb
Branch: refs/heads/master
Commit: 454abfcbb324e728aaa4e2e0e1ca0925233bea78
Parents: 614145e
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Feb 26 11:02:14 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Feb 26 11:02:14 2016 -0500
----------------------------------------------------------------------
app/views/resource/browse.blade.php | 2 +-
app/views/storage-resource/browse.blade.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/454abfcb/app/views/resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php
index d604d3f..1ec22df 100644
--- a/app/views/resource/browse.blade.php
+++ b/app/views/resource/browse.blade.php
@@ -76,7 +76,7 @@
>
</div>
</td>
- <td><a href="{{URL::to('/')}}/cr/view?crId={{ $crId }}" title="View">
+ <td><a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
<span class="glyphicon glyphicon-list"></span>
</a>
</td>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/454abfcb/app/views/storage-resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/storage-resource/browse.blade.php b/app/views/storage-resource/browse.blade.php
index a6ca0e7..e769822 100644
--- a/app/views/storage-resource/browse.blade.php
+++ b/app/views/storage-resource/browse.blade.php
@@ -62,7 +62,7 @@
$enabled = $resource->enabled;
?>
<tr id="srDetails">
- <td>{{ $srId }}</td>
+ <td><a href="{{URL::to('/')}}/sr/edit?srId={{ $srId }}" title="Edit">{{ $srId }}</a></td>
<td>{{ $hostName }}</td>
<td>
<div class="checkbox">
[13/15] airavata-php-gateway git commit: fixing capatcha verification
issue
Posted by sc...@apache.org.
fixing capatcha verification issue
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/7aca00c8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7aca00c8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7aca00c8
Branch: refs/heads/master
Commit: 7aca00c88ef1585c795971f0290eeef1c72325bd
Parents: d2f6dd5
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 1 14:18:16 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 1 14:18:16 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7aca00c8/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 2b16190..7812f7a 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -325,7 +325,7 @@ class AccountController extends BaseController
}else{
$capatcha = WSIS::getCapatcha()->return;
//hack to work with wso2 IS 5.0.0
- if (file_exists($capatcha->imagePath)){
+ if (is_array(getimagesize(Config::get('pga_config.wsis')['service-url'] . $capatcha->imagePath))){
return View::make("account/verify-human", array("username"=>$username,"code"=>$confirmation,
"imagePath"=>$capatcha->imagePath, "secretKey"=>$capatcha->secretKey,
"imageUrl"=> Config::get("pga_config.wsis")["service-url"] . $capatcha->imagePath));
@@ -343,6 +343,24 @@ class AccountController extends BaseController
}
}
+ private function checkRemoteFile($url)
+ {
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL,$url);
+ // don't download content
+ curl_setopt($ch, CURLOPT_NOBODY, 1);
+ curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ if(curl_exec($ch)!==FALSE)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
private function sendAccountCreationNotification2Admin($username){
$mail = new PHPMailer;
[14/15] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
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/bcf167a5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/bcf167a5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/bcf167a5
Branch: refs/heads/master
Commit: bcf167a5cf3de3edfe40909ee2b8d7556f0a9d6a
Parents: 7aca00c 24df8b8
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 1 14:18:26 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 1 14:18:26 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 8 +
app/controllers/AdminController.php | 4 +
app/controllers/ApplicationController.php | 12 +-
app/controllers/ComputeResourceController.php | 18 ++
.../Model/AppCatalog/AppDeployment/Types.php | 33 ---
.../Model/AppCatalog/ComputeResource/Types.php | 290 +++++++++++++------
.../Model/AppCatalog/GatewayProfile/Types.php | 23 ++
.../Model/AppCatalog/Parallelism/Types.php | 53 ++++
.../Airavata/Model/Experiment/Types.php | 67 +++--
app/libraries/AppUtilities.php | 6 +
app/libraries/CRUtilities.php | 14 +-
app/routes.php | 7 +
app/views/account/dashboard.blade.php | 10 +
app/views/account/request-allocation.blade.php | 70 +++++
app/views/admin/manage-gateway.blade.php | 2 +-
app/views/application/interface.blade.php | 55 +++-
.../compute-resource-preferences.blade.php | 13 +
.../partials/resource-job-manager.blade.php | 41 +++
app/views/resource/browse.blade.php | 2 +-
app/views/resource/edit.blade.php | 152 ++++------
app/views/storage-resource/browse.blade.php | 2 +-
public/css/bootstrap.min.css | 6 +-
public/js/interface.js | 10 +
public/js/script.js | 18 +-
24 files changed, 676 insertions(+), 240 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bcf167a5/app/controllers/AccountController.php
----------------------------------------------------------------------
[15/15] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by sc...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
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/ce130558
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ce130558
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ce130558
Branch: refs/heads/master
Commit: ce1305584fec200f3630874a3aded9278fa30217
Parents: bcf167a 1e839a7
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 1 14:19:57 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 1 14:19:57 2016 -0500
----------------------------------------------------------------------
.../Model/AppCatalog/GatewayProfile/Types.php | 23 ++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ce130558/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
[12/15] airavata-php-gateway git commit: adding gateway instance id
Posted by sc...@apache.org.
adding gateway instance id
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/24df8b83
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/24df8b83
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/24df8b83
Branch: refs/heads/master
Commit: 24df8b83cda01ccc111e80133916c09023d3b53d
Parents: ba651fe
Author: smarru <sm...@apache.org>
Authored: Fri Feb 26 15:15:38 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Feb 26 15:15:38 2016 -0500
----------------------------------------------------------------------
.../Airavata/Model/Experiment/Types.php | 67 +++++++++++++-------
1 file changed, 45 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/24df8b83/app/libraries/Airavata/Model/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Experiment/Types.php b/app/libraries/Airavata/Model/Experiment/Types.php
index 7180c44..20587b6 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -374,6 +374,10 @@ class ExperimentModel {
*/
public $gatewayExecutionId = null;
/**
+ * @var string
+ */
+ public $gatewayInstanceId = null;
+ /**
* @var bool
*/
public $enableEmailNotification = null;
@@ -450,10 +454,14 @@ class ExperimentModel {
'type' => TType::STRING,
),
11 => array(
+ 'var' => 'gatewayInstanceId',
+ 'type' => TType::STRING,
+ ),
+ 12 => array(
'var' => 'enableEmailNotification',
'type' => TType::BOOL,
),
- 12 => array(
+ 13 => array(
'var' => 'emailAddresses',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -461,12 +469,12 @@ class ExperimentModel {
'type' => TType::STRING,
),
),
- 13 => array(
+ 14 => array(
'var' => 'userConfigurationData',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Experiment\UserConfigurationDataModel',
),
- 14 => array(
+ 15 => array(
'var' => 'experimentInputs',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -475,7 +483,7 @@ class ExperimentModel {
'class' => '\Airavata\Model\Application\Io\InputDataObjectType',
),
),
- 15 => array(
+ 16 => array(
'var' => 'experimentOutputs',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -484,12 +492,12 @@ class ExperimentModel {
'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
),
),
- 16 => array(
+ 17 => array(
'var' => 'experimentStatus',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Status\ExperimentStatus',
),
- 17 => array(
+ 18 => array(
'var' => 'errors',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -498,7 +506,7 @@ class ExperimentModel {
'class' => '\Airavata\Model\Commons\ErrorModel',
),
),
- 18 => array(
+ 19 => array(
'var' => 'processes',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -540,6 +548,9 @@ class ExperimentModel {
if (isset($vals['gatewayExecutionId'])) {
$this->gatewayExecutionId = $vals['gatewayExecutionId'];
}
+ if (isset($vals['gatewayInstanceId'])) {
+ $this->gatewayInstanceId = $vals['gatewayInstanceId'];
+ }
if (isset($vals['enableEmailNotification'])) {
$this->enableEmailNotification = $vals['enableEmailNotification'];
}
@@ -657,13 +668,20 @@ class ExperimentModel {
}
break;
case 11:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayInstanceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
if ($ftype == TType::BOOL) {
$xfer += $input->readBool($this->enableEmailNotification);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 12:
+ case 13:
if ($ftype == TType::LST) {
$this->emailAddresses = array();
$_size0 = 0;
@@ -680,7 +698,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 13:
+ case 14:
if ($ftype == TType::STRUCT) {
$this->userConfigurationData = new \Airavata\Model\Experiment\UserConfigurationDataModel();
$xfer += $this->userConfigurationData->read($input);
@@ -688,7 +706,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 14:
+ case 15:
if ($ftype == TType::LST) {
$this->experimentInputs = array();
$_size6 = 0;
@@ -706,7 +724,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 15:
+ case 16:
if ($ftype == TType::LST) {
$this->experimentOutputs = array();
$_size12 = 0;
@@ -724,7 +742,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 16:
+ case 17:
if ($ftype == TType::STRUCT) {
$this->experimentStatus = new \Airavata\Model\Status\ExperimentStatus();
$xfer += $this->experimentStatus->read($input);
@@ -732,7 +750,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 17:
+ case 18:
if ($ftype == TType::LST) {
$this->errors = array();
$_size18 = 0;
@@ -750,7 +768,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 18:
+ case 19:
if ($ftype == TType::LST) {
$this->processes = array();
$_size24 = 0;
@@ -831,8 +849,13 @@ class ExperimentModel {
$xfer += $output->writeString($this->gatewayExecutionId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayInstanceId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayInstanceId', TType::STRING, 11);
+ $xfer += $output->writeString($this->gatewayInstanceId);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->enableEmailNotification !== null) {
- $xfer += $output->writeFieldBegin('enableEmailNotification', TType::BOOL, 11);
+ $xfer += $output->writeFieldBegin('enableEmailNotification', TType::BOOL, 12);
$xfer += $output->writeBool($this->enableEmailNotification);
$xfer += $output->writeFieldEnd();
}
@@ -840,7 +863,7 @@ class ExperimentModel {
if (!is_array($this->emailAddresses)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('emailAddresses', TType::LST, 12);
+ $xfer += $output->writeFieldBegin('emailAddresses', TType::LST, 13);
{
$output->writeListBegin(TType::STRING, count($this->emailAddresses));
{
@@ -857,7 +880,7 @@ class ExperimentModel {
if (!is_object($this->userConfigurationData)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('userConfigurationData', TType::STRUCT, 13);
+ $xfer += $output->writeFieldBegin('userConfigurationData', TType::STRUCT, 14);
$xfer += $this->userConfigurationData->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -865,7 +888,7 @@ class ExperimentModel {
if (!is_array($this->experimentInputs)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('experimentInputs', TType::LST, 14);
+ $xfer += $output->writeFieldBegin('experimentInputs', TType::LST, 15);
{
$output->writeListBegin(TType::STRUCT, count($this->experimentInputs));
{
@@ -882,7 +905,7 @@ class ExperimentModel {
if (!is_array($this->experimentOutputs)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('experimentOutputs', TType::LST, 15);
+ $xfer += $output->writeFieldBegin('experimentOutputs', TType::LST, 16);
{
$output->writeListBegin(TType::STRUCT, count($this->experimentOutputs));
{
@@ -899,7 +922,7 @@ class ExperimentModel {
if (!is_object($this->experimentStatus)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('experimentStatus', TType::STRUCT, 16);
+ $xfer += $output->writeFieldBegin('experimentStatus', TType::STRUCT, 17);
$xfer += $this->experimentStatus->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -907,7 +930,7 @@ class ExperimentModel {
if (!is_array($this->errors)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('errors', TType::LST, 17);
+ $xfer += $output->writeFieldBegin('errors', TType::LST, 18);
{
$output->writeListBegin(TType::STRUCT, count($this->errors));
{
@@ -924,7 +947,7 @@ class ExperimentModel {
if (!is_array($this->processes)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('processes', TType::LST, 18);
+ $xfer += $output->writeFieldBegin('processes', TType::LST, 19);
{
$output->writeListBegin(TType::STRUCT, count($this->processes));
{
[09/15] airavata-php-gateway git commit: Missed new ui files from
commit.
Posted by sc...@apache.org.
Missed new ui files from commit.
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/196d3090
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/196d3090
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/196d3090
Branch: refs/heads/master
Commit: 196d309056b9ebfa93cef667c05697eb5ec5e98e
Parents: a228f19
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Feb 26 15:03:28 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Feb 26 15:03:28 2016 -0500
----------------------------------------------------------------------
app/views/account/request-allocation.blade.php | 70 ++++++++++++++++++++
.../partials/resource-job-manager.blade.php | 41 ++++++++++++
2 files changed, 111 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/196d3090/app/views/account/request-allocation.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/request-allocation.blade.php b/app/views/account/request-allocation.blade.php
new file mode 100644
index 0000000..a5f18a0
--- /dev/null
+++ b/app/views/account/request-allocation.blade.php
@@ -0,0 +1,70 @@
+@extends('layout.basic')
+
+@section('page-header')
+@parent
+@stop
+
+@section('content')
+
+<div class="row">
+
+ <div class="col-md-offset-3 col-md-6">
+ <h1>Request an allocation</h1>
+
+ <form action="{{URL::to('/')}}/allocation-request" method="POST" role="form" enctype="multipart/form-data">
+
+ <div class="form-group required">
+ <label for="experiment-name" class="control-label">Total Allocation Request in Service Units</label>
+ <input type="text" class="form-control" name=""
+ placeholder="" autofocus required="required" maxlength="50"/>
+ </div>
+ <div class="form-group">
+ <label for="experiment-description">Total SUs per job ( CPU hours x No. of CPUs )</label>
+ <textarea class="form-control" name="experiment-description" id=""
+ placeholder="" maxlength="200"></textarea>
+ </div>
+ <div class="form-group required">
+ <label for="project">Maximum memory per CPU</label>
+ <input type="text" class="form-control" name=""
+ placeholder="" autofocus required="required" maxlength="50"/>
+
+
+ </div>
+ <div class="form-group">
+ <label for="application">Disk Usage range ( GB ) per job</label>
+ <input type="text" class="form-control" name=""
+ placeholder="" autofocus required="required" maxlength="50"/>
+
+ </div>
+ <div class="form-group">
+ <label for="application">Number of CPUs ( if parallel code is used ) per job</label>
+ <input type="text" class="form-control" name=""
+ placeholder="" autofocus required="required" maxlength="50"/>
+ </div>
+ <div class="form-group">
+ <label for="experiment-description">Project Reviewed and Funded By (Eg., NSF, NIH, DOD, DOE, None etc...)</label>
+ <textarea class="form-control" name="experiment-description" id="experiment-description"
+ placeholder="" maxlength="200"></textarea>
+ </div>
+ <div class="form-group">
+ <label for="experiment-description">Brief Project Description (Hypothesis, Model Systems, Methods, and Analysis)</label>
+ <textarea class="form-control" name="experiment-description" id="experiment-description"
+ placeholder="" maxlength="200"></textarea>
+ </div>
+ <div class="btn-toolbar">
+ <input name="continue" type="submit" class="btn btn-primary" value="Submit Request">
+ <input name="clear" type="reset" class="btn btn-default" value="Reset values">
+ </div>
+ </form>
+
+ </div>
+</div>
+
+
+@stop
+
+@section('scripts')
+@parent
+<script>
+</script>
+@stop
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/196d3090/app/views/partials/resource-job-manager.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/resource-job-manager.blade.php b/app/views/partials/resource-job-manager.blade.php
new file mode 100644
index 0000000..f737dfd
--- /dev/null
+++ b/app/views/partials/resource-job-manager.blade.php
@@ -0,0 +1,41 @@
+<div class="select-resource-manager-type">
+ <div class="form-group required">
+ <label class="control-label">Select resource manager type</label>
+ <select name="resourceJobManagerType" class="form-control selected-resource-manager"
+ required="required">
+ @foreach( $resourceJobManagerTypes as $index => $rJmT)
+ <option value="{{ $index }}"
+ @if( isset( $JSI) )
+ @if( $JSI->resourceJobManager->resourceJobManagerType == $index ) selected @endif
+ @endif >
+ {{ $rJmT }}</option>
+ @endforeach
+ </select>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Push Monitoring End Point</label>
+ <input type="text" class="form-control" name="pushMonitoringEndpoint"
+ value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Job Manager Bin Path</label>
+ <input type="text" class="form-control" name="jobManagerBinPath"
+ value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/>
+ </div>
+ <div class="form-group">
+ <h3>Job Manager Commands</h3>
+ @foreach( $jobManagerCommands as $index => $jmc)
+ <label class="control-label">{{ $jmc }}</label>
+ <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}"
+ value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index] ) ){{$JSI->resourceJobManager->jobManagerCommands[$index]}}@endif"/>
+ @endforeach
+ </div>
+ <div class="form-group">
+ <h3>Parallelism Prefixes</h3>
+ @foreach( $parallelismTypes as $index => $pt)
+ <label class="control-label">{{ $pt }}</label>
+ <input class="form-control" name="parallelismPrefix[{{ $index }}]" placeholder="{{ $pt }}"
+ value="@if( isset( $JSI->resourceJobManager->parallalisimPrefix[$index] ) ){{$JSI->resourceJobManager->parallalisimPrefix[$index]}}@endif"/>
+ @endforeach
+ </div>
+</div>
\ No newline at end of file
[11/15] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by sc...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
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/ba651fe2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ba651fe2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ba651fe2
Branch: refs/heads/master
Commit: ba651fe2b7ca9d09dd6a5b8fc90dfc276dc5c3a0
Parents: 20458c6 ac25081
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Feb 26 15:07:03 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Feb 26 15:07:03 2016 -0500
----------------------------------------------------------------------
.../Model/AppCatalog/ComputeResource/Types.php | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------