You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2015/12/10 17:50:33 UTC
[20/23] airavata-php-gateway git commit: changing the class name
changing the class name
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/72cc4dd0
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/72cc4dd0
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/72cc4dd0
Branch: refs/heads/develop
Commit: 72cc4dd0e32d7978750ab47431e74745ca620b88
Parents: 442dfa9
Author: smarru <sm...@apache.org>
Authored: Tue Dec 8 16:49:42 2015 -0500
Committer: smarru <sm...@apache.org>
Committed: Tue Dec 8 16:49:42 2015 -0500
----------------------------------------------------------------------
app/controllers/StorageResourceController.php | 191 +++++++++++++++++++++
app/controllers/StorageresourceController.php | 191 ---------------------
2 files changed, 191 insertions(+), 191 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/72cc4dd0/app/controllers/StorageResourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/StorageResourceController.php b/app/controllers/StorageResourceController.php
new file mode 100644
index 0000000..0ec4c6e
--- /dev/null
+++ b/app/controllers/StorageResourceController.php
@@ -0,0 +1,191 @@
+<?php
+
+class StorageresourceController extends BaseController
+{
+
+ /**
+ * Instantiate a new Compute Resource Controller Instance
+ **/
+
+ public function __construct()
+ {
+ $this->beforeFilter('verifyadmin');
+ Session::put("nav-active", "storage-resource");
+
+ }
+
+ public function createView()
+ {
+ $this->beforeFilter('verifyeditadmin');
+ Session::put("admin-nav", "sr-create");
+ $data = SRUtilities::getEditSRData();
+ return View::make("storage-resource/create", $data);
+ }
+
+ public function createSubmit()
+ {
+ $this->beforeFilter('verifyeditadmin');
+ //Compute resource is by default enabled
+ $storageDescription = array(
+ "hostName" => trim(Input::get("hostname")),
+ "storageResourceDescription" => trim(Input::get("description")),
+ "enabled" => true
+ );
+ $storageResource = SRUtilities::register_or_update_storage_resource($storageDescription);
+
+ return Redirect::to("sr/edit?srId=" . $storageResource->storageResourceId);
+ }
+
+ public function editView()
+ {
+ $this->beforeFilter('verifyeditadmin');
+ $data = SRUtilities::getEditSRData();
+ $storageResourceId = "";
+ if (Input::has("srId"))
+ $storageResourceId = Input::get("srId");
+ else if (Session::has("storageResource")) {
+ $storageResource = Session::get("storageResource");
+ $storageResourceId = $storageResource->storageResourceId;
+ }
+ if ($storageResourceId != "") {
+ $storageResource = SRUtilities::get_storage_resource($storageResourceId);
+ $dataMovementInterfaces = array();
+ $addedDMI = array();
+ //var_dump( CRUtilities::getJobSubmissionDetails( $data["computeResource"]->jobSubmissionInterfaces[0]->jobSubmissionInterfaceId, 1) ); exit;
+
+ if (count($storageResource->dataMovementInterfaces)) {
+ foreach ($storageResource->dataMovementInterfaces as $DMI) {
+ $dataMovementInterfaces[] = SRUtilities::getDataMovementDetails($DMI->dataMovementInterfaceId, $DMI->dataMovementProtocol);
+ $addedDMI[] = $DMI->dataMovementProtocol;
+ }
+ }
+
+ $data["storageResource"] = $storageResource;
+ $data["dataMovementInterfaces"] = $dataMovementInterfaces;
+ $data["addedDMI"] = $addedDMI;
+ return View::make("storage-resource/edit", $data);
+ } else{
+ Session::put("message", "Unable to retrieve this Storage Resource. Please try again later or submit a bug report using the link in the Help menu.");
+ return View::make("storage-resource/browse");
+ }
+
+ }
+
+ public function editSubmit()
+ {
+ $this->beforeFilter('verifyeditadmin');
+ $tabName = "";
+ if (Input::get("sr-edit") == "resDesc") /* Modify compute Resource description */ {
+ $storageResourceDescription = SRUtilities::get_storage_resource(Input::get("srId"));
+ $storageResourceDescription->hostName = trim(Input::get("hostname"));
+ $storageResourceDescription->resourceDescription = Input::get("description");
+ //var_dump( $computeDescription); exit;
+
+ $storageResource = SRUtilities::register_or_update_storage_resource($storageResourceDescription, true);
+
+ $tabName = "#tab-desc";
+ }
+
+ if (Input::get("sr-edit") == "dmp" || Input::get("sr-edit") == "edit-dmi") /* Add / Modify a Data Movement Interface */ {
+ $update = false;
+ if (Input::get("sr-edit") == "edit-dmi")
+ $update = true;
+ $dataMovementInterface = SRUtilities::create_or_update_DMIObject(Input::all(), $update);
+
+ $tabName = "#tab-dataMovement";
+ } else if (Input::get("sr-edit") == "dmi-priority") {
+ $inputs = Input::all();
+ $storageDescription = SRUtilities::get_storage_resource(Input::get("srId"));
+ foreach ($storageDescription->dataMovementInterfaces as $index => $dmi) {
+ foreach ($inputs["dmi-id"] as $idIndex => $dmiId) {
+ if ($dmiId == $dmi->dataMovementInterfaceId) {
+ $storageDescription->dataMovementInterfaces[$index]->priorityOrder = $inputs["dmi-priority"][$idIndex];
+ break;
+ }
+ }
+ }
+ $storageResource = SRUtilities::register_or_update_storage_resource($storageDescription, true);
+
+ return 1; //currently done by ajax.
+ }
+
+ return Redirect::to("sr/edit?srId=" . Input::get("srId") . $tabName);
+ }
+
+ public function viewView()
+ {
+ $data = CRUtilities::getEditCRData();
+ $computeResourceId = "";
+ if (Input::has("crId"))
+ $computeResourceId = Input::get("crId");
+ else if (Session::has("computeResource")) {
+ $computeResource = Session::get("computeResource");
+ $computeResourceId = $computeResource->computeResourceId;
+ }
+
+ if ($computeResourceId != "") {
+ $computeResource = CRUtilities::get_compute_resource($computeResourceId);
+ $jobSubmissionInterfaces = array();
+ $dataMovementInterfaces = array();
+ $addedJSP = array();
+ $addedDMI = array();
+ //var_dump( $computeResource->jobSubmissionInterfaces); exit;
+ if (count($computeResource->jobSubmissionInterfaces)) {
+ foreach ($computeResource->jobSubmissionInterfaces as $JSI) {
+ $jobSubmissionInterfaces[] = CRUtilities::getJobSubmissionDetails($JSI->jobSubmissionInterfaceId, $JSI->jobSubmissionProtocol);
+ $addedJSP[] = $JSI->jobSubmissionProtocol;
+ }
+ }
+ //var_dump( CRUtilities::getJobSubmissionDetails( $data["computeResource"]->jobSubmissionInterfaces[0]->jobSubmissionInterfaceId, 1) ); exit;
+ if (count($computeResource->dataMovementInterfaces)) {
+ foreach ($computeResource->dataMovementInterfaces as $DMI) {
+ $dataMovementInterfaces[] = CRUtilities::getDataMovementDetails($DMI->dataMovementInterfaceId, $DMI->dataMovementProtocol);
+ $addedDMI[] = $DMI->dataMovementProtocol;
+ }
+ }
+
+ $data["computeResource"] = $computeResource;
+ $data["jobSubmissionInterfaces"] = $jobSubmissionInterfaces;
+ $data["dataMovementInterfaces"] = $dataMovementInterfaces;
+ $data["addedJSP"] = $addedJSP;
+ $data["addedDMI"] = $addedDMI;
+ //var_dump($data["jobSubmissionInterfaces"]); exit;
+ return View::make("resource/view", $data);
+ } else
+ return View::make("resource/browse")->with("login-alert", "Unable to retrieve this Compute Resource. Please report this error to devs.");
+
+ }
+
+ public function deleteActions()
+ {
+ $this->beforeFilter('verifyeditadmin');
+ $result = SRUtilities::deleteActions(Input::all());
+ /*
+ if (Input::has("jsiId")) {
+ return Redirect::to("cr/edit?crId=" . Input::get("crId") . "#tab-jobSubmission")
+ ->with("message", "Job Submission Interface was deleted successfully");
+ }
+ */
+ if (Input::has("dmiId")) {
+ return Redirect::to("sr/edit?crId=" . Input::get("crId") . "#tab-dataMovement")
+ ->with("message", "Data Movement Protocol was deleted successfully");
+ } elseif (Input::has("del-srId")) {
+ return Redirect::to("sr/browse")->with("message", "The Compute Resource has been successfully deleted.");
+ } else
+ return $result;
+ }
+
+ public function browseView()
+ {
+ $data = SRUtilities::getBrowseSRData(false);
+ $allSRs = $data["srObjects"];
+
+ Session::put("admin-nav", "sr-browse");
+ return View::make("storage-resource/browse", array(
+ "allSRs" => $allSRs
+ ));
+
+ }
+}
+
+?>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/72cc4dd0/app/controllers/StorageresourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/StorageresourceController.php b/app/controllers/StorageresourceController.php
deleted file mode 100644
index 0ec4c6e..0000000
--- a/app/controllers/StorageresourceController.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-class StorageresourceController extends BaseController
-{
-
- /**
- * Instantiate a new Compute Resource Controller Instance
- **/
-
- public function __construct()
- {
- $this->beforeFilter('verifyadmin');
- Session::put("nav-active", "storage-resource");
-
- }
-
- public function createView()
- {
- $this->beforeFilter('verifyeditadmin');
- Session::put("admin-nav", "sr-create");
- $data = SRUtilities::getEditSRData();
- return View::make("storage-resource/create", $data);
- }
-
- public function createSubmit()
- {
- $this->beforeFilter('verifyeditadmin');
- //Compute resource is by default enabled
- $storageDescription = array(
- "hostName" => trim(Input::get("hostname")),
- "storageResourceDescription" => trim(Input::get("description")),
- "enabled" => true
- );
- $storageResource = SRUtilities::register_or_update_storage_resource($storageDescription);
-
- return Redirect::to("sr/edit?srId=" . $storageResource->storageResourceId);
- }
-
- public function editView()
- {
- $this->beforeFilter('verifyeditadmin');
- $data = SRUtilities::getEditSRData();
- $storageResourceId = "";
- if (Input::has("srId"))
- $storageResourceId = Input::get("srId");
- else if (Session::has("storageResource")) {
- $storageResource = Session::get("storageResource");
- $storageResourceId = $storageResource->storageResourceId;
- }
- if ($storageResourceId != "") {
- $storageResource = SRUtilities::get_storage_resource($storageResourceId);
- $dataMovementInterfaces = array();
- $addedDMI = array();
- //var_dump( CRUtilities::getJobSubmissionDetails( $data["computeResource"]->jobSubmissionInterfaces[0]->jobSubmissionInterfaceId, 1) ); exit;
-
- if (count($storageResource->dataMovementInterfaces)) {
- foreach ($storageResource->dataMovementInterfaces as $DMI) {
- $dataMovementInterfaces[] = SRUtilities::getDataMovementDetails($DMI->dataMovementInterfaceId, $DMI->dataMovementProtocol);
- $addedDMI[] = $DMI->dataMovementProtocol;
- }
- }
-
- $data["storageResource"] = $storageResource;
- $data["dataMovementInterfaces"] = $dataMovementInterfaces;
- $data["addedDMI"] = $addedDMI;
- return View::make("storage-resource/edit", $data);
- } else{
- Session::put("message", "Unable to retrieve this Storage Resource. Please try again later or submit a bug report using the link in the Help menu.");
- return View::make("storage-resource/browse");
- }
-
- }
-
- public function editSubmit()
- {
- $this->beforeFilter('verifyeditadmin');
- $tabName = "";
- if (Input::get("sr-edit") == "resDesc") /* Modify compute Resource description */ {
- $storageResourceDescription = SRUtilities::get_storage_resource(Input::get("srId"));
- $storageResourceDescription->hostName = trim(Input::get("hostname"));
- $storageResourceDescription->resourceDescription = Input::get("description");
- //var_dump( $computeDescription); exit;
-
- $storageResource = SRUtilities::register_or_update_storage_resource($storageResourceDescription, true);
-
- $tabName = "#tab-desc";
- }
-
- if (Input::get("sr-edit") == "dmp" || Input::get("sr-edit") == "edit-dmi") /* Add / Modify a Data Movement Interface */ {
- $update = false;
- if (Input::get("sr-edit") == "edit-dmi")
- $update = true;
- $dataMovementInterface = SRUtilities::create_or_update_DMIObject(Input::all(), $update);
-
- $tabName = "#tab-dataMovement";
- } else if (Input::get("sr-edit") == "dmi-priority") {
- $inputs = Input::all();
- $storageDescription = SRUtilities::get_storage_resource(Input::get("srId"));
- foreach ($storageDescription->dataMovementInterfaces as $index => $dmi) {
- foreach ($inputs["dmi-id"] as $idIndex => $dmiId) {
- if ($dmiId == $dmi->dataMovementInterfaceId) {
- $storageDescription->dataMovementInterfaces[$index]->priorityOrder = $inputs["dmi-priority"][$idIndex];
- break;
- }
- }
- }
- $storageResource = SRUtilities::register_or_update_storage_resource($storageDescription, true);
-
- return 1; //currently done by ajax.
- }
-
- return Redirect::to("sr/edit?srId=" . Input::get("srId") . $tabName);
- }
-
- public function viewView()
- {
- $data = CRUtilities::getEditCRData();
- $computeResourceId = "";
- if (Input::has("crId"))
- $computeResourceId = Input::get("crId");
- else if (Session::has("computeResource")) {
- $computeResource = Session::get("computeResource");
- $computeResourceId = $computeResource->computeResourceId;
- }
-
- if ($computeResourceId != "") {
- $computeResource = CRUtilities::get_compute_resource($computeResourceId);
- $jobSubmissionInterfaces = array();
- $dataMovementInterfaces = array();
- $addedJSP = array();
- $addedDMI = array();
- //var_dump( $computeResource->jobSubmissionInterfaces); exit;
- if (count($computeResource->jobSubmissionInterfaces)) {
- foreach ($computeResource->jobSubmissionInterfaces as $JSI) {
- $jobSubmissionInterfaces[] = CRUtilities::getJobSubmissionDetails($JSI->jobSubmissionInterfaceId, $JSI->jobSubmissionProtocol);
- $addedJSP[] = $JSI->jobSubmissionProtocol;
- }
- }
- //var_dump( CRUtilities::getJobSubmissionDetails( $data["computeResource"]->jobSubmissionInterfaces[0]->jobSubmissionInterfaceId, 1) ); exit;
- if (count($computeResource->dataMovementInterfaces)) {
- foreach ($computeResource->dataMovementInterfaces as $DMI) {
- $dataMovementInterfaces[] = CRUtilities::getDataMovementDetails($DMI->dataMovementInterfaceId, $DMI->dataMovementProtocol);
- $addedDMI[] = $DMI->dataMovementProtocol;
- }
- }
-
- $data["computeResource"] = $computeResource;
- $data["jobSubmissionInterfaces"] = $jobSubmissionInterfaces;
- $data["dataMovementInterfaces"] = $dataMovementInterfaces;
- $data["addedJSP"] = $addedJSP;
- $data["addedDMI"] = $addedDMI;
- //var_dump($data["jobSubmissionInterfaces"]); exit;
- return View::make("resource/view", $data);
- } else
- return View::make("resource/browse")->with("login-alert", "Unable to retrieve this Compute Resource. Please report this error to devs.");
-
- }
-
- public function deleteActions()
- {
- $this->beforeFilter('verifyeditadmin');
- $result = SRUtilities::deleteActions(Input::all());
- /*
- if (Input::has("jsiId")) {
- return Redirect::to("cr/edit?crId=" . Input::get("crId") . "#tab-jobSubmission")
- ->with("message", "Job Submission Interface was deleted successfully");
- }
- */
- if (Input::has("dmiId")) {
- return Redirect::to("sr/edit?crId=" . Input::get("crId") . "#tab-dataMovement")
- ->with("message", "Data Movement Protocol was deleted successfully");
- } elseif (Input::has("del-srId")) {
- return Redirect::to("sr/browse")->with("message", "The Compute Resource has been successfully deleted.");
- } else
- return $result;
- }
-
- public function browseView()
- {
- $data = SRUtilities::getBrowseSRData(false);
- $allSRs = $data["srObjects"];
-
- Session::put("admin-nav", "sr-browse");
- return View::make("storage-resource/browse", array(
- "allSRs" => $allSRs
- ));
-
- }
-}
-
-?>
\ No newline at end of file