This is an automated email from the ASF dual-hosted git repository.

yasithdev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new 18faafd885 refactor: nest the iam-service proto packages under api.iam 
(#648)
18faafd885 is described below

commit 18faafd8856d83ef8f99e589c9d2e82b0c5a4ce3
Author: Yasith Jayawardana <[email protected]>
AuthorDate: Sun Jun 7 23:30:33 2026 -0400

    refactor: nest the iam-service proto packages under api.iam (#648)
    
    Rename the three non-iam_admin service protos in iam-service so all of 
iam-service's gRPC APIs share the org.apache.airavata.api.iam.* namespace: 
api.userprofile -> api.iam.userprofile, api.sharing -> api.iam.sharing, 
api.groupmanager -> api.iam.groupmanager (iam_admin_service already lives at 
api.iam). A single flat api.iam is infeasible because sharing_service and 
group_manager_service share 17 message names, so the distinct services are 
nested as siblings under api.iam.
    
    This is wire-breaking: the gRPC service paths change (e.g. 
/org.apache.airavata.api.sharing.SharingService/... -> 
/org.apache.airavata.api.iam.sharing.SharingService/...). The in-repo Java 
consumers are updated (the iam Sharing/GroupManager gRPC handlers and the 
launcher's UserProfileGrpcService). compute-service's 
user_resource_profile_service.proto keeps api.userprofile and is unchanged - it 
coincidentally shared that Java package with iam's user_profile_service, so 
this rename actu [...]
    
    The Python SDK gRPC stubs for the three services are regenerated with the 
matching toolchain (protoc 6.31.1 / grpcio 1.80.0) so the diff is purely the 
rename; the .pyi stubs are unchanged. The full reactor builds green and the 
iam/compute tests pass. Regenerating the separate-repo portal client is a 
follow-up.
---
 .../airavata/iam/grpc/GroupManagerGrpcService.java |   2 +-
 .../airavata/iam/grpc/SharingGrpcService.java      |   2 +-
 .../src/main/proto/group_manager_service.proto     |   4 +-
 .../src/main/proto/sharing_service.proto           |   4 +-
 .../src/main/proto/user_profile_service.proto      |   4 +-
 .../services/group_manager_service_pb2.py          |  80 ++--
 .../services/group_manager_service_pb2_grpc.py     |  56 +--
 .../generated/services/sharing_service_pb2.py      | 412 ++++++++++-----------
 .../generated/services/sharing_service_pb2_grpc.py | 266 ++++++-------
 .../generated/services/user_profile_service_pb2.py |  48 +--
 .../services/user_profile_service_pb2_grpc.py      |  32 +-
 .../grpc/services/UserProfileGrpcService.java      |   2 +-
 12 files changed, 456 insertions(+), 456 deletions(-)

diff --git 
a/airavata-api/iam-service/src/main/java/org/apache/airavata/iam/grpc/GroupManagerGrpcService.java
 
b/airavata-api/iam-service/src/main/java/org/apache/airavata/iam/grpc/GroupManagerGrpcService.java
index 0426f10fa5..71b24531ea 100644
--- 
a/airavata-api/iam-service/src/main/java/org/apache/airavata/iam/grpc/GroupManagerGrpcService.java
+++ 
b/airavata-api/iam-service/src/main/java/org/apache/airavata/iam/grpc/GroupManagerGrpcService.java
@@ -23,7 +23,7 @@ import com.google.protobuf.Empty;
 import io.grpc.stub.StreamObserver;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.airavata.api.groupmanager.*;
+import org.apache.airavata.api.iam.groupmanager.*;
 import org.apache.airavata.config.RequestContext;
 import org.apache.airavata.grpc.GrpcRequestContext;
 import org.apache.airavata.grpc.GrpcStatusMapper;
diff --git 
a/airavata-api/iam-service/src/main/java/org/apache/airavata/iam/grpc/SharingGrpcService.java
 
b/airavata-api/iam-service/src/main/java/org/apache/airavata/iam/grpc/SharingGrpcService.java
index 690c28d2f1..5d640e6b9c 100644
--- 
a/airavata-api/iam-service/src/main/java/org/apache/airavata/iam/grpc/SharingGrpcService.java
+++ 
b/airavata-api/iam-service/src/main/java/org/apache/airavata/iam/grpc/SharingGrpcService.java
@@ -25,7 +25,7 @@ import io.grpc.stub.StreamObserver;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.airavata.api.sharing.*;
+import org.apache.airavata.api.iam.sharing.*;
 import org.apache.airavata.config.RequestContext;
 import org.apache.airavata.grpc.GrpcRequestContext;
 import org.apache.airavata.grpc.GrpcStatusMapper;
diff --git 
a/airavata-api/iam-service/src/main/proto/group_manager_service.proto 
b/airavata-api/iam-service/src/main/proto/group_manager_service.proto
index 4f825c2ae1..107af60bc4 100644
--- a/airavata-api/iam-service/src/main/proto/group_manager_service.proto
+++ b/airavata-api/iam-service/src/main/proto/group_manager_service.proto
@@ -17,9 +17,9 @@
 
 syntax = "proto3";
 
-package org.apache.airavata.api.groupmanager;
+package org.apache.airavata.api.iam.groupmanager;
 
-option java_package = "org.apache.airavata.api.groupmanager";
+option java_package = "org.apache.airavata.api.iam.groupmanager";
 option java_multiple_files = true;
 
 import "google/api/annotations.proto";
diff --git a/airavata-api/iam-service/src/main/proto/sharing_service.proto 
b/airavata-api/iam-service/src/main/proto/sharing_service.proto
index 79ed488444..7020bf484d 100644
--- a/airavata-api/iam-service/src/main/proto/sharing_service.proto
+++ b/airavata-api/iam-service/src/main/proto/sharing_service.proto
@@ -17,9 +17,9 @@
 
 syntax = "proto3";
 
-package org.apache.airavata.api.sharing;
+package org.apache.airavata.api.iam.sharing;
 
-option java_package = "org.apache.airavata.api.sharing";
+option java_package = "org.apache.airavata.api.iam.sharing";
 option java_multiple_files = true;
 
 import "google/api/annotations.proto";
diff --git a/airavata-api/iam-service/src/main/proto/user_profile_service.proto 
b/airavata-api/iam-service/src/main/proto/user_profile_service.proto
index 5e3a1add9a..b37f785158 100644
--- a/airavata-api/iam-service/src/main/proto/user_profile_service.proto
+++ b/airavata-api/iam-service/src/main/proto/user_profile_service.proto
@@ -17,9 +17,9 @@
 
 syntax = "proto3";
 
-package org.apache.airavata.api.userprofile;
+package org.apache.airavata.api.iam.userprofile;
 
-option java_package = "org.apache.airavata.api.userprofile";
+option java_package = "org.apache.airavata.api.iam.userprofile";
 option java_multiple_files = true;
 
 import "google/api/annotations.proto";
diff --git 
a/airavata-python-sdk/airavata_sdk/generated/services/group_manager_service_pb2.py
 
b/airavata-python-sdk/airavata_sdk/generated/services/group_manager_service_pb2.py
index 8ed325ad07..98befb1074 100644
--- 
a/airavata-python-sdk/airavata_sdk/generated/services/group_manager_service_pb2.py
+++ 
b/airavata-python-sdk/airavata_sdk/generated/services/group_manager_service_pb2.py
@@ -27,14 +27,14 @@ from google.protobuf import empty_pb2 as 
google_dot_protobuf_dot_empty__pb2
 from org.apache.airavata.model.group import group_manager_pb2 as 
org_dot_apache_dot_airavata_dot_model_dot_group_dot_group__manager__pb2
 
 
-DESCRIPTOR = 
_descriptor_pool.Default().AddSerializedFile(b'\n$services/group_manager_service.proto\x12$org.apache.airavata.api.groupmanager\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x33org/apache/airavata/model/group/group_manager.proto\"P\n\x12\x43reateGroupRequest\x12:\n\x05group\x18\x01
 
\x01(\x0b\x32+.org.apache.airavata.model.group.GroupModel\"\'\n\x13\x43reateGroupResponse\x12\x10\n\x08group_id\x18\x01
 \x01(\t\"P\n\x12UpdateGroupRequest\x12:\n\x05gr [...]
+DESCRIPTOR = 
_descriptor_pool.Default().AddSerializedFile(b'\n$services/group_manager_service.proto\x12(org.apache.airavata.api.iam.groupmanager\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x33org/apache/airavata/model/group/group_manager.proto\"P\n\x12\x43reateGroupRequest\x12:\n\x05group\x18\x01
 
\x01(\x0b\x32+.org.apache.airavata.model.group.GroupModel\"\'\n\x13\x43reateGroupResponse\x12\x10\n\x08group_id\x18\x01
 \x01(\t\"P\n\x12UpdateGroupRequest\x12:\n\x [...]
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 
'services.group_manager_service_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = 
b'\n$org.apache.airavata.api.groupmanagerP\001'
+  _globals['DESCRIPTOR']._serialized_options = 
b'\n(org.apache.airavata.api.iam.groupmanagerP\001'
   
_globals['_GROUPMANAGERSERVICE'].methods_by_name['CreateGroup']._loaded_options 
= None
   
_globals['_GROUPMANAGERSERVICE'].methods_by_name['CreateGroup']._serialized_options
 = b'\202\323\344\223\002\027\"\016/api/v1/groups:\005group'
   
_globals['_GROUPMANAGERSERVICE'].methods_by_name['UpdateGroup']._loaded_options 
= None
@@ -61,42 +61,42 @@ if not _descriptor._USE_C_DESCRIPTORS:
   
_globals['_GROUPMANAGERSERVICE'].methods_by_name['HasAdminAccess']._serialized_options
 = 
b'\202\323\344\223\0023\0221/api/v1/groups/{group_id}/admins/{admin_id}:check'
   
_globals['_GROUPMANAGERSERVICE'].methods_by_name['HasOwnerAccess']._loaded_options
 = None
   
_globals['_GROUPMANAGERSERVICE'].methods_by_name['HasOwnerAccess']._serialized_options
 = 
b'\202\323\344\223\0023\0221/api/v1/groups/{group_id}/owners/{owner_id}:check'
-  _globals['_CREATEGROUPREQUEST']._serialized_start=190
-  _globals['_CREATEGROUPREQUEST']._serialized_end=270
-  _globals['_CREATEGROUPRESPONSE']._serialized_start=272
-  _globals['_CREATEGROUPRESPONSE']._serialized_end=311
-  _globals['_UPDATEGROUPREQUEST']._serialized_start=313
-  _globals['_UPDATEGROUPREQUEST']._serialized_end=393
-  _globals['_DELETEGROUPREQUEST']._serialized_start=395
-  _globals['_DELETEGROUPREQUEST']._serialized_end=451
-  _globals['_GETGROUPREQUEST']._serialized_start=453
-  _globals['_GETGROUPREQUEST']._serialized_end=488
-  _globals['_GETGROUPSREQUEST']._serialized_start=490
-  _globals['_GETGROUPSREQUEST']._serialized_end=508
-  _globals['_GETGROUPSRESPONSE']._serialized_start=510
-  _globals['_GETGROUPSRESPONSE']._serialized_end=590
-  _globals['_GETALLGROUPSUSERBELONGSREQUEST']._serialized_start=592
-  _globals['_GETALLGROUPSUSERBELONGSREQUEST']._serialized_end=643
-  _globals['_GETALLGROUPSUSERBELONGSRESPONSE']._serialized_start=645
-  _globals['_GETALLGROUPSUSERBELONGSRESPONSE']._serialized_end=739
-  _globals['_ADDUSERSTOGROUPREQUEST']._serialized_start=741
-  _globals['_ADDUSERSTOGROUPREQUEST']._serialized_end=801
-  _globals['_REMOVEUSERSFROMGROUPREQUEST']._serialized_start=803
-  _globals['_REMOVEUSERSFROMGROUPREQUEST']._serialized_end=868
-  _globals['_TRANSFERGROUPOWNERSHIPREQUEST']._serialized_start=870
-  _globals['_TRANSFERGROUPOWNERSHIPREQUEST']._serialized_end=941
-  _globals['_ADDGROUPADMINSREQUEST']._serialized_start=943
-  _globals['_ADDGROUPADMINSREQUEST']._serialized_end=1003
-  _globals['_REMOVEGROUPADMINSREQUEST']._serialized_start=1005
-  _globals['_REMOVEGROUPADMINSREQUEST']._serialized_end=1068
-  _globals['_HASADMINACCESSREQUEST']._serialized_start=1070
-  _globals['_HASADMINACCESSREQUEST']._serialized_end=1129
-  _globals['_HASADMINACCESSRESPONSE']._serialized_start=1131
-  _globals['_HASADMINACCESSRESPONSE']._serialized_end=1175
-  _globals['_HASOWNERACCESSREQUEST']._serialized_start=1177
-  _globals['_HASOWNERACCESSREQUEST']._serialized_end=1236
-  _globals['_HASOWNERACCESSRESPONSE']._serialized_start=1238
-  _globals['_HASOWNERACCESSRESPONSE']._serialized_end=1282
-  _globals['_GROUPMANAGERSERVICE']._serialized_start=1285
-  _globals['_GROUPMANAGERSERVICE']._serialized_end=3434
+  _globals['_CREATEGROUPREQUEST']._serialized_start=194
+  _globals['_CREATEGROUPREQUEST']._serialized_end=274
+  _globals['_CREATEGROUPRESPONSE']._serialized_start=276
+  _globals['_CREATEGROUPRESPONSE']._serialized_end=315
+  _globals['_UPDATEGROUPREQUEST']._serialized_start=317
+  _globals['_UPDATEGROUPREQUEST']._serialized_end=397
+  _globals['_DELETEGROUPREQUEST']._serialized_start=399
+  _globals['_DELETEGROUPREQUEST']._serialized_end=455
+  _globals['_GETGROUPREQUEST']._serialized_start=457
+  _globals['_GETGROUPREQUEST']._serialized_end=492
+  _globals['_GETGROUPSREQUEST']._serialized_start=494
+  _globals['_GETGROUPSREQUEST']._serialized_end=512
+  _globals['_GETGROUPSRESPONSE']._serialized_start=514
+  _globals['_GETGROUPSRESPONSE']._serialized_end=594
+  _globals['_GETALLGROUPSUSERBELONGSREQUEST']._serialized_start=596
+  _globals['_GETALLGROUPSUSERBELONGSREQUEST']._serialized_end=647
+  _globals['_GETALLGROUPSUSERBELONGSRESPONSE']._serialized_start=649
+  _globals['_GETALLGROUPSUSERBELONGSRESPONSE']._serialized_end=743
+  _globals['_ADDUSERSTOGROUPREQUEST']._serialized_start=745
+  _globals['_ADDUSERSTOGROUPREQUEST']._serialized_end=805
+  _globals['_REMOVEUSERSFROMGROUPREQUEST']._serialized_start=807
+  _globals['_REMOVEUSERSFROMGROUPREQUEST']._serialized_end=872
+  _globals['_TRANSFERGROUPOWNERSHIPREQUEST']._serialized_start=874
+  _globals['_TRANSFERGROUPOWNERSHIPREQUEST']._serialized_end=945
+  _globals['_ADDGROUPADMINSREQUEST']._serialized_start=947
+  _globals['_ADDGROUPADMINSREQUEST']._serialized_end=1007
+  _globals['_REMOVEGROUPADMINSREQUEST']._serialized_start=1009
+  _globals['_REMOVEGROUPADMINSREQUEST']._serialized_end=1072
+  _globals['_HASADMINACCESSREQUEST']._serialized_start=1074
+  _globals['_HASADMINACCESSREQUEST']._serialized_end=1133
+  _globals['_HASADMINACCESSRESPONSE']._serialized_start=1135
+  _globals['_HASADMINACCESSRESPONSE']._serialized_end=1179
+  _globals['_HASOWNERACCESSREQUEST']._serialized_start=1181
+  _globals['_HASOWNERACCESSREQUEST']._serialized_end=1240
+  _globals['_HASOWNERACCESSRESPONSE']._serialized_start=1242
+  _globals['_HASOWNERACCESSRESPONSE']._serialized_end=1286
+  _globals['_GROUPMANAGERSERVICE']._serialized_start=1289
+  _globals['_GROUPMANAGERSERVICE']._serialized_end=3510
 # @@protoc_insertion_point(module_scope)
diff --git 
a/airavata-python-sdk/airavata_sdk/generated/services/group_manager_service_pb2_grpc.py
 
b/airavata-python-sdk/airavata_sdk/generated/services/group_manager_service_pb2_grpc.py
index d42f153433..2b9175870e 100644
--- 
a/airavata-python-sdk/airavata_sdk/generated/services/group_manager_service_pb2_grpc.py
+++ 
b/airavata-python-sdk/airavata_sdk/generated/services/group_manager_service_pb2_grpc.py
@@ -38,67 +38,67 @@ class GroupManagerServiceStub(object):
             channel: A grpc.Channel.
         """
         self.CreateGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/CreateGroup',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/CreateGroup',
                 
request_serializer=services_dot_group__manager__service__pb2.CreateGroupRequest.SerializeToString,
                 
response_deserializer=services_dot_group__manager__service__pb2.CreateGroupResponse.FromString,
                 _registered_method=True)
         self.UpdateGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/UpdateGroup',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/UpdateGroup',
                 
request_serializer=services_dot_group__manager__service__pb2.UpdateGroupRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.DeleteGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/DeleteGroup',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/DeleteGroup',
                 
request_serializer=services_dot_group__manager__service__pb2.DeleteGroupRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/GetGroup',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/GetGroup',
                 
request_serializer=services_dot_group__manager__service__pb2.GetGroupRequest.SerializeToString,
                 
response_deserializer=org_dot_apache_dot_airavata_dot_model_dot_group_dot_group__manager__pb2.GroupModel.FromString,
                 _registered_method=True)
         self.GetGroups = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/GetGroups',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/GetGroups',
                 
request_serializer=services_dot_group__manager__service__pb2.GetGroupsRequest.SerializeToString,
                 
response_deserializer=services_dot_group__manager__service__pb2.GetGroupsResponse.FromString,
                 _registered_method=True)
         self.GetAllGroupsUserBelongs = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/GetAllGroupsUserBelongs',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/GetAllGroupsUserBelongs',
                 
request_serializer=services_dot_group__manager__service__pb2.GetAllGroupsUserBelongsRequest.SerializeToString,
                 
response_deserializer=services_dot_group__manager__service__pb2.GetAllGroupsUserBelongsResponse.FromString,
                 _registered_method=True)
         self.AddUsersToGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/AddUsersToGroup',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/AddUsersToGroup',
                 
request_serializer=services_dot_group__manager__service__pb2.AddUsersToGroupRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.RemoveUsersFromGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/RemoveUsersFromGroup',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/RemoveUsersFromGroup',
                 
request_serializer=services_dot_group__manager__service__pb2.RemoveUsersFromGroupRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.TransferGroupOwnership = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/TransferGroupOwnership',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/TransferGroupOwnership',
                 
request_serializer=services_dot_group__manager__service__pb2.TransferGroupOwnershipRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.AddGroupAdmins = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/AddGroupAdmins',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/AddGroupAdmins',
                 
request_serializer=services_dot_group__manager__service__pb2.AddGroupAdminsRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.RemoveGroupAdmins = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/RemoveGroupAdmins',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/RemoveGroupAdmins',
                 
request_serializer=services_dot_group__manager__service__pb2.RemoveGroupAdminsRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.HasAdminAccess = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/HasAdminAccess',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/HasAdminAccess',
                 
request_serializer=services_dot_group__manager__service__pb2.HasAdminAccessRequest.SerializeToString,
                 
response_deserializer=services_dot_group__manager__service__pb2.HasAdminAccessResponse.FromString,
                 _registered_method=True)
         self.HasOwnerAccess = channel.unary_unary(
-                
'/org.apache.airavata.api.groupmanager.GroupManagerService/HasOwnerAccess',
+                
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/HasOwnerAccess',
                 
request_serializer=services_dot_group__manager__service__pb2.HasOwnerAccessRequest.SerializeToString,
                 
response_deserializer=services_dot_group__manager__service__pb2.HasOwnerAccessResponse.FromString,
                 _registered_method=True)
@@ -256,9 +256,9 @@ def add_GroupManagerServiceServicer_to_server(servicer, 
server):
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
-            'org.apache.airavata.api.groupmanager.GroupManagerService', 
rpc_method_handlers)
+            'org.apache.airavata.api.iam.groupmanager.GroupManagerService', 
rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
-    
server.add_registered_method_handlers('org.apache.airavata.api.groupmanager.GroupManagerService',
 rpc_method_handlers)
+    
server.add_registered_method_handlers('org.apache.airavata.api.iam.groupmanager.GroupManagerService',
 rpc_method_handlers)
 
 
  # This class is part of an EXPERIMENTAL API.
@@ -280,7 +280,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/CreateGroup',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/CreateGroup',
             
services_dot_group__manager__service__pb2.CreateGroupRequest.SerializeToString,
             
services_dot_group__manager__service__pb2.CreateGroupResponse.FromString,
             options,
@@ -307,7 +307,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/UpdateGroup',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/UpdateGroup',
             
services_dot_group__manager__service__pb2.UpdateGroupRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -334,7 +334,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/DeleteGroup',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/DeleteGroup',
             
services_dot_group__manager__service__pb2.DeleteGroupRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -361,7 +361,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/GetGroup',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/GetGroup',
             
services_dot_group__manager__service__pb2.GetGroupRequest.SerializeToString,
             
org_dot_apache_dot_airavata_dot_model_dot_group_dot_group__manager__pb2.GroupModel.FromString,
             options,
@@ -388,7 +388,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/GetGroups',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/GetGroups',
             
services_dot_group__manager__service__pb2.GetGroupsRequest.SerializeToString,
             
services_dot_group__manager__service__pb2.GetGroupsResponse.FromString,
             options,
@@ -415,7 +415,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/GetAllGroupsUserBelongs',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/GetAllGroupsUserBelongs',
             
services_dot_group__manager__service__pb2.GetAllGroupsUserBelongsRequest.SerializeToString,
             
services_dot_group__manager__service__pb2.GetAllGroupsUserBelongsResponse.FromString,
             options,
@@ -442,7 +442,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/AddUsersToGroup',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/AddUsersToGroup',
             
services_dot_group__manager__service__pb2.AddUsersToGroupRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -469,7 +469,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/RemoveUsersFromGroup',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/RemoveUsersFromGroup',
             
services_dot_group__manager__service__pb2.RemoveUsersFromGroupRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -496,7 +496,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/TransferGroupOwnership',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/TransferGroupOwnership',
             
services_dot_group__manager__service__pb2.TransferGroupOwnershipRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -523,7 +523,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/AddGroupAdmins',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/AddGroupAdmins',
             
services_dot_group__manager__service__pb2.AddGroupAdminsRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -550,7 +550,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/RemoveGroupAdmins',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/RemoveGroupAdmins',
             
services_dot_group__manager__service__pb2.RemoveGroupAdminsRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -577,7 +577,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/HasAdminAccess',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/HasAdminAccess',
             
services_dot_group__manager__service__pb2.HasAdminAccessRequest.SerializeToString,
             
services_dot_group__manager__service__pb2.HasAdminAccessResponse.FromString,
             options,
@@ -604,7 +604,7 @@ class GroupManagerService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.groupmanager.GroupManagerService/HasOwnerAccess',
+            
'/org.apache.airavata.api.iam.groupmanager.GroupManagerService/HasOwnerAccess',
             
services_dot_group__manager__service__pb2.HasOwnerAccessRequest.SerializeToString,
             
services_dot_group__manager__service__pb2.HasOwnerAccessResponse.FromString,
             options,
diff --git 
a/airavata-python-sdk/airavata_sdk/generated/services/sharing_service_pb2.py 
b/airavata-python-sdk/airavata_sdk/generated/services/sharing_service_pb2.py
index a3fbc60646..43ad54f4f4 100644
--- a/airavata-python-sdk/airavata_sdk/generated/services/sharing_service_pb2.py
+++ b/airavata-python-sdk/airavata_sdk/generated/services/sharing_service_pb2.py
@@ -27,14 +27,14 @@ from google.protobuf import empty_pb2 as 
google_dot_protobuf_dot_empty__pb2
 from org.apache.airavata.model.sharing import sharing_pb2 as 
org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2
 
 
-DESCRIPTOR = 
_descriptor_pool.Default().AddSerializedFile(b'\n\x1eservices/sharing_service.proto\x12\x1forg.apache.airavata.api.sharing\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a/org/apache/airavata/model/sharing/sharing.proto\"\xdb\x01\n\x1dShareResourceWithUsersRequest\x12\x13\n\x0bresource_id\x18\x01
 \x01(\t\x12m\n\x10user_permissions\x18\x02 
\x03(\x0b\x32S.org.apache.airavata.api.sharing.ShareResourceWithUsersRequest.UserPermissionsEntry\x1a\x36\n\x14U
 [...]
+DESCRIPTOR = 
_descriptor_pool.Default().AddSerializedFile(b'\n\x1eservices/sharing_service.proto\x12#org.apache.airavata.api.iam.sharing\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a/org/apache/airavata/model/sharing/sharing.proto\"\xdf\x01\n\x1dShareResourceWithUsersRequest\x12\x13\n\x0bresource_id\x18\x01
 \x01(\t\x12q\n\x10user_permissions\x18\x02 
\x03(\x0b\x32W.org.apache.airavata.api.iam.sharing.ShareResourceWithUsersRequest.UserPermissionsEntry\x1a\x36\n
 [...]
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 
'services.sharing_service_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = 
b'\n\037org.apache.airavata.api.sharingP\001'
+  _globals['DESCRIPTOR']._serialized_options = 
b'\n#org.apache.airavata.api.iam.sharingP\001'
   
_globals['_SHARERESOURCEWITHUSERSREQUEST_USERPERMISSIONSENTRY']._loaded_options 
= None
   
_globals['_SHARERESOURCEWITHUSERSREQUEST_USERPERMISSIONSENTRY']._serialized_options
 = b'8\001'
   
_globals['_SHARERESOURCEWITHGROUPSREQUEST_GROUPPERMISSIONSENTRY']._loaded_options
 = None
@@ -173,208 +173,208 @@ if not _descriptor._USE_C_DESCRIPTORS:
   
_globals['_SHARINGSERVICE'].methods_by_name['ShareEntityWithGroups']._serialized_options
 = 
b'\202\323\344\223\002J\"E/api/v1/sharing/domains/{domain_id}/entities/{entity_id}/groups:share:\001*'
   
_globals['_SHARINGSERVICE'].methods_by_name['RevokeEntitySharingFromGroups']._loaded_options
 = None
   
_globals['_SHARINGSERVICE'].methods_by_name['RevokeEntitySharingFromGroups']._serialized_options
 = 
b'\202\323\344\223\002K\"F/api/v1/sharing/domains/{domain_id}/entities/{entity_id}/groups:revoke:\001*'
-  _globals['_SHARERESOURCEWITHUSERSREQUEST']._serialized_start=176
-  _globals['_SHARERESOURCEWITHUSERSREQUEST']._serialized_end=395
-  
_globals['_SHARERESOURCEWITHUSERSREQUEST_USERPERMISSIONSENTRY']._serialized_start=341
-  
_globals['_SHARERESOURCEWITHUSERSREQUEST_USERPERMISSIONSENTRY']._serialized_end=395
-  _globals['_SHARERESOURCEWITHGROUPSREQUEST']._serialized_start=398
-  _globals['_SHARERESOURCEWITHGROUPSREQUEST']._serialized_end=622
-  
_globals['_SHARERESOURCEWITHGROUPSREQUEST_GROUPPERMISSIONSENTRY']._serialized_start=567
-  
_globals['_SHARERESOURCEWITHGROUPSREQUEST_GROUPPERMISSIONSENTRY']._serialized_end=622
-  _globals['_REVOKEFROMUSERSREQUEST']._serialized_start=625
-  _globals['_REVOKEFROMUSERSREQUEST']._serialized_end=830
-  
_globals['_REVOKEFROMUSERSREQUEST_USERPERMISSIONSENTRY']._serialized_start=341
-  _globals['_REVOKEFROMUSERSREQUEST_USERPERMISSIONSENTRY']._serialized_end=395
-  _globals['_REVOKEFROMGROUPSREQUEST']._serialized_start=833
-  _globals['_REVOKEFROMGROUPSREQUEST']._serialized_end=1043
-  
_globals['_REVOKEFROMGROUPSREQUEST_GROUPPERMISSIONSENTRY']._serialized_start=567
-  
_globals['_REVOKEFROMGROUPSREQUEST_GROUPPERMISSIONSENTRY']._serialized_end=622
-  _globals['_GETALLACCESSIBLEUSERSREQUEST']._serialized_start=1045
-  _globals['_GETALLACCESSIBLEUSERSREQUEST']._serialized_end=1121
-  _globals['_GETALLACCESSIBLEUSERSRESPONSE']._serialized_start=1123
-  _globals['_GETALLACCESSIBLEUSERSRESPONSE']._serialized_end=1172
-  _globals['_GETALLDIRECTLYACCESSIBLEUSERSREQUEST']._serialized_start=1174
-  _globals['_GETALLDIRECTLYACCESSIBLEUSERSREQUEST']._serialized_end=1258
-  _globals['_GETALLDIRECTLYACCESSIBLEUSERSRESPONSE']._serialized_start=1260
-  _globals['_GETALLDIRECTLYACCESSIBLEUSERSRESPONSE']._serialized_end=1317
-  _globals['_GETALLACCESSIBLEGROUPSREQUEST']._serialized_start=1319
-  _globals['_GETALLACCESSIBLEGROUPSREQUEST']._serialized_end=1396
-  _globals['_GETALLACCESSIBLEGROUPSRESPONSE']._serialized_start=1398
-  _globals['_GETALLACCESSIBLEGROUPSRESPONSE']._serialized_end=1449
-  _globals['_GETALLDIRECTLYACCESSIBLEGROUPSREQUEST']._serialized_start=1451
-  _globals['_GETALLDIRECTLYACCESSIBLEGROUPSREQUEST']._serialized_end=1536
-  _globals['_GETALLDIRECTLYACCESSIBLEGROUPSRESPONSE']._serialized_start=1538
-  _globals['_GETALLDIRECTLYACCESSIBLEGROUPSRESPONSE']._serialized_end=1597
-  _globals['_USERHASACCESSREQUEST']._serialized_start=1599
-  _globals['_USERHASACCESSREQUEST']._serialized_end=1684
-  _globals['_USERHASACCESSRESPONSE']._serialized_start=1686
-  _globals['_USERHASACCESSRESPONSE']._serialized_end=1729
-  _globals['_CREATEDOMAINREQUEST']._serialized_start=1731
-  _globals['_CREATEDOMAINREQUEST']._serialized_end=1821
-  _globals['_CREATEDOMAINRESPONSE']._serialized_start=1823
-  _globals['_CREATEDOMAINRESPONSE']._serialized_end=1864
-  _globals['_UPDATEDOMAINREQUEST']._serialized_start=1866
-  _globals['_UPDATEDOMAINREQUEST']._serialized_end=1956
-  _globals['_ISDOMAINEXISTSREQUEST']._serialized_start=1958
-  _globals['_ISDOMAINEXISTSREQUEST']._serialized_end=2000
-  _globals['_ISDOMAINEXISTSRESPONSE']._serialized_start=2002
-  _globals['_ISDOMAINEXISTSRESPONSE']._serialized_end=2042
-  _globals['_DELETEDOMAINREQUEST']._serialized_start=2044
-  _globals['_DELETEDOMAINREQUEST']._serialized_end=2084
-  _globals['_GETDOMAINREQUEST']._serialized_start=2086
-  _globals['_GETDOMAINREQUEST']._serialized_end=2123
-  _globals['_GETDOMAINSREQUEST']._serialized_start=2125
-  _globals['_GETDOMAINSREQUEST']._serialized_end=2175
-  _globals['_GETDOMAINSRESPONSE']._serialized_start=2177
-  _globals['_GETDOMAINSRESPONSE']._serialized_end=2267
-  _globals['_CREATEUSERREQUEST']._serialized_start=2269
-  _globals['_CREATEUSERREQUEST']._serialized_end=2353
-  _globals['_CREATEUSERRESPONSE']._serialized_start=2355
-  _globals['_CREATEUSERRESPONSE']._serialized_end=2392
-  _globals['_UPDATEUSERREQUEST']._serialized_start=2394
-  _globals['_UPDATEUSERREQUEST']._serialized_end=2478
-  _globals['_ISUSEREXISTSREQUEST']._serialized_start=2480
-  _globals['_ISUSEREXISTSREQUEST']._serialized_end=2537
-  _globals['_ISUSEREXISTSRESPONSE']._serialized_start=2539
-  _globals['_ISUSEREXISTSRESPONSE']._serialized_end=2577
-  _globals['_DELETEUSERREQUEST']._serialized_start=2579
-  _globals['_DELETEUSERREQUEST']._serialized_end=2634
-  _globals['_GETUSERREQUEST']._serialized_start=2636
-  _globals['_GETUSERREQUEST']._serialized_end=2688
-  _globals['_GETUSERSREQUEST']._serialized_start=2690
-  _globals['_GETUSERSREQUEST']._serialized_end=2757
-  _globals['_GETUSERSRESPONSE']._serialized_start=2759
-  _globals['_GETUSERSRESPONSE']._serialized_end=2843
-  _globals['_CREATEGROUPREQUEST']._serialized_start=2845
-  _globals['_CREATEGROUPREQUEST']._serialized_end=2936
-  _globals['_CREATEGROUPRESPONSE']._serialized_start=2938
-  _globals['_CREATEGROUPRESPONSE']._serialized_end=2977
-  _globals['_UPDATEGROUPREQUEST']._serialized_start=2979
-  _globals['_UPDATEGROUPREQUEST']._serialized_end=3070
-  _globals['_ISGROUPEXISTSREQUEST']._serialized_start=3072
-  _globals['_ISGROUPEXISTSREQUEST']._serialized_end=3131
-  _globals['_ISGROUPEXISTSRESPONSE']._serialized_start=3133
-  _globals['_ISGROUPEXISTSRESPONSE']._serialized_end=3172
-  _globals['_DELETEGROUPREQUEST']._serialized_start=3174
-  _globals['_DELETEGROUPREQUEST']._serialized_end=3231
-  _globals['_GETGROUPREQUEST']._serialized_start=3233
-  _globals['_GETGROUPREQUEST']._serialized_end=3287
-  _globals['_GETGROUPSREQUEST']._serialized_start=3289
-  _globals['_GETGROUPSREQUEST']._serialized_end=3357
-  _globals['_GETGROUPSRESPONSE']._serialized_start=3359
-  _globals['_GETGROUPSRESPONSE']._serialized_end=3450
-  _globals['_ADDUSERSTOGROUPREQUEST']._serialized_start=3452
-  _globals['_ADDUSERSTOGROUPREQUEST']._serialized_end=3531
-  _globals['_REMOVEUSERSFROMGROUPREQUEST']._serialized_start=3533
-  _globals['_REMOVEUSERSFROMGROUPREQUEST']._serialized_end=3617
-  _globals['_TRANSFERGROUPOWNERSHIPREQUEST']._serialized_start=3619
-  _globals['_TRANSFERGROUPOWNERSHIPREQUEST']._serialized_end=3709
-  _globals['_ADDGROUPADMINSREQUEST']._serialized_start=3711
-  _globals['_ADDGROUPADMINSREQUEST']._serialized_end=3790
-  _globals['_REMOVEGROUPADMINSREQUEST']._serialized_start=3792
-  _globals['_REMOVEGROUPADMINSREQUEST']._serialized_end=3874
-  _globals['_HASADMINACCESSREQUEST']._serialized_start=3876
-  _globals['_HASADMINACCESSREQUEST']._serialized_end=3954
-  _globals['_HASADMINACCESSRESPONSE']._serialized_start=3956
-  _globals['_HASADMINACCESSRESPONSE']._serialized_end=4000
-  _globals['_HASOWNERACCESSREQUEST']._serialized_start=4002
-  _globals['_HASOWNERACCESSREQUEST']._serialized_end=4080
-  _globals['_HASOWNERACCESSRESPONSE']._serialized_start=4082
-  _globals['_HASOWNERACCESSRESPONSE']._serialized_end=4126
-  _globals['_GETGROUPMEMBERSOFTYPEUSERREQUEST']._serialized_start=4128
-  _globals['_GETGROUPMEMBERSOFTYPEUSERREQUEST']._serialized_end=4230
-  _globals['_GETGROUPMEMBERSOFTYPEUSERRESPONSE']._serialized_start=4232
-  _globals['_GETGROUPMEMBERSOFTYPEUSERRESPONSE']._serialized_end=4333
-  _globals['_GETGROUPMEMBERSOFTYPEGROUPREQUEST']._serialized_start=4335
-  _globals['_GETGROUPMEMBERSOFTYPEGROUPREQUEST']._serialized_end=4438
-  _globals['_GETGROUPMEMBERSOFTYPEGROUPRESPONSE']._serialized_start=4440
-  _globals['_GETGROUPMEMBERSOFTYPEGROUPRESPONSE']._serialized_end=4548
-  _globals['_ADDCHILDGROUPSTOPARENTGROUPREQUEST']._serialized_start=4550
-  _globals['_ADDCHILDGROUPSTOPARENTGROUPREQUEST']._serialized_end=4642
-  _globals['_REMOVECHILDGROUPFROMPARENTGROUPREQUEST']._serialized_start=4644
-  _globals['_REMOVECHILDGROUPFROMPARENTGROUPREQUEST']._serialized_end=4739
-  _globals['_GETALLMEMBERGROUPSFORUSERREQUEST']._serialized_start=4741
-  _globals['_GETALLMEMBERGROUPSFORUSERREQUEST']._serialized_end=4811
-  _globals['_GETALLMEMBERGROUPSFORUSERRESPONSE']._serialized_start=4813
-  _globals['_GETALLMEMBERGROUPSFORUSERRESPONSE']._serialized_end=4920
-  _globals['_CREATEENTITYTYPEREQUEST']._serialized_start=4922
-  _globals['_CREATEENTITYTYPEREQUEST']._serialized_end=5025
-  _globals['_CREATEENTITYTYPERESPONSE']._serialized_start=5027
-  _globals['_CREATEENTITYTYPERESPONSE']._serialized_end=5077
-  _globals['_UPDATEENTITYTYPEREQUEST']._serialized_start=5079
-  _globals['_UPDATEENTITYTYPEREQUEST']._serialized_end=5182
-  _globals['_ISENTITYTYPEEXISTSREQUEST']._serialized_start=5184
-  _globals['_ISENTITYTYPEEXISTSREQUEST']._serialized_end=5254
-  _globals['_ISENTITYTYPEEXISTSRESPONSE']._serialized_start=5256
-  _globals['_ISENTITYTYPEEXISTSRESPONSE']._serialized_end=5300
-  _globals['_DELETEENTITYTYPEREQUEST']._serialized_start=5302
-  _globals['_DELETEENTITYTYPEREQUEST']._serialized_end=5370
-  _globals['_GETENTITYTYPEREQUEST']._serialized_start=5372
-  _globals['_GETENTITYTYPEREQUEST']._serialized_end=5437
-  _globals['_GETENTITYTYPESREQUEST']._serialized_start=5439
-  _globals['_GETENTITYTYPESREQUEST']._serialized_end=5512
-  _globals['_GETENTITYTYPESRESPONSE']._serialized_start=5514
-  _globals['_GETENTITYTYPESRESPONSE']._serialized_end=5617
-  _globals['_CREATEENTITYREQUEST']._serialized_start=5619
-  _globals['_CREATEENTITYREQUEST']._serialized_end=5709
-  _globals['_CREATEENTITYRESPONSE']._serialized_start=5711
-  _globals['_CREATEENTITYRESPONSE']._serialized_end=5752
-  _globals['_UPDATEENTITYREQUEST']._serialized_start=5754
-  _globals['_UPDATEENTITYREQUEST']._serialized_end=5844
-  _globals['_ISENTITYEXISTSREQUEST']._serialized_start=5846
-  _globals['_ISENTITYEXISTSREQUEST']._serialized_end=5907
-  _globals['_ISENTITYEXISTSRESPONSE']._serialized_start=5909
-  _globals['_ISENTITYEXISTSRESPONSE']._serialized_end=5949
-  _globals['_DELETEENTITYREQUEST']._serialized_start=5951
-  _globals['_DELETEENTITYREQUEST']._serialized_end=6010
-  _globals['_GETENTITYREQUEST']._serialized_start=6012
-  _globals['_GETENTITYREQUEST']._serialized_end=6068
-  _globals['_SEARCHENTITIESREQUEST']._serialized_start=6071
-  _globals['_SEARCHENTITIESREQUEST']._serialized_end=6239
-  _globals['_SEARCHENTITIESRESPONSE']._serialized_start=6241
-  _globals['_SEARCHENTITIESRESPONSE']._serialized_end=6336
-  _globals['_GETLISTOFSHAREDUSERSREQUEST']._serialized_start=6338
-  _globals['_GETLISTOFSHAREDUSERSREQUEST']._serialized_end=6433
-  _globals['_GETLISTOFSHAREDUSERSRESPONSE']._serialized_start=6435
-  _globals['_GETLISTOFSHAREDUSERSRESPONSE']._serialized_end=6531
-  _globals['_GETLISTOFDIRECTLYSHAREDUSERSREQUEST']._serialized_start=6533
-  _globals['_GETLISTOFDIRECTLYSHAREDUSERSREQUEST']._serialized_end=6636
-  _globals['_GETLISTOFDIRECTLYSHAREDUSERSRESPONSE']._serialized_start=6638
-  _globals['_GETLISTOFDIRECTLYSHAREDUSERSRESPONSE']._serialized_end=6742
-  _globals['_GETLISTOFSHAREDGROUPSREQUEST']._serialized_start=6744
-  _globals['_GETLISTOFSHAREDGROUPSREQUEST']._serialized_end=6840
-  _globals['_GETLISTOFSHAREDGROUPSRESPONSE']._serialized_start=6842
-  _globals['_GETLISTOFSHAREDGROUPSRESPONSE']._serialized_end=6945
-  _globals['_GETLISTOFDIRECTLYSHAREDGROUPSREQUEST']._serialized_start=6947
-  _globals['_GETLISTOFDIRECTLYSHAREDGROUPSREQUEST']._serialized_end=7051
-  _globals['_GETLISTOFDIRECTLYSHAREDGROUPSRESPONSE']._serialized_start=7053
-  _globals['_GETLISTOFDIRECTLYSHAREDGROUPSRESPONSE']._serialized_end=7164
-  _globals['_CREATEPERMISSIONTYPEREQUEST']._serialized_start=7166
-  _globals['_CREATEPERMISSIONTYPEREQUEST']._serialized_end=7281
-  _globals['_CREATEPERMISSIONTYPERESPONSE']._serialized_start=7283
-  _globals['_CREATEPERMISSIONTYPERESPONSE']._serialized_end=7341
-  _globals['_UPDATEPERMISSIONTYPEREQUEST']._serialized_start=7343
-  _globals['_UPDATEPERMISSIONTYPEREQUEST']._serialized_end=7458
-  _globals['_ISPERMISSIONEXISTSREQUEST']._serialized_start=7460
-  _globals['_ISPERMISSIONEXISTSREQUEST']._serialized_end=7529
-  _globals['_ISPERMISSIONEXISTSRESPONSE']._serialized_start=7531
-  _globals['_ISPERMISSIONEXISTSRESPONSE']._serialized_end=7575
-  _globals['_DELETEPERMISSIONTYPEREQUEST']._serialized_start=7577
-  _globals['_DELETEPERMISSIONTYPEREQUEST']._serialized_end=7653
-  _globals['_GETPERMISSIONTYPEREQUEST']._serialized_start=7655
-  _globals['_GETPERMISSIONTYPEREQUEST']._serialized_end=7728
-  _globals['_GETPERMISSIONTYPESREQUEST']._serialized_start=7730
-  _globals['_GETPERMISSIONTYPESREQUEST']._serialized_end=7807
-  _globals['_GETPERMISSIONTYPESRESPONSE']._serialized_start=7809
-  _globals['_GETPERMISSIONTYPESRESPONSE']._serialized_end=7924
-  _globals['_SHAREENTITYWITHUSERSREQUEST']._serialized_start=7927
-  _globals['_SHAREENTITYWITHUSERSREQUEST']._serialized_end=8069
-  _globals['_REVOKEENTITYSHARINGFROMUSERSREQUEST']._serialized_start=8071
-  _globals['_REVOKEENTITYSHARINGFROMUSERSREQUEST']._serialized_end=8193
-  _globals['_SHAREENTITYWITHGROUPSREQUEST']._serialized_start=8196
-  _globals['_SHAREENTITYWITHGROUPSREQUEST']._serialized_end=8340
-  _globals['_REVOKEENTITYSHARINGFROMGROUPSREQUEST']._serialized_start=8342
-  _globals['_REVOKEENTITYSHARINGFROMGROUPSREQUEST']._serialized_end=8466
-  _globals['_SHARINGSERVICE']._serialized_start=8469
-  _globals['_SHARINGSERVICE']._serialized_end=20821
+  _globals['_SHARERESOURCEWITHUSERSREQUEST']._serialized_start=180
+  _globals['_SHARERESOURCEWITHUSERSREQUEST']._serialized_end=403
+  
_globals['_SHARERESOURCEWITHUSERSREQUEST_USERPERMISSIONSENTRY']._serialized_start=349
+  
_globals['_SHARERESOURCEWITHUSERSREQUEST_USERPERMISSIONSENTRY']._serialized_end=403
+  _globals['_SHARERESOURCEWITHGROUPSREQUEST']._serialized_start=406
+  _globals['_SHARERESOURCEWITHGROUPSREQUEST']._serialized_end=634
+  
_globals['_SHARERESOURCEWITHGROUPSREQUEST_GROUPPERMISSIONSENTRY']._serialized_start=579
+  
_globals['_SHARERESOURCEWITHGROUPSREQUEST_GROUPPERMISSIONSENTRY']._serialized_end=634
+  _globals['_REVOKEFROMUSERSREQUEST']._serialized_start=637
+  _globals['_REVOKEFROMUSERSREQUEST']._serialized_end=846
+  
_globals['_REVOKEFROMUSERSREQUEST_USERPERMISSIONSENTRY']._serialized_start=349
+  _globals['_REVOKEFROMUSERSREQUEST_USERPERMISSIONSENTRY']._serialized_end=403
+  _globals['_REVOKEFROMGROUPSREQUEST']._serialized_start=849
+  _globals['_REVOKEFROMGROUPSREQUEST']._serialized_end=1063
+  
_globals['_REVOKEFROMGROUPSREQUEST_GROUPPERMISSIONSENTRY']._serialized_start=579
+  
_globals['_REVOKEFROMGROUPSREQUEST_GROUPPERMISSIONSENTRY']._serialized_end=634
+  _globals['_GETALLACCESSIBLEUSERSREQUEST']._serialized_start=1065
+  _globals['_GETALLACCESSIBLEUSERSREQUEST']._serialized_end=1141
+  _globals['_GETALLACCESSIBLEUSERSRESPONSE']._serialized_start=1143
+  _globals['_GETALLACCESSIBLEUSERSRESPONSE']._serialized_end=1192
+  _globals['_GETALLDIRECTLYACCESSIBLEUSERSREQUEST']._serialized_start=1194
+  _globals['_GETALLDIRECTLYACCESSIBLEUSERSREQUEST']._serialized_end=1278
+  _globals['_GETALLDIRECTLYACCESSIBLEUSERSRESPONSE']._serialized_start=1280
+  _globals['_GETALLDIRECTLYACCESSIBLEUSERSRESPONSE']._serialized_end=1337
+  _globals['_GETALLACCESSIBLEGROUPSREQUEST']._serialized_start=1339
+  _globals['_GETALLACCESSIBLEGROUPSREQUEST']._serialized_end=1416
+  _globals['_GETALLACCESSIBLEGROUPSRESPONSE']._serialized_start=1418
+  _globals['_GETALLACCESSIBLEGROUPSRESPONSE']._serialized_end=1469
+  _globals['_GETALLDIRECTLYACCESSIBLEGROUPSREQUEST']._serialized_start=1471
+  _globals['_GETALLDIRECTLYACCESSIBLEGROUPSREQUEST']._serialized_end=1556
+  _globals['_GETALLDIRECTLYACCESSIBLEGROUPSRESPONSE']._serialized_start=1558
+  _globals['_GETALLDIRECTLYACCESSIBLEGROUPSRESPONSE']._serialized_end=1617
+  _globals['_USERHASACCESSREQUEST']._serialized_start=1619
+  _globals['_USERHASACCESSREQUEST']._serialized_end=1704
+  _globals['_USERHASACCESSRESPONSE']._serialized_start=1706
+  _globals['_USERHASACCESSRESPONSE']._serialized_end=1749
+  _globals['_CREATEDOMAINREQUEST']._serialized_start=1751
+  _globals['_CREATEDOMAINREQUEST']._serialized_end=1841
+  _globals['_CREATEDOMAINRESPONSE']._serialized_start=1843
+  _globals['_CREATEDOMAINRESPONSE']._serialized_end=1884
+  _globals['_UPDATEDOMAINREQUEST']._serialized_start=1886
+  _globals['_UPDATEDOMAINREQUEST']._serialized_end=1976
+  _globals['_ISDOMAINEXISTSREQUEST']._serialized_start=1978
+  _globals['_ISDOMAINEXISTSREQUEST']._serialized_end=2020
+  _globals['_ISDOMAINEXISTSRESPONSE']._serialized_start=2022
+  _globals['_ISDOMAINEXISTSRESPONSE']._serialized_end=2062
+  _globals['_DELETEDOMAINREQUEST']._serialized_start=2064
+  _globals['_DELETEDOMAINREQUEST']._serialized_end=2104
+  _globals['_GETDOMAINREQUEST']._serialized_start=2106
+  _globals['_GETDOMAINREQUEST']._serialized_end=2143
+  _globals['_GETDOMAINSREQUEST']._serialized_start=2145
+  _globals['_GETDOMAINSREQUEST']._serialized_end=2195
+  _globals['_GETDOMAINSRESPONSE']._serialized_start=2197
+  _globals['_GETDOMAINSRESPONSE']._serialized_end=2287
+  _globals['_CREATEUSERREQUEST']._serialized_start=2289
+  _globals['_CREATEUSERREQUEST']._serialized_end=2373
+  _globals['_CREATEUSERRESPONSE']._serialized_start=2375
+  _globals['_CREATEUSERRESPONSE']._serialized_end=2412
+  _globals['_UPDATEUSERREQUEST']._serialized_start=2414
+  _globals['_UPDATEUSERREQUEST']._serialized_end=2498
+  _globals['_ISUSEREXISTSREQUEST']._serialized_start=2500
+  _globals['_ISUSEREXISTSREQUEST']._serialized_end=2557
+  _globals['_ISUSEREXISTSRESPONSE']._serialized_start=2559
+  _globals['_ISUSEREXISTSRESPONSE']._serialized_end=2597
+  _globals['_DELETEUSERREQUEST']._serialized_start=2599
+  _globals['_DELETEUSERREQUEST']._serialized_end=2654
+  _globals['_GETUSERREQUEST']._serialized_start=2656
+  _globals['_GETUSERREQUEST']._serialized_end=2708
+  _globals['_GETUSERSREQUEST']._serialized_start=2710
+  _globals['_GETUSERSREQUEST']._serialized_end=2777
+  _globals['_GETUSERSRESPONSE']._serialized_start=2779
+  _globals['_GETUSERSRESPONSE']._serialized_end=2863
+  _globals['_CREATEGROUPREQUEST']._serialized_start=2865
+  _globals['_CREATEGROUPREQUEST']._serialized_end=2956
+  _globals['_CREATEGROUPRESPONSE']._serialized_start=2958
+  _globals['_CREATEGROUPRESPONSE']._serialized_end=2997
+  _globals['_UPDATEGROUPREQUEST']._serialized_start=2999
+  _globals['_UPDATEGROUPREQUEST']._serialized_end=3090
+  _globals['_ISGROUPEXISTSREQUEST']._serialized_start=3092
+  _globals['_ISGROUPEXISTSREQUEST']._serialized_end=3151
+  _globals['_ISGROUPEXISTSRESPONSE']._serialized_start=3153
+  _globals['_ISGROUPEXISTSRESPONSE']._serialized_end=3192
+  _globals['_DELETEGROUPREQUEST']._serialized_start=3194
+  _globals['_DELETEGROUPREQUEST']._serialized_end=3251
+  _globals['_GETGROUPREQUEST']._serialized_start=3253
+  _globals['_GETGROUPREQUEST']._serialized_end=3307
+  _globals['_GETGROUPSREQUEST']._serialized_start=3309
+  _globals['_GETGROUPSREQUEST']._serialized_end=3377
+  _globals['_GETGROUPSRESPONSE']._serialized_start=3379
+  _globals['_GETGROUPSRESPONSE']._serialized_end=3470
+  _globals['_ADDUSERSTOGROUPREQUEST']._serialized_start=3472
+  _globals['_ADDUSERSTOGROUPREQUEST']._serialized_end=3551
+  _globals['_REMOVEUSERSFROMGROUPREQUEST']._serialized_start=3553
+  _globals['_REMOVEUSERSFROMGROUPREQUEST']._serialized_end=3637
+  _globals['_TRANSFERGROUPOWNERSHIPREQUEST']._serialized_start=3639
+  _globals['_TRANSFERGROUPOWNERSHIPREQUEST']._serialized_end=3729
+  _globals['_ADDGROUPADMINSREQUEST']._serialized_start=3731
+  _globals['_ADDGROUPADMINSREQUEST']._serialized_end=3810
+  _globals['_REMOVEGROUPADMINSREQUEST']._serialized_start=3812
+  _globals['_REMOVEGROUPADMINSREQUEST']._serialized_end=3894
+  _globals['_HASADMINACCESSREQUEST']._serialized_start=3896
+  _globals['_HASADMINACCESSREQUEST']._serialized_end=3974
+  _globals['_HASADMINACCESSRESPONSE']._serialized_start=3976
+  _globals['_HASADMINACCESSRESPONSE']._serialized_end=4020
+  _globals['_HASOWNERACCESSREQUEST']._serialized_start=4022
+  _globals['_HASOWNERACCESSREQUEST']._serialized_end=4100
+  _globals['_HASOWNERACCESSRESPONSE']._serialized_start=4102
+  _globals['_HASOWNERACCESSRESPONSE']._serialized_end=4146
+  _globals['_GETGROUPMEMBERSOFTYPEUSERREQUEST']._serialized_start=4148
+  _globals['_GETGROUPMEMBERSOFTYPEUSERREQUEST']._serialized_end=4250
+  _globals['_GETGROUPMEMBERSOFTYPEUSERRESPONSE']._serialized_start=4252
+  _globals['_GETGROUPMEMBERSOFTYPEUSERRESPONSE']._serialized_end=4353
+  _globals['_GETGROUPMEMBERSOFTYPEGROUPREQUEST']._serialized_start=4355
+  _globals['_GETGROUPMEMBERSOFTYPEGROUPREQUEST']._serialized_end=4458
+  _globals['_GETGROUPMEMBERSOFTYPEGROUPRESPONSE']._serialized_start=4460
+  _globals['_GETGROUPMEMBERSOFTYPEGROUPRESPONSE']._serialized_end=4568
+  _globals['_ADDCHILDGROUPSTOPARENTGROUPREQUEST']._serialized_start=4570
+  _globals['_ADDCHILDGROUPSTOPARENTGROUPREQUEST']._serialized_end=4662
+  _globals['_REMOVECHILDGROUPFROMPARENTGROUPREQUEST']._serialized_start=4664
+  _globals['_REMOVECHILDGROUPFROMPARENTGROUPREQUEST']._serialized_end=4759
+  _globals['_GETALLMEMBERGROUPSFORUSERREQUEST']._serialized_start=4761
+  _globals['_GETALLMEMBERGROUPSFORUSERREQUEST']._serialized_end=4831
+  _globals['_GETALLMEMBERGROUPSFORUSERRESPONSE']._serialized_start=4833
+  _globals['_GETALLMEMBERGROUPSFORUSERRESPONSE']._serialized_end=4940
+  _globals['_CREATEENTITYTYPEREQUEST']._serialized_start=4942
+  _globals['_CREATEENTITYTYPEREQUEST']._serialized_end=5045
+  _globals['_CREATEENTITYTYPERESPONSE']._serialized_start=5047
+  _globals['_CREATEENTITYTYPERESPONSE']._serialized_end=5097
+  _globals['_UPDATEENTITYTYPEREQUEST']._serialized_start=5099
+  _globals['_UPDATEENTITYTYPEREQUEST']._serialized_end=5202
+  _globals['_ISENTITYTYPEEXISTSREQUEST']._serialized_start=5204
+  _globals['_ISENTITYTYPEEXISTSREQUEST']._serialized_end=5274
+  _globals['_ISENTITYTYPEEXISTSRESPONSE']._serialized_start=5276
+  _globals['_ISENTITYTYPEEXISTSRESPONSE']._serialized_end=5320
+  _globals['_DELETEENTITYTYPEREQUEST']._serialized_start=5322
+  _globals['_DELETEENTITYTYPEREQUEST']._serialized_end=5390
+  _globals['_GETENTITYTYPEREQUEST']._serialized_start=5392
+  _globals['_GETENTITYTYPEREQUEST']._serialized_end=5457
+  _globals['_GETENTITYTYPESREQUEST']._serialized_start=5459
+  _globals['_GETENTITYTYPESREQUEST']._serialized_end=5532
+  _globals['_GETENTITYTYPESRESPONSE']._serialized_start=5534
+  _globals['_GETENTITYTYPESRESPONSE']._serialized_end=5637
+  _globals['_CREATEENTITYREQUEST']._serialized_start=5639
+  _globals['_CREATEENTITYREQUEST']._serialized_end=5729
+  _globals['_CREATEENTITYRESPONSE']._serialized_start=5731
+  _globals['_CREATEENTITYRESPONSE']._serialized_end=5772
+  _globals['_UPDATEENTITYREQUEST']._serialized_start=5774
+  _globals['_UPDATEENTITYREQUEST']._serialized_end=5864
+  _globals['_ISENTITYEXISTSREQUEST']._serialized_start=5866
+  _globals['_ISENTITYEXISTSREQUEST']._serialized_end=5927
+  _globals['_ISENTITYEXISTSRESPONSE']._serialized_start=5929
+  _globals['_ISENTITYEXISTSRESPONSE']._serialized_end=5969
+  _globals['_DELETEENTITYREQUEST']._serialized_start=5971
+  _globals['_DELETEENTITYREQUEST']._serialized_end=6030
+  _globals['_GETENTITYREQUEST']._serialized_start=6032
+  _globals['_GETENTITYREQUEST']._serialized_end=6088
+  _globals['_SEARCHENTITIESREQUEST']._serialized_start=6091
+  _globals['_SEARCHENTITIESREQUEST']._serialized_end=6259
+  _globals['_SEARCHENTITIESRESPONSE']._serialized_start=6261
+  _globals['_SEARCHENTITIESRESPONSE']._serialized_end=6356
+  _globals['_GETLISTOFSHAREDUSERSREQUEST']._serialized_start=6358
+  _globals['_GETLISTOFSHAREDUSERSREQUEST']._serialized_end=6453
+  _globals['_GETLISTOFSHAREDUSERSRESPONSE']._serialized_start=6455
+  _globals['_GETLISTOFSHAREDUSERSRESPONSE']._serialized_end=6551
+  _globals['_GETLISTOFDIRECTLYSHAREDUSERSREQUEST']._serialized_start=6553
+  _globals['_GETLISTOFDIRECTLYSHAREDUSERSREQUEST']._serialized_end=6656
+  _globals['_GETLISTOFDIRECTLYSHAREDUSERSRESPONSE']._serialized_start=6658
+  _globals['_GETLISTOFDIRECTLYSHAREDUSERSRESPONSE']._serialized_end=6762
+  _globals['_GETLISTOFSHAREDGROUPSREQUEST']._serialized_start=6764
+  _globals['_GETLISTOFSHAREDGROUPSREQUEST']._serialized_end=6860
+  _globals['_GETLISTOFSHAREDGROUPSRESPONSE']._serialized_start=6862
+  _globals['_GETLISTOFSHAREDGROUPSRESPONSE']._serialized_end=6965
+  _globals['_GETLISTOFDIRECTLYSHAREDGROUPSREQUEST']._serialized_start=6967
+  _globals['_GETLISTOFDIRECTLYSHAREDGROUPSREQUEST']._serialized_end=7071
+  _globals['_GETLISTOFDIRECTLYSHAREDGROUPSRESPONSE']._serialized_start=7073
+  _globals['_GETLISTOFDIRECTLYSHAREDGROUPSRESPONSE']._serialized_end=7184
+  _globals['_CREATEPERMISSIONTYPEREQUEST']._serialized_start=7186
+  _globals['_CREATEPERMISSIONTYPEREQUEST']._serialized_end=7301
+  _globals['_CREATEPERMISSIONTYPERESPONSE']._serialized_start=7303
+  _globals['_CREATEPERMISSIONTYPERESPONSE']._serialized_end=7361
+  _globals['_UPDATEPERMISSIONTYPEREQUEST']._serialized_start=7363
+  _globals['_UPDATEPERMISSIONTYPEREQUEST']._serialized_end=7478
+  _globals['_ISPERMISSIONEXISTSREQUEST']._serialized_start=7480
+  _globals['_ISPERMISSIONEXISTSREQUEST']._serialized_end=7549
+  _globals['_ISPERMISSIONEXISTSRESPONSE']._serialized_start=7551
+  _globals['_ISPERMISSIONEXISTSRESPONSE']._serialized_end=7595
+  _globals['_DELETEPERMISSIONTYPEREQUEST']._serialized_start=7597
+  _globals['_DELETEPERMISSIONTYPEREQUEST']._serialized_end=7673
+  _globals['_GETPERMISSIONTYPEREQUEST']._serialized_start=7675
+  _globals['_GETPERMISSIONTYPEREQUEST']._serialized_end=7748
+  _globals['_GETPERMISSIONTYPESREQUEST']._serialized_start=7750
+  _globals['_GETPERMISSIONTYPESREQUEST']._serialized_end=7827
+  _globals['_GETPERMISSIONTYPESRESPONSE']._serialized_start=7829
+  _globals['_GETPERMISSIONTYPESRESPONSE']._serialized_end=7944
+  _globals['_SHAREENTITYWITHUSERSREQUEST']._serialized_start=7947
+  _globals['_SHAREENTITYWITHUSERSREQUEST']._serialized_end=8089
+  _globals['_REVOKEENTITYSHARINGFROMUSERSREQUEST']._serialized_start=8091
+  _globals['_REVOKEENTITYSHARINGFROMUSERSREQUEST']._serialized_end=8213
+  _globals['_SHAREENTITYWITHGROUPSREQUEST']._serialized_start=8216
+  _globals['_SHAREENTITYWITHGROUPSREQUEST']._serialized_end=8360
+  _globals['_REVOKEENTITYSHARINGFROMGROUPSREQUEST']._serialized_start=8362
+  _globals['_REVOKEENTITYSHARINGFROMGROUPSREQUEST']._serialized_end=8486
+  _globals['_SHARINGSERVICE']._serialized_start=8489
+  _globals['_SHARINGSERVICE']._serialized_end=21229
 # @@protoc_insertion_point(module_scope)
diff --git 
a/airavata-python-sdk/airavata_sdk/generated/services/sharing_service_pb2_grpc.py
 
b/airavata-python-sdk/airavata_sdk/generated/services/sharing_service_pb2_grpc.py
index 79d398cc92..3043f9190d 100644
--- 
a/airavata-python-sdk/airavata_sdk/generated/services/sharing_service_pb2_grpc.py
+++ 
b/airavata-python-sdk/airavata_sdk/generated/services/sharing_service_pb2_grpc.py
@@ -39,327 +39,327 @@ class SharingServiceStub(object):
             channel: A grpc.Channel.
         """
         self.ShareResourceWithUsers = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/ShareResourceWithUsers',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/ShareResourceWithUsers',
                 
request_serializer=services_dot_sharing__service__pb2.ShareResourceWithUsersRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.ShareResourceWithGroups = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/ShareResourceWithGroups',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/ShareResourceWithGroups',
                 
request_serializer=services_dot_sharing__service__pb2.ShareResourceWithGroupsRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.RevokeFromUsers = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/RevokeFromUsers',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/RevokeFromUsers',
                 
request_serializer=services_dot_sharing__service__pb2.RevokeFromUsersRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.RevokeFromGroups = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/RevokeFromGroups',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/RevokeFromGroups',
                 
request_serializer=services_dot_sharing__service__pb2.RevokeFromGroupsRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetAllAccessibleUsers = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetAllAccessibleUsers',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetAllAccessibleUsers',
                 
request_serializer=services_dot_sharing__service__pb2.GetAllAccessibleUsersRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetAllAccessibleUsersResponse.FromString,
                 _registered_method=True)
         self.GetAllDirectlyAccessibleUsers = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetAllDirectlyAccessibleUsers',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetAllDirectlyAccessibleUsers',
                 
request_serializer=services_dot_sharing__service__pb2.GetAllDirectlyAccessibleUsersRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetAllDirectlyAccessibleUsersResponse.FromString,
                 _registered_method=True)
         self.GetAllAccessibleGroups = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetAllAccessibleGroups',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetAllAccessibleGroups',
                 
request_serializer=services_dot_sharing__service__pb2.GetAllAccessibleGroupsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetAllAccessibleGroupsResponse.FromString,
                 _registered_method=True)
         self.GetAllDirectlyAccessibleGroups = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetAllDirectlyAccessibleGroups',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetAllDirectlyAccessibleGroups',
                 
request_serializer=services_dot_sharing__service__pb2.GetAllDirectlyAccessibleGroupsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetAllDirectlyAccessibleGroupsResponse.FromString,
                 _registered_method=True)
         self.UserHasAccess = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/UserHasAccess',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/UserHasAccess',
                 
request_serializer=services_dot_sharing__service__pb2.UserHasAccessRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.UserHasAccessResponse.FromString,
                 _registered_method=True)
         self.CreateDomain = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/CreateDomain',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/CreateDomain',
                 
request_serializer=services_dot_sharing__service__pb2.CreateDomainRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.CreateDomainResponse.FromString,
                 _registered_method=True)
         self.UpdateDomain = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/UpdateDomain',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/UpdateDomain',
                 
request_serializer=services_dot_sharing__service__pb2.UpdateDomainRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.IsDomainExists = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/IsDomainExists',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/IsDomainExists',
                 
request_serializer=services_dot_sharing__service__pb2.IsDomainExistsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.IsDomainExistsResponse.FromString,
                 _registered_method=True)
         self.DeleteDomain = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/DeleteDomain',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/DeleteDomain',
                 
request_serializer=services_dot_sharing__service__pb2.DeleteDomainRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetDomain = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/GetDomain',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetDomain',
                 
request_serializer=services_dot_sharing__service__pb2.GetDomainRequest.SerializeToString,
                 
response_deserializer=org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.Domain.FromString,
                 _registered_method=True)
         self.GetDomains = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/GetDomains',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetDomains',
                 
request_serializer=services_dot_sharing__service__pb2.GetDomainsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetDomainsResponse.FromString,
                 _registered_method=True)
         self.CreateUser = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/CreateUser',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/CreateUser',
                 
request_serializer=services_dot_sharing__service__pb2.CreateUserRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.CreateUserResponse.FromString,
                 _registered_method=True)
         self.UpdateUser = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/UpdateUser',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/UpdateUser',
                 
request_serializer=services_dot_sharing__service__pb2.UpdateUserRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.IsUserExists = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/IsUserExists',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/IsUserExists',
                 
request_serializer=services_dot_sharing__service__pb2.IsUserExistsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.IsUserExistsResponse.FromString,
                 _registered_method=True)
         self.DeleteUser = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/DeleteUser',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/DeleteUser',
                 
request_serializer=services_dot_sharing__service__pb2.DeleteUserRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetUser = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/GetUser',
+                '/org.apache.airavata.api.iam.sharing.SharingService/GetUser',
                 
request_serializer=services_dot_sharing__service__pb2.GetUserRequest.SerializeToString,
                 
response_deserializer=org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.User.FromString,
                 _registered_method=True)
         self.GetUsers = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/GetUsers',
+                '/org.apache.airavata.api.iam.sharing.SharingService/GetUsers',
                 
request_serializer=services_dot_sharing__service__pb2.GetUsersRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetUsersResponse.FromString,
                 _registered_method=True)
         self.CreateGroup = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/CreateGroup',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/CreateGroup',
                 
request_serializer=services_dot_sharing__service__pb2.CreateGroupRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.CreateGroupResponse.FromString,
                 _registered_method=True)
         self.UpdateGroup = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/UpdateGroup',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/UpdateGroup',
                 
request_serializer=services_dot_sharing__service__pb2.UpdateGroupRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.IsGroupExists = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/IsGroupExists',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/IsGroupExists',
                 
request_serializer=services_dot_sharing__service__pb2.IsGroupExistsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.IsGroupExistsResponse.FromString,
                 _registered_method=True)
         self.DeleteGroup = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/DeleteGroup',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/DeleteGroup',
                 
request_serializer=services_dot_sharing__service__pb2.DeleteGroupRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetGroup = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/GetGroup',
+                '/org.apache.airavata.api.iam.sharing.SharingService/GetGroup',
                 
request_serializer=services_dot_sharing__service__pb2.GetGroupRequest.SerializeToString,
                 
response_deserializer=org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.UserGroup.FromString,
                 _registered_method=True)
         self.GetGroups = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/GetGroups',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetGroups',
                 
request_serializer=services_dot_sharing__service__pb2.GetGroupsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetGroupsResponse.FromString,
                 _registered_method=True)
         self.AddUsersToGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/AddUsersToGroup',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/AddUsersToGroup',
                 
request_serializer=services_dot_sharing__service__pb2.AddUsersToGroupRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.RemoveUsersFromGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/RemoveUsersFromGroup',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/RemoveUsersFromGroup',
                 
request_serializer=services_dot_sharing__service__pb2.RemoveUsersFromGroupRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.TransferGroupOwnership = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/TransferGroupOwnership',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/TransferGroupOwnership',
                 
request_serializer=services_dot_sharing__service__pb2.TransferGroupOwnershipRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.AddGroupAdmins = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/AddGroupAdmins',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/AddGroupAdmins',
                 
request_serializer=services_dot_sharing__service__pb2.AddGroupAdminsRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.RemoveGroupAdmins = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/RemoveGroupAdmins',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/RemoveGroupAdmins',
                 
request_serializer=services_dot_sharing__service__pb2.RemoveGroupAdminsRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.HasAdminAccess = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/HasAdminAccess',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/HasAdminAccess',
                 
request_serializer=services_dot_sharing__service__pb2.HasAdminAccessRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.HasAdminAccessResponse.FromString,
                 _registered_method=True)
         self.HasOwnerAccess = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/HasOwnerAccess',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/HasOwnerAccess',
                 
request_serializer=services_dot_sharing__service__pb2.HasOwnerAccessRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.HasOwnerAccessResponse.FromString,
                 _registered_method=True)
         self.GetGroupMembersOfTypeUser = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetGroupMembersOfTypeUser',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetGroupMembersOfTypeUser',
                 
request_serializer=services_dot_sharing__service__pb2.GetGroupMembersOfTypeUserRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetGroupMembersOfTypeUserResponse.FromString,
                 _registered_method=True)
         self.GetGroupMembersOfTypeGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetGroupMembersOfTypeGroup',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetGroupMembersOfTypeGroup',
                 
request_serializer=services_dot_sharing__service__pb2.GetGroupMembersOfTypeGroupRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetGroupMembersOfTypeGroupResponse.FromString,
                 _registered_method=True)
         self.AddChildGroupsToParentGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/AddChildGroupsToParentGroup',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/AddChildGroupsToParentGroup',
                 
request_serializer=services_dot_sharing__service__pb2.AddChildGroupsToParentGroupRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.RemoveChildGroupFromParentGroup = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/RemoveChildGroupFromParentGroup',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/RemoveChildGroupFromParentGroup',
                 
request_serializer=services_dot_sharing__service__pb2.RemoveChildGroupFromParentGroupRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetAllMemberGroupsForUser = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetAllMemberGroupsForUser',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetAllMemberGroupsForUser',
                 
request_serializer=services_dot_sharing__service__pb2.GetAllMemberGroupsForUserRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetAllMemberGroupsForUserResponse.FromString,
                 _registered_method=True)
         self.CreateEntityType = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/CreateEntityType',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/CreateEntityType',
                 
request_serializer=services_dot_sharing__service__pb2.CreateEntityTypeRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.CreateEntityTypeResponse.FromString,
                 _registered_method=True)
         self.UpdateEntityType = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/UpdateEntityType',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/UpdateEntityType',
                 
request_serializer=services_dot_sharing__service__pb2.UpdateEntityTypeRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.IsEntityTypeExists = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/IsEntityTypeExists',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/IsEntityTypeExists',
                 
request_serializer=services_dot_sharing__service__pb2.IsEntityTypeExistsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.IsEntityTypeExistsResponse.FromString,
                 _registered_method=True)
         self.DeleteEntityType = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/DeleteEntityType',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/DeleteEntityType',
                 
request_serializer=services_dot_sharing__service__pb2.DeleteEntityTypeRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetEntityType = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetEntityType',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetEntityType',
                 
request_serializer=services_dot_sharing__service__pb2.GetEntityTypeRequest.SerializeToString,
                 
response_deserializer=org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.EntityType.FromString,
                 _registered_method=True)
         self.GetEntityTypes = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetEntityTypes',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetEntityTypes',
                 
request_serializer=services_dot_sharing__service__pb2.GetEntityTypesRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetEntityTypesResponse.FromString,
                 _registered_method=True)
         self.CreateEntity = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/CreateEntity',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/CreateEntity',
                 
request_serializer=services_dot_sharing__service__pb2.CreateEntityRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.CreateEntityResponse.FromString,
                 _registered_method=True)
         self.UpdateEntity = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/UpdateEntity',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/UpdateEntity',
                 
request_serializer=services_dot_sharing__service__pb2.UpdateEntityRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.IsEntityExists = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/IsEntityExists',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/IsEntityExists',
                 
request_serializer=services_dot_sharing__service__pb2.IsEntityExistsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.IsEntityExistsResponse.FromString,
                 _registered_method=True)
         self.DeleteEntity = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/DeleteEntity',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/DeleteEntity',
                 
request_serializer=services_dot_sharing__service__pb2.DeleteEntityRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetEntity = channel.unary_unary(
-                '/org.apache.airavata.api.sharing.SharingService/GetEntity',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetEntity',
                 
request_serializer=services_dot_sharing__service__pb2.GetEntityRequest.SerializeToString,
                 
response_deserializer=org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.Entity.FromString,
                 _registered_method=True)
         self.SearchEntities = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/SearchEntities',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/SearchEntities',
                 
request_serializer=services_dot_sharing__service__pb2.SearchEntitiesRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.SearchEntitiesResponse.FromString,
                 _registered_method=True)
         self.GetListOfSharedUsers = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetListOfSharedUsers',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetListOfSharedUsers',
                 
request_serializer=services_dot_sharing__service__pb2.GetListOfSharedUsersRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetListOfSharedUsersResponse.FromString,
                 _registered_method=True)
         self.GetListOfDirectlySharedUsers = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetListOfDirectlySharedUsers',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetListOfDirectlySharedUsers',
                 
request_serializer=services_dot_sharing__service__pb2.GetListOfDirectlySharedUsersRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetListOfDirectlySharedUsersResponse.FromString,
                 _registered_method=True)
         self.GetListOfSharedGroups = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetListOfSharedGroups',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetListOfSharedGroups',
                 
request_serializer=services_dot_sharing__service__pb2.GetListOfSharedGroupsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetListOfSharedGroupsResponse.FromString,
                 _registered_method=True)
         self.GetListOfDirectlySharedGroups = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetListOfDirectlySharedGroups',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetListOfDirectlySharedGroups',
                 
request_serializer=services_dot_sharing__service__pb2.GetListOfDirectlySharedGroupsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetListOfDirectlySharedGroupsResponse.FromString,
                 _registered_method=True)
         self.CreatePermissionType = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/CreatePermissionType',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/CreatePermissionType',
                 
request_serializer=services_dot_sharing__service__pb2.CreatePermissionTypeRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.CreatePermissionTypeResponse.FromString,
                 _registered_method=True)
         self.UpdatePermissionType = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/UpdatePermissionType',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/UpdatePermissionType',
                 
request_serializer=services_dot_sharing__service__pb2.UpdatePermissionTypeRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.IsPermissionExists = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/IsPermissionExists',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/IsPermissionExists',
                 
request_serializer=services_dot_sharing__service__pb2.IsPermissionExistsRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.IsPermissionExistsResponse.FromString,
                 _registered_method=True)
         self.DeletePermissionType = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/DeletePermissionType',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/DeletePermissionType',
                 
request_serializer=services_dot_sharing__service__pb2.DeletePermissionTypeRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetPermissionType = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetPermissionType',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetPermissionType',
                 
request_serializer=services_dot_sharing__service__pb2.GetPermissionTypeRequest.SerializeToString,
                 
response_deserializer=org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.PermissionType.FromString,
                 _registered_method=True)
         self.GetPermissionTypes = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/GetPermissionTypes',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/GetPermissionTypes',
                 
request_serializer=services_dot_sharing__service__pb2.GetPermissionTypesRequest.SerializeToString,
                 
response_deserializer=services_dot_sharing__service__pb2.GetPermissionTypesResponse.FromString,
                 _registered_method=True)
         self.ShareEntityWithUsers = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/ShareEntityWithUsers',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/ShareEntityWithUsers',
                 
request_serializer=services_dot_sharing__service__pb2.ShareEntityWithUsersRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.RevokeEntitySharingFromUsers = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/RevokeEntitySharingFromUsers',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/RevokeEntitySharingFromUsers',
                 
request_serializer=services_dot_sharing__service__pb2.RevokeEntitySharingFromUsersRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.ShareEntityWithGroups = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/ShareEntityWithGroups',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/ShareEntityWithGroups',
                 
request_serializer=services_dot_sharing__service__pb2.ShareEntityWithGroupsRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.RevokeEntitySharingFromGroups = channel.unary_unary(
-                
'/org.apache.airavata.api.sharing.SharingService/RevokeEntitySharingFromGroups',
+                
'/org.apache.airavata.api.iam.sharing.SharingService/RevokeEntitySharingFromGroups',
                 
request_serializer=services_dot_sharing__service__pb2.RevokeEntitySharingFromGroupsRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
@@ -753,7 +753,7 @@ class SharingServiceServicer(object):
         raise NotImplementedError('Method not implemented!')
 
     def ShareEntityWithUsers(self, request, context):
-        """--- Entity sharing (Thrift-compatible aliases using domain_id) ---
+        """--- Entity sharing (aliases using domain_id) ---
 
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -1108,9 +1108,9 @@ def add_SharingServiceServicer_to_server(servicer, 
server):
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
-            'org.apache.airavata.api.sharing.SharingService', 
rpc_method_handlers)
+            'org.apache.airavata.api.iam.sharing.SharingService', 
rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
-    
server.add_registered_method_handlers('org.apache.airavata.api.sharing.SharingService',
 rpc_method_handlers)
+    
server.add_registered_method_handlers('org.apache.airavata.api.iam.sharing.SharingService',
 rpc_method_handlers)
 
 
  # This class is part of an EXPERIMENTAL API.
@@ -1133,7 +1133,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/ShareResourceWithUsers',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/ShareResourceWithUsers',
             
services_dot_sharing__service__pb2.ShareResourceWithUsersRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1160,7 +1160,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/ShareResourceWithGroups',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/ShareResourceWithGroups',
             
services_dot_sharing__service__pb2.ShareResourceWithGroupsRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1187,7 +1187,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/RevokeFromUsers',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/RevokeFromUsers',
             
services_dot_sharing__service__pb2.RevokeFromUsersRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1214,7 +1214,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/RevokeFromGroups',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/RevokeFromGroups',
             
services_dot_sharing__service__pb2.RevokeFromGroupsRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1241,7 +1241,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetAllAccessibleUsers',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetAllAccessibleUsers',
             
services_dot_sharing__service__pb2.GetAllAccessibleUsersRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetAllAccessibleUsersResponse.FromString,
             options,
@@ -1268,7 +1268,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetAllDirectlyAccessibleUsers',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetAllDirectlyAccessibleUsers',
             
services_dot_sharing__service__pb2.GetAllDirectlyAccessibleUsersRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetAllDirectlyAccessibleUsersResponse.FromString,
             options,
@@ -1295,7 +1295,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetAllAccessibleGroups',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetAllAccessibleGroups',
             
services_dot_sharing__service__pb2.GetAllAccessibleGroupsRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetAllAccessibleGroupsResponse.FromString,
             options,
@@ -1322,7 +1322,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetAllDirectlyAccessibleGroups',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetAllDirectlyAccessibleGroups',
             
services_dot_sharing__service__pb2.GetAllDirectlyAccessibleGroupsRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetAllDirectlyAccessibleGroupsResponse.FromString,
             options,
@@ -1349,7 +1349,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/UserHasAccess',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/UserHasAccess',
             
services_dot_sharing__service__pb2.UserHasAccessRequest.SerializeToString,
             
services_dot_sharing__service__pb2.UserHasAccessResponse.FromString,
             options,
@@ -1376,7 +1376,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/CreateDomain',
+            '/org.apache.airavata.api.iam.sharing.SharingService/CreateDomain',
             
services_dot_sharing__service__pb2.CreateDomainRequest.SerializeToString,
             services_dot_sharing__service__pb2.CreateDomainResponse.FromString,
             options,
@@ -1403,7 +1403,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/UpdateDomain',
+            '/org.apache.airavata.api.iam.sharing.SharingService/UpdateDomain',
             
services_dot_sharing__service__pb2.UpdateDomainRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1430,7 +1430,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/IsDomainExists',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/IsDomainExists',
             
services_dot_sharing__service__pb2.IsDomainExistsRequest.SerializeToString,
             
services_dot_sharing__service__pb2.IsDomainExistsResponse.FromString,
             options,
@@ -1457,7 +1457,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/DeleteDomain',
+            '/org.apache.airavata.api.iam.sharing.SharingService/DeleteDomain',
             
services_dot_sharing__service__pb2.DeleteDomainRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1484,7 +1484,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/GetDomain',
+            '/org.apache.airavata.api.iam.sharing.SharingService/GetDomain',
             
services_dot_sharing__service__pb2.GetDomainRequest.SerializeToString,
             
org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.Domain.FromString,
             options,
@@ -1511,7 +1511,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/GetDomains',
+            '/org.apache.airavata.api.iam.sharing.SharingService/GetDomains',
             
services_dot_sharing__service__pb2.GetDomainsRequest.SerializeToString,
             services_dot_sharing__service__pb2.GetDomainsResponse.FromString,
             options,
@@ -1538,7 +1538,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/CreateUser',
+            '/org.apache.airavata.api.iam.sharing.SharingService/CreateUser',
             
services_dot_sharing__service__pb2.CreateUserRequest.SerializeToString,
             services_dot_sharing__service__pb2.CreateUserResponse.FromString,
             options,
@@ -1565,7 +1565,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/UpdateUser',
+            '/org.apache.airavata.api.iam.sharing.SharingService/UpdateUser',
             
services_dot_sharing__service__pb2.UpdateUserRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1592,7 +1592,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/IsUserExists',
+            '/org.apache.airavata.api.iam.sharing.SharingService/IsUserExists',
             
services_dot_sharing__service__pb2.IsUserExistsRequest.SerializeToString,
             services_dot_sharing__service__pb2.IsUserExistsResponse.FromString,
             options,
@@ -1619,7 +1619,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/DeleteUser',
+            '/org.apache.airavata.api.iam.sharing.SharingService/DeleteUser',
             
services_dot_sharing__service__pb2.DeleteUserRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1646,7 +1646,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/GetUser',
+            '/org.apache.airavata.api.iam.sharing.SharingService/GetUser',
             
services_dot_sharing__service__pb2.GetUserRequest.SerializeToString,
             
org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.User.FromString,
             options,
@@ -1673,7 +1673,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/GetUsers',
+            '/org.apache.airavata.api.iam.sharing.SharingService/GetUsers',
             
services_dot_sharing__service__pb2.GetUsersRequest.SerializeToString,
             services_dot_sharing__service__pb2.GetUsersResponse.FromString,
             options,
@@ -1700,7 +1700,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/CreateGroup',
+            '/org.apache.airavata.api.iam.sharing.SharingService/CreateGroup',
             
services_dot_sharing__service__pb2.CreateGroupRequest.SerializeToString,
             services_dot_sharing__service__pb2.CreateGroupResponse.FromString,
             options,
@@ -1727,7 +1727,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/UpdateGroup',
+            '/org.apache.airavata.api.iam.sharing.SharingService/UpdateGroup',
             
services_dot_sharing__service__pb2.UpdateGroupRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1754,7 +1754,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/IsGroupExists',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/IsGroupExists',
             
services_dot_sharing__service__pb2.IsGroupExistsRequest.SerializeToString,
             
services_dot_sharing__service__pb2.IsGroupExistsResponse.FromString,
             options,
@@ -1781,7 +1781,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/DeleteGroup',
+            '/org.apache.airavata.api.iam.sharing.SharingService/DeleteGroup',
             
services_dot_sharing__service__pb2.DeleteGroupRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1808,7 +1808,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/GetGroup',
+            '/org.apache.airavata.api.iam.sharing.SharingService/GetGroup',
             
services_dot_sharing__service__pb2.GetGroupRequest.SerializeToString,
             
org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.UserGroup.FromString,
             options,
@@ -1835,7 +1835,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/GetGroups',
+            '/org.apache.airavata.api.iam.sharing.SharingService/GetGroups',
             
services_dot_sharing__service__pb2.GetGroupsRequest.SerializeToString,
             services_dot_sharing__service__pb2.GetGroupsResponse.FromString,
             options,
@@ -1862,7 +1862,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/AddUsersToGroup',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/AddUsersToGroup',
             
services_dot_sharing__service__pb2.AddUsersToGroupRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1889,7 +1889,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/RemoveUsersFromGroup',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/RemoveUsersFromGroup',
             
services_dot_sharing__service__pb2.RemoveUsersFromGroupRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1916,7 +1916,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/TransferGroupOwnership',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/TransferGroupOwnership',
             
services_dot_sharing__service__pb2.TransferGroupOwnershipRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1943,7 +1943,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/AddGroupAdmins',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/AddGroupAdmins',
             
services_dot_sharing__service__pb2.AddGroupAdminsRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1970,7 +1970,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/RemoveGroupAdmins',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/RemoveGroupAdmins',
             
services_dot_sharing__service__pb2.RemoveGroupAdminsRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -1997,7 +1997,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/HasAdminAccess',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/HasAdminAccess',
             
services_dot_sharing__service__pb2.HasAdminAccessRequest.SerializeToString,
             
services_dot_sharing__service__pb2.HasAdminAccessResponse.FromString,
             options,
@@ -2024,7 +2024,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/HasOwnerAccess',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/HasOwnerAccess',
             
services_dot_sharing__service__pb2.HasOwnerAccessRequest.SerializeToString,
             
services_dot_sharing__service__pb2.HasOwnerAccessResponse.FromString,
             options,
@@ -2051,7 +2051,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetGroupMembersOfTypeUser',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetGroupMembersOfTypeUser',
             
services_dot_sharing__service__pb2.GetGroupMembersOfTypeUserRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetGroupMembersOfTypeUserResponse.FromString,
             options,
@@ -2078,7 +2078,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetGroupMembersOfTypeGroup',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetGroupMembersOfTypeGroup',
             
services_dot_sharing__service__pb2.GetGroupMembersOfTypeGroupRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetGroupMembersOfTypeGroupResponse.FromString,
             options,
@@ -2105,7 +2105,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/AddChildGroupsToParentGroup',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/AddChildGroupsToParentGroup',
             
services_dot_sharing__service__pb2.AddChildGroupsToParentGroupRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2132,7 +2132,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/RemoveChildGroupFromParentGroup',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/RemoveChildGroupFromParentGroup',
             
services_dot_sharing__service__pb2.RemoveChildGroupFromParentGroupRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2159,7 +2159,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetAllMemberGroupsForUser',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetAllMemberGroupsForUser',
             
services_dot_sharing__service__pb2.GetAllMemberGroupsForUserRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetAllMemberGroupsForUserResponse.FromString,
             options,
@@ -2186,7 +2186,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/CreateEntityType',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/CreateEntityType',
             
services_dot_sharing__service__pb2.CreateEntityTypeRequest.SerializeToString,
             
services_dot_sharing__service__pb2.CreateEntityTypeResponse.FromString,
             options,
@@ -2213,7 +2213,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/UpdateEntityType',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/UpdateEntityType',
             
services_dot_sharing__service__pb2.UpdateEntityTypeRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2240,7 +2240,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/IsEntityTypeExists',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/IsEntityTypeExists',
             
services_dot_sharing__service__pb2.IsEntityTypeExistsRequest.SerializeToString,
             
services_dot_sharing__service__pb2.IsEntityTypeExistsResponse.FromString,
             options,
@@ -2267,7 +2267,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/DeleteEntityType',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/DeleteEntityType',
             
services_dot_sharing__service__pb2.DeleteEntityTypeRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2294,7 +2294,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/GetEntityType',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetEntityType',
             
services_dot_sharing__service__pb2.GetEntityTypeRequest.SerializeToString,
             
org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.EntityType.FromString,
             options,
@@ -2321,7 +2321,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/GetEntityTypes',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetEntityTypes',
             
services_dot_sharing__service__pb2.GetEntityTypesRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetEntityTypesResponse.FromString,
             options,
@@ -2348,7 +2348,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/CreateEntity',
+            '/org.apache.airavata.api.iam.sharing.SharingService/CreateEntity',
             
services_dot_sharing__service__pb2.CreateEntityRequest.SerializeToString,
             services_dot_sharing__service__pb2.CreateEntityResponse.FromString,
             options,
@@ -2375,7 +2375,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/UpdateEntity',
+            '/org.apache.airavata.api.iam.sharing.SharingService/UpdateEntity',
             
services_dot_sharing__service__pb2.UpdateEntityRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2402,7 +2402,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/IsEntityExists',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/IsEntityExists',
             
services_dot_sharing__service__pb2.IsEntityExistsRequest.SerializeToString,
             
services_dot_sharing__service__pb2.IsEntityExistsResponse.FromString,
             options,
@@ -2429,7 +2429,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/DeleteEntity',
+            '/org.apache.airavata.api.iam.sharing.SharingService/DeleteEntity',
             
services_dot_sharing__service__pb2.DeleteEntityRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2456,7 +2456,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/GetEntity',
+            '/org.apache.airavata.api.iam.sharing.SharingService/GetEntity',
             
services_dot_sharing__service__pb2.GetEntityRequest.SerializeToString,
             
org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.Entity.FromString,
             options,
@@ -2483,7 +2483,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/org.apache.airavata.api.sharing.SharingService/SearchEntities',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/SearchEntities',
             
services_dot_sharing__service__pb2.SearchEntitiesRequest.SerializeToString,
             
services_dot_sharing__service__pb2.SearchEntitiesResponse.FromString,
             options,
@@ -2510,7 +2510,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetListOfSharedUsers',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetListOfSharedUsers',
             
services_dot_sharing__service__pb2.GetListOfSharedUsersRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetListOfSharedUsersResponse.FromString,
             options,
@@ -2537,7 +2537,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetListOfDirectlySharedUsers',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetListOfDirectlySharedUsers',
             
services_dot_sharing__service__pb2.GetListOfDirectlySharedUsersRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetListOfDirectlySharedUsersResponse.FromString,
             options,
@@ -2564,7 +2564,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetListOfSharedGroups',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetListOfSharedGroups',
             
services_dot_sharing__service__pb2.GetListOfSharedGroupsRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetListOfSharedGroupsResponse.FromString,
             options,
@@ -2591,7 +2591,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetListOfDirectlySharedGroups',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetListOfDirectlySharedGroups',
             
services_dot_sharing__service__pb2.GetListOfDirectlySharedGroupsRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetListOfDirectlySharedGroupsResponse.FromString,
             options,
@@ -2618,7 +2618,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/CreatePermissionType',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/CreatePermissionType',
             
services_dot_sharing__service__pb2.CreatePermissionTypeRequest.SerializeToString,
             
services_dot_sharing__service__pb2.CreatePermissionTypeResponse.FromString,
             options,
@@ -2645,7 +2645,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/UpdatePermissionType',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/UpdatePermissionType',
             
services_dot_sharing__service__pb2.UpdatePermissionTypeRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2672,7 +2672,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/IsPermissionExists',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/IsPermissionExists',
             
services_dot_sharing__service__pb2.IsPermissionExistsRequest.SerializeToString,
             
services_dot_sharing__service__pb2.IsPermissionExistsResponse.FromString,
             options,
@@ -2699,7 +2699,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/DeletePermissionType',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/DeletePermissionType',
             
services_dot_sharing__service__pb2.DeletePermissionTypeRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2726,7 +2726,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetPermissionType',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetPermissionType',
             
services_dot_sharing__service__pb2.GetPermissionTypeRequest.SerializeToString,
             
org_dot_apache_dot_airavata_dot_model_dot_sharing_dot_sharing__pb2.PermissionType.FromString,
             options,
@@ -2753,7 +2753,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/GetPermissionTypes',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/GetPermissionTypes',
             
services_dot_sharing__service__pb2.GetPermissionTypesRequest.SerializeToString,
             
services_dot_sharing__service__pb2.GetPermissionTypesResponse.FromString,
             options,
@@ -2780,7 +2780,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/ShareEntityWithUsers',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/ShareEntityWithUsers',
             
services_dot_sharing__service__pb2.ShareEntityWithUsersRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2807,7 +2807,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/RevokeEntitySharingFromUsers',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/RevokeEntitySharingFromUsers',
             
services_dot_sharing__service__pb2.RevokeEntitySharingFromUsersRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2834,7 +2834,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/ShareEntityWithGroups',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/ShareEntityWithGroups',
             
services_dot_sharing__service__pb2.ShareEntityWithGroupsRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -2861,7 +2861,7 @@ class SharingService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.sharing.SharingService/RevokeEntitySharingFromGroups',
+            
'/org.apache.airavata.api.iam.sharing.SharingService/RevokeEntitySharingFromGroups',
             
services_dot_sharing__service__pb2.RevokeEntitySharingFromGroupsRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
diff --git 
a/airavata-python-sdk/airavata_sdk/generated/services/user_profile_service_pb2.py
 
b/airavata-python-sdk/airavata_sdk/generated/services/user_profile_service_pb2.py
index e61653b9a2..24d76eec7e 100644
--- 
a/airavata-python-sdk/airavata_sdk/generated/services/user_profile_service_pb2.py
+++ 
b/airavata-python-sdk/airavata_sdk/generated/services/user_profile_service_pb2.py
@@ -27,14 +27,14 @@ from google.protobuf import empty_pb2 as 
google_dot_protobuf_dot_empty__pb2
 from org.apache.airavata.model.user import user_profile_pb2 as 
org_dot_apache_dot_airavata_dot_model_dot_user_dot_user__profile__pb2
 
 
-DESCRIPTOR = 
_descriptor_pool.Default().AddSerializedFile(b'\n#services/user_profile_service.proto\x12#org.apache.airavata.api.userprofile\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x31org/apache/airavata/model/user/user_profile.proto\"Z\n\x15\x41\x64\x64UserProfileRequest\x12\x41\n\x0cuser_profile\x18\x01
 
\x01(\x0b\x32+.org.apache.airavata.model.user.UserProfile\")\n\x16\x41\x64\x64UserProfileResponse\x12\x0f\n\x07user_id\x18\x01
 \x01(\t\"]\n\x18UpdateUse [...]
+DESCRIPTOR = 
_descriptor_pool.Default().AddSerializedFile(b'\n#services/user_profile_service.proto\x12\'org.apache.airavata.api.iam.userprofile\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x31org/apache/airavata/model/user/user_profile.proto\"Z\n\x15\x41\x64\x64UserProfileRequest\x12\x41\n\x0cuser_profile\x18\x01
 
\x01(\x0b\x32+.org.apache.airavata.model.user.UserProfile\")\n\x16\x41\x64\x64UserProfileResponse\x12\x0f\n\x07user_id\x18\x01
 \x01(\t\"]\n\x18Upda [...]
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 
'services.user_profile_service_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = 
b'\n#org.apache.airavata.api.userprofileP\001'
+  _globals['DESCRIPTOR']._serialized_options = 
b'\n\'org.apache.airavata.api.iam.userprofileP\001'
   
_globals['_USERPROFILESERVICE'].methods_by_name['AddUserProfile']._loaded_options
 = None
   
_globals['_USERPROFILESERVICE'].methods_by_name['AddUserProfile']._serialized_options
 = b'\202\323\344\223\002%\"\025/api/v1/user-profiles:\014user_profile'
   
_globals['_USERPROFILESERVICE'].methods_by_name['UpdateUserProfile']._loaded_options
 = None
@@ -49,26 +49,26 @@ if not _descriptor._USE_C_DESCRIPTORS:
   
_globals['_USERPROFILESERVICE'].methods_by_name['GetAllUserProfilesInGateway']._serialized_options
 = b'\202\323\344\223\002-\022+/api/v1/gateways/{gateway_id}/user-profiles'
   
_globals['_USERPROFILESERVICE'].methods_by_name['DoesUserExist']._loaded_options
 = None
   
_globals['_USERPROFILESERVICE'].methods_by_name['DoesUserExist']._serialized_options
 = 
b'\202\323\344\223\002@\022>/api/v1/gateways/{gateway_id}/user-profiles/{user_name}:exists'
-  _globals['_ADDUSERPROFILEREQUEST']._serialized_start=186
-  _globals['_ADDUSERPROFILEREQUEST']._serialized_end=276
-  _globals['_ADDUSERPROFILERESPONSE']._serialized_start=278
-  _globals['_ADDUSERPROFILERESPONSE']._serialized_end=319
-  _globals['_UPDATEUSERPROFILEREQUEST']._serialized_start=321
-  _globals['_UPDATEUSERPROFILEREQUEST']._serialized_end=414
-  _globals['_GETUSERPROFILEBYIDREQUEST']._serialized_start=416
-  _globals['_GETUSERPROFILEBYIDREQUEST']._serialized_end=480
-  _globals['_GETUSERPROFILEBYNAMEREQUEST']._serialized_start=482
-  _globals['_GETUSERPROFILEBYNAMEREQUEST']._serialized_end=550
-  _globals['_DELETEUSERPROFILEREQUEST']._serialized_start=552
-  _globals['_DELETEUSERPROFILEREQUEST']._serialized_end=595
-  _globals['_GETALLUSERPROFILESINGATEWAYREQUEST']._serialized_start=597
-  _globals['_GETALLUSERPROFILESINGATEWAYREQUEST']._serialized_end=684
-  _globals['_GETALLUSERPROFILESINGATEWAYRESPONSE']._serialized_start=686
-  _globals['_GETALLUSERPROFILESINGATEWAYRESPONSE']._serialized_end=791
-  _globals['_DOESUSEREXISTREQUEST']._serialized_start=793
-  _globals['_DOESUSEREXISTREQUEST']._serialized_end=854
-  _globals['_DOESUSEREXISTRESPONSE']._serialized_start=856
-  _globals['_DOESUSEREXISTRESPONSE']._serialized_end=895
-  _globals['_USERPROFILESERVICE']._serialized_start=898
-  _globals['_USERPROFILESERVICE']._serialized_end=2240
+  _globals['_ADDUSERPROFILEREQUEST']._serialized_start=190
+  _globals['_ADDUSERPROFILEREQUEST']._serialized_end=280
+  _globals['_ADDUSERPROFILERESPONSE']._serialized_start=282
+  _globals['_ADDUSERPROFILERESPONSE']._serialized_end=323
+  _globals['_UPDATEUSERPROFILEREQUEST']._serialized_start=325
+  _globals['_UPDATEUSERPROFILEREQUEST']._serialized_end=418
+  _globals['_GETUSERPROFILEBYIDREQUEST']._serialized_start=420
+  _globals['_GETUSERPROFILEBYIDREQUEST']._serialized_end=484
+  _globals['_GETUSERPROFILEBYNAMEREQUEST']._serialized_start=486
+  _globals['_GETUSERPROFILEBYNAMEREQUEST']._serialized_end=554
+  _globals['_DELETEUSERPROFILEREQUEST']._serialized_start=556
+  _globals['_DELETEUSERPROFILEREQUEST']._serialized_end=599
+  _globals['_GETALLUSERPROFILESINGATEWAYREQUEST']._serialized_start=601
+  _globals['_GETALLUSERPROFILESINGATEWAYREQUEST']._serialized_end=688
+  _globals['_GETALLUSERPROFILESINGATEWAYRESPONSE']._serialized_start=690
+  _globals['_GETALLUSERPROFILESINGATEWAYRESPONSE']._serialized_end=795
+  _globals['_DOESUSEREXISTREQUEST']._serialized_start=797
+  _globals['_DOESUSEREXISTREQUEST']._serialized_end=858
+  _globals['_DOESUSEREXISTRESPONSE']._serialized_start=860
+  _globals['_DOESUSEREXISTRESPONSE']._serialized_end=899
+  _globals['_USERPROFILESERVICE']._serialized_start=902
+  _globals['_USERPROFILESERVICE']._serialized_end=2284
 # @@protoc_insertion_point(module_scope)
diff --git 
a/airavata-python-sdk/airavata_sdk/generated/services/user_profile_service_pb2_grpc.py
 
b/airavata-python-sdk/airavata_sdk/generated/services/user_profile_service_pb2_grpc.py
index c86584277d..a924b7f74c 100644
--- 
a/airavata-python-sdk/airavata_sdk/generated/services/user_profile_service_pb2_grpc.py
+++ 
b/airavata-python-sdk/airavata_sdk/generated/services/user_profile_service_pb2_grpc.py
@@ -38,37 +38,37 @@ class UserProfileServiceStub(object):
             channel: A grpc.Channel.
         """
         self.AddUserProfile = channel.unary_unary(
-                
'/org.apache.airavata.api.userprofile.UserProfileService/AddUserProfile',
+                
'/org.apache.airavata.api.iam.userprofile.UserProfileService/AddUserProfile',
                 
request_serializer=services_dot_user__profile__service__pb2.AddUserProfileRequest.SerializeToString,
                 
response_deserializer=services_dot_user__profile__service__pb2.AddUserProfileResponse.FromString,
                 _registered_method=True)
         self.UpdateUserProfile = channel.unary_unary(
-                
'/org.apache.airavata.api.userprofile.UserProfileService/UpdateUserProfile',
+                
'/org.apache.airavata.api.iam.userprofile.UserProfileService/UpdateUserProfile',
                 
request_serializer=services_dot_user__profile__service__pb2.UpdateUserProfileRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetUserProfileById = channel.unary_unary(
-                
'/org.apache.airavata.api.userprofile.UserProfileService/GetUserProfileById',
+                
'/org.apache.airavata.api.iam.userprofile.UserProfileService/GetUserProfileById',
                 
request_serializer=services_dot_user__profile__service__pb2.GetUserProfileByIdRequest.SerializeToString,
                 
response_deserializer=org_dot_apache_dot_airavata_dot_model_dot_user_dot_user__profile__pb2.UserProfile.FromString,
                 _registered_method=True)
         self.GetUserProfileByName = channel.unary_unary(
-                
'/org.apache.airavata.api.userprofile.UserProfileService/GetUserProfileByName',
+                
'/org.apache.airavata.api.iam.userprofile.UserProfileService/GetUserProfileByName',
                 
request_serializer=services_dot_user__profile__service__pb2.GetUserProfileByNameRequest.SerializeToString,
                 
response_deserializer=org_dot_apache_dot_airavata_dot_model_dot_user_dot_user__profile__pb2.UserProfile.FromString,
                 _registered_method=True)
         self.DeleteUserProfile = channel.unary_unary(
-                
'/org.apache.airavata.api.userprofile.UserProfileService/DeleteUserProfile',
+                
'/org.apache.airavata.api.iam.userprofile.UserProfileService/DeleteUserProfile',
                 
request_serializer=services_dot_user__profile__service__pb2.DeleteUserProfileRequest.SerializeToString,
                 
response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString,
                 _registered_method=True)
         self.GetAllUserProfilesInGateway = channel.unary_unary(
-                
'/org.apache.airavata.api.userprofile.UserProfileService/GetAllUserProfilesInGateway',
+                
'/org.apache.airavata.api.iam.userprofile.UserProfileService/GetAllUserProfilesInGateway',
                 
request_serializer=services_dot_user__profile__service__pb2.GetAllUserProfilesInGatewayRequest.SerializeToString,
                 
response_deserializer=services_dot_user__profile__service__pb2.GetAllUserProfilesInGatewayResponse.FromString,
                 _registered_method=True)
         self.DoesUserExist = channel.unary_unary(
-                
'/org.apache.airavata.api.userprofile.UserProfileService/DoesUserExist',
+                
'/org.apache.airavata.api.iam.userprofile.UserProfileService/DoesUserExist',
                 
request_serializer=services_dot_user__profile__service__pb2.DoesUserExistRequest.SerializeToString,
                 
response_deserializer=services_dot_user__profile__service__pb2.DoesUserExistResponse.FromString,
                 _registered_method=True)
@@ -160,9 +160,9 @@ def add_UserProfileServiceServicer_to_server(servicer, 
server):
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
-            'org.apache.airavata.api.userprofile.UserProfileService', 
rpc_method_handlers)
+            'org.apache.airavata.api.iam.userprofile.UserProfileService', 
rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
-    
server.add_registered_method_handlers('org.apache.airavata.api.userprofile.UserProfileService',
 rpc_method_handlers)
+    
server.add_registered_method_handlers('org.apache.airavata.api.iam.userprofile.UserProfileService',
 rpc_method_handlers)
 
 
  # This class is part of an EXPERIMENTAL API.
@@ -184,7 +184,7 @@ class UserProfileService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.userprofile.UserProfileService/AddUserProfile',
+            
'/org.apache.airavata.api.iam.userprofile.UserProfileService/AddUserProfile',
             
services_dot_user__profile__service__pb2.AddUserProfileRequest.SerializeToString,
             
services_dot_user__profile__service__pb2.AddUserProfileResponse.FromString,
             options,
@@ -211,7 +211,7 @@ class UserProfileService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.userprofile.UserProfileService/UpdateUserProfile',
+            
'/org.apache.airavata.api.iam.userprofile.UserProfileService/UpdateUserProfile',
             
services_dot_user__profile__service__pb2.UpdateUserProfileRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -238,7 +238,7 @@ class UserProfileService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.userprofile.UserProfileService/GetUserProfileById',
+            
'/org.apache.airavata.api.iam.userprofile.UserProfileService/GetUserProfileById',
             
services_dot_user__profile__service__pb2.GetUserProfileByIdRequest.SerializeToString,
             
org_dot_apache_dot_airavata_dot_model_dot_user_dot_user__profile__pb2.UserProfile.FromString,
             options,
@@ -265,7 +265,7 @@ class UserProfileService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.userprofile.UserProfileService/GetUserProfileByName',
+            
'/org.apache.airavata.api.iam.userprofile.UserProfileService/GetUserProfileByName',
             
services_dot_user__profile__service__pb2.GetUserProfileByNameRequest.SerializeToString,
             
org_dot_apache_dot_airavata_dot_model_dot_user_dot_user__profile__pb2.UserProfile.FromString,
             options,
@@ -292,7 +292,7 @@ class UserProfileService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.userprofile.UserProfileService/DeleteUserProfile',
+            
'/org.apache.airavata.api.iam.userprofile.UserProfileService/DeleteUserProfile',
             
services_dot_user__profile__service__pb2.DeleteUserProfileRequest.SerializeToString,
             google_dot_protobuf_dot_empty__pb2.Empty.FromString,
             options,
@@ -319,7 +319,7 @@ class UserProfileService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.userprofile.UserProfileService/GetAllUserProfilesInGateway',
+            
'/org.apache.airavata.api.iam.userprofile.UserProfileService/GetAllUserProfilesInGateway',
             
services_dot_user__profile__service__pb2.GetAllUserProfilesInGatewayRequest.SerializeToString,
             
services_dot_user__profile__service__pb2.GetAllUserProfilesInGatewayResponse.FromString,
             options,
@@ -346,7 +346,7 @@ class UserProfileService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            
'/org.apache.airavata.api.userprofile.UserProfileService/DoesUserExist',
+            
'/org.apache.airavata.api.iam.userprofile.UserProfileService/DoesUserExist',
             
services_dot_user__profile__service__pb2.DoesUserExistRequest.SerializeToString,
             
services_dot_user__profile__service__pb2.DoesUserExistResponse.FromString,
             options,
diff --git 
a/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/UserProfileGrpcService.java
 
b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/UserProfileGrpcService.java
index 57af5a0b3b..3767a82fba 100644
--- 
a/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/UserProfileGrpcService.java
+++ 
b/airavata-server/src/main/java/org/apache/airavata/server/grpc/services/UserProfileGrpcService.java
@@ -22,7 +22,7 @@ package org.apache.airavata.server.grpc.services;
 import com.google.protobuf.Empty;
 import io.grpc.stub.StreamObserver;
 import java.util.List;
-import org.apache.airavata.api.userprofile.*;
+import org.apache.airavata.api.iam.userprofile.*;
 import org.apache.airavata.grpc.GrpcStatusMapper;
 import org.apache.airavata.iam.repository.UserProfileRepository;
 import org.apache.airavata.model.user.proto.UserProfile;


Reply via email to