You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/09/10 23:50:42 UTC

[16/21] stratos git commit: Uplifting automation engine to v4.4.3, dynamically pick ports for integration tests

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/common/log4j.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/common/log4j.properties b/products/stratos/modules/integration/src/test/resources/common/log4j.properties
deleted file mode 100644
index 72ad1c4..0000000
--- a/products/stratos/modules/integration/src/test/resources/common/log4j.properties
+++ /dev/null
@@ -1,206 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-#
-# This is the log4j configuration file used by Stratos
-#
-
-log4j.rootLogger=INFO, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY, CARBON_SYS_LOG
-
-log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE
-log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.axis2.clustering=INFO
-log4j.logger.org.apache=INFO
-log4j.logger.org.apache.catalina=WARN
-log4j.logger.org.apache.tomcat=WARN
-log4j.logger.org.wso2.carbon.apacheds=WARN
-log4j.logger.org.apache.directory.server.ldap=WARN
-log4j.logger.org.apache.directory.server.core.event=WARN
-log4j.logger.com.atomikos=INFO,ATOMIKOS
-log4j.logger.org.quartz=WARN
-log4j.logger.org.apache.jackrabbit.webdav=WARN
-log4j.logger.org.apache.juddi=ERROR
-log4j.logger.org.apache.commons.digester.Digester=WARN
-log4j.logger.org.apache.jasper.compiler.TldLocationsCache=WARN
-log4j.logger.org.apache.qpid=WARN
-log4j.logger.org.apache.qpid.server.Main=INFO
-log4j.logger.qpid.message=WARN
-log4j.logger.qpid.message.broker.listening=INFO
-log4j.logger.org.apache.tiles=WARN
-log4j.logger.org.apache.commons.httpclient=ERROR
-log4j.logger.org.apache.coyote=WARN
-log4j.logger.org.apache.solr=ERROR
-log4j.logger.org.infinispan=WARN
-log4j.logger.org.jgroups=ERROR
-log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=ERROR
-log4j.logger.org.wso2=INFO
-
-# Apache Stratos logging configuration
-log4j.logger.org.apache.stratos.manager=INFO
-log4j.logger.org.apache.stratos.autoscaler=INFO
-log4j.logger.org.apache.stratos.messaging=INFO
-log4j.logger.org.apache.stratos.cloud.controller=INFO
-log4j.logger.org.wso2.andes.client=ERROR
-# Autoscaler rule logs
-log4j.logger.org.apache.stratos.autoscaler.rule.RuleLog=INFO
-
-# Apache jclouds
-#log4j.logger.jclouds.wire=DEBUG
-#log4j.logger.jclouds.headers=DEBUG
-#log4j.logger.org.jclouds=DEBUG
-
-# CEP Window processors
-#log4j.logger.org.apache.stratos.cep.extension.FaultHandlingWindowProcessor=DEBUG
-
-log4j.logger.org.apache.axis2.enterprise=FATAL, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.opensaml.xml=WARN, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_LOGFILE, CARBON_MEMORY 
-
-# Following are to remove false error messages from startup (IS)
-log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.server.core.DefaultDirectoryService=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.server.core=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-
-# Hive logging configuration
-log4j.logger.DataNucleus=ERROR
-log4j.logger.Datastore=ERROR
-log4j.logger.Datastore.Schema=ERROR
-log4j.logger.JPOX.Datastore=ERROR
-log4j.logger.JPOX.Plugin=ERROR
-log4j.logger.JPOX.MetaData=ERROR
-log4j.logger.JPOX.Query=ERROR
-log4j.logger.JPOX.General=ERROR
-log4j.logger.JPOX.Enhancer=ERROR
-log4j.logger.org.apache.hadoop.hive=WARN
-log4j.logger.hive=WARN
-log4j.logger.ExecMapper=WARN
-log4j.logger.ExecReducer=WARN
-log4j.logger.net.sf.ehcache.config.ConfigurationFactory=ERROR
-log4j.logger.org.apache.axis2.clustering.tribes.Axis2GroupChannel=FATAL
-
-log4j.logger.trace.messages=TRACE,CARBON_TRACE_LOGFILE
-
-log4j.additivity.org.apache.axis2.clustering=false
-log4j.additivity.com.atomikos=false
-
-# CARBON_CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CARBON_CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CARBON_CONSOLE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-# ConversionPattern will be overridden by the configuration setting in the DB
-log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m%n
-log4j.appender.CARBON_CONSOLE.layout.TenantPattern=%U%@%D[%T]
-log4j.appender.CARBON_CONSOLE.threshold=DEBUG
-
-# CARBON_MEMORY is set to be a MemoryAppender using a PatternLayout.
-log4j.appender.CARBON_MEMORY=org.wso2.carbon.logging.appenders.MemoryAppender
-log4j.appender.CARBON_MEMORY.layout=org.apache.log4j.PatternLayout
-log4j.appender.CARBON_MEMORY.bufferSize=200
-# ConversionPattern will be overridden by the configuration setting in the DB
-#log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p - %x %m {%c}%n
-log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m%n
-log4j.appender.CARBON_MEMORY.threshold=DEBUG
-
-
-# CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout.
-log4j.appender.CARBON_LOGFILE=org.apache.log4j.RollingFileAppender
-log4j.appender.CARBON_LOGFILE.MaxFileSize=10000KB
-log4j.appender.CARBON_LOGFILE.MaxBackupIndex=10
-# Log file will be overridden by the configuration setting in the DB
-# This path should be relative to WSO2 Carbon Home
-log4j.appender.CARBON_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon${instance.log}.log
-log4j.appender.CARBON_LOGFILE.Append=true
-log4j.appender.CARBON_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-# ConversionPattern will be overridden by the configuration setting in the DB
-log4j.appender.CARBON_LOGFILE.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m%n
-log4j.appender.CARBON_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
-log4j.appender.CARBON_LOGFILE.threshold=DEBUG
-
-log4j.appender.CARBON_SYS_LOG = org.apache.log4j.net.SyslogAppender
-log4j.appender.CARBON_SYS_LOG.layout=org.apache.log4j.PatternLayout
-log4j.appender.CARBON_SYS_LOG.layout.ConversionPattern=[%d] %5p {%c} - %x %m%n
-log4j.appender.CARBON_SYS_LOG.SyslogHost=localhost
-log4j.appender.CARBON_SYS_LOG.Facility=USER
-log4j.appender.CARBON_SYS_LOG.threshold=DEBUG
-
-# LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT 
-log4j.appender.LOGEVENT=org.wso2.carbon.logging.appender.LogEventAppender
-log4j.appender.LOGEVENT.url=tcp://10.100.3.103:7611
-log4j.appender.LOGEVENT.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-log4j.appender.LOGEVENT.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace
-log4j.appender.LOGEVENT.userName=admin
-log4j.appender.LOGEVENT.password=admin
-
-# Appender config to CARBON_TRACE_LOGFILE
-log4j.appender.CARBON_TRACE_LOGFILE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.CARBON_TRACE_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon-trace-messages${instance.log}.log
-log4j.appender.CARBON_TRACE_LOGFILE.Append=true
-log4j.appender.CARBON_TRACE_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-log4j.appender.CARBON_TRACE_LOGFILE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m%n
-log4j.appender.CARBON_TRACE_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
-log4j.appender.CARBON_TRACE_LOGFILE.threshold=TRACE
-log4j.additivity.trace.messages=false
-
-# Appender config to AUDIT_LOGFILE
-log4j.appender.AUDIT_LOGFILE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.AUDIT_LOGFILE.File=${carbon.home}/repository/logs/audit.log
-log4j.appender.AUDIT_LOGFILE.Append=true
-log4j.appender.AUDIT_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-log4j.appender.AUDIT_LOGFILE.layout.ConversionPattern=[%d] %P%5p - %x %m %n
-log4j.appender.AUDIT_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
-log4j.appender.AUDIT_LOGFILE.threshold=INFO
-log4j.additivity.AUDIT_LOG=false
-
-# The event trace logger dumps enough information @INFO level.
-# Writes events received by DataBridge
-log4j.category.LOG_AGGREGATOR_LOGGER=INFO, LOG_AGGREGATOR_FILE_APPENDER
-log4j.additivity.LOG_AGGREGATOR_LOGGER=false
-log4j.appender.LOG_AGGREGATOR_FILE_APPENDER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.LOG_AGGREGATOR_FILE_APPENDER.File=${carbon.home}/repository/logs/${instance.log}/aggregate${instance.log}.log
-log4j.appender.LOG_AGGREGATOR_FILE_APPENDER.Append=true
-log4j.appender.LOG_AGGREGATOR_FILE_APPENDER.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOG_AGGREGATOR_FILE_APPENDER.layout.ConversionPattern=%m%n
-
-# The event trace logger dumps enough information @INFO level, but maybe pushed upto TRACE.
-# Writes only run-time/event processing time tracing/debug messages for event passing through trace
-# enabled transport adapters event formatters, builders and processors. Enabling event tracing on these has a performance impact
-log4j.category.EVENT_TRACE_LOGGER=INFO, EVENT_TRACE_APPENDER
-log4j.additivity.EVENT_TRACE_LOGGER=false
-log4j.appender.EVENT_TRACE_APPENDER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.EVENT_TRACE_APPENDER.File=${carbon.home}/repository/logs/${instance.log}/wso2-cep-trace${instance.log}.log
-log4j.appender.EVENT_TRACE_APPENDER.Append=true
-log4j.appender.EVENT_TRACE_APPENDER.layout=org.apache.log4j.PatternLayout
-log4j.appender.EVENT_TRACE_APPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
-
-# Appender config to send Atomikos transaction logs to new log file tm.out.
-log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender
-log4j.appender.ATOMIKOS.File = repository/logs/tm.out
-log4j.appender.ATOMIKOS.Append = true
-log4j.appender.ATOMIKOS.layout = org.apache.log4j.PatternLayout
-log4j.appender.ATOMIKOS.layout.ConversionPattern=%p %t %c - %m%n
-
-# This file is used to override the default logger settings, and is used to remove unwanted logs from Shindig appearing on the console.
-
-# Specification of Handler used by Console Logger
-handlers=java.util.logging.ConsoleHandler
-
-# Replacing default INFO level with SEVERE
-java.util.logging.ConsoleHandler.level=SEVERE

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/common/mock-iaas.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/common/mock-iaas.xml b/products/stratos/modules/integration/src/test/resources/common/mock-iaas.xml
deleted file mode 100644
index 0f6b206..0000000
--- a/products/stratos/modules/integration/src/test/resources/common/mock-iaas.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~  http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<mock-iaas enabled="true">
-    <health-statistics>
-        <cartridge type="tomcat">
-            <!-- factor:memory-consumption|load-average|requests-in-flight-->
-            <!-- mode:loop|continue|stop -->
-            <!-- Mode defines the action needs to be taken after the last sample value:
-                 loop: start from beginning
-                 continue: continue the last sample value
-                 stop: stop publishing statistics -->
-            <pattern factor="memory-consumption" mode="continue">
-                <!-- Sample values -->
-                <sampleValues>20,30,40,50,60,70,50,40,30,20</sampleValues>
-                <!-- Duration of each sample value in seconds -->
-                <sampleDuration>60</sampleDuration>
-            </pattern>
-            <pattern factor="load-average" mode="continue">
-                <!-- Sample values -->
-                <sampleValues>20</sampleValues>
-                <!-- Duration of each sample value in seconds -->
-                <sampleDuration>60</sampleDuration>
-            </pattern>
-        </cartridge>
-        <cartridge type="c7-single-cluster-scaling-test">
-            <!-- factor:memory-consumption|load-average|requests-in-flight-->
-            <!-- mode:loop|continue|stop -->
-            <!-- Mode defines the action needs to be taken after the last sample value:
-                 loop: start from beginning
-                 continue: continue the last sample value
-                 stop: stop publishing statistics -->
-            <pattern factor="memory-consumption" mode="continue">
-                <!-- Sample values -->
-                <sampleValues>60,70,80,90,90,90,40,60,50,60</sampleValues>
-                <!-- Duration of each sample value in seconds -->
-                <sampleDuration>60</sampleDuration>
-            </pattern>
-            <pattern factor="load-average" mode="continue">
-                <!-- Sample values -->
-                <sampleValues>70,70,70</sampleValues>
-                <!-- Duration of each sample value in seconds -->
-                <sampleDuration>60</sampleDuration>
-            </pattern>
-        </cartridge>
-        <cartridge type="c7-partition-round-robin-test">
-            <!-- factor:memory-consumption|load-average|requests-in-flight-->
-            <!-- mode:loop|continue|stop -->
-            <!-- Mode defines the action needs to be taken after the last sample value:
-                 loop: start from beginning
-                 continue: continue the last sample value
-                 stop: stop publishing statistics -->
-            <pattern factor="memory-consumption" mode="stop">
-                <!-- Sample values -->
-                <sampleValues>20,20,20,20</sampleValues>
-                <!-- Duration of each sample value in seconds -->
-                <sampleDuration>30</sampleDuration>
-            </pattern>
-            <pattern factor="load-average" mode="stop">
-                <!-- Sample values -->
-                <sampleValues>20,20,20,20</sampleValues>
-                <!-- Duration of each sample value in seconds -->
-                <sampleDuration>30</sampleDuration>
-            </pattern>
-        </cartridge>
-        <cartridge type="c3-group-termination-behavior-test">
-            <!-- factor:memory-consumption|load-average|requests-in-flight-->
-            <!-- mode:loop|continue|stop -->
-            <!-- Mode defines the action needs to be taken after the last sample value:
-                 loop: start from beginning
-                 continue: continue the last sample value
-                 stop: stop publishing statistics -->
-            <pattern factor="memory-consumption" mode="stop">
-                <!-- Sample values -->
-                <sampleValues>20,20,20</sampleValues>
-                <!-- Duration of each sample value in seconds -->
-                <sampleDuration>60</sampleDuration>
-            </pattern>
-            <pattern factor="load-average" mode="stop">
-                <!-- Sample values -->
-                <sampleValues>20,20,20</sampleValues>
-                <!-- Duration of each sample value in seconds -->
-                <sampleDuration>60</sampleDuration>
-            </pattern>
-        </cartridge>
-        <cartridge type="php">
-            <!-- factor:memory-consumption|load-average|requests-in-flight-->
-            <!-- mode:loop|continue|stop -->
-            <!-- Mode defines the action needs to be taken after the last sample value:
-                 loop: start from beginning
-                 continue: continue the last sample value
-                 stop: stop publishing statistics -->
-            <pattern factor="memory-consumption" mode="continue">
-                <!-- Sample values -->
-                <sampleValues>20,30,40,50,60,70,50,40,30,20</sampleValues>
-                <!-- Duration of each sample value in seconds -->
-                <sampleDuration>60</sampleDuration>
-            </pattern>
-            <pattern factor="load-average" mode="continue">
-                <!-- Sample values -->
-                <sampleValues>20</sampleValues>
-                <!-- Duration of each sample value in seconds -->
-                <sampleDuration>60</sampleDuration>
-            </pattern>
-        </cartridge>
-    </health-statistics>
-</mock-iaas>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/common/scaling.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/common/scaling.drl b/products/stratos/modules/integration/src/test/resources/common/scaling.drl
deleted file mode 100644
index 69d9111..0000000
--- a/products/stratos/modules/integration/src/test/resources/common/scaling.drl
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.autoscaler
-
-import org.apache.stratos.messaging.domain.topology.Service;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.autoscaler.context.AutoscalerContext;
-import org.apache.stratos.autoscaler.context.member.MemberStatsContext;
-import org.apache.stratos.autoscaler.util.AutoscalerConstants;
-import org.apache.stratos.autoscaler.context.partition.network.NetworkPartitionContext;
-import org.apache.stratos.autoscaler.pojo.policy.PolicyManager;
-import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy;
-import org.apache.stratos.autoscaler.pojo.policy.autoscale.RequestsInFlight;
-import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadThresholds;
-import org.apache.stratos.autoscaler.pojo.policy.autoscale.MemoryConsumption;
-import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadAverage;
-import org.apache.stratos.autoscaler.algorithms.PartitionAlgorithm;
-import org.apache.stratos.autoscaler.algorithms.partition.OneAfterAnother;
-import org.apache.stratos.autoscaler.algorithms.partition.RoundRobin;
-import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext;
-import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator;
-import org.apache.stratos.cloud.controller.stub.domain.Partition;
-import org.apache.stratos.cloud.controller.stub.domain.MemberContext;
-import org.apache.stratos.autoscaler.context.cluster.ClusterInstanceContext;
-
-import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadAverage
-import org.apache.stratos.autoscaler.pojo.policy.autoscale.MemoryConsumption
-
-global org.apache.stratos.autoscaler.rule.RuleLog log;
-global org.apache.stratos.autoscaler.rule.RuleTasksDelegator delegator;
-global org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy autoscalePolicy;
-global java.lang.String applicationId;
-global java.lang.String clusterId;
-global java.lang.Boolean rifReset;
-global java.lang.Boolean mcReset;
-global java.lang.Boolean laReset;
-global java.lang.Boolean arspiReset;
-global java.lang.String algorithmName;
-
-rule "Scaling Rule"
-dialect "mvel"
-	when
-       clusterInstanceContext : ClusterInstanceContext ()
-
-        loadThresholds : LoadThresholds() from  autoscalePolicy.getLoadThresholds()
-        partitionAlgorithm : PartitionAlgorithm() from  delegator.getPartitionAlgorithm(algorithmName)
-
-        eval(log.debug("Running scale up rule: [network-partition] " + clusterInstanceContext.getNetworkPartitionId() +
-            " [cluster] " + clusterId))
-        eval(log.debug("[scaling] [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster] "
-            + clusterId + " Algorithm name: " + algorithmName))
-
-	
-        rifThreshold : Float() from  loadThresholds.getRequestsInFlightThreshold()
-
-        rifAverage : Float() from  clusterInstanceContext.getAverageRequestsInFlight()
-        rifGradient : Float() from  clusterInstanceContext.getRequestsInFlightGradient()
-        rifSecondDerivative : Float() from  clusterInstanceContext.getRequestsInFlightSecondDerivative()
-	    rifPredictedValue : Double() from delegator.getPredictedValueForNextMinute(rifAverage, rifGradient, rifSecondDerivative, 1)
-
-        mcThreshold : Float() from  loadThresholds.getMemoryConsumptionThreshold()
-
-        mcPredictedValue : Double() from delegator.getMemoryConsumptionPredictedValue(clusterInstanceContext)
-
-        laThreshold : Float() from  loadThresholds.getLoadAverageThreshold()
-
-        laPredictedValue : Double() from delegator.getLoadAveragePredictedValue(clusterInstanceContext)
-
-        activeInstancesCount : Integer() from clusterInstanceContext.getActiveMemberCount()
-        maxInstancesCount : Integer() from clusterInstanceContext.getMaxInstanceCount()
-        minInstancesCount : Integer() from clusterInstanceContext.getMinInstanceCount()
-        requestsServedPerInstance : Float() from  clusterInstanceContext.getRequestsServedPerInstance()
-        averageRequestsServedPerInstance : Float() from  clusterInstanceContext.getAverageRequestsServedPerInstance()
-
-        numberOfInstancesReuquiredBasedOnRif : Integer() from delegator.getNumberOfInstancesRequiredBasedOnRif(
-            rifPredictedValue, rifThreshold)
-        numberOfInstancesReuquiredBasedOnMemoryConsumption : Integer() from
-            delegator.getNumberOfInstancesRequiredBasedOnMemoryConsumption(mcThreshold, mcPredictedValue, minInstancesCount,
-            maxInstancesCount)
-        numberOfInstancesReuquiredBasedOnLoadAverage : Integer() from
-            delegator.getNumberOfInstancesRequiredBasedOnLoadAverage(laThreshold, laPredictedValue, minInstancesCount)
-
-        numberOfRequiredInstances : Integer() from delegator.getMaxNumberOfInstancesRequired(
-            numberOfInstancesReuquiredBasedOnRif, numberOfInstancesReuquiredBasedOnMemoryConsumption, mcReset,
-            numberOfInstancesReuquiredBasedOnLoadAverage, laReset)
-
-
-
-        scaleUp : Boolean() from (activeInstancesCount < numberOfRequiredInstances)
-        scaleDown : Boolean() from (activeInstancesCount > numberOfRequiredInstances || (numberOfRequiredInstances == 1 && activeInstancesCount == 1))
-
-
-        eval(log.debug("[scaling] " + "[cluster] " + clusterId + " RIF Resetted?: " + rifReset))
-        eval(log.debug("[scaling] " + "[cluster] " + clusterId + " RIF predicted value: " + rifPredictedValue))
-        eval(log.debug("[scaling] " + "[cluster] " + clusterId + " RIF threshold: " + rifThreshold))
-
-        eval(log.debug("[scaling] " + "[cluster] " + clusterId + " MC predicted value: " + mcPredictedValue))
-        eval(log.debug("[scaling] " + "[cluster] " + clusterId + " MC threshold: " + mcThreshold))
-
-        eval(log.debug("[scaling] " + "[cluster] " + clusterId + " LA predicted value: " + laPredictedValue))
-        eval(log.debug("[scaling] " + "[cluster] " + clusterId + " LA threshold: " + laThreshold))
-
-        eval(log.debug("[scaling] " + "[cluster] " + clusterId + " Scale-up action: " + scaleUp))
-        eval(log.debug("[scaling] " + "[cluster] " + clusterId + " Scale-down action: " + scaleDown))
-
-	then
-
-	    log.debug("[scaling] Number of required instances based on stats: " + numberOfRequiredInstances + " " +
-	        "[active instances count] " + activeInstancesCount + " [network-partition] " +
-	        clusterInstanceContext.getNetworkPartitionId() + " [cluster] " + clusterId);
-
-        int nonTerminatedMembers = clusterInstanceContext.getNonTerminatedMemberCount();
-        if(scaleUp){
-
-            int clusterMaxMembers = clusterInstanceContext.getMaxInstanceCount();
-            if (nonTerminatedMembers < clusterMaxMembers) {
-
-                int additionalInstances = 0;
-                if(clusterMaxMembers < numberOfRequiredInstances){
-
-                    additionalInstances = clusterMaxMembers - nonTerminatedMembers;
-                    log.info("[scale-up] Required member count based on stat based scaling is higher than max, hence"
-                            + " notifying to parent for possible group scaling or app bursting. [cluster] " + clusterId
-                            + " [instance id]" + clusterInstanceContext.getId() + " [max] " + clusterMaxMembers
-                            + " [number of required instances] " + numberOfRequiredInstances
-                            + " [additional instances to be created] " + additionalInstances);
-                    delegator.delegateScalingOverMaxNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(),
-                        clusterInstanceContext.getId());
-                } else {
-
-                    additionalInstances = numberOfRequiredInstances - nonTerminatedMembers;
-                }
-
-                clusterInstanceContext.resetScaleDownRequestsCount();
-
-                log.debug("[scale-up] " + " [has scaling dependents] " + clusterInstanceContext.hasScalingDependants() +
-                    " [cluster] " + clusterId );
-                if(clusterInstanceContext.hasScalingDependants()) {
-
-                    log.debug("[scale-up] Notifying dependencies [cluster] " + clusterId);
-                    delegator.delegateScalingDependencyNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(),
-                        clusterInstanceContext.getId(), numberOfRequiredInstances, clusterInstanceContext.getMinInstanceCount());
-                } else {
-
-                    boolean partitionsAvailable = true;
-                    int count = 0;
-
-                    while(count != additionalInstances && partitionsAvailable){
-
-                        ClusterLevelPartitionContext partitionContext = (ClusterLevelPartitionContext) partitionAlgorithm.getNextScaleUpPartitionContext(clusterInstanceContext.getPartitionCtxtsAsAnArray());
-                        if(partitionContext != null){
-
-                            log.info("[scale-up] Partition available, hence trying to spawn an instance to scale up! " +
-                                " [application id] " + applicationId +
-                                " [cluster] " + clusterId + " [instance id] " + clusterInstanceContext.getId() +
-                                " [network-partition] " + clusterInstanceContext.getNetworkPartitionId() +
-                                " [partition] " + partitionContext.getPartitionId() +
-                                " scaleup due to RIF: " + (rifReset && (rifPredictedValue > rifThreshold)) +
-                                " [rifPredictedValue] " + rifPredictedValue + " [rifThreshold] " + rifThreshold +
-                                " scaleup due to MC: " + (mcReset && (mcPredictedValue > mcThreshold)) +
-                                " [mcPredictedValue] " + mcPredictedValue + " [mcThreshold] " + mcThreshold +
-                                " scaleup due to LA: " + (laReset && (laPredictedValue > laThreshold)) +
-                                " [laPredictedValue] " + laPredictedValue + " [laThreshold] " + laThreshold);
-
-                            log.debug("[scale-up] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId );
-                            delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId());
-                            count++;
-                        } else {
-
-                            log.warn("[scale-up] No more partition available even though " +
-                             "cartridge-max is not reached!, [cluster] " + clusterId +
-                            " Please update deployment-policy with new partitions or with higher " +
-                             "partition-max");
-                            partitionsAvailable = false;
-                        }
-                    }
-                }
-            } else {
-                log.info("[scale-up] Trying to scale up over max, hence not scaling up cluster itself and
-                        notifying to parent for possible group scaling or app bursting.
-                        [cluster] " + clusterId + " [instance id]" + clusterInstanceContext.getId() +
-                        " [max] " + clusterMaxMembers);
-                delegator.delegateScalingOverMaxNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(),
-                    clusterInstanceContext.getId());
-            }
-        } else if(scaleDown){
-
-            if(nonTerminatedMembers > clusterInstanceContext.getMinInstanceCount){
-
-                log.debug("[scale-down] Decided to Scale down [cluster] " + clusterId);
-                if(clusterInstanceContext.getScaleDownRequestsCount() >= 0 ){
-
-                    log.debug("[scale-down] Reached scale down requests threshold [cluster] " + clusterId + " Count " +
-                        clusterInstanceContext.getScaleDownRequestsCount());
-
-                    if(clusterInstanceContext.hasScalingDependants()) {
-
-                        log.debug("[scale-up] Notifying dependencies [cluster] " + clusterId);
-                        delegator.delegateScalingDependencyNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(),
-                            clusterInstanceContext.getId(), numberOfRequiredInstances, clusterInstanceContext.getMinInstanceCount());
-                    } else{
-
-                        MemberStatsContext selectedMemberStatsContext = null;
-                        double lowestOverallLoad = 0.0;
-                        boolean foundAValue = false;
-                        ClusterLevelPartitionContext partitionContext = (ClusterLevelPartitionContext) partitionAlgorithm.getNextScaleDownPartitionContext(clusterInstanceContext.getPartitionCtxtsAsAnArray());
-                        if(partitionContext != null) {
-                            log.info("[scale-down] Partition available to scale down " +
-                                " [application id] " + applicationId +
-                                " [cluster] " + clusterId + " [instance id] " + clusterInstanceContext.getId() +
-                                " [network-partition] " + clusterInstanceContext.getNetworkPartitionId() +
-                                " [partition] " + partitionContext.getPartitionId() +
-                                " scaledown due to RIF: " + (rifReset && (rifPredictedValue < rifThreshold)) +
-                                " [rifPredictedValue] " + rifPredictedValue + " [rifThreshold] " + rifThreshold +
-                                " scaledown due to MC: " + (mcReset && (mcPredictedValue < mcThreshold)) +
-                                " [mcPredictedValue] " + mcPredictedValue + " [mcThreshold] " + mcThreshold +
-                                " scaledown due to LA: " + (laReset && (laPredictedValue < laThreshold)) +
-                                " [laPredictedValue] " + laPredictedValue + " [laThreshold] " + laThreshold
-                            );
-
-
-                            for(MemberStatsContext memberStatsContext: partitionContext.getMemberStatsContexts().values()){
-
-                                LoadAverage loadAverage = memberStatsContext.getLoadAverage();
-                                log.debug("[scale-down] " + " [cluster] "
-                                    + clusterId + " [member] " + memberStatsContext.getMemberId() + " Load average: " + loadAverage);
-
-                                MemoryConsumption memoryConsumption = memberStatsContext.getMemoryConsumption();
-                                log.debug("[scale-down] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] "
-                                    + clusterId + " [member] " + memberStatsContext.getMemberId() + " Memory consumption: " +
-                                    memoryConsumption);
-
-                                double predictedCpu = delegator.getPredictedValueForNextMinute(loadAverage.getAverage(),
-                                    loadAverage.getGradient(),loadAverage.getSecondDerivative(), 1);
-                                log.debug("[scale-down] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] "
-                                    + clusterId + " [member] " + memberStatsContext.getMemberId() + " Predicted CPU: " + predictedCpu);
-
-                                double predictedMemoryConsumption = delegator.getPredictedValueForNextMinute(
-                                    memoryConsumption.getAverage(),memoryConsumption.getGradient(),memoryConsumption.getSecondDerivative(), 1);
-                                log.debug("[scale-down] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] "
-                                    + clusterId + " [member] " + memberStatsContext.getMemberId() + " Predicted memory consumption: " +
-                                        predictedMemoryConsumption);
-
-                                double overallLoad = (predictedCpu + predictedMemoryConsumption) / 2;
-                                log.debug("[scale-down] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] "
-                                    + clusterId + " [member] " + memberStatsContext.getMemberId() + " Overall load: " + overallLoad);
-
-                                if(!foundAValue){
-                                    foundAValue = true;
-                                    selectedMemberStatsContext = memberStatsContext;
-                                    lowestOverallLoad = overallLoad;
-                                } else if(overallLoad < lowestOverallLoad){
-                                    selectedMemberStatsContext = memberStatsContext;
-                                    lowestOverallLoad = overallLoad;
-                                }
-
-                            }
-                            if(selectedMemberStatsContext != null) {
-                                log.info("[scale-down] Trying to terminating an instace to scale down!" );
-                                log.debug("[scale-down] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] "
-                                    + clusterId + " Member with lowest overall load: " + selectedMemberStatsContext.getMemberId());
-
-                                delegator.delegateTerminate(partitionContext, selectedMemberStatsContext.getMemberId());
-                            }
-                        } else {
-                            log.warn("Partition is not available to scale-down..!!!!");
-                        }
-                    }
-                } else{
-                     log.debug("[scale-down] Not reached scale down requests threshold. " + clusterId + " Count " +
-                        clusterInstanceContext.getScaleDownRequestsCount());
-                     clusterInstanceContext.increaseScaleDownRequestsCount();
-
-                }
-            } else {
-                log.debug("[scale-down] Min is reached, hence not scaling down [cluster] " + clusterId + " [instance id]"
-                    + clusterInstanceContext.getId());
-                //if(clusterInstanceContext.isInGroupScalingEnabledSubtree()){
-
-                    delegator.delegateScalingDownBeyondMinNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(),
-                        clusterInstanceContext.getId());
-                //}
-            }
-        }  else{
-            log.debug("[scaling] No decision made to either scale up or scale down ... [cluster] " + clusterId + " [instance id]"
-             + clusterInstanceContext.getId());
-
-        }
-
-end
-
-
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-1.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-1.json
deleted file mode 100644
index edab5bd..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-1.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "id": "deployment-policy-deployment-policy-test-1",
-    "networkPartitions": [
-        {
-            "id": "network-partition-deployment-policy-test-1",
-            "partitionAlgo": "one-after-another",
-            "partitions": [
-                {
-                    "id": "partition-1",
-                    "partitionMax": 20
-                }
-            ]
-        },
-        {
-            "id": "network-partition-deployment-policy-test-2",
-            "partitionAlgo": "round-robin",
-            "partitions": [
-                {
-                    "id": "network-partition-6-partition-1",
-                    "partitionMax": 10
-                },
-                {
-                    "id": "network-partition-6-partition-2",
-                    "partitionMax": 9
-                }
-            ]
-        }
-    ]
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-2.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-2.json
deleted file mode 100644
index 18cb31c..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-2.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "id": "deployment-policy-deployment-policy-test-2",
-    "networkPartitions": [
-        {
-            "id": "network-partition-deployment-policy-test-1",
-            "partitionAlgo": "one-after-another",
-            "partitions": [
-                {
-                    "id": "partition-1",
-                    "partitionMax": 20
-                }
-            ]
-        },
-        {
-            "id": "network-partition-deployment-policy-test-2",
-            "partitionAlgo": "round-robin",
-            "partitions": [
-                {
-                    "id": "network-partition-6-partition-1",
-                    "partitionMax": 10
-                },
-                {
-                    "id": "network-partition-6-partition-2",
-                    "partitionMax": 9
-                }
-            ]
-        }
-    ]
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-v1.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-v1.json
deleted file mode 100644
index 6c73878..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test-v1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "id": "deployment-policy-deployment-policy-test",
-    "networkPartitions": [
-        {
-            "id": "network-partition-deployment-policy-test-1",
-            "partitionAlgo": "one-after-another",
-            "partitions": [
-                {
-                    "id": "partition-1",
-                    "partitionMax": 25
-                },
-                {
-                    "id": "partition-2",
-                    "partitionMax": 20
-                }
-            ]
-        },
-        {
-            "id": "network-partition-deployment-policy-test-2",
-            "partitionAlgo": "round-robin",
-            "partitions": [
-                {
-                    "id": "network-partition-6-partition-1",
-                    "partitionMax": 15
-                },
-                {
-                    "id": "network-partition-6-partition-2",
-                    "partitionMax": 5
-                }
-            ]
-        }
-    ]
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test.json
deleted file mode 100644
index 49b3e0d..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/deployment-policies/deployment-policy-deployment-policy-test.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "id": "deployment-policy-deployment-policy-test",
-    "networkPartitions": [
-        {
-            "id": "network-partition-deployment-policy-test-1",
-            "partitionAlgo": "one-after-another",
-            "partitions": [
-                {
-                    "id": "partition-1",
-                    "partitionMax": 20
-                }
-            ]
-        },
-        {
-            "id": "network-partition-deployment-policy-test-2",
-            "partitionAlgo": "round-robin",
-            "partitions": [
-                {
-                    "id": "network-partition-6-partition-1",
-                    "partitionMax": 10
-                },
-                {
-                    "id": "network-partition-6-partition-2",
-                    "partitionMax": 9
-                }
-            ]
-        }
-    ]
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-1-v1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-1-v1.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-1-v1.json
deleted file mode 100644
index 9670e48..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-1-v1.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "id": "network-partition-deployment-policy-test-1",
-    "provider": "mock",
-    "partitions": [
-        {
-            "id": "partition-1",
-            "property": [
-                {
-                    "name": "region",
-                    "value": "default"
-                }
-            ]
-        },
-        {
-            "id": "partition-2",
-            "property": [
-                {
-                    "name": "region",
-                    "value": "default1"
-                },
-                {
-                    "name": "zone",
-                    "value": "z1"
-                }
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-1.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-1.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-1.json
deleted file mode 100644
index 3b420fe..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "id": "network-partition-deployment-policy-test-1",
-    "provider": "mock",
-    "partitions": [
-        {
-            "id": "partition-1",
-            "property": [
-                {
-                    "name": "region",
-                    "value": "default"
-                }
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-2.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-2.json b/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-2.json
deleted file mode 100644
index 890ee6c..0000000
--- a/products/stratos/modules/integration/src/test/resources/deployment-policy-test/network-partitions/mock/network-partition-deployment-policy-test-2.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "id": "network-partition-deployment-policy-test-2",
-    "provider": "mock",
-    "partitions": [
-        {
-            "id": "network-partition-6-partition-1",
-            "property": [
-                {
-                    "name": "region",
-                    "value": "default"
-                }
-            ]
-        },
-        {
-            "id": "network-partition-6-partition-2",
-            "property": [
-                {
-                    "name": "region",
-                    "value": "default"
-                }
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-application-bursting-test.json
deleted file mode 100644
index 7bc9c2d..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-application-bursting-test.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "id": "application-policy-group-startup-order-test",
-    "algorithm": "one-after-another",
-    "networkPartitions": [
-        "network-partition-group-startup-order-test-1",
-        "network-partition-group-startup-order-test-2"
-    ],
-    "properties": [
-        {
-            "name": "networkPartitionGroups",
-            "value": "network-partition-group-startup-order-test-1|network-partition-group-startup-order-test-2"
-        },
-        {
-            "name": "key-2",
-            "value": "value-2"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-group-startup-order-test.json
deleted file mode 100644
index e7d80a5..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/application-policies/application-policy-group-startup-order-test.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "id": "application-policy-group-startup-order-test",
-    "algorithm": "one-after-another",
-    "networkPartitions": [
-        "network-partition-group-startup-order-test-1"
-    ],
-    "properties": [
-        {
-            "name": "key-2",
-            "value": "value-2"
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json
deleted file mode 100644
index db04c61..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/app-bursting-single-cartriddge-group.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "applicationId": "group-startup-order-test",
-    "alias": "my-cartridge-group-app",
-    "components": {
-        "groups": [
-            {
-                "name": "esb-php-group-group-startup-order-test",
-                "alias": "my-esb-php-group-group-startup-order-test",
-                "deploymentPolicy": "deployment-policy-group-startup-order-test",
-                "groupMinInstances": 1,
-                "groupMaxInstances": 2,
-                "cartridges": [
-                    {
-                        "type": "esb-group-startup-order-test",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "my-esb-group-startup-order-test",
-                            "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                            "artifactRepository": {
-                                "privateRepo": false,
-                                "repoUrl": "https://github.com/imesh/stratos-esb-applications.git",
-                                "repoUsername": "",
-                                "repoPassword": ""
-                            }
-                        }
-                    },
-                    {
-                        "type": "php-group-startup-order-test",
-                        "cartridgeMin": 2,
-                        "cartridgeMax": 4,
-                        "lvsVirtualIP": "192.168.56.50|255.255.255.0",
-                        "subscribableInfo": {
-                            "alias": "my-php-group-startup-order-test",
-                            "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                            "artifactRepository": {
-                                "privateRepo": false,
-                                "repoUrl": "https://github.com/imesh/stratos-php-applications.git",
-                                "repoUsername": "",
-                                "repoPassword": ""
-                            }
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "tomcat-group-startup-order-test",
-                "cartridgeMin": 2,
-                "cartridgeMax": 4,
-                "subscribableInfo": {
-                    "alias": "my-tomcat-group-startup-order-test",
-                    "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                    "deploymentPolicy": "deployment-policy-group-startup-order-test",
-                    "artifactRepository": {
-                        "privateRepo": false,
-                        "repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git",
-                        "repoUsername": "",
-                        "repoPassword": ""
-                    }
-                }
-            }
-        ],
-        "dependencies": {
-            "terminationBehaviour": "terminate-none"
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/group-startup-order-test.json
deleted file mode 100644
index 60ed310..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/applications/group-startup-order-test.json
+++ /dev/null
@@ -1,206 +0,0 @@
-{
-    "applicationId": "group-startup-order-test",
-    "alias": "group-startup-order-test",
-    "components": {
-        "groups": [
-            {
-                "name": "group6-group-startup-order-test",
-                "alias": "my-group6-group-startup-order-test",
-                "groupMinInstances": 1,
-                "groupMaxInstances": 1,
-                "groups": [
-                    {
-                        "name": "group7-group-startup-order-test",
-                        "alias": "my-group7-group-startup-order-test",
-                        "deploymentPolicy": "deployment-policy-group-startup-order-test",
-                        "groupMinInstances": 1,
-                        "groupMaxInstances": 1,
-                        "cartridges": [
-                            {
-                                "type": "tomcat-group-startup-order-test",
-                                "cartridgeMin": 1,
-                                "cartridgeMax": 2,
-                                "subscribableInfo": {
-                                    "alias": "my-group7-tomcat-group-startup-order-test",
-                                    "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                                    "artifactRepository": {
-                                        "privateRepo": false,
-                                        "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git",
-                                        "repoUsername": "",
-                                        "repoPassword": ""
-                                    }
-                                }
-                            },
-                            {
-                                "type": "tomcat1-group-startup-order-test",
-                                "cartridgeMin": 1,
-                                "cartridgeMax": 2,
-                                "subscribableInfo": {
-                                    "alias": "my-group7-tomcat1-group-startup-order-test",
-                                    "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                                    "artifactRepository": {
-                                        "privateRepo": false,
-                                        "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git",
-                                        "repoUsername": "",
-                                        "repoPassword": ""
-                                    }
-                                }
-                            }
-                        ]
-                    },
-                    {
-                        "name": "group-tom2-group-startup-order-test",
-                        "alias": "my-group6-group-tom2-group-startup-order-test",
-                        "deploymentPolicy": "deployment-policy-group-startup-order-test",
-                        "groupMinInstances": 1,
-                        "groupMaxInstances": 1,
-                        "cartridges": [
-                            {
-                                "type": "tomcat2-group-startup-order-test",
-                                "cartridgeMin": 1,
-                                "cartridgeMax": 2,
-                                "subscribableInfo": {
-                                    "alias": "my-group-tom2-tomcat2-group-startup-order-test",
-                                    "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                                    "artifactRepository": {
-                                        "privateRepo": false,
-                                        "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git",
-                                        "repoUsername": "",
-                                        "repoPassword": ""
-                                    }
-                                }
-                            },
-                            {
-                                "type": "tomcat3-group-startup-order-test",
-                                "cartridgeMin": 1,
-                                "cartridgeMax": 2,
-                                "subscribableInfo": {
-                                    "alias": "my-group-tom2-tomcat3-group-startup-order-test",
-                                    "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                                    "artifactRepository": {
-                                        "privateRepo": false,
-                                        "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git",
-                                        "repoUsername": "",
-                                        "repoPassword": ""
-                                    }
-                                }
-                            }
-                        ]
-                    }
-                ]
-            },
-            {
-                "name": "group8-group-startup-order-test",
-                "alias": "my-group8-group-startup-order-test",
-                "groupMinInstances": 1,
-                "groupMaxInstances": 1,
-                "deploymentPolicy": "deployment-policy-group-startup-order-test",
-                "groups": [
-                    {
-                        "name": "group9-group-startup-order-test",
-                        "alias": "my-group9-group-startup-order-test",
-                        "groupMinInstances": 1,
-                        "groupMaxInstances": 1,
-                        "cartridges": [
-                            {
-                                "type": "tomcat1-group-startup-order-test",
-                                "cartridgeMin": 1,
-                                "cartridgeMax": 2,
-                                "subscribableInfo": {
-                                    "alias": "my-tomcat1-group9-group-startup-order-test",
-                                    "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                                    "artifactRepository": {
-                                        "privateRepo": false,
-                                        "repoUrl": "https://github.com/imesh/stratos-tomcat1-applications.git",
-                                        "repoUsername": "",
-                                        "repoPassword": ""
-                                    }
-                                }
-                            }
-                        ]
-                    }
-                ],
-                "cartridges": [
-                    {
-                        "type": "tomcat2-group-startup-order-test",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "my-tomcat2-group8-group-startup-order-test",
-                            "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                            "artifactRepository": {
-                                "privateRepo": false,
-                                "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git",
-                                "repoUsername": "",
-                                "repoPassword": ""
-                            }
-                        }
-                    },
-                    {
-                        "type": "tomcat-group-startup-order-test",
-                        "cartridgeMin": 1,
-                        "cartridgeMax": 2,
-                        "subscribableInfo": {
-                            "alias": "my-tomcat-group8-group-startup-order-test",
-                            "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                            "artifactRepository": {
-                                "privateRepo": false,
-                                "repoUrl": "https://github.com/imesh/stratos-tomcat2-applications.git",
-                                "repoUsername": "",
-                                "repoPassword": ""
-                            }
-                        }
-                    }
-                ]
-            }
-        ],
-        "cartridges": [
-            {
-                "type": "stratos-lb-group-startup-order-test",
-                "cartridgeMin": 1,
-                "cartridgeMax": 2,
-                "subscribableInfo": {
-                    "alias": "my-stratos-lb-group-startup-order-test",
-                    "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                    "deploymentPolicy": "deployment-policy-group-startup-order-test"
-                }
-            },
-            {
-                "type": "tomcat-group-startup-order-test",
-                "cartridgeMin": 1,
-                "cartridgeMax": 2,
-                "subscribableInfo": {
-                    "alias": "my-tomcat-group-startup-order-test",
-                    "autoscalingPolicy": "autoscaling-policy-group-startup-order-test",
-                    "deploymentPolicy": "deployment-policy-group-startup-order-test",
-                    "artifactRepository": {
-                        "privateRepo": false,
-                        "repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git",
-                        "repoUsername": "",
-                        "repoPassword": ""
-                    }
-                }
-            }
-        ],
-        "dependencies": {
-            "startupOrders": [
-                {
-                    "aliases": [
-                        "cartridge.my-stratos-lb-group-startup-order-test",
-                        "cartridge.my-tomcat-group-startup-order-test",
-                        "group.my-group8-group-startup-order-test"
-                    ]
-                },
-                {
-                    "aliases": [
-                        "cartridge.my-stratos-lb-group-startup-order-test",
-                        "cartridge.my-tomcat-group-startup-order-test",
-                        "group.my-group6-group-startup-order-test"
-                    ]
-                }
-            ],
-            "terminationBehaviour": "terminate-all"
-        }
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json
deleted file mode 100644
index 0c6ec97..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-application-bursting-test.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "autoscaling-policy-group-startup-order-test",
-    "loadThresholds": {
-        "requestsInFlight": {
-            "threshold": 35
-        },
-        "memoryConsumption": {
-            "threshold": 45
-        },
-        "loadAverage": {
-            "threshold": 25
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-group-startup-order-test.json
deleted file mode 100644
index 0c6ec97..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/autoscaling-policies/autoscaling-policy-group-startup-order-test.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "autoscaling-policy-group-startup-order-test",
-    "loadThresholds": {
-        "requestsInFlight": {
-            "threshold": 35
-        },
-        "memoryConsumption": {
-            "threshold": 45
-        },
-        "loadAverage": {
-            "threshold": 25
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-application-bursting-test.json
deleted file mode 100644
index 9c7d997..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/esb-php-group-application-bursting-test.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name": "esb-php-group-group-startup-order-test",
-    "cartridges": [
-        "esb-group-startup-order-test",
-        "php-group-startup-order-test"
-    ],
-    "dependencies": {
-        "startupOrders": [
-            {
-                "aliases": [
-                    "cartridge.my-esb-group-startup-order-test",
-                    "cartridge.my-php-group-startup-order-test"
-                ]
-            }
-        ],
-        "terminationBehaviour": "terminate-none"
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-group-startup-order-test.json
deleted file mode 100644
index 75d71fb..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group6-group-startup-order-test.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "group6-group-startup-order-test",
-    "groups": [
-        {
-            "name": "group7-group-startup-order-test",
-            "cartridges": [
-                "tomcat-group-startup-order-test",
-                "tomcat1-group-startup-order-test"
-            ],
-            "dependencies": {
-                "terminationBehaviour": "terminate-none",
-                "startupOrders": [
-                    {
-                        "aliases": [
-                            "cartridge.my-group7-tomcat-group-startup-order-test",
-                            "cartridge.my-group7-tomcat1-group-startup-order-test"
-                        ]
-                    }
-                ]
-            }
-        },
-        {
-            "name": "group-tom2-group-startup-order-test",
-            "dependencies": {
-                "terminationBehaviour": "terminate-none",
-                "startupOrders": [
-                    {
-                        "aliases": [
-                            "cartridge.my-group-tom2-tomcat2-group-startup-order-test",
-                            "cartridge.my-group-tom2-tomcat3-group-startup-order-test"
-                        ]
-                    }
-                ]
-            },
-            "cartridges": [
-                "tomcat2-group-startup-order-test",
-                "tomcat3-group-startup-order-test"
-            ]
-        }
-    ]
-}
-
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group8-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group8-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group8-group-startup-order-test.json
deleted file mode 100644
index c83b1ce..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges-groups/group8-group-startup-order-test.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "name": "group8-group-startup-order-test",
-    "groups": [
-        {
-            "name": "group9-group-startup-order-test",
-            "cartridges": [
-                "tomcat1-group-startup-order-test"
-            ]
-        }
-    ],
-    "cartridges": [
-        "tomcat2-group-startup-order-test","tomcat-group-startup-order-test"
-    ],
-    "dependencies": {
-        "terminationBehaviour": "terminate-all"
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-application-bursting-test.json
deleted file mode 100755
index b6f428e..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-application-bursting-test.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "type": "esb-group-startup-order-test",
-    "provider": "apache",
-    "host": "stratos.apache.org",
-    "category": "framework",
-    "displayName": "esb-group-startup-order-test",
-    "description": "esb-group-startup-order-test Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "name": "http-22",
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "vishanth-key"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-    "metadataKeys": [
-        "server_ip",
-        "username",
-        "password"
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-group-startup-order-test.json
deleted file mode 100755
index b6f428e..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/esb-group-startup-order-test.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "type": "esb-group-startup-order-test",
-    "provider": "apache",
-    "host": "stratos.apache.org",
-    "category": "framework",
-    "displayName": "esb-group-startup-order-test",
-    "description": "esb-group-startup-order-test Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "name": "http-22",
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "vishanth-key"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-    "metadataKeys": [
-        "server_ip",
-        "username",
-        "password"
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-application-bursting-test.json
deleted file mode 100755
index 95f78a5..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-application-bursting-test.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "type": "php-group-startup-order-test",
-    "provider": "apache",
-    "category": "framework",
-    "host": "php.stratos.org",
-    "displayName": "php-group-startup-order-test",
-    "description": "php-group-startup-order-test Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "name": "http-80",
-            "protocol": "http",
-            "port": "8080",
-            "proxyPort": "8280"
-        },
-        {
-            "name": "http-22",
-            "protocol": "tcp",
-            "port": "22",
-            "proxyPort": "8222"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "reka"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-group-startup-order-test.json
deleted file mode 100755
index 95f78a5..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/php-group-startup-order-test.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "type": "php-group-startup-order-test",
-    "provider": "apache",
-    "category": "framework",
-    "host": "php.stratos.org",
-    "displayName": "php-group-startup-order-test",
-    "description": "php-group-startup-order-test Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "name": "http-80",
-            "protocol": "http",
-            "port": "8080",
-            "proxyPort": "8280"
-        },
-        {
-            "name": "http-22",
-            "protocol": "tcp",
-            "port": "22",
-            "proxyPort": "8222"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "reka"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json
deleted file mode 100755
index 1c665b7..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/stratos-lb-group-startup-order-test.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "type": "stratos-lb-group-startup-order-test",
-    "provider": "stratos",
-    "category": "load-balancer",
-    "host": "complex-app-with-lb",
-    "displayName": "Stratos Load Balancer",
-    "description": "Stratos Load Balancer Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "name": "http-22",
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "image1",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "instanceType1"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "default"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-    "metadataKeys": [
-        "writeparam3",
-        "writeparam4"
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-application-bursting-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-application-bursting-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-application-bursting-test.json
deleted file mode 100755
index 7cf895a..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-application-bursting-test.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "type": "tomcat-group-startup-order-test",
-    "provider": "apache",
-    "host": "tomcat.stratos.org",
-    "category": "framework",
-    "displayName": "tomcat-group-startup-order-test",
-    "description": "tomcat-group-startup-order-test Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "name": "http-22",
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        },
-        {
-            "protocol": "http",
-            "port": "8080",
-            "proxyPort": "80"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "vishanth-key"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-    "metadataKeys": [
-        "url"
-    ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/c0664270/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json b/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json
deleted file mode 100755
index 7cf895a..0000000
--- a/products/stratos/modules/integration/src/test/resources/group-startup-order-test/cartridges/mock/tomcat-group-startup-order-test.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "type": "tomcat-group-startup-order-test",
-    "provider": "apache",
-    "host": "tomcat.stratos.org",
-    "category": "framework",
-    "displayName": "tomcat-group-startup-order-test",
-    "description": "tomcat-group-startup-order-test Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "name": "http-22",
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        },
-        {
-            "protocol": "http",
-            "port": "8080",
-            "proxyPort": "80"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "vishanth-key"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-    "metadataKeys": [
-        "url"
-    ]
-}