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/01/06 14:05:57 UTC

stratos git commit: Update the payload with the dependency cluster ids

Repository: stratos
Updated Branches:
  refs/heads/master 32b8e12e2 -> 7515b8bb2


Update the payload with the dependency cluster ids


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

Branch: refs/heads/master
Commit: 7515b8bb22ff790d3e9f0c96fa1d8336cd4538cf
Parents: 32b8e12
Author: gayan <ga...@puppet.gayan.org>
Authored: Tue Jan 6 18:35:24 2015 +0530
Committer: gayan <ga...@puppet.gayan.org>
Committed: Tue Jan 6 18:35:24 2015 +0530

----------------------------------------------------------------------
 .../parser/DefaultApplicationParser.java        | 32 +++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/7515b8bb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index eebe7ec..8c8296f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -312,7 +312,7 @@ public class DefaultApplicationParser implements ApplicationParser {
                          " ] for Composite Application");
              }
 
-    		// get hostname and cluster id
+    		 // get hostname and cluster id
              ClusterInformation clusterInfo;
              assert cartridgeInfo != null;
              if (cartridgeInfo.getMultiTenant()) {
@@ -324,20 +324,6 @@ public class DefaultApplicationParser implements ApplicationParser {
              String hostname = clusterInfo.getHostName(subscriptionAlias, cartridgeInfo.getHostName());
              String clusterId = clusterInfo.getClusterId(subscriptionAlias, cartridgeType);
 
-		     String[] arrDependencyClusterIDs = new String[dependencyClusterIDs.size()];
-		     arrDependencyClusterIDs = dependencyClusterIDs.toArray(arrDependencyClusterIDs);
-
-		     // create and collect this cluster's information
-             ApplicationClusterContext appClusterCtxt = createApplicationClusterContext(appId, groupName, cartridgeInfo,
-                     key, tenantId, cartridgeContext.getSubscribableInfoContext().getRepoUrl(), subscriptionAlias,
-                     clusterId, hostname, cartridgeContext.getSubscribableInfoContext().getDeploymentPolicy(), false,
-                     cartridgeContext.getSubscribableInfoContext().getDependencyAliases(),
-                     cartridgeContext.getSubscribableInfoContext().getProperties(), arrDependencyClusterIDs);
-
-             appClusterCtxt.setAutoscalePolicyName(cartridgeContext.getSubscribableInfoContext().getAutoscalingPolicy());
-             appClusterCtxt.setProperties(cartridgeContext.getSubscribableInfoContext().getProperties());
-             this.applicationClusterContexts.add(appClusterCtxt);
-
 		     // add relevant information to the map
 		     ClusterDataHolder clusterDataHolder = new ClusterDataHolder(cartridgeType, clusterId);
 		     clusterDataHolder.setMinInstances(cartridgeContext.getCartridgeMin());
@@ -355,11 +341,21 @@ public class DefaultApplicationParser implements ApplicationParser {
 			     }
 
 		     }
+		     String[] arrDependencyClusterIDs = new String[dependencyClusterIDs.size()];
+		     arrDependencyClusterIDs = dependencyClusterIDs.toArray(arrDependencyClusterIDs);
 
+		     // create and collect this cluster's information
+             ApplicationClusterContext appClusterCtxt = createApplicationClusterContext(appId, groupName, cartridgeInfo,
+                     key, tenantId, cartridgeContext.getSubscribableInfoContext().getRepoUrl(), subscriptionAlias,
+                     clusterId, hostname, cartridgeContext.getSubscribableInfoContext().getDeploymentPolicy(), false,
+                     cartridgeContext.getSubscribableInfoContext().getDependencyAliases(),
+                     cartridgeContext.getSubscribableInfoContext().getProperties(), arrDependencyClusterIDs);
 
-        }
-
+             appClusterCtxt.setAutoscalePolicyName(cartridgeContext.getSubscribableInfoContext().getAutoscalingPolicy());
+             appClusterCtxt.setProperties(cartridgeContext.getSubscribableInfoContext().getProperties());
+             this.applicationClusterContexts.add(appClusterCtxt);
 
+         }
          return clusterDataMap;
     }
 
@@ -715,7 +711,7 @@ public class DefaultApplicationParser implements ApplicationParser {
                 hostname, repoUrl, alias, null, dependencyAliases, properties, oauthToken, dependencyClustorIDs);
 
         String textPayload = payloadData.toString();
-
+		log.info("Payload:::"+textPayload);
         return new ApplicationClusterContext(cartridgeInfo.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB);
     }