Google compute engine load balancing support for stratos

components/org.apache.stratos.autoscaler/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.cartridge.agent/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java

@@ -77,7 +77,8 @@ public class JavaCartridgeAgentTest {
     private static final String PARTITION_ID = "partition-1";
     private static final String TENANT_ID = "-1234";
     private static final String SERVICE_NAME = "php";
-    public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.1";
+    private static final String INSTANCE_ID = "instance-1";
+    public static final String AGENT_NAME = "apache-stratos-cartridge-agent-4.1.2-SNAPSHOT";
     private static HashMap<String, Executor> executorList;
     private static ArrayList<ServerSocket> serverSocketList;
     private final ArtifactUpdatedEvent artifactUpdatedEvent;
@@ -249,7 +250,7 @@ private String setupJavaAgent() {
             }
 
             log.info("Copying agent jar");
-            String agentJar = "org.apache.stratos.cartridge.agent-4.1.1.jar";
+            String agentJar = "org.apache.stratos.cartridge.agent-4.1.2-SNAPSHOT.jar";
             String agentJarSource = getResourcesFolderPath() + "/../" + agentJar;
             String agentJarDest = agentHome.getCanonicalPath() + "/lib/" + agentJar;
             FileUtils.copyFile(new File(agentJarSource), new File(agentJarDest));
@@ -327,7 +328,7 @@ public void run() {
                                 // Publish member initialized event
                                 log.info("Publishing member initialized event...");
                                 MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent(
-                                        SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, PARTITION_ID
+                                        SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, PARTITION_ID, INSTANCE_ID
                                 );
                                 publishEvent(memberInitializedEvent);
                                 log.info("Member initialized event published");

components/org.apache.stratos.cli/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.cloud.controller/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java

@@ -171,7 +171,8 @@ public static void sendMemberInitializedEvent(MemberContext memberContext) {
                 memberContext.getClusterInstanceId(),
                 memberContext.getMemberId(),
                 memberContext.getNetworkPartitionId(),
-                memberContext.getPartition().getId());
+                memberContext.getPartition().getId(),
+                memberContext.getInstanceId());
 
         memberInitializedEvent.setDefaultPrivateIP(memberContext.getDefaultPrivateIP());
         if (memberContext.getPrivateIPs() != null) {

components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java

@@ -444,6 +444,7 @@ public static void handleMemberInitializedEvent(MemberContext memberContext) {
             if (memberContext.getPublicIPs() != null) {
                 member.setMemberPublicIPs(Arrays.asList(memberContext.getPublicIPs()));
             }
+            member.setInstanceId(memberContext.getInstanceId());
 
             // try update lifecycle state
             if (!member.isStateTransitionValid(MemberStatus.Initialized)) {

components/org.apache.stratos.common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.custom.handlers/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.deployment/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.email.sender/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/org.apache.stratos.kubernetes.client/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.load.balancer.common/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java

@@ -32,6 +32,8 @@ public class Member {
     private String clusterId;
     private String memberId;
     private String hostName;
+    //instance id provided by IaaS in order to use in GCE load balancer
+    private String instanceId;
     private Map<Integer, Port> portMap;
 
     public Member(String serviceName, String clusterId, String memberId, String hostName) {
@@ -86,4 +88,12 @@ public Collection getPorts() {
     public String getServiceName() {
         return serviceName;
     }
+
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
 }

components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java

@@ -440,6 +440,9 @@ private org.apache.stratos.load.balancer.common.domain.Member transformMember(Me
                 member.addPort(transformPort(port));
             }
         }
+        if (messagingMember.getInstanceId() != null) {
+            member.setInstanceId(messagingMember.getInstanceId());
+        }
         return member;
     }
 }

components/org.apache.stratos.load.balancer.extension.api/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>

components/org.apache.stratos.load.balancer/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.logging.view.ui/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.manager.styles/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/org.apache.stratos.manager/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.messaging/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java

@@ -60,6 +60,8 @@ public class Member implements Serializable, LifeCycleStateTransitionBehavior<Me
     // instance id to use if snapshot wise group scaling is enabled
     private LifeCycleStateManager<MemberStatus> memberStateManager;
     private LoadBalancingIPType loadBalancingIPType;
+    //instance id provided by IaaS(In order to use in GCE Load balancer)
+    private String instanceId;
 
     public Member(String serviceName, String clusterId, String memberId, String clusterInstanceId,
                   String networkPartitionId, String partitionId, LoadBalancingIPType loadBalancingIPType,
@@ -209,6 +211,14 @@ public LoadBalancingIPType getLoadBalancingIPType() {
         return loadBalancingIPType;
     }
 
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
     @Override
     public String toString() {
         return "Member [serviceName=" + getServiceName()

components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberInitializedEvent.java

@@ -36,6 +36,8 @@ public class MemberInitializedEvent extends TopologyEvent implements Serializabl
     private final String networkPartitionId;
     private final String partitionId;
     private final String memberId;
+    //instance Id provided by IaaS
+    private final String instanceId;
 
     private List<String> memberPublicIPs;
     private String defaultPublicIP;
@@ -44,13 +46,14 @@ public class MemberInitializedEvent extends TopologyEvent implements Serializabl
     private Properties properties;
 
     public MemberInitializedEvent(String serviceName, String clusterId, String clusterInstanceId, String memberId,
-                                  String networkPartitionId, String partitionId) {
+                                  String networkPartitionId, String partitionId, String instanceId) {
         this.serviceName = serviceName;
         this.clusterId = clusterId;
         this.clusterInstanceId = clusterInstanceId;
         this.memberId = memberId;
         this.networkPartitionId = networkPartitionId;
         this.partitionId = partitionId;
+        this.instanceId = instanceId;
     }
 
     public String getServiceName() {
@@ -116,4 +119,8 @@ public List<String> getMemberPrivateIPs() {
     public void setMemberPrivateIPs(List<String> memberPrivateIPs) {
         this.memberPrivateIPs = memberPrivateIPs;
     }
+
+    public String getInstanceId() {
+        return instanceId;
+    }
 }

components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java

@@ -140,6 +140,7 @@ private boolean doProcess(MemberInitializedEvent event, Topology topology) {
             member.setMemberPublicIPs(event.getMemberPublicIPs());
             member.setDefaultPrivateIP(event.getDefaultPrivateIP());
             member.setMemberPrivateIPs(event.getMemberPrivateIPs());
+            member.setInstanceId(event.getInstanceId());
 
             if (log.isInfoEnabled()) {
                 log.info(String.format("Member initialized: [service] %s [cluster] %s [member] %s",

components/org.apache.stratos.metadata.client/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.stratos.metadata.client</artifactId>

components/org.apache.stratos.metadata.service/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.mock.iaas.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.mock.iaas.client/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <artifactId>stratos-components-parent</artifactId>
         <groupId>org.apache.stratos</groupId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

components/org.apache.stratos.mock.iaas/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>stratos-components-parent</artifactId>
         <groupId>org.apache.stratos</groupId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

components/org.apache.stratos.python.cartridge.agent/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java

@@ -74,6 +74,7 @@ public class PythonCartridgeAgentTest {
     private static final String TENANT_ID = "-1234";
     private static final String SERVICE_NAME = "php";
     public static final String SOURCE_PATH = "/tmp/stratos-pca-test-app-path/";
+    private static final String INSTANCE_ID = "instance-1";
 
     private static List<ServerSocket> serverSocketList;
     private static Map<String, Executor> executorList;
@@ -282,8 +283,7 @@ public void run() {
                                 // Publish member initialized event
                                 log.info("Publishing member initialized event...");
                                 MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent(
-                                        SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID,
-                                        PARTITION_ID
+                                        SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, PARTITION_ID, INSTANCE_ID
                                 );
                                 publishEvent(memberInitializedEvent);
                                 log.info("Member initialized event published");

components/org.apache.stratos.rest.endpoint/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.sso.redirector.ui/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.apache.stratos.tenant.activity/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>