Update kubernetes cluster with uuid
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/212b83d0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/212b83d0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/212b83d0 Branch: refs/heads/tenant-isolation Commit: 212b83d0a4e5f50010d2683a3634d201844aeaeb Parents: 75940f8 Author: Gayan Gunarathne <[email protected]> Authored: Mon Jul 13 22:18:29 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Mon Jul 13 22:18:29 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 | 64 +- .../main/resources/CloudControllerService.wsdl | 757 ++++++++++--------- 7 files changed, 506 insertions(+), 388 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/212b83d0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java index 2d82960..7d020af 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java @@ -275,13 +275,23 @@ public interface CloudControllerService { public KubernetesCluster[] getKubernetesClusters(); /** - * Retrieves Kubernetes cluster for given Kubernetes cluster ID. + * Retrieves Kubernetes cluster for given Kubernetes cluster UUID. * - * @param kubernetesClusterId + * @param kubernetesClusterUuid */ - public KubernetesCluster getKubernetesCluster(String kubernetesClusterId) + public KubernetesCluster getKubernetesCluster(String kubernetesClusterUuid) throws NonExistingKubernetesClusterException; + /** + * Retrieves Kubernetes cluster for given Kubernetes cluster ID and tenant id + * @param kubernetesClusterId + * @param tenantId + * @return + * @throws NonExistingKubernetesClusterException + */ + public KubernetesCluster getKubernetesClusterByTenant(String kubernetesClusterId, int tenantId) throws + NonExistingKubernetesClusterException; + /** * Retrieves Kubernetes Master for given Kubernetes cluster ID. * http://git-wip-us.apache.org/repos/asf/stratos/blob/212b83d0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index 0a019b3..4d27ab2 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -1177,11 +1177,22 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public KubernetesCluster getKubernetesCluster(String kubernetesClusterId) throws + public KubernetesCluster getKubernetesCluster(String kubernetesClusterUuid) throws NonExistingKubernetesClusterException { - return CloudControllerContext.getInstance().getKubernetesCluster(kubernetesClusterId); + return CloudControllerContext.getInstance().getKubernetesCluster(kubernetesClusterUuid); } + @Override + public KubernetesCluster getKubernetesClusterByTenant(String kubernetesClusterId,int tenantId) throws + NonExistingKubernetesClusterException { + for(KubernetesCluster kubernetesCluster:getKubernetesClusters()){ + if(kubernetesCluster.getClusterId().equals(kubernetesClusterId)&&kubernetesCluster.getTenantId()==tenantId){ + return kubernetesCluster; + } + } + return null; + } + @Override public KubernetesMaster getMasterForKubernetesCluster(String kubernetesClusterId) throws NonExistingKubernetesClusterException { http://git-wip-us.apache.org/repos/asf/stratos/blob/212b83d0/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java index fa2c7d4..5c33859 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java @@ -240,4 +240,14 @@ public class CloudControllerServiceClient { return stub.getIaasProviders(); } + public KubernetesCluster getKubernetesClusterByTenantId(String clusterId, int tenantId) + throws RemoteException { + try { + return stub.getKubernetesClusterByTenant(clusterId,tenantId); + } catch (CloudControllerServiceNonExistingKubernetesClusterExceptionException e) { + String msg = e.getFaultMessage().getNonExistingKubernetesClusterException().getMessage(); + log.error(msg, e); + throw new RuntimeException(msg, e); + } + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/212b83d0/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index bfb6be6..b3e7e40 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -1974,7 +1974,7 @@ public class StratosApiV41 extends AbstractApi { throws RestAPIException { PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - StratosApiV41Utils.addKubernetesHost(kubernetesClusterId, kubernetesHost); + StratosApiV41Utils.addKubernetesHost(kubernetesClusterId,kubernetesHost,carbonContext.getTenantId()); URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesHost.getHostId()).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Kubernetes host added successfully: [kub-host] %s", kubernetesHost.getHostId()))).build(); @@ -1995,7 +1995,8 @@ public class StratosApiV41 extends AbstractApi { public Response updateKubernetesMaster( KubernetesMasterBean kubernetesMaster) throws RestAPIException { try { - StratosApiV41Utils.updateKubernetesMaster(kubernetesMaster); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + StratosApiV41Utils.updateKubernetesMaster(kubernetesMaster,carbonContext.getTenantId()); URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesMaster.getHostId()).build(); return Response.ok(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Kubernetes master updated successfully: [kub-master] %s", @@ -2014,7 +2015,8 @@ public class StratosApiV41 extends AbstractApi { public Response updateKubernetesHost( KubernetesHostBean kubernetesHost) throws RestAPIException { try { - StratosApiV41Utils.updateKubernetesHost(kubernetesHost); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + StratosApiV41Utils.updateKubernetesHost(kubernetesHost,carbonContext.getTenantId()); URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesHost.getHostId()).build(); return Response.ok(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Kubernetes Host updated successfully: [kub-host] %s", http://git-wip-us.apache.org/repos/asf/stratos/blob/212b83d0/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 df816f3..86727ab 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 @@ -2196,13 +2196,13 @@ public class StratosApiV41Utils { * @return add status * @throws RestAPIException */ - public static boolean addKubernetesHost(String kubernetesClusterId, KubernetesHostBean kubernetesHostBean) + public static boolean addKubernetesHost(String kubernetesClusterId, KubernetesHostBean kubernetesHostBean,int tenantId) throws RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost kubernetesHost = - ObjectConverter.convertKubernetesHostToStubKubernetesHost(kubernetesHostBean); + ObjectConverter.convertKubernetesHostToStubKubernetesHost(kubernetesHostBean,tenantId); try { return cloudControllerServiceClient.addKubernetesHost(kubernetesClusterId, kubernetesHost); @@ -2229,12 +2229,12 @@ public class StratosApiV41Utils { * @return update status * @throws RestAPIException */ - public static boolean updateKubernetesMaster(KubernetesMasterBean kubernetesMasterBean) throws RestAPIException { + public static boolean updateKubernetesMaster(KubernetesMasterBean kubernetesMasterBean,int tenantId) throws RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesMaster kubernetesMaster = - ObjectConverter.convertStubKubernetesMasterToKubernetesMaster(kubernetesMasterBean); + ObjectConverter.convertStubKubernetesMasterToKubernetesMaster(kubernetesMasterBean,tenantId); try { return cloudControllerServiceClient.updateKubernetesMaster(kubernetesMaster); @@ -2430,12 +2430,12 @@ public class StratosApiV41Utils { * @return update status * @throws RestAPIException */ - public static boolean updateKubernetesHost(KubernetesHostBean kubernetesHostBean) throws + public static boolean updateKubernetesHost(KubernetesHostBean kubernetesHostBean,int tenantId) throws RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost kubernetesHost = - ObjectConverter.convertKubernetesHostToStubKubernetesHost(kubernetesHostBean); + ObjectConverter.convertKubernetesHostToStubKubernetesHost(kubernetesHostBean,tenantId); try { return cloudControllerServiceClient.updateKubernetesHost(kubernetesHost); } catch (RemoteException e) { @@ -3824,4 +3824,16 @@ public class StratosApiV41Utils { throw new RestAPIException(message, e); } } + + public static String getKubernetesClusterUuid(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/212b83d0/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 ca90da7..d22293a 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 @@ -58,6 +58,7 @@ import org.apache.stratos.messaging.domain.instance.GroupInstance; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.KubernetesService; import org.apache.stratos.messaging.domain.topology.Port; +import org.apache.stratos.rest.endpoint.api.StratosApiV41Utils; import org.apache.stratos.rest.endpoint.exception.RestAPIException; import org.apache.stratos.rest.endpoint.exception.ServiceGroupDefinitionException; import org.wso2.carbon.stratos.common.beans.TenantInfoBean; @@ -68,7 +69,7 @@ import java.util.*; public class ObjectConverter { public static Cartridge convertCartridgeBeanToStubCartridgeConfig( - CartridgeBean cartridgeBean) { + CartridgeBean cartridgeBean) throws RestAPIException { if (cartridgeBean == null) { return null; @@ -110,12 +111,13 @@ public class ObjectConverter { // iaas providers if (cartridgeBean.getIaasProvider() != null && !cartridgeBean.getIaasProvider().isEmpty()) { - cartridge.setIaasConfigs(convertIaasProviderBeansToStubIaasConfig(cartridgeBean.getIaasProvider())); + cartridge.setIaasConfigs(convertIaasProviderBeansToStubIaasConfig(cartridgeBean.getIaasProvider(),cartridgeBean.getTenantId())); } // properties if (cartridgeBean.getProperty() != null && !cartridgeBean.getProperty().isEmpty()) { - cartridge.setProperties(convertPropertyBeansToCCStubProperties(cartridgeBean.getProperty())); + cartridge.setProperties(convertPropertyBeansToCCStubProperties(cartridgeBean.getProperty(), + cartridgeBean.getTenantId())); } return cartridge; } @@ -202,7 +204,9 @@ public class ObjectConverter { return iaasProviderBeans; } - private static IaasConfig[] convertIaasProviderBeansToStubIaasConfig(List<IaasProviderBean> iaasProviderBeans) { + private static IaasConfig[] convertIaasProviderBeansToStubIaasConfig(List<IaasProviderBean> iaasProviderBeans,int tenantId) + + throws RestAPIException { if (iaasProviderBeans == null) { return null; @@ -225,7 +229,7 @@ public class ObjectConverter { if (iaasProviderBeansArray[i].getProperty() != null && !iaasProviderBeansArray[i].getProperty().isEmpty()) { //set the Properties instance to IaasConfig instance - iaasConfig.setProperties(convertPropertyBeansToCCStubProperties(iaasProviderBeansArray[i].getProperty())); + iaasConfig.setProperties(convertPropertyBeansToCCStubProperties(iaasProviderBeansArray[i].getProperty(),tenantId)); } if (iaasProviderBeansArray[i].getNetworkInterfaces() != null @@ -272,7 +276,7 @@ public class ObjectConverter { } private static org.apache.stratos.cloud.controller.stub.Properties convertPropertyBeansToCCStubProperties( - List<org.apache.stratos.common.beans.PropertyBean> propertyBeans) { + List<org.apache.stratos.common.beans.PropertyBean> propertyBeans,int tenantId) throws RestAPIException { if (propertyBeans == null) { return null; @@ -284,8 +288,14 @@ public class ObjectConverter { for (org.apache.stratos.common.beans.PropertyBean propertyBean : propertyBeans) { org.apache.stratos.cloud.controller.stub.Property stubProperty = new org.apache.stratos.cloud.controller.stub.Property(); - stubProperty.setName(propertyBean.getName()); - stubProperty.setValue(propertyBean.getValue()); + stubProperty.setName(propertyBean.getName()); + if(propertyBean.getName().equals("cluster")){ + stubProperty.setValue(StratosApiV41Utils.getKubernetesClusterUuid(propertyBean.getName(),tenantId)); + } + else{ + stubProperty.setValue(propertyBean.getValue()); + } + stubPropertiesList.add(stubProperty); } @@ -391,7 +401,7 @@ public class ObjectConverter { } private static org.apache.stratos.cloud.controller.stub.domain.Partition convertPartitionToStubPartition - (PartitionBean partition) { + (PartitionBean partition,int tenantId) throws RestAPIException { if (partition == null) { return null; @@ -400,7 +410,7 @@ public class ObjectConverter { org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition = new org.apache.stratos.cloud.controller.stub.domain.Partition(); stubPartition.setId(partition.getId()); - stubPartition.setProperties(convertPropertyBeansToCCStubProperties(partition.getProperty())); + stubPartition.setProperties(convertPropertyBeansToCCStubProperties(partition.getProperty(), tenantId)); return stubPartition; } @@ -591,7 +601,7 @@ public class ObjectConverter { public static org.apache.stratos.cloud.controller.stub.domain.NetworkPartition - convertNetworkPartitionToCCStubNetworkPartition(NetworkPartitionBean networkPartitionBean) { + convertNetworkPartitionToCCStubNetworkPartition(NetworkPartitionBean networkPartitionBean) throws RestAPIException { org.apache.stratos.cloud.controller.stub.domain.NetworkPartition networkPartition = new org.apache.stratos.cloud.controller.stub.domain.NetworkPartition(); @@ -600,10 +610,10 @@ public class ObjectConverter { networkPartition.setUuid(networkPartitionBean.getUuid()); networkPartition.setTenantId(networkPartitionBean.getTenantId()); if (networkPartitionBean.getPartitions() != null && !networkPartitionBean.getPartitions().isEmpty()) { - networkPartition.setPartitions(convertToStubPartitions(networkPartitionBean.getPartitions())); + networkPartition.setPartitions(convertToStubPartitions(networkPartitionBean.getPartitions(),networkPartitionBean.getTenantId())); } if (networkPartitionBean.getProperties() != null && !networkPartitionBean.getProperties().isEmpty()) { - networkPartition.setProperties(convertPropertyBeansToCCStubProperties(networkPartitionBean.getProperties())); + networkPartition.setProperties(convertPropertyBeansToCCStubProperties(networkPartitionBean.getProperties(),networkPartitionBean.getTenantId())); } return networkPartition; } @@ -766,12 +776,12 @@ public class ObjectConverter { } private static org.apache.stratos.cloud.controller.stub.domain.Partition[] convertToStubPartitions - (List<PartitionBean> partitionList) { + (List<PartitionBean> partitionList,int tenantId) throws RestAPIException { org.apache.stratos.cloud.controller.stub.domain.Partition[] partitions = new org.apache.stratos.cloud.controller.stub.domain.Partition[partitionList.size()]; for (int i = 0; i < partitionList.size(); i++) { - partitions[i] = convertPartitionToStubPartition(partitionList.get(i)); + partitions[i] = convertPartitionToStubPartition(partitionList.get(i),tenantId); } return partitions; } @@ -922,7 +932,7 @@ public class ObjectConverter { } public static org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesCluster - convertToCCKubernetesClusterPojo(KubernetesClusterBean kubernetesClusterBean) { + convertToCCKubernetesClusterPojo(KubernetesClusterBean kubernetesClusterBean) throws RestAPIException { org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesCluster kubernetesCluster = new org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesCluster(); @@ -931,17 +941,19 @@ public class ObjectConverter { kubernetesCluster.setClusterId(kubernetesClusterBean.getClusterUuid()); kubernetesCluster.setDescription(kubernetesClusterBean.getDescription()); kubernetesCluster.setKubernetesMaster(convertStubKubernetesMasterToKubernetesMaster( - kubernetesClusterBean.getKubernetesMaster())); + kubernetesClusterBean.getKubernetesMaster(),kubernetesClusterBean.getTenantId())); kubernetesCluster.setPortRange(convertPortRangeToStubPortRange(kubernetesClusterBean.getPortRange())); - kubernetesCluster.setKubernetesHosts(convertToASKubernetesHostsPojo(kubernetesClusterBean.getKubernetesHosts())); - kubernetesCluster.setProperties((convertPropertyBeansToCCStubProperties(kubernetesClusterBean.getProperty()))); + kubernetesCluster.setKubernetesHosts(convertToASKubernetesHostsPojo(kubernetesClusterBean.getKubernetesHosts(), + kubernetesClusterBean.getTenantId())); + kubernetesCluster.setProperties((convertPropertyBeansToCCStubProperties(kubernetesClusterBean.getProperty(), + kubernetesClusterBean.getTenantId()))); kubernetesCluster.setTenantId(kubernetesClusterBean.getTenantId()); return kubernetesCluster; } private static org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost[] - convertToASKubernetesHostsPojo(List<KubernetesHostBean> kubernetesHosts) { + convertToASKubernetesHostsPojo(List<KubernetesHostBean> kubernetesHosts,int tenantId) throws RestAPIException { if (kubernetesHosts == null || kubernetesHosts.isEmpty()) { return null; @@ -951,7 +963,7 @@ public class ObjectConverter { = new org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost[kubernetesHostCount]; for (int i = 0; i < kubernetesHostCount; i++) { KubernetesHostBean kubernetesHostBean = kubernetesHosts.get(i); - kubernetesHostsArr[i] = convertKubernetesHostToStubKubernetesHost(kubernetesHostBean); + kubernetesHostsArr[i] = convertKubernetesHostToStubKubernetesHost(kubernetesHostBean,tenantId); } return kubernetesHostsArr; } @@ -970,7 +982,8 @@ public class ObjectConverter { } public static org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost - convertKubernetesHostToStubKubernetesHost(KubernetesHostBean kubernetesHostBean) { + convertKubernetesHostToStubKubernetesHost(KubernetesHostBean kubernetesHostBean,int tenantId) + throws RestAPIException { if (kubernetesHostBean == null) { return null; @@ -982,13 +995,14 @@ public class ObjectConverter { kubernetesHost.setPrivateIPAddress(kubernetesHostBean.getPrivateIPAddress()); kubernetesHost.setPublicIPAddress(kubernetesHostBean.getPublicIPAddress()); kubernetesHost.setHostname(kubernetesHostBean.getHostname()); - kubernetesHost.setProperties(convertPropertyBeansToCCStubProperties(kubernetesHostBean.getProperty())); + kubernetesHost.setProperties(convertPropertyBeansToCCStubProperties(kubernetesHostBean.getProperty(),tenantId)); return kubernetesHost; } public static org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesMaster - convertStubKubernetesMasterToKubernetesMaster(KubernetesMasterBean kubernetesMasterBean) { + convertStubKubernetesMasterToKubernetesMaster(KubernetesMasterBean kubernetesMasterBean,int tenantId) + throws RestAPIException { if (kubernetesMasterBean == null) { return null; @@ -1000,7 +1014,7 @@ public class ObjectConverter { kubernetesMaster.setPrivateIPAddress(kubernetesMasterBean.getPrivateIPAddress()); kubernetesMaster.setPublicIPAddress(kubernetesMasterBean.getPublicIPAddress()); kubernetesMaster.setHostname(kubernetesMasterBean.getHostname()); - kubernetesMaster.setProperties(convertPropertyBeansToCCStubProperties(kubernetesMasterBean.getProperty())); + kubernetesMaster.setProperties(convertPropertyBeansToCCStubProperties(kubernetesMasterBean.getProperty(),tenantId)); return kubernetesMaster; }
