You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2013/12/10 15:54:07 UTC
[08/16] git commit: conflict resolution
conflict resolution
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/88167dae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/88167dae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/88167dae
Branch: refs/heads/master
Commit: 88167daee1ca8dc352e2c60d7c99defd033aeccb
Parents: d31f140
Author: Nirmal Fernando <ni...@apache.org>
Authored: Tue Dec 10 18:58:00 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Tue Dec 10 19:16:13 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/client/AutoscalerServiceClient.java | 18 ++++++++++++++++--
.../mgt/subscription/CartridgeSubscription.java | 3 ++-
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88167dae/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
index a069221..02bd4d4 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
@@ -23,9 +23,9 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.adc.mgt.exception.ADCException;
import org.apache.stratos.adc.mgt.internal.DataHolder;
-import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
-import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
+import org.apache.stratos.autoscaler.stub.AutoScalerServiceNonExistingLBExceptionException;
import org.apache.stratos.autoscaler.stub.AutoScalerServiceStub;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
@@ -192,6 +192,20 @@ public class AutoscalerServiceClient {
return deploymentPolicies;
}
+
+ public void checkLBExistence(String clusterId) throws ADCException {
+ try {
+ stub.checkLBExistence(clusterId);
+ } catch (RemoteException e) {
+ String errorMsg = "Error connecting to Auto-scaler Service.";
+ log.error(errorMsg, e);
+ throw new ADCException(errorMsg, e);
+ } catch (AutoScalerServiceNonExistingLBExceptionException e) {
+ String errorMsg = "LB Cluster doesn't exist. Cluster id: "+clusterId;
+ log.error(errorMsg, e);
+ throw new ADCException(errorMsg, e);
+ }
+ }
public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy getDeploymentPolicy (String deploymentPolicyId)
throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/88167dae/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java
index dae407e..b75ebe0 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java
@@ -81,7 +81,8 @@ public abstract class CartridgeSubscription implements Serializable {
getCluster().setHostName(cartridgeInfo.getHostName());
this.setSubscriptionStatus(CartridgeConstants.SUBSCRIBED);
this.connectedSubscriptionAliases = new ArrayList<String>();
- if(getCartridgeInfo().getMultiTenant()) {
+ boolean isMultiTenant = getCartridgeInfo().getMultiTenant();
+ if(isMultiTenant) {
subscriptionTenancyBehaviour = new SubscriptionMultiTenantBehaviour(this);
}
else {