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/08/08 21:34:46 UTC
[1/2] airavata-php-gateway git commit: updating thrift generated files
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop a38ded02b -> d016990d8
updating thrift generated files
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/3a94a745
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3a94a745
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3a94a745
Branch: refs/heads/develop
Commit: 3a94a7452c9f3e3c1b6eb35580cddb88f5fce710
Parents: 7edd1a7
Author: scnakandala <su...@gmail.com>
Authored: Mon Aug 8 17:34:38 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Aug 8 17:34:38 2016 -0400
----------------------------------------------------------------------
.../Model/AppCatalog/GatewayProfile/Types.php | 92 ++++++++++++++++++++
.../Airavata/Model/Workspace/Types.php | 46 ++++++++++
2 files changed, 138 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3a94a745/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 8a56327..f0b329d 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -94,6 +94,22 @@ class ComputeResourcePreference {
* @var string
*/
public $usageReportingGatewayId = null;
+ /**
+ * @var string
+ */
+ public $qualityOfService = null;
+ /**
+ * @var string
+ */
+ public $reservation = null;
+ /**
+ * @var int
+ */
+ public $reservationStartTime = null;
+ /**
+ * @var int
+ */
+ public $reservationEndTime = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -138,6 +154,22 @@ class ComputeResourcePreference {
'var' => 'usageReportingGatewayId',
'type' => TType::STRING,
),
+ 11 => array(
+ 'var' => 'qualityOfService',
+ 'type' => TType::STRING,
+ ),
+ 12 => array(
+ 'var' => 'reservation',
+ 'type' => TType::STRING,
+ ),
+ 13 => array(
+ 'var' => 'reservationStartTime',
+ 'type' => TType::I64,
+ ),
+ 14 => array(
+ 'var' => 'reservationEndTime',
+ 'type' => TType::I64,
+ ),
);
}
if (is_array($vals)) {
@@ -171,6 +203,18 @@ class ComputeResourcePreference {
if (isset($vals['usageReportingGatewayId'])) {
$this->usageReportingGatewayId = $vals['usageReportingGatewayId'];
}
+ if (isset($vals['qualityOfService'])) {
+ $this->qualityOfService = $vals['qualityOfService'];
+ }
+ if (isset($vals['reservation'])) {
+ $this->reservation = $vals['reservation'];
+ }
+ if (isset($vals['reservationStartTime'])) {
+ $this->reservationStartTime = $vals['reservationStartTime'];
+ }
+ if (isset($vals['reservationEndTime'])) {
+ $this->reservationEndTime = $vals['reservationEndTime'];
+ }
}
}
@@ -263,6 +307,34 @@ class ComputeResourcePreference {
$xfer += $input->skip($ftype);
}
break;
+ case 11:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->qualityOfService);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->reservation);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 13:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->reservationStartTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 14:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->reservationEndTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -326,6 +398,26 @@ class ComputeResourcePreference {
$xfer += $output->writeString($this->usageReportingGatewayId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->qualityOfService !== null) {
+ $xfer += $output->writeFieldBegin('qualityOfService', TType::STRING, 11);
+ $xfer += $output->writeString($this->qualityOfService);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->reservation !== null) {
+ $xfer += $output->writeFieldBegin('reservation', TType::STRING, 12);
+ $xfer += $output->writeString($this->reservation);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->reservationStartTime !== null) {
+ $xfer += $output->writeFieldBegin('reservationStartTime', TType::I64, 13);
+ $xfer += $output->writeI64($this->reservationStartTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->reservationEndTime !== null) {
+ $xfer += $output->writeFieldBegin('reservationEndTime', TType::I64, 14);
+ $xfer += $output->writeI64($this->reservationEndTime);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3a94a745/app/libraries/Airavata/Model/Workspace/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Workspace/Types.php b/app/libraries/Airavata/Model/Workspace/Types.php
index 34f2699..b44753f 100644
--- a/app/libraries/Airavata/Model/Workspace/Types.php
+++ b/app/libraries/Airavata/Model/Workspace/Types.php
@@ -684,6 +684,14 @@ class Gateway {
* @var string
*/
public $declinedReason = null;
+ /**
+ * @var string
+ */
+ public $oauthClientId = null;
+ /**
+ * @var string
+ */
+ public $oauthClientSecret = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -748,6 +756,14 @@ class Gateway {
'var' => 'declinedReason',
'type' => TType::STRING,
),
+ 16 => array(
+ 'var' => 'oauthClientId',
+ 'type' => TType::STRING,
+ ),
+ 17 => array(
+ 'var' => 'oauthClientSecret',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -796,6 +812,12 @@ class Gateway {
if (isset($vals['declinedReason'])) {
$this->declinedReason = $vals['declinedReason'];
}
+ if (isset($vals['oauthClientId'])) {
+ $this->oauthClientId = $vals['oauthClientId'];
+ }
+ if (isset($vals['oauthClientSecret'])) {
+ $this->oauthClientSecret = $vals['oauthClientSecret'];
+ }
}
}
@@ -923,6 +945,20 @@ class Gateway {
$xfer += $input->skip($ftype);
}
break;
+ case 16:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->oauthClientId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 17:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->oauthClientSecret);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -1011,6 +1047,16 @@ class Gateway {
$xfer += $output->writeString($this->declinedReason);
$xfer += $output->writeFieldEnd();
}
+ if ($this->oauthClientId !== null) {
+ $xfer += $output->writeFieldBegin('oauthClientId', TType::STRING, 16);
+ $xfer += $output->writeString($this->oauthClientId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->oauthClientSecret !== null) {
+ $xfer += $output->writeFieldBegin('oauthClientSecret', TType::STRING, 17);
+ $xfer += $output->writeString($this->oauthClientSecret);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
[2/2] 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/d016990d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d016990d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d016990d
Branch: refs/heads/develop
Commit: d016990d8251f596127aef3c41f5049183583272
Parents: 3a94a74 a38ded0
Author: scnakandala <su...@gmail.com>
Authored: Mon Aug 8 17:34:44 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Aug 8 17:34:44 2016 -0400
----------------------------------------------------------------------
app/controllers/AdminController.php | 18 +++++-
app/libraries/AdminUtilities.php | 9 ++-
app/views/account/dashboard.blade.php | 93 ++++++++++++++++++++++++---
app/views/admin/manage-gateway.blade.php | 14 ++--
4 files changed, 114 insertions(+), 20 deletions(-)
----------------------------------------------------------------------