resolve conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5176be85 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5176be85 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5176be85 Branch: refs/heads/tenant-isolation Commit: 5176be85bbec114d863670f28cc6c8e133c7a339 Parents: c8b1d11 5e04809 Author: Dinithi <[email protected]> Authored: Tue Jul 14 16:45:57 2015 +0530 Committer: Dinithi <[email protected]> Committed: Tue Jul 14 16:45:57 2015 +0530 ---------------------------------------------------------------------- .../services/CloudControllerService.java | 16 +- .../impl/CloudControllerServiceImpl.java | 15 +- .../client/CloudControllerServiceClient.java | 10 + .../rest/endpoint/api/StratosApiV41.java | 8 +- .../rest/endpoint/api/StratosApiV41Utils.java | 24 +- .../util/converter/ObjectConverter.java | 65 +- .../main/resources/CloudControllerService.wsdl | 757 ++++++++++--------- 7 files changed, 506 insertions(+), 389 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5176be85/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5176be85/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index da56bec,3eb88ea..e424bbd --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@@ -3826,21 -3825,15 +3826,33 @@@ public class StratosApiV41Utils } } + /** + * Get Service Group uuid by TenantId + * + * @return String Uuid + */ + public static String getServiceGroupUuidByTenant(String serviceGroupName, + int tenantId) throws RestAPIException { + try { + AutoscalerServiceClient autoscalerServiceClient = AutoscalerServiceClient.getInstance(); + return (autoscalerServiceClient.getServiceGroupByTenant(serviceGroupName, tenantId).getUuid()); + } catch (RemoteException e) { + String message = e.getMessage(); + log.error(message); + throw new RestAPIException(message, e); + } + } + ++ + public static String getKubernetesClusterUuidByTenant(String clusterId,int tenantId) throws RestAPIException { + + try { + return CloudControllerServiceClient.getInstance().getKubernetesClusterByTenantId(clusterId, tenantId) + .getClusterUuid(); + } catch (RemoteException e) { + String message = e.getMessage(); + log.error(message); + throw new RestAPIException(message, e); + } + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/5176be85/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ----------------------------------------------------------------------
