You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/03/11 08:02:19 UTC
[1/4] airavata-php-gateway git commit: adding gateway usage reporting
flags
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 09a65f9c9 -> ffe3b4e53
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/1e839a71
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1e839a71
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1e839a71
Branch: refs/heads/develop
Commit: 1e839a718eaa0000857a8e9fb03f9818e7e45adf
Parents: c047e65
Author: smarru <sm...@apache.org>
Authored: Tue Feb 23 15:34:09 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Tue Feb 23 15:34:09 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/1e839a71/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/1e839a71/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;
[4/4] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/master' into develop
Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/master' 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/ffe3b4e5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ffe3b4e5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ffe3b4e5
Branch: refs/heads/develop
Commit: ffe3b4e53d47f033e3615fe5524b1ee922a5173a
Parents: 09a65f9 8ae672d
Author: Suresh Marru <sm...@apache.org>
Authored: Fri Mar 11 01:59:44 2016 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Fri Mar 11 01:59:44 2016 -0500
----------------------------------------------------------------------
.../Model/AppCatalog/GatewayProfile/Types.php | 23 ++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
[3/4] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by sm...@apache.org.
Merge branch 'develop' 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/8ae672d2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/8ae672d2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/8ae672d2
Branch: refs/heads/develop
Commit: 8ae672d2eb847ed3c47ba6c6158a03f8754f9d85
Parents: ce13055 43466f1
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 2 16:01:43 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 2 16:01:43 2016 -0500
----------------------------------------------------------------------
app/libraries/AppUtilities.php | 14 +++++++-------
app/views/partials/resource-job-manager.blade.php | 2 +-
public/css/bootstrap.min.css | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[2/4] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by sm...@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/develop
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
----------------------------------------------------------------------