[AIRAVATA-2601] Adding groups to Applications #146

tilaks26 · 2017-12-01T20:54:27Z

Filtering of Application Deployments by gateway ID and user name. We first get a list of Application Deployment IDs that are accessible by the current user and then retrieve the list of Application Deployments. (Similar to how we search for Experiments).

Files changed:

AiravataDataMigrator.java -> Included a new Entity Type names APPLICATION
AiravataServerHandler.java -> Modified getAllApplicationDeployments(), getAllAppModules() methods to filter the accessible Application IDs using the user name
registry-api.thrift -> Modified getAllApplicationDeployments(), getAllAppModules() methods' parameter list to include the accessible Application IDs
RegistryService.java -> Regenerated the Thrift stubs which changed the Registry Service interface
ApplicationDeployment.java -> Modified getAllApplicationDeployements() method to include accessible Application Deployment IDs
ApplicationInterface.java -> Modified getAllAppModules() method to include accessible Application Module IDs
RegistryServerHandler.java -> Modified getAllApplicationDeployments(), getAllAppModules() methods to reflect the changes in ApplicationDeployment.java and RegistryService.java files

TODO:

Modify the launchExperiment() method in AiravataServerHandler.java to first check if the user has access to launch an Experiment in the Application Module.

tilaks26 · 2017-12-04T20:31:00Z

Files changed:

AiravataServerHandler.java -> Modified launchExperiment() to first check if the current user has access to the Application Module

machristie

Thanks for submitting this pull request Sneha. See my comments.

machristie · 2017-12-04T22:13:36Z

...a-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java

        try {
            ExperimentModel experiment = regClient.getExperiment(airavataExperimentId);
+            String userId = authzToken.getClaimsMap().get(Constants.USER_NAME);
+            String entityId = experiment.getExecutionId();


The execution id is the application interface id. You need to fetch the application interface and get the application module id from it, and then check to see if the user has access to the application module id.

machristie · 2017-12-04T22:16:45Z

...a-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java

            if (experiment == null) {
                logger.error(airavataExperimentId, "Error while launching experiment, experiment {} doesn't exist.", airavataExperimentId);
                throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
            }
            submitExperiment(gatewayId, airavataExperimentId);
            registryClientPool.returnResource(regClient);
+            sharingClientPool.returnResource(sharingClient);


You should probably return the sharingClient to the pool as a broken resource, like what is done for the regClient, see line 1787.

machristie · 2017-12-04T22:18:23Z

...a-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java

            registryClientPool.returnResource(regClient);
+            sharingClientPool.returnResource(sharingClient);


Same comment about returning the sharingClient in the catch clause.

machristie · 2017-12-04T22:21:50Z

...gistry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ApplicationInterface.java

@@ -86,7 +86,7 @@
     */
    List<ApplicationModule> getApplicationModules(Map<String, String> filters) throws AppCatalogException;

-    List<ApplicationModule> getAllApplicationModules(String gatewayId) throws AppCatalogException;
+    List<ApplicationModule> getAllApplicationModules(String gatewayId, List<String> accessibleAppIds) throws AppCatalogException;


Where's the implementation for this?

machristie · 2017-12-04T22:23:15Z

...istry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ApplicationDeployment.java

@@ -53,7 +53,7 @@
     */
    List<ApplicationDeploymentDescription> getApplicationDeployements (Map<String, String> filters) throws AppCatalogException;

-    List<ApplicationDeploymentDescription> getAllApplicationDeployements (String gatewayId) throws AppCatalogException;
+    List<ApplicationDeploymentDescription> getAllApplicationDeployements (String gatewayId, List<String> accessibleIds) throws AppCatalogException;


Where's the implementation of this?

machristie · 2017-12-04T22:25:26Z

...c/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java

+                entity.setDomainId(rs.getString("GATEWAY_ID"));
+                entity.setEntityTypeId(rs.getString("GATEWAY_ID") + ":APPLICATION");
+                entity.setOwnerId(rs.getString("USER_NAME") + "@" + rs.getString("GATEWAY_ID"));
+                entity.setParentEntityId(rs.getString("PROJECT_ID"));


Let's just leave parent entity id null since there really isn't a parent of an application.

machristie · 2017-12-04T22:26:03Z

thrift-interface-descriptions/component-cpis/registry-api.thrift

@@ -774,7 +774,8 @@ service RegistryService {
             *    Returns the list of all Application Module Objects.
             *
            */
-            list<application_deployment_model.ApplicationModule> getAllAppModules (1: required string gatewayId)


Please update the method documentation.

machristie · 2017-12-04T22:26:14Z

thrift-interface-descriptions/component-cpis/registry-api.thrift

@@ -869,11 +870,15 @@ service RegistryService {
             * @param gatewayId
             *    ID of the gateway which need to list all available application deployment documentation.
             *
+             * @param userName


Likewise please update the method documentation.

machristie requested changes Dec 4, 2017

View reviewed changes

tilaks26 closed this Jan 29, 2018

tilaks26 force-pushed the develop branch from 43415f3 to 211691d Compare January 29, 2018 17:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[AIRAVATA-2601] Adding groups to Applications #146

[AIRAVATA-2601] Adding groups to Applications #146

tilaks26 commented Dec 1, 2017 •

edited

tilaks26 commented Dec 4, 2017

machristie left a comment

machristie Dec 4, 2017

tilaks26 Dec 5, 2017

machristie Dec 4, 2017

tilaks26 Dec 5, 2017

machristie Dec 4, 2017

tilaks26 Dec 5, 2017

machristie Dec 4, 2017

tilaks26 Dec 7, 2017

machristie Dec 4, 2017

tilaks26 Dec 7, 2017

machristie Dec 4, 2017

tilaks26 Dec 5, 2017

machristie Dec 4, 2017

tilaks26 Dec 5, 2017

machristie Dec 4, 2017

tilaks26 Dec 5, 2017

		registryClientPool.returnResource(regClient);
		sharingClientPool.returnResource(sharingClient);

[AIRAVATA-2601] Adding groups to Applications #146

[AIRAVATA-2601] Adding groups to Applications #146

Conversation

tilaks26 commented Dec 1, 2017 • edited

tilaks26 commented Dec 4, 2017

machristie left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tilaks26 commented Dec 1, 2017 •

edited