Repository: airavata-php-gateway Updated Branches: refs/heads/develop d14ea846b -> f9fc0161e
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f9fc0161/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 7f0d412..8a56327 100644 --- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php @@ -489,6 +489,10 @@ class StoragePreference { * computeResourcePreferences: * List of resource preferences for each of the registered compute resources. * + * identityServerTenant: + * + * identityServerPwdCredToken: + * */ class GatewayResourceProfile { static $_TSPEC; @@ -509,6 +513,14 @@ class GatewayResourceProfile { * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[] */ public $storagePreferences = null; + /** + * @var string + */ + public $identityServerTenant = null; + /** + * @var string + */ + public $identityServerPwdCredToken = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -539,6 +551,14 @@ class GatewayResourceProfile { 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference', ), ), + 5 => array( + 'var' => 'identityServerTenant', + 'type' => TType::STRING, + ), + 6 => array( + 'var' => 'identityServerPwdCredToken', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -554,6 +574,12 @@ class GatewayResourceProfile { if (isset($vals['storagePreferences'])) { $this->storagePreferences = $vals['storagePreferences']; } + if (isset($vals['identityServerTenant'])) { + $this->identityServerTenant = $vals['identityServerTenant']; + } + if (isset($vals['identityServerPwdCredToken'])) { + $this->identityServerPwdCredToken = $vals['identityServerPwdCredToken']; + } } } @@ -626,6 +652,20 @@ class GatewayResourceProfile { $xfer += $input->skip($ftype); } break; + case 5: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->identityServerTenant); + } else { + $xfer += $input->skip($ftype); + } + break; + case 6: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->identityServerPwdCredToken); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -683,6 +723,16 @@ class GatewayResourceProfile { } $xfer += $output->writeFieldEnd(); } + if ($this->identityServerTenant !== null) { + $xfer += $output->writeFieldBegin('identityServerTenant', TType::STRING, 5); + $xfer += $output->writeString($this->identityServerTenant); + $xfer += $output->writeFieldEnd(); + } + if ($this->identityServerPwdCredToken !== null) { + $xfer += $output->writeFieldBegin('identityServerPwdCredToken', TType::STRING, 6); + $xfer += $output->writeString($this->identityServerPwdCredToken); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f9fc0161/app/views/admin/manage-credentials.blade.php ---------------------------------------------------------------------- diff --git a/app/views/admin/manage-credentials.blade.php b/app/views/admin/manage-credentials.blade.php index fa751f6..67196fb 100644 --- a/app/views/admin/manage-credentials.blade.php +++ b/app/views/admin/manage-credentials.blade.php @@ -99,6 +99,33 @@ </div> @endif --> + <br/> + <h1 class="text-center">Password Credentials</h1> + @if(Session::has("admin")) + <table class="table"> + <tr class="text-center table-condensed"> + <td> + <button class="btn btn-default register-pwd-cred">Register a new password credential</button> + </td> + </tr> + </table> + <div class="loading-img text-center hide"> + <img src="../../assets/ajax-loader.gif"/> + </div> + @endif + <table class="table table-bordered table-condensed" style="word-wrap: break-word;"> + <tr> + <th class="text-center"> + Token + </th> + <th class="text-center">Description</th> + @if( Session::has("admin")) + <th>Delete</th> + @endif + </tr> + <tbody class="token-values"> + </tbody> + </table> <h1 class="text-center">Amazon Credentials</h1> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f9fc0161/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 e7bd0a5..55a6546 100644 --- a/app/views/admin/manage-gateway.blade.php +++ b/app/views/admin/manage-gateway.blade.php @@ -37,7 +37,7 @@ </div> <div class="container-fluid"> <div class="panel-group" id="accordion2"> - <h3>Edit your Gateway Preferences</h3> + <h3>Edit your Gateway Profile</h3> @foreach( $gateways as $indexGP => $gp ) @if( $gp->gatewayId == Session::get("gateway_id")) @include('partials/gateway-preferences-block', array("gp" => $gp, "accName" => "accordion2") ) @@ -48,7 +48,7 @@ @if( Session::has('super-admin')) <div class="row"> <div class="col-md-6"> - <h3>Check all Gateway Preferences</h3> + <h3>Check all Gateway Profiles</h3> </div> <div class="col-md-6" style="margin-top:2%"> <input type="text" class="col-md-12 filterinput" placeholder="Search by Gateway Name"/> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f9fc0161/app/views/partials/dashboard-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/dashboard-block.blade.php b/app/views/partials/dashboard-block.blade.php index 08740d4..575f833 100644 --- a/app/views/partials/dashboard-block.blade.php +++ b/app/views/partials/dashboard-block.blade.php @@ -79,7 +79,7 @@ <li @if( Session::has("admin-nav") && Session::get("admin-nav") == "gateway-prefs") class="active" @endif> <a class="dashboard-link" href="{{ URL::to('/')}}/admin/dashboard/gateway"><span class="glyphicon glyphicon-sort"></span> - Gateway Preferences</a> + Gateway Profile</a> </li> <li http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f9fc0161/app/views/partials/gateway-preferences-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/gateway-preferences-block.blade.php b/app/views/partials/gateway-preferences-block.blade.php index 990a420..1724605 100644 --- a/app/views/partials/gateway-preferences-block.blade.php +++ b/app/views/partials/gateway-preferences-block.blade.php @@ -183,6 +183,18 @@ </div> </div> @endif + + <br/> + <div> + <h3>Identity Server Configuration :</h3> + </div> + <div> + <label>Tenant ID :</label> + <input type="text"> + </br> + <label>Password Credential Token :</label> + <input type="text"> + </div> </div> <div class="col-md-10">
