making PGA master work Airavata master
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/375afaf5 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/375afaf5 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/375afaf5 Branch: refs/heads/master Commit: 375afaf5accd65234f4c997b211592ffdf8a266c Parents: 77c835d Author: Supun Nakandala <[email protected]> Authored: Wed Jul 15 11:56:24 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Wed Jul 15 11:56:24 2015 +0530 ---------------------------------------------------------------------- app/controllers/AdminController.php | 18 +- app/filters.php | 4 +- app/libraries/Airavata/API/Airavata.php | 5441 ++++++++++++++++-- app/libraries/Airavata/API/Error/Types.php | 122 +- app/libraries/Airavata/API/Types.php | 24 +- .../Model/AppCatalog/AppDeployment/Types.php | 130 +- .../Model/AppCatalog/AppInterface/Types.php | 570 +- .../Model/AppCatalog/ComputeResource/Types.php | 487 +- .../Model/AppCatalog/GatewayProfile/Types.php | 73 +- .../Airavata/Model/Messaging/Event/Types.php | 685 ++- app/libraries/Airavata/Model/Security/Types.php | 152 + app/libraries/Airavata/Model/Types.php | 36 +- .../Model/Workspace/Experiment/Types.php | 467 +- .../Airavata/Model/Workspace/Types.php | 49 +- app/views/admin/manage-resources.blade.php | 4 +- 15 files changed, 6791 insertions(+), 1471 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/375afaf5/app/controllers/AdminController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php index 641f3a5..a0f3033 100644 --- a/app/controllers/AdminController.php +++ b/app/controllers/AdminController.php @@ -173,17 +173,19 @@ class AdminController extends BaseController { } } +//Fixme public function enableComputeResource(){ - $resourceId = Input::get("resourceId"); - $computeResource = CRUtilities::get_compute_resource($resourceId); - $computeResource->enabled = true; - CRUtilities::register_or_update_compute_resource($computeResource, true); +// $resourceId = Input::get("resourceId"); +// $computeResource = CRUtilities::get_compute_resource($resourceId); +// $computeResource->enabled = true; +// CRUtilities::register_or_update_compute_resource($computeResource, true); } +//Fixme public function disableComputeResource(){ - $resourceId = Input::get("resourceId"); - $computeResource = CRUtilities::get_compute_resource($resourceId); - $computeResource->enabled = false; - CRUtilities::register_or_update_compute_resource($computeResource, true); +// $resourceId = Input::get("resourceId"); +// $computeResource = CRUtilities::get_compute_resource($resourceId); +// $computeResource->enabled = false; +// CRUtilities::register_or_update_compute_resource($computeResource, true); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/375afaf5/app/filters.php ---------------------------------------------------------------------- diff --git a/app/filters.php b/app/filters.php index 4106032..eeea00c 100755 --- a/app/filters.php +++ b/app/filters.php @@ -12,7 +12,9 @@ */ App::before(function ($request) { - $apiVersion = Airavata::getAPIVersion(); + $authzToken = new Airavata\Model\Security\AuthzToken(); + $authzToken->accessToken = "emptyToken"; + $apiVersion = Airavata::getAPIVersion($authzToken); if (empty($apiVersion)) return View::make("server-down"); });
