[2/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-04-27 Thread ndoshi 
Merge branch 'develop' of 
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway 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/873aec41
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/873aec41
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/873aec41

Branch: refs/heads/develop
Commit: 873aec41bbe80f427c63473d08f06950987cbfac
Parents: a14cd91 8b67709
Author: Nipurn Doshi 
Authored: Tue Apr 26 12:25:40 2016 -0400
Committer: Nipurn Doshi 
Committed: Tue Apr 26 12:25:40 2016 -0400

--
 app/libraries/Airavata/API/Airavata.php | 3062 ++
 .../Airavata/Model/Data/Product/Types.php   |  879 +
 .../Airavata/Model/Data/Resource/Types.php  |  854 +
 app/libraries/Airavata/Model/Process/Types.php  |   23 +
 .../Airavata/Model/Scheduling/Types.php |   69 +
 .../Airavata/Model/Workspace/Types.php  |  190 ++
 6 files changed, 4447 insertions(+), 630 deletions(-)
--

[1/3] airavata-php-gateway git commit: Notification Icon UI

2016-04-27 Thread ndoshi 
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop 8b67709f3 -> 2fb0e4c29


Notification Icon UI


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/a14cd91a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a14cd91a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a14cd91a

Branch: refs/heads/develop
Commit: a14cd91ae4caac5dff18a7dd9cbd725a6c0635cd
Parents: ad20352
Author: Nipurn Doshi 
Authored: Tue Apr 26 11:13:19 2016 -0400
Committer: Nipurn Doshi 
Committed: Tue Apr 26 11:13:19 2016 -0400

--
 app/libraries/CommonUtilities.php |  4 
 public/css/bootstrap.min.css  | 15 +++
 2 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a14cd91a/app/libraries/CommonUtilities.php
--
diff --git a/app/libraries/CommonUtilities.php 
b/app/libraries/CommonUtilities.php
index 92a8d31..bfb1e5c 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -212,6 +212,10 @@ class CommonUtilities
 if ("user-console" == Session::get("nav-active"))
 $active = " active ";
 }
+echo '' .
+'' .
+'2' .
+'';
 if (Session::has("admin") || Session::has("admin-read-only"))
 echo 'Admin 
Dashboard';
 //else

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a14cd91a/public/css/bootstrap.min.css
--
diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css
index 55f50ef..715c62e 100644
--- a/public/css/bootstrap.min.css
+++ b/public/css/bootstrap.min.css
@@ -62,4 +62,19 @@ body{
 
 .tab-content>.tab-pane {
 margin-top: 20px;
+ }
+
+ .notif-bell{
+   margin:15px; 
+   font-size:1.5em;
+ }
+
+ .notif-num{
+   background: red; 
+   border-radius: 20px; 
+   padding: 7px; 
+   position: absolute; 
+   top: 0px; 
+   left: 50%; 
+   font-size: 0.6em;
  }
\ No newline at end of file

[3/3] airavata-php-gateway git commit: Notification system implementation for Admins. User side still in the works.

2016-04-27 Thread ndoshi 
Notification system implementation for Admins. User side still in the works.


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/2fb0e4c2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2fb0e4c2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2fb0e4c2

Branch: refs/heads/develop
Commit: 2fb0e4c299048809f0c62f7a0d1eac11eb2a3fbc
Parents: 873aec4
Author: Nipurn Doshi 
Authored: Wed Apr 27 17:03:34 2016 -0400
Committer: Nipurn Doshi 
Committed: Wed Apr 27 17:03:34 2016 -0400

--
 app/controllers/AdminController.php  |  42 ++-
 app/libraries/AdminUtilities.php |  31 +-
 app/routes.php   |  12 +-
 app/views/admin/manage-credentials.blade.php |  53 ---
 app/views/admin/manage-notices.blade.php | 380 ++
 app/views/partials/dashboard-block.blade.php |   2 +-
 6 files changed, 322 insertions(+), 198 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fb0e4c2/app/controllers/AdminController.php
--
diff --git a/app/controllers/AdminController.php 
b/app/controllers/AdminController.php
index d6de6bd..520ce5a 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -183,13 +183,6 @@ class AdminController extends BaseController {
return View::make("admin/manage-credentials", array("tokens" => 
$tokens ) );
}
 
-   public function noticesView(){
-Session::put("admin-nav", "notices");
-$notices = array();
-//$notices = AdminUtilities::getNotices();
-   return View::make("admin/manage-notices", array("notices" => 
$notices));
-   }
-
public function updateUserRoles(){
if( Input::has("add")){
WSIS::updateUserRoles(Input::get("username"), 
array("new"=> Input::get("roles"), "deleted" => array() ) );
@@ -373,4 +366,39 @@ class AdminController extends BaseController {
 public function viewAllocationRequests(){
return 'result';
 }
+
+   public function noticesView(){
+Session::put("admin-nav", "notices");
+$notices = array();
+$notices = array_reverse( AdminUtilities::get_all_notices() );
+   return View::make("admin/manage-notices", array("notices" => 
$notices));
+   }
+
+   public function addNotice(){
+   $inputs = Input::all();
+   $newNotice = AdminUtilities::add_or_update_notice( $inputs);
+   return json_encode( $newNotice);
+   }
+
+   public function updateNotice(){
+   $inputs = Input::all();
+   if( AdminUtilities::add_or_update_notice( $inputs, true))
+   {
+   return 1;
+   }
+   else
+   return 0;
+   }
+
+   public function deleteNotice(){
+   $inputs = Input::all();
+   if( AdminUtilities::delete_notice( $inputs["notificationId"]))
+   {
+   //ajax
+   return 1;
+   }
+   else
+   return 0;
+   }
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fb0e4c2/app/libraries/AdminUtilities.php
--
diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php
index 52e2123..8fb15ec 100644
--- a/app/libraries/AdminUtilities.php
+++ b/app/libraries/AdminUtilities.php
@@ -1,6 +1,7 @@
 gatewayId = Session::get("gateway_id");
+$notification->title = $notifData["title"];
+$notification->notifcationMessage = $notifData["notificationMessage"];
+$notification->publishedtime = strtotime( 
$notifData["publishedtime"])* 1000;
+$notification->expirationTime = strtotime( 
$notifData["expirationTime"]) * 1000;
+
+if( $update){
+$notification->notificationId =  $notifData["notificationId"];
+return Airavata::getNotification( 
+Session::get('authz-token'), 
+Session::get("gateway_id"), 
+Airavata::updateNotification( Session::get("authz-token"), 
$notification) );
+}
+else
+return Airavata::getNotification( 
+Session::get('authz-token'), 
+Session::get("gateway_id"), 
+Airavata::createNotification( Session::get("authz-token"), 
$notification) );
+}
+
+public static function delete_notice( $notificationId){
+

[1/3] airavata-docs git commit: Adding descriptions to Admin Dashboard API methods

2016-04-27 Thread eroma 
Repository: airavata-docs
Updated Branches:
  refs/heads/master acf199467 -> 390a7f4d3


Adding descriptions to Admin Dashboard API methods


Project: http://git-wip-us.apache.org/repos/asf/airavata-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-docs/commit/0a9bdfe1
Tree: http://git-wip-us.apache.org/repos/asf/airavata-docs/tree/0a9bdfe1
Diff: http://git-wip-us.apache.org/repos/asf/airavata-docs/diff/0a9bdfe1

Branch: refs/heads/master
Commit: 0a9bdfe1f909d9721756365838d16669f67785a7
Parents: acf1994
Author: Eroma Abeysinghe 
Authored: Wed Apr 27 14:33:16 2016 -0400
Committer: Eroma Abeysinghe 
Committed: Wed Apr 27 14:33:16 2016 -0400

--
 AiravataApi.md | 40 +---
 1 file changed, 21 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata-docs/blob/0a9bdfe1/AiravataApi.md
--
diff --git a/AiravataApi.md b/AiravataApi.md
index aebaece..48c7cfe 100644
--- a/AiravataApi.md
+++ b/AiravataApi.md
@@ -16,15 +16,15 @@ For Airavata API documentation please visit http://airavata.apache.org/
 | Create an Experiment  | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_createExperiment;
 target="_blank">createExperiment| Create 
an Experiment.  |
 | Update an Experiment  | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_updateExperiment;
 target="_blank">updateExperiment| Update 
ab Experiment. Experiments with CREATED exp-status can be updated.  |
 | Get an Experiment | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getExperiment;
 target="_blank">getExperiment  | 
Retrieve Experiment by providing the experiment ID.  |
-| Get Detailed Experiment   | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getDetailedExperimentTree;
 target="_blank">getDetailedExperimentTree  |   |
-| Clone an Experiment   | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_cloneExperiment;
 target="_blank">cloneExperiment  | 
  |
-| Cancel an Experiment  | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_terminateExperiment;
 target="_blank">terminateExperiment  |   |
-| Search Experiment by Name | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_searchExperimentsByName;
 target="_blank">searchExperimentsByName  |   |
-| Search Experiment by Desc | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_searchExperimentsByDesc;
 target="_blank">searchExperimentsByDesc  |   |
-| Search Experiments by Application Name| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_searchExperimentsByApplication;
 target="_blank">searchExperimentsByApplication|   |
-| Search Experiment by Creation Time| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_searchExperimentsByCreationTime;
 target="_blank">searchExperimentsByCreationTime  |   |
-| Get all user Experiments  | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getUserExperiments;
 target="_blank">getUserExperiments|   |
-| Get Experiments for a Project | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getExperimentsInProject;
 target="_blank">getExperimentsInProject  |   |
+| Get Detailed Experiment   | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getDetailedExperimentTree;
 target="_blank">getDetailedExperimentTree  | Retrieve detailed 
Experiment by providing the experiment ID.  |
+| Clone an Experiment   | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_cloneExperiment;
 target="_blank">cloneExperiment  | Clone 
an existing Experiment. Experiment with any exp-status can be cloned by 
providing the ID.  |
+| Cancel an Experiment  | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_terminateExperiment;
 target="_blank">terminateExperiment  | Cancel an 
existing Experiment. Experiments with exp-statuses LAUNCHING or EXECUTING can 
be cancelled.   |
+| Search Experiment by

[3/3] airavata-docs git commit: Adding descriptions to Admin Dashboard API methods

2016-04-27 Thread eroma 
Adding descriptions to Admin Dashboard API methods


Project: http://git-wip-us.apache.org/repos/asf/airavata-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-docs/commit/390a7f4d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-docs/tree/390a7f4d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-docs/diff/390a7f4d

Branch: refs/heads/master
Commit: 390a7f4d3afebca1a3a304ada733ea82aaccb770
Parents: 68bd2d7
Author: Eroma Abeysinghe 
Authored: Wed Apr 27 15:32:04 2016 -0400
Committer: Eroma Abeysinghe 
Committed: Wed Apr 27 15:32:04 2016 -0400

--
 AiravataApi.md | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata-docs/blob/390a7f4d/AiravataApi.md
--
diff --git a/AiravataApi.md b/AiravataApi.md
index 5737e62..db615a5 100644
--- a/AiravataApi.md
+++ b/AiravataApi.md
@@ -58,12 +58,12 @@ For Airavata API documentation please visit http://airavata.apache.org/
 Experiment Statistics
 | Get Experiment Statistics | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getExperimentStatistics;
 target="_blank">getExperimentStatistics   | Displays 
experiments grouped by the experiment status and derived for the given date 
time range.  |
 Gateway Preferences
-| Add CR Preference for a gateway   | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_addGatewayComputeResourcePreference;
 target="_blank"> addGatewayComputeResourcePreference|| 
+| Add CR Preference for a gateway   | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_addGatewayComputeResourcePreference;
 target="_blank"> addGatewayComputeResourcePreference || 
 | Edit CR Preference| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_addGatewayComputeResourcePreference;
 target="_blank"> addGatewayComputeResourcePreference ||
-| Delete a CR Preference|||
-| Add SR Preference for a gateway   ||| 
-| Edit SR Preference|||
-| Delete a SR Preference|||
+| Delete a CR Preference|  ||
+| Add SR Preference for a gateway   | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_addGatewayStoragePreference;
 target="_blank"> addGatewayStoragePreference || 
+| Edit SR Preference| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_addGatewayStoragePreference;
 target="_blank"> addGatewayStoragePreference ||
+| Delete a SR Preference|  ||
 Other
 | Get all Notices   | noticesView  
 | View all existing Notices.|

[2/3] airavata-docs git commit: Adding descriptions to Admin Dashboard API methods

2016-04-27 Thread eroma 
Adding descriptions to Admin Dashboard API methods


Project: http://git-wip-us.apache.org/repos/asf/airavata-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-docs/commit/68bd2d7b
Tree: http://git-wip-us.apache.org/repos/asf/airavata-docs/tree/68bd2d7b
Diff: http://git-wip-us.apache.org/repos/asf/airavata-docs/diff/68bd2d7b

Branch: refs/heads/master
Commit: 68bd2d7b7e0c54a3309ed5a19d892070ae9e4d45
Parents: 0a9bdfe
Author: Eroma Abeysinghe 
Authored: Wed Apr 27 15:25:50 2016 -0400
Committer: Eroma Abeysinghe 
Committed: Wed Apr 27 15:25:50 2016 -0400

--
 AiravataApi.md | 31 ++-
 1 file changed, 18 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata-docs/blob/68bd2d7b/AiravataApi.md
--
diff --git a/AiravataApi.md b/AiravataApi.md
index 48c7cfe..5737e62 100644
--- a/AiravataApi.md
+++ b/AiravataApi.md
@@ -35,7 +35,7 @@ For Airavata API documentation please visit http://airavata.apache.org/
 |   Admin Function/Feature  |  Airavata API
 |  Description 
 |
 
|:--|:--|:
  |
 Add Gateway
-| Add a gateway | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_addGateway;
 target="_blank">addGateway| Adding a new Gateway.  
 |
+| Add a gateway | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_addGateway;
 target="_blank">addGateway| Adding a new Gateway. |
 Credential Store  
 | Generate a Token/SSH Key  | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_generateAndRegisterSSHKeys;
 target="_blank">generateAndRegisterSSHKeys| Generate new SSH 
Key and Token.   |
 | Get all Credential Store Tokens   | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getAllGatewaySSHPubKeys;
 target="_blank">getAllGatewaySSHPubKeys   | Retrieve all the 
generated keys of a Gateway.  |
@@ -43,24 +43,29 @@ For Airavata API documentation please visit http://airavata.apache.org/
 Compute Resource (CR)   
 
 | Get all application deployed CRs  | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getAllApplicationDeployments;
 target="_blank">getAllApplicationDeployments  | Get all 
Application deployed Compute Resources.|
 | Get a CR  | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getComputeResource;
 target="_blank">getComputeResource| Retrieve Compute 
Resource information by providing the resource ID.   |
-| Register CR   | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_registerComputeResource;
 target="_blank">registerComputeResource   | Register a new 
Compute Resource.|
+| Register CR   | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_registerComputeResource;
 target="_blank">registerComputeResource   | Register a new 
Compute Resource. This is Super Admin Feature.|
 | Update CR | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_updateComputeResource;
 target="_blank">updateComputeResource | Retrieve an 
existing Compute Resource and update.|
-| Enable and Disable CR | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getComputeResource;
 target="_blank">getComputeResourcehttp://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_updateComputeResource;
 target="_blank">updateComputeResource|
-| Delete a Queue| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_deleteBatchQueue;
 target="_blank">deleteBatchQueue  |
+| Enable and Disable CR | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getComputeResource;
 target="_blank">getComputeResourcehttp://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_updateComputeResource;
 target="_blank">updateComputeResource| Retrieve the CR and enable or 
disable through update. This is a Super

airavata git commit: a placeholder for playbooks

2016-04-27 Thread smarru 
Repository: airavata
Updated Branches:
  refs/heads/develop 79a9f1db7 -> 60bfc4db9


a placeholder for playbooks


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/60bfc4db
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/60bfc4db
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/60bfc4db

Branch: refs/heads/develop
Commit: 60bfc4db9881d97706878fe54d66d4aadea4
Parents: 79a9f1d
Author: Suresh Marru 
Authored: Wed Apr 27 15:24:17 2016 -0400
Committer: Suresh Marru 
Committed: Wed Apr 27 15:24:17 2016 -0400

--
 modules/cloud/ansible-playbooks/README | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/60bfc4db/modules/cloud/ansible-playbooks/README
--
diff --git a/modules/cloud/ansible-playbooks/README 
b/modules/cloud/ansible-playbooks/README
new file mode 100644
index 000..115bc6a
--- /dev/null
+++ b/modules/cloud/ansible-playbooks/README
@@ -0,0 +1 @@
+A Placeholder to contribute Ansible Play books to setup bootstrap Mesos cluster

[4/5] airavata git commit: Fix indentation issues in code and properties file.

2016-04-27 Thread smarru 
Fix indentation issues in code and properties file.

Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/de05f6b4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/de05f6b4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/de05f6b4

Branch: refs/heads/develop
Commit: de05f6b45c2b60d9e8254d90a9b43df87afd59df
Parents: 45adf30
Author: Gourav Shenoy 
Authored: Fri Apr 22 15:33:47 2016 -0400
Committer: Gourav Shenoy 
Committed: Fri Apr 22 15:33:47 2016 -0400

--
 .../airavata/cloud/intf/CloudInterface.java | 16 +-
 .../cloud/intf/impl/OpenstackIntfImpl.java  | 32 ++--
 .../apache/airavata/cloud/util/Constants.java   | 16 +-
 .../main/resources/jetstream_openrc.properties  |  4 +--
 .../airavata/cloud/test/CloudIntfTest.java  | 24 +++
 .../src/test/resources/test_data.properties |  2 +-
 6 files changed, 47 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/de05f6b4/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/CloudInterface.java
--
diff --git 
a/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/CloudInterface.java
 
b/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/CloudInterface.java
index 9d0fc5e..5c3893c 100644
--- 
a/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/CloudInterface.java
+++ 
b/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/CloudInterface.java
@@ -82,7 +82,7 @@ public interface CloudInterface {
 * @param serverId the server id
 */
public void addFloatingIP(String serverId);
-   
+
/**
 * Creates the router.
 *
@@ -91,7 +91,7 @@ public interface CloudInterface {
 * @return the object
 */
public Object createRouter(String routerName, String 
externalGatewayName);
-   
+
/**
 * Creates the subnet.
 *
@@ -102,7 +102,7 @@ public interface CloudInterface {
 * @return the object
 */
public Object createSubnet(String subnetName, String networkName, 
String subnetCIDR, int ipVersion);
-   
+
/**
 * Creates the network.
 *
@@ -110,7 +110,7 @@ public interface CloudInterface {
 * @return the object
 */
public Object createNetwork(String networkName);
-   
+
/**
 * Creates the router subnet interface.
 *
@@ -119,7 +119,7 @@ public interface CloudInterface {
 * @return the object
 */
public Object createRouterSubnetInterface(String routerName, String 
subnetName);
-   
+
/**
 * Delete router subnet interface.
 *
@@ -127,21 +127,21 @@ public interface CloudInterface {
 * @param subnetName the subnet name
 */
public void deleteRouterSubnetInterface(String routerName, String 
subnetName);
-   
+
/**
 * Delete subnet.
 *
 * @param subnetName the subnet name
 */
public void deleteSubnet(String subnetName);
-   
+
/**
 * Delete router.
 *
 * @param routerName the router name
 */
public void deleteRouter(String routerName);
-   
+
/**
 * Delete network.
 *

http://git-wip-us.apache.org/repos/asf/airavata/blob/de05f6b4/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/impl/OpenstackIntfImpl.java
--
diff --git 
a/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/impl/OpenstackIntfImpl.java
 
b/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/impl/OpenstackIntfImpl.java
index 109df9d..650f491 100644
--- 
a/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/impl/OpenstackIntfImpl.java
+++ 
b/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/impl/OpenstackIntfImpl.java
@@ -308,10 +308,10 @@ public class OpenstackIntfImpl implements CloudInterface {
}
if(publicNetId != null) {
router = 
os.networking().router().create(Builders.router()
-   
.name(routerName)
-   
.adminStateUp(true)
-

[3/5] airavata git commit: Merge pull request #2 from apache/develop

2016-04-27 Thread smarru 
Merge pull request #2 from apache/develop

Develop

Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/45adf30d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/45adf30d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/45adf30d

Branch: refs/heads/develop
Commit: 45adf30d98a36f376df29903d92f60d2e15d6be3
Parents: bd239d5 2a30f80
Author: Gourav Shenoy 
Authored: Fri Apr 22 15:29:14 2016 -0400
Committer: Gourav Shenoy 
Committed: Fri Apr 22 15:29:14 2016 -0400

--
 .../airavata/gfac/impl/HPCRemoteCluster.java| 31 ++--
 1 file changed, 22 insertions(+), 9 deletions(-)
--

[1/5] airavata git commit: Adding methods to create network, subnet, router, interface

2016-04-27 Thread smarru 
Repository: airavata
Updated Branches:
  refs/heads/develop d721666ed -> 79a9f1db7


Adding methods to create network, subnet, router, interface

Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ebae1a77
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ebae1a77
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ebae1a77

Branch: refs/heads/develop
Commit: ebae1a77b4e153716ca2c288a473c3b737895980
Parents: 4a1e79f
Author: Gourav Shenoy 
Authored: Fri Apr 22 04:23:40 2016 -0400
Committer: Gourav Shenoy 
Committed: Fri Apr 22 04:23:40 2016 -0400

--
 modules/cloud/cloud-provisioning/README |  20 +-
 .../airavata/cloud/intf/CloudInterface.java | 229 --
 .../cloud/intf/impl/OpenstackIntfImpl.java  | 748 ---
 .../apache/airavata/cloud/util/Constants.java   |  92 ++-
 .../main/resources/jetstream_openrc.properties  |  66 +-
 .../airavata/cloud/test/CloudIntfTest.java  | 331 
 .../src/test/resources/test_data.properties |  58 +-
 7 files changed, 957 insertions(+), 587 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/ebae1a77/modules/cloud/cloud-provisioning/README
--
diff --git a/modules/cloud/cloud-provisioning/README 
b/modules/cloud/cloud-provisioning/README
index dc4a7a6..0e16d0b 100644
--- a/modules/cloud/cloud-provisioning/README
+++ b/modules/cloud/cloud-provisioning/README
@@ -1,7 +1,13 @@
-This is the initial project created as an interface to various clouds.
-Currently supporting, Openstack on Jetstream using Openstack4j.
-
-To Test Run:-
-1) Replace the credentials in src/main/resources/jetstream_openrc.properties 
with the Jetstream credentials.
-2) Update the publicKeyFile, jetstream_imageId, jetstream_flavorId to the 
local path in src/test/resources/test_data.properties. This are the parameters 
used by the unit tests.
-3) Run JUnit Test org.apache.airavata.cloud.test.CloudIntfTest.
+This is the initial project created as an interface to various clouds.
+Currently supporting, Openstack on Jetstream using Openstack4j.
+
+To Test Run:-
+1) Replace the credentials in src/main/resources/jetstream_openrc.properties 
with the Jetstream credentials.
+2) Update the publicKeyFile, jetstream_imageId, jetstream_flavorId to the 
local path in src/test/resources/test_data.properties. This are the parameters 
used by the unit tests.
+3) Run JUnit Test org.apache.airavata.cloud.test.CloudIntfTest.
+
+## NETWORK CREATION STEPS
+1. Create a network.
+2. Create a subnet for the network.
+3. Create a router attached to public network. 
+4. Create an interface between router and the subnet.

http://git-wip-us.apache.org/repos/asf/airavata/blob/ebae1a77/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/CloudInterface.java
--
diff --git 
a/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/CloudInterface.java
 
b/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/CloudInterface.java
index f64e11a..9d0fc5e 100644
--- 
a/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/CloudInterface.java
+++ 
b/modules/cloud/cloud-provisioning/src/main/java/org/apache/airavata/cloud/intf/CloudInterface.java
@@ -1,78 +1,151 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.cloud.intf;
-
-import org.openstack4j.model.compute.Keypair;
-import org.openstack4j.model.compute.Server;
-
-public interface CloudInterface {
-
-   /**
-* Method to create Server.
-* @param serverName
-* @param imageId
-* @param flavorId
-* @param networkId
-* @param keyPairName
-* @return Server object.
-*/
-   public Server createServer(String serverName, String imageId, String 
flavorId, String keyPairName);

[5/5] airavata git commit: Merge branch 'pr13' into develop

2016-04-27 Thread smarru 
Merge branch 'pr13' into develop


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/79a9f1db
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/79a9f1db
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/79a9f1db

Branch: refs/heads/develop
Commit: 79a9f1db7cba563d38060117772bce06effd512d
Parents: d721666 de05f6b
Author: Suresh Marru 
Authored: Wed Apr 27 15:21:38 2016 -0400
Committer: Suresh Marru 
Committed: Wed Apr 27 15:21:38 2016 -0400

--
 modules/cloud/cloud-provisioning/README |  20 +-
 .../airavata/cloud/intf/CloudInterface.java | 229 --
 .../cloud/intf/impl/OpenstackIntfImpl.java  | 748 ---
 .../apache/airavata/cloud/util/Constants.java   |  92 ++-
 .../main/resources/jetstream_openrc.properties  |  66 +-
 .../airavata/cloud/test/CloudIntfTest.java  | 331 
 .../src/test/resources/test_data.properties |  58 +-
 7 files changed, 957 insertions(+), 587 deletions(-)
--

[2/5] airavata git commit: Merge pull request #1 from apache/develop

2016-04-27 Thread smarru 
Merge pull request #1 from apache/develop

Pull changes from apache/airavata:develop

Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bd239d59
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bd239d59
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bd239d59

Branch: refs/heads/develop
Commit: bd239d5933a92a825819bb0adaf9896bb8e9e9db
Parents: ebae1a7 22ae026
Author: Gourav Shenoy 
Authored: Fri Apr 22 15:28:16 2016 -0400
Committer: Gourav Shenoy 
Committed: Fri Apr 22 15:28:16 2016 -0400

--
 .../server/handler/AiravataServerHandler.java   |87 +
 .../handler/AiravataServerHandlerTest.java  |22 +
 .../java/org/apache/airavata/api/Airavata.java  | 15220 -
 .../main/resources/lib/airavata/Airavata.cpp|  5355 --
 .../src/main/resources/lib/airavata/Airavata.h  |  1172 +-
 .../lib/airavata/Airavata_server.skeleton.cpp   |32 +
 .../lib/airavata/workspace_model_types.cpp  |   201 +
 .../lib/airavata/workspace_model_types.h|81 +
 .../resources/lib/Airavata/API/Airavata.php |  3062 +++-
 .../lib/Airavata/Model/Workspace/Types.php  |   190 +
 .../lib/apache/airavata/api/Airavata-remote |35 +
 .../lib/apache/airavata/api/Airavata.py |  2754 ++-
 .../apache/airavata/model/workspace/ttypes.py   |   136 +
 .../apache/airavata/model/ComponentStatus.java  | 2 +-
 .../org/apache/airavata/model/EdgeModel.java| 2 +-
 .../org/apache/airavata/model/NodeModel.java| 2 +-
 .../org/apache/airavata/model/PortModel.java| 2 +-
 .../apache/airavata/model/WorkflowModel.java| 2 +-
 .../apache/airavata/model/WorkflowStatus.java   | 2 +-
 .../ApplicationDeploymentDescription.java   | 2 +-
 .../appdeployment/ApplicationModule.java| 2 +-
 .../appcatalog/appdeployment/CommandObject.java | 2 +-
 .../appcatalog/appdeployment/SetEnvPaths.java   | 2 +-
 .../ApplicationInterfaceDescription.java| 2 +-
 .../appcatalog/computeresource/BatchQueue.java  | 2 +-
 .../computeresource/CloudJobSubmission.java | 2 +-
 .../ComputeResourceDescription.java | 2 +-
 .../computeresource/GlobusJobSubmission.java| 2 +-
 .../computeresource/JobSubmissionInterface.java | 2 +-
 .../computeresource/LOCALSubmission.java| 2 +-
 .../computeresource/ResourceJobManager.java | 2 +-
 .../computeresource/SSHJobSubmission.java   | 2 +-
 .../computeresource/UnicoreJobSubmission.java   | 2 +-
 .../ComputeResourcePreference.java  | 2 +-
 .../gatewayprofile/GatewayResourceProfile.java  | 2 +-
 .../gatewayprofile/StoragePreference.java   | 2 +-
 .../StorageResourceDescription.java | 2 +-
 .../application/io/InputDataObjectType.java | 2 +-
 .../application/io/OutputDataObjectType.java| 2 +-
 .../airavata/model/commons/ErrorModel.java  | 2 +-
 .../model/commons/ValidationResults.java| 2 +-
 .../airavata/model/commons/ValidatorResult.java | 2 +-
 .../data/movement/DataMovementInterface.java| 2 +-
 .../data/movement/GridFTPDataMovement.java  | 2 +-
 .../model/data/movement/LOCALDataMovement.java  | 2 +-
 .../model/data/movement/SCPDataMovement.java| 2 +-
 .../data/movement/UnicoreDataMovement.java  | 2 +-
 .../model/data/replica/DataProductModel.java| 2 +-
 .../data/replica/DataReplicaLocationModel.java  | 2 +-
 .../model/error/AiravataClientException.java| 2 +-
 .../model/error/AiravataSystemException.java| 2 +-
 .../model/error/AuthenticationException.java| 2 +-
 .../model/error/AuthorizationException.java | 2 +-
 .../error/ExperimentNotFoundException.java  | 2 +-
 .../model/error/InvalidRequestException.java| 2 +-
 .../model/error/LaunchValidationException.java  | 2 +-
 .../model/error/ProjectNotFoundException.java   | 2 +-
 .../airavata/model/error/TimedOutException.java | 2 +-
 .../airavata/model/error/ValidationResults.java | 2 +-
 .../airavata/model/error/ValidatorResult.java   | 2 +-
 .../model/experiment/ExperimentModel.java   | 2 +-
 .../model/experiment/ExperimentStatistics.java  | 2 +-
 .../experiment/ExperimentSummaryModel.java  | 2 +-
 .../experiment/UserConfigurationDataModel.java  | 2 +-
 .../org/apache/airavata/model/job/JobModel.java | 2 +-
 .../event/ExperimentStatusChangeEvent.java  | 2 +-
 .../model/messaging/event/JobIdentifier.java| 2 +-
 .../messaging/event/JobStatusChangeEvent.java   | 2 +-
 .../event/JobStatusChangeRequestEvent.java  | 2 +-
 .../airavata/model/messaging/event/Message.java | 2 +-
 .../messaging/event/ProcessIdentifier.java  | 2 +-

airavata-docs git commit: Adding descriptions to API methods and linking with generated API documentation

2016-04-27 Thread eroma 
Repository: airavata-docs
Updated Branches:
  refs/heads/master cfb04eec7 -> acf199467


Adding descriptions to API methods and linking with generated API documentation


Project: http://git-wip-us.apache.org/repos/asf/airavata-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-docs/commit/acf19946
Tree: http://git-wip-us.apache.org/repos/asf/airavata-docs/tree/acf19946
Diff: http://git-wip-us.apache.org/repos/asf/airavata-docs/diff/acf19946

Branch: refs/heads/master
Commit: acf199467064e3f31853ca07afc84555d9b31eba
Parents: cfb04ee
Author: Eroma Abeysinghe 
Authored: Wed Apr 27 12:51:46 2016 -0400
Committer: Eroma Abeysinghe 
Committed: Wed Apr 27 12:51:46 2016 -0400

--
 AiravataApi.md | 71 +++--
 1 file changed, 36 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata-docs/blob/acf19946/AiravataApi.md
--
diff --git a/AiravataApi.md b/AiravataApi.md
index c75992d..aebaece 100644
--- a/AiravataApi.md
+++ b/AiravataApi.md
@@ -6,25 +6,25 @@ For Airavata API documentation please visit http://airavata.apache.org/
 |   Gateway Function/Feature|   Airavata API|  
 Description |
 
|:--|:--|:--|
 Project
-| Create a Project  | createProject
 |   |
-| Update Project| updateProject
 |   |
-| Get a Project | getProject   
 |   |
-| Search Project by Name| searchProjectsByProjectName  
 |   |
-| Search Project by Desc| searchProjectsByProjectDesc  
 |   |
-| Get all user Projects | getUserProjects  
 |   |
+| Create a Project  | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_createProject;
 target="_blank">createProject  | 
Linked with Create Project in PGA.|
+| Update Project| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_updateProject;
 target="_blank">updateProject  | To 
update Project name and description.   |
+| Get a Project | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getProject;
 target="_blank">getProject| 
Retrieve Project by providing the ID.   |
+| Search Project by Name| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_searchProjectsByProjectName;
 target="_blank">searchProjectsByProjectName  | Search for Project 
by giving part or full project name.  |
+| Search Project by Desc| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_searchProjectsByProjectDesc;
 target="_blank">searchProjectsByProjectDesc  | Search for Project 
by giving part or full project description.  |
+| Get all user Projects | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getUserProjects;
 target="_blank">getUserProjects  | 
Retrieve all Projects of a user.  |
 Experiment
-| Create an Experiment  | createExperiment 
 |   |
-| Update an Experiment  | updateExperiment 
 |   |
-| Get an Experiment | getExperiment
 |   |
-| Get Detailed Experiment   | getDetailedExperimentTree
 |   |
-| Clone an Experiment   | cloneExperiment  
 |   |
-| Cancel an Experiment  | terminateExperiment  
 |   |
-| Search Experiment by Name | searchExperimentsByName  
 |   |
-| Search Experiment by Desc | searchExperimentsByDesc  
 |   |
-| Search Experiments by Application Name| searchExperimentsByApplication   
 |   |
-| Search Experiment by Creation Time| searchExperimentsByCreationTime  
 |   |
-| Get all user Experiments  | getUserProjects  
 |   |
-| Get Experiments for a Project | getExperimentsInProject  
 |   |
+| Create an Experiment  |