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/12 16:58:05 UTC
[3/3] stratos git commit: Update the undeployment with uuid
Update the undeployment with uuid
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/647771b4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/647771b4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/647771b4
Branch: refs/heads/tenant-isolation
Commit: 647771b44a34d2da75bee4566a06f0c3321ffcd6
Parents: 2678f0f
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Sun Jul 12 19:59:36 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Sun Jul 12 19:59:36 2015 +0530
----------------------------------------------------------------------
.../concurrent/PartitionValidatorCallable.java | 2 +-
.../services/impl/InstanceTerminator.java | 17 +-
.../controller/util/CloudControllerUtil.java | 2 +-
.../main/resources/CloudControllerService.wsdl | 948 +++++++++----------
4 files changed, 478 insertions(+), 491 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/647771b4/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
index e1800ff..310b4d7 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
@@ -46,7 +46,7 @@ public class PartitionValidatorCallable implements Callable<IaasProvider> {
log.debug("Partition validation started for " + partition + " of " + cartridge);
}
String provider = partition.getProvider();
- IaasProvider iaasProvider = CloudControllerContext.getInstance().getIaasProvider(cartridge.getType(), provider);
+ IaasProvider iaasProvider = CloudControllerContext.getInstance().getIaasProvider(cartridge.getUuid(), provider);
IaasProvider updatedIaasProvider =
CloudControllerServiceUtil.validatePartitionAndGetIaasProvider(partition, iaasProvider);
http://git-wip-us.apache.org/repos/asf/stratos/blob/647771b4/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java
index a60aeb3..18f0741 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java
@@ -26,10 +26,7 @@ import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.MemberContext;
import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.iaases.Iaas;
-import org.apache.stratos.cloud.controller.stub.CloudControllerServiceCartridgeNotFoundExceptionException;
-import org.apache.stratos.common.client.CloudControllerServiceClient;
-import java.rmi.RemoteException;
import java.util.concurrent.locks.Lock;
/**
@@ -44,18 +41,8 @@ public class InstanceTerminator implements Runnable {
public InstanceTerminator(MemberContext memberContext) {
String provider = memberContext.getPartition().getProvider();
- String type=null;
- try {
- type=
- CloudControllerServiceClient.getInstance().getCartridge(memberContext.getCartridgeType()).getType();
- } catch (RemoteException e) {
- log.error("Error in retrieving the cartridge",e);
- } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
- log.error("Error in retrieving the cartridge", e);
- }
- IaasProvider iaasProvider = CloudControllerContext.getInstance()
- .getIaasProvider(type, provider);
-
+ IaasProvider iaasProvider = CloudControllerContext.getInstance()
+ .getIaasProvider(memberContext.getCartridgeType(), provider);
this.iaas = iaasProvider.getIaas();
this.memberContext = memberContext;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/647771b4/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index f9b585e..5617e19 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -144,7 +144,7 @@ public class CloudControllerUtil {
iaasProvider.setNetworkInterfaces(networkInterfaces.getNetworkInterfaces());
}
- CloudControllerContext.getInstance().addIaasProvider(cartridge.getType(), iaasProvider);
+ CloudControllerContext.getInstance().addIaasProvider(cartridge.getUuid(), iaasProvider);
}
}
}