You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/07/14 06:37:55 UTC

[3/3] stratos git commit: Refactor the method signatures with UUID

Refactor the method signatures with UUID


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

Branch: refs/heads/tenant-isolation
Commit: 5e04809a87db9ab3501dd255ed9071351a78b076
Parents: 212b83d
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Mon Jul 13 23:09:00 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Mon Jul 13 23:09:00 2015 +0530

----------------------------------------------------------------------
 .../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +-
 .../stratos/rest/endpoint/util/converter/ObjectConverter.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/5e04809a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git 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
index 86727ab..3eb88ea 100644
--- 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
@@ -3825,7 +3825,7 @@ public class StratosApiV41Utils {
         }
     }
 
-	public static String getKubernetesClusterUuid(String clusterId,int tenantId) throws RestAPIException {
+	public static String getKubernetesClusterUuidByTenant(String clusterId,int tenantId) throws RestAPIException {
 
 		try {
 			return CloudControllerServiceClient.getInstance().getKubernetesClusterByTenantId(clusterId, tenantId)

http://git-wip-us.apache.org/repos/asf/stratos/blob/5e04809a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index d22293a..7c40b0a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -290,7 +290,7 @@ public class ObjectConverter {
                     = new org.apache.stratos.cloud.controller.stub.Property();
 	        stubProperty.setName(propertyBean.getName());
 	        if(propertyBean.getName().equals("cluster")){
-		        stubProperty.setValue(StratosApiV41Utils.getKubernetesClusterUuid(propertyBean.getName(),tenantId));
+		        stubProperty.setValue(StratosApiV41Utils.getKubernetesClusterUuidByTenant(propertyBean.getValue(),tenantId));
 	        }
 	        else{
 		        stubProperty.setValue(propertyBean.getValue());
@@ -938,7 +938,7 @@ public class ObjectConverter {
                 org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesCluster();
 
 	    kubernetesCluster.setClusterUuid(kubernetesClusterBean.getClusterUuid());
-	    kubernetesCluster.setClusterId(kubernetesClusterBean.getClusterUuid());
+	    kubernetesCluster.setClusterId(kubernetesClusterBean.getClusterId());
         kubernetesCluster.setDescription(kubernetesClusterBean.getDescription());
         kubernetesCluster.setKubernetesMaster(convertStubKubernetesMasterToKubernetesMaster(
                 kubernetesClusterBean.getKubernetesMaster(),kubernetesClusterBean.getTenantId()));