Conflict resolved
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/218fc1f5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/218fc1f5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/218fc1f5 Branch: refs/heads/master Commit: 218fc1f5cfbe3b0c99a0deead82c0cb339fc79bf Parents: 94f2278 d5f11fc Author: gayangunarathne <[email protected]> Authored: Tue Sep 1 17:22:30 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Tue Sep 1 17:22:30 2015 +0530 ---------------------------------------------------------------------- .../applications/topic/ApplicationBuilder.java | 1 - .../org.apache.stratos.cartridge.agent/pom.xml | 2 - .../test/resources/test-conf/test.properties | 20 + .../context/CloudControllerContext.java | 4 + .../application/ApplicationEventReceiver.java | 4 +- .../status/ClusterStatusTopicReceiver.java | 9 - .../status/InstanceStatusTopicReceiver.java | 5 - .../messaging/topology/TopologyManager.java | 16 +- .../console/README.md | 9 +- .../mock/iaas/client/MockIaasApiClient.java | 4 +- .../cartridge.agent/cartridge.agent/config.py | 13 +- .../cartridge.agent/cartridge.agent/entity.py | 5 +- .../extensions/bash/CreateLVSDummyInterface.sh | 26 + .../extensions/bash/MemberInitializedEvent.sh | 26 + .../cartridge.agent/healthstats.py | 2 +- .../modules/artifactmgt/git/agentgithandler.py | 37 +- .../cartridge.agent/modules/databridge/agent.py | 7 +- .../modules/databridge/thrift/publisher.py | 9 +- .../thrift/thrift/transport/TSSLSocket.py | 357 ++++---- .../modules/event/eventhandler.py | 33 +- .../cartridge.agent/publisher.py | 1 - .../rest/endpoint/api/StratosApiV41.java | 2 +- dependencies/org.wso2.carbon.ui/pom.xml | 92 +- .../HealthStatisticsEventBuilder.xml | 31 - .../LoadBalancerStatisticsEventBuilder.xml | 31 - .../AverageInFlightRequestsEventFormatter.xml | 32 - .../AverageLoadAverageEventFormatter.xml | 32 - .../AverageMemoryConsumptionEventFormatter.xml | 32 - .../FaultMessageEventFormatter.xml | 32 - .../GradientInFlightRequestsEventFormatter.xml | 32 - .../GradientLoadAverageEventFormatter.xml | 32 - .../GradientMemoryConsumptionEventFormatter.xml | 32 - .../MemberAverageLoadAverageEventFormatter.xml | 32 - ...erAverageMemoryConsumptionEventFormatter.xml | 32 - .../MemberGradientLoadAverageEventFormatter.xml | 32 - ...rGradientMemoryConsumptionEventFormatter.xml | 32 - ...econdDerivativeLoadAverageEventFormatter.xml | 32 - ...erivativeMemoryConsumptionEventFormatter.xml | 32 - ...DerivativeInFlightRequestsEventFormatter.xml | 32 - ...econdDerivativeLoadAverageEventFormatter.xml | 32 - ...erivativeMemoryConsumptionEventFormatter.xml | 32 - .../executionplans/AverageHeathRequest.xml | 71 -- .../AverageInFlightRequestsFinder.xml | 48 -- .../executionplans/GradientOfHealthRequest.xml | 71 -- .../GradientOfRequestsInFlightFinder.xml | 48 -- .../SecondDerivativeOfHealthRequest.xml | 68 -- ...SecondDerivativeOfRequestsInFlightFinder.xml | 48 -- .../DefaultWSO2EventInputAdaptor.xml | 24 - .../DefaultWSO2EventOutputAdaptor.xml | 29 - .../outputeventadaptors/JMSOutputAdaptor.xml | 30 - .../streamdefinitions/stream-manager-config.xml | 311 ------- extensions/cep/distribution/README.md | 12 - extensions/cep/distribution/pom.xml | 66 -- .../cep/distribution/src/assembly/bin.xml | 59 -- .../cep/distribution/src/main/license/LICENSE | 204 ----- .../cep/distribution/src/main/notice/NOTICE | 7 - .../HealthStatisticsEventBuilder.xml | 31 + .../LoadBalancerStatisticsEventBuilder.xml | 31 + .../AverageInFlightRequestsEventFormatter.xml | 32 + .../AverageLoadAverageEventFormatter.xml | 32 + .../AverageMemoryConsumptionEventFormatter.xml | 32 + .../FaultMessageEventFormatter.xml | 32 + .../GradientInFlightRequestsEventFormatter.xml | 32 + .../GradientLoadAverageEventFormatter.xml | 32 + .../GradientMemoryConsumptionEventFormatter.xml | 32 + .../MemberAverageLoadAverageEventFormatter.xml | 32 + ...erAverageMemoryConsumptionEventFormatter.xml | 32 + .../MemberGradientLoadAverageEventFormatter.xml | 32 + ...rGradientMemoryConsumptionEventFormatter.xml | 32 + ...econdDerivativeLoadAverageEventFormatter.xml | 32 + ...erivativeMemoryConsumptionEventFormatter.xml | 32 + ...DerivativeInFlightRequestsEventFormatter.xml | 32 + ...econdDerivativeLoadAverageEventFormatter.xml | 32 + ...erivativeMemoryConsumptionEventFormatter.xml | 32 + .../executionplans/AverageHeathRequest.xml | 71 ++ .../AverageInFlightRequestsFinder.xml | 48 ++ .../executionplans/GradientOfHealthRequest.xml | 71 ++ .../GradientOfRequestsInFlightFinder.xml | 48 ++ .../SecondDerivativeOfHealthRequest.xml | 68 ++ ...SecondDerivativeOfRequestsInFlightFinder.xml | 48 ++ .../DefaultWSO2EventInputAdaptor.xml | 24 + .../DefaultWSO2EventOutputAdaptor.xml | 29 + .../outputeventadaptors/JMSOutputAdaptor.xml | 30 + .../streamdefinitions/stream-manager-config.xml | 311 +++++++ extensions/cep/modules/distribution/README.md | 12 + extensions/cep/modules/distribution/pom.xml | 66 ++ .../modules/distribution/src/assembly/bin.xml | 59 ++ .../distribution/src/main/license/LICENSE | 204 +++++ .../modules/distribution/src/main/notice/NOTICE | 7 + .../cep/modules/stratos-cep-extension/pom.xml | 63 ++ .../cep/extension/CEPTopologyEventReceiver.java | 99 +++ .../cep/extension/ConcatWindowProcessor.java | 54 ++ .../extension/FaultHandlingWindowProcessor.java | 349 ++++++++ .../GradientFinderWindowProcessor.java | 283 +++++++ ...equestHandlingCapabilityWindowProcessor.java | 68 ++ .../SecondDerivativeFinderWindowProcessor.java | 301 +++++++ extensions/cep/pom.xml | 38 + extensions/cep/stratos-cep-extension/pom.xml | 63 -- .../cep/extension/CEPTopologyEventReceiver.java | 99 --- .../cep/extension/ConcatWindowProcessor.java | 54 -- .../extension/FaultHandlingWindowProcessor.java | 349 -------- .../GradientFinderWindowProcessor.java | 283 ------- ...equestHandlingCapabilityWindowProcessor.java | 68 -- .../SecondDerivativeFinderWindowProcessor.java | 301 ------- .../load-balancer/haproxy-extension/INSTALL.md | 32 - .../load-balancer/haproxy-extension/README.md | 20 - .../load-balancer/haproxy-extension/pom.xml | 109 --- .../haproxy-extension/src/main/assembly/bin.xml | 106 --- .../src/main/bin/haproxy-extension.sh | 50 -- .../src/main/conf/jndi.properties | 22 - .../src/main/conf/log4j.properties | 40 - .../src/main/conf/thrift-client-config.xml | 27 - .../stratos/haproxy/extension/Constants.java | 39 - .../stratos/haproxy/extension/HAProxy.java | 158 ---- .../haproxy/extension/HAProxyConfigWriter.java | 147 ---- .../haproxy/extension/HAProxyContext.java | 157 ---- .../extension/HAProxyStatisticsReader.java | 108 --- .../apache/stratos/haproxy/extension/Main.java | 85 -- .../haproxy-extension/src/main/license/LICENSE | 481 ----------- .../haproxy-extension/src/main/notice/NOTICE | 402 --------- .../src/main/resources/velocity.properties | 26 - .../src/main/scripts/get-weight.sh | 23 - .../src/main/security/client-truststore.jks | Bin 35240 -> 0 bytes .../src/main/templates/haproxy.cfg.template | 17 - .../load-balancer/lvs-extension/INSTALL.md | 37 - .../load-balancer/lvs-extension/README.md | 18 - extensions/load-balancer/lvs-extension/pom.xml | 109 --- .../lvs-extension/src/main/assembly/bin.xml | 106 --- .../lvs-extension/src/main/bin/lvs-extension.sh | 54 -- .../lvs-extension/src/main/conf/jndi.properties | 22 - .../src/main/conf/log4j.properties | 40 - .../src/main/conf/thrift-client-config.xml | 25 - .../apache/stratos/lvs/extension/Constants.java | 43 - .../org/apache/stratos/lvs/extension/LVS.java | 158 ---- .../stratos/lvs/extension/LVSConfigWriter.java | 237 ------ .../stratos/lvs/extension/LVSContext.java | 203 ----- .../lvs/extension/LVSStatisticsReader.java | 80 -- .../org/apache/stratos/lvs/extension/Main.java | 85 -- .../lvs-extension/src/main/license/LICENSE | 481 ----------- .../lvs-extension/src/main/notice/NOTICE | 395 --------- .../src/main/resources/velocity.properties | 26 - .../src/main/security/client-truststore.jks | Bin 35240 -> 0 bytes .../src/main/templates/keepalived.conf.template | 59 -- .../modules/haproxy-extension/INSTALL.md | 32 + .../modules/haproxy-extension/README.md | 20 + .../modules/haproxy-extension/pom.xml | 110 +++ .../haproxy-extension/src/main/assembly/bin.xml | 106 +++ .../src/main/bin/haproxy-extension.sh | 50 ++ .../src/main/conf/jndi.properties | 22 + .../src/main/conf/log4j.properties | 40 + .../src/main/conf/thrift-client-config.xml | 27 + .../stratos/haproxy/extension/Constants.java | 39 + .../stratos/haproxy/extension/HAProxy.java | 158 ++++ .../haproxy/extension/HAProxyConfigWriter.java | 152 ++++ .../haproxy/extension/HAProxyContext.java | 157 ++++ .../extension/HAProxyStatisticsReader.java | 108 +++ .../apache/stratos/haproxy/extension/Main.java | 85 ++ .../haproxy-extension/src/main/license/LICENSE | 481 +++++++++++ .../haproxy-extension/src/main/notice/NOTICE | 402 +++++++++ .../src/main/resources/velocity.properties | 26 + .../src/main/scripts/get-weight.sh | 23 + .../src/main/security/client-truststore.jks | Bin 0 -> 35240 bytes .../src/main/templates/haproxy.cfg.template | 17 + .../modules/lvs-extension/INSTALL.md | 37 + .../modules/lvs-extension/README.md | 18 + .../load-balancer/modules/lvs-extension/pom.xml | 110 +++ .../lvs-extension/src/main/assembly/bin.xml | 106 +++ .../lvs-extension/src/main/bin/lvs-extension.sh | 54 ++ .../lvs-extension/src/main/conf/jndi.properties | 22 + .../src/main/conf/log4j.properties | 40 + .../src/main/conf/thrift-client-config.xml | 25 + .../apache/stratos/lvs/extension/Constants.java | 43 + .../org/apache/stratos/lvs/extension/LVS.java | 158 ++++ .../stratos/lvs/extension/LVSConfigWriter.java | 241 ++++++ .../stratos/lvs/extension/LVSContext.java | 203 +++++ .../lvs/extension/LVSStatisticsReader.java | 80 ++ .../org/apache/stratos/lvs/extension/Main.java | 85 ++ .../lvs-extension/src/main/license/LICENSE | 481 +++++++++++ .../lvs-extension/src/main/notice/NOTICE | 395 +++++++++ .../src/main/resources/velocity.properties | 26 + .../src/main/security/client-truststore.jks | Bin 0 -> 35240 bytes .../src/main/templates/keepalived.conf.template | 59 ++ .../modules/nginx-extension/INSTALL.md | 33 + .../modules/nginx-extension/README.md | 27 + .../modules/nginx-extension/pom.xml | 110 +++ .../nginx-extension/src/main/assembly/bin.xml | 106 +++ .../src/main/bin/nginx-extension.sh | 50 ++ .../src/main/conf/jndi.properties | 22 + .../src/main/conf/log4j.properties | 40 + .../src/main/conf/thrift-client-config.xml | 27 + .../stratos/nginx/extension/Constants.java | 39 + .../apache/stratos/nginx/extension/Main.java | 85 ++ .../apache/stratos/nginx/extension/Nginx.java | 140 ++++ .../nginx/extension/NginxConfigWriter.java | 181 ++++ .../stratos/nginx/extension/NginxContext.java | 157 ++++ .../nginx/extension/NginxStatisticsReader.java | 124 +++ .../nginx-extension/src/main/license/LICENSE | 481 +++++++++++ .../nginx-extension/src/main/notice/NOTICE | 402 +++++++++ .../src/main/resources/velocity.properties | 26 + .../src/main/security/client-truststore.jks | Bin 0 -> 35240 bytes .../src/main/templates/nginx.cfg.template | 8 + .../load-balancer/nginx-extension/INSTALL.md | 33 - .../load-balancer/nginx-extension/README.md | 27 - .../load-balancer/nginx-extension/pom.xml | 109 --- .../nginx-extension/src/main/assembly/bin.xml | 106 --- .../src/main/bin/nginx-extension.sh | 50 -- .../src/main/conf/jndi.properties | 22 - .../src/main/conf/log4j.properties | 40 - .../src/main/conf/thrift-client-config.xml | 27 - .../stratos/nginx/extension/Constants.java | 39 - .../apache/stratos/nginx/extension/Main.java | 85 -- .../apache/stratos/nginx/extension/Nginx.java | 140 ---- .../nginx/extension/NginxConfigWriter.java | 177 ---- .../stratos/nginx/extension/NginxContext.java | 157 ---- .../nginx/extension/NginxStatisticsReader.java | 124 --- .../nginx-extension/src/main/license/LICENSE | 481 ----------- .../nginx-extension/src/main/notice/NOTICE | 402 --------- .../src/main/resources/velocity.properties | 26 - .../src/main/security/client-truststore.jks | Bin 35240 -> 0 bytes .../src/main/templates/nginx.cfg.template | 8 - extensions/load-balancer/pom.xml | 8 +- extensions/pom.xml | 3 +- pom.xml | 23 + .../modules/distribution/INSTALL.txt | 2 +- .../modules/distribution/pom.xml | 5 +- .../distribution/src/main/assembly/bin.xml | 1 - .../load-balancer/modules/distribution/pom.xml | 3 +- .../distribution/src/main/assembly/bin.xml | 121 +-- .../src/main/assembly/filter.properties | 2 +- .../test/PythonCartridgeAgentTest.java | 578 ------------- .../src/test/resources/pca-testing1.xml | 2 +- .../src/test/resources/suite-1/agent.conf | 45 + .../src/test/resources/suite-2/agent.conf | 45 + .../src/test/resources/suite-3/agent.conf | 45 - products/stratos-cli/distribution/INSTALL.txt | 42 - products/stratos-cli/distribution/README.txt | 75 -- products/stratos-cli/distribution/pom.xml | 84 -- .../distribution/src/main/assembly/bin.xml | 88 -- .../distribution/src/main/bin/stratos.bat | 80 -- .../distribution/src/main/bin/stratos.sh | 42 - .../distribution/src/main/conf/log4j.properties | 37 - .../distribution/src/main/license/LICENSE | 836 ------------------- .../distribution/src/main/notice/NOTICE | 85 -- .../modules/distribution/INSTALL.txt | 42 + .../stratos-cli/modules/distribution/README.txt | 75 ++ .../stratos-cli/modules/distribution/pom.xml | 85 ++ .../distribution/src/main/assembly/bin.xml | 88 ++ .../distribution/src/main/bin/stratos.bat | 80 ++ .../distribution/src/main/bin/stratos.sh | 42 + .../distribution/src/main/conf/log4j.properties | 37 + .../distribution/src/main/license/LICENSE | 836 +++++++++++++++++++ .../modules/distribution/src/main/notice/NOTICE | 85 ++ products/stratos-cli/pom.xml | 5 +- .../stratos/modules/distribution/INSTALL.txt | 2 +- products/stratos/modules/distribution/pom.xml | 6 +- .../modules/distribution/src/assembly/bin.xml | 228 ++--- .../distribution/src/assembly/filter.properties | 1 - .../distribution/src/main/conf/axis2/axis2.xml | 8 +- .../distribution/src/main/conf/carbon.xml | 2 +- products/stratos/modules/integration/pom.xml | 6 + .../tests/rest/IntegrationMockClient.java | 7 +- .../src/test/resources/stratos-testing.xml | 4 +- .../test-conf/integration-test.properties | 26 + tools/config-scripts/ec2/config.sh | 6 +- tools/config-scripts/gce/config.sh | 4 - tools/config-scripts/openstack/config.sh | 6 +- .../base-image/Dockerfile | 13 +- .../service-images/php/Dockerfile | 4 +- .../php/packs/plugins/PhpServerStarterPlugin.py | 36 - .../plugins/PhpServerStarterPlugin.yapsy-plugin | 26 - .../php/plugins/PhpServerStarterPlugin.py | 36 + .../plugins/PhpServerStarterPlugin.yapsy-plugin | 26 + .../service-images/tomcat/Dockerfile | 2 +- .../service-images/tomcat/packs/.gitignore | 4 + .../packs/plugins/TomcatServerStarterPlugin.py | 38 - .../TomcatServerStarterPlugin.yapsy-plugin | 25 - .../tomcat/plugins/TomcatServerStarterPlugin.py | 38 + .../TomcatServerStarterPlugin.yapsy-plugin | 25 + tools/puppet3/modules/agent/files/README.txt | 2 +- tools/puppet3/modules/haproxy/files/README.txt | 2 +- tools/puppet3/modules/lb/files/README.txt | 2 +- .../modules/python_agent/files/README.txt | 2 +- tools/stratos-installer/README.md | 3 +- 283 files changed, 11482 insertions(+), 11807 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/218fc1f5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/218fc1f5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/218fc1f5/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 66ccf12,af0ff89..1192db9 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@@ -67,10 -63,9 +67,10 @@@ import java.net.URI import java.rmi.RemoteException; import java.util.ArrayList; import java.util.List; +import java.util.UUID; /** - * Stratos API v4.1 for Stratos 4.2.0 release. + * Stratos API v4.1 */ @Path("/") public class StratosApiV41 extends AbstractApi { http://git-wip-us.apache.org/repos/asf/stratos/blob/218fc1f5/extensions/cep/modules/artifacts/streamdefinitions/stream-manager-config.xml ---------------------------------------------------------------------- diff --cc extensions/cep/modules/artifacts/streamdefinitions/stream-manager-config.xml index 0000000,4c4c7e0..9e0a833 mode 000000,100644..100644 --- a/extensions/cep/modules/artifacts/streamdefinitions/stream-manager-config.xml +++ b/extensions/cep/modules/artifacts/streamdefinitions/stream-manager-config.xml @@@ -1,0 -1,309 +1,311 @@@ + <?xml version='1.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. + + --> + + <streamManagerConfiguration xmlns="http://wso2.org/carbon/streammanager";> + <!-- in-flight requests stream definitions start --> + <streamDefinition name="in_flight_requests" version="1.0.0"> - <description>in-flight request count</description> - <nickName>in-flight requests</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String"/> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="in_flight_request_count" type="double"/> - </payloadData> - </streamDefinition> ++ <description>in-flight request count</description> ++ <nickName>in-flight requests</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="timestamp" type="long"/> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="in_flight_request_count" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="gradient_in_flight_requests" version="1.0.0"> - <description>gradient of in flight request count</description> - <nickName>gradient in flight requests</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String"/> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="count" type="double"/> - </payloadData> - </streamDefinition> ++ <description>gradient of in flight request count</description> ++ <nickName>gradient in flight requests</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="count" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="average_in_flight_requests" version="1.0.0"> - <description>average of in-flight request count</description> - <nickName>average in-flight requests</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String"/> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="count" type="double"/> - </payloadData> - </streamDefinition> ++ <description>average of in-flight request count</description> ++ <nickName>average in-flight requests</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="count" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="second_derivative_in_flight_requests" version="1.0.0"> - <description>second derivative of in-flight request count</description> - <nickName>second derivative in-flight requests</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String"/> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="count" type="double"/> - </payloadData> ++ <description>second derivative of in-flight request count</description> ++ <nickName>second derivative in-flight requests</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="count" type="double"/> ++ </payloadData> + </streamDefinition> + <!-- in-flight requests stream definitions end --> + + <!-- cartridge agent health stats stream definitions start --> + <streamDefinition name="cartridge_agent_health_stats" version="1.0.0"> - <description>agent health stats</description> - <nickName>agent health stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="member_id" type="String" /> - <property name="partition_id" type="String" /> - <property name="health_description" type="String"/> - <property name="value" type="double"/> - </payloadData> - </streamDefinition> ++ <description>agent health stats</description> ++ <nickName>agent health stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="timestamp" type="long"/> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="member_id" type="String"/> ++ <property name="partition_id" type="String"/> ++ <property name="health_description" type="String"/> ++ <property name="value" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="average_load_average_stats" version="1.0.0"> - <description>average load average stats</description> - <nickName>average load average stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="average_load_average" type="double"/> - </payloadData> - </streamDefinition> ++ <description>average load average stats</description> ++ <nickName>average load average stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="average_load_average" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="average_memory_consumption_stats" version="1.0.0"> - <description>average memory consumption stats</description> - <nickName>average memory consumption stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String"/> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="average_memory_consumption" type="double"/> - </payloadData> - </streamDefinition> ++ <description>average memory consumption stats</description> ++ <nickName>average memory consumption stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="average_memory_consumption" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="gradient_load_average_stats" version="1.0.0"> - <description>gradient load average stats</description> - <nickName>gradient load average stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="gradient_load_average" type="double"/> - </payloadData> - </streamDefinition> ++ <description>gradient load average stats</description> ++ <nickName>gradient load average stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="gradient_load_average" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="gradient_memory_consumption_stats" version="1.0.0"> - <description>gradient memoryconsumption stats</description> - <nickName>gradient memoryconsumption stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="gradient_memory_consumption" type="double"/> - </payloadData> - </streamDefinition> ++ <description>gradient memoryconsumption stats</description> ++ <nickName>gradient memoryconsumption stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="gradient_memory_consumption" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="second_derivative_memory_consumption_stats" version="1.0.0"> - <description>second derivative memory consumption stats</description> - <nickName>second derivative memory consumption stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="second_derivative_memory_consumption" type="double"/> - </payloadData> - </streamDefinition> ++ <description>second derivative memory consumption stats</description> ++ <nickName>second derivative memory consumption stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="second_derivative_memory_consumption" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="second_derivative_load_average_stats" version="1.0.0"> - <description>second derivative load average stats</description> - <nickName>second derivative load average stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="second_derivative_load_average" type="double"/> - </payloadData> - </streamDefinition> ++ <description>second derivative load average stats</description> ++ <nickName>second derivative load average stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="second_derivative_load_average" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="fault_message" version="1.0.0"> - <description>fault message</description> - <nickName>fault message</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="cluster_id" type="String"/> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="member_id" type="String"/> - <property name="partition_id" type="String"/> - </payloadData> ++ <description>fault message</description> ++ <nickName>fault message</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="member_id" type="String"/> ++ <property name="partition_id" type="String"/> ++ </payloadData> + </streamDefinition> + <!-- cartridge agent health stats stream definitions end --> + + <!-- This is for member_id wise grouping--> + <streamDefinition name="member_average_load_average_stats" version="1.0.0"> - <description>average load average stats</description> - <nickName>average load average stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="member_id" type="String" /> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="member_average_load_average" type="double"/> - </payloadData> - </streamDefinition> ++ <description>average load average stats</description> ++ <nickName>average load average stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="member_id" type="String"/> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="member_average_load_average" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="member_average_memory_consumption_stats" version="1.0.0"> - <description>average memory consumption stats</description> - <nickName>average memory consumption stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="member_id" type="String"/> - <property name="cluster_id" type="String"/> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="member_average_memory_consumption" type="double"/> - </payloadData> - </streamDefinition> ++ <description>average memory consumption stats</description> ++ <nickName>average memory consumption stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="member_id" type="String"/> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="member_average_memory_consumption" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="member_gradient_load_average_stats" version="1.0.0"> - <description>gradient load average stats</description> - <nickName>gradient load average stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="member_id" type="String" /> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="member_gradient_load_average" type="double"/> - </payloadData> - </streamDefinition> ++ <description>gradient load average stats</description> ++ <nickName>gradient load average stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="member_id" type="String"/> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="member_gradient_load_average" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="member_gradient_memory_consumption_stats" version="1.0.0"> - <description>gradient memoryconsumption stats</description> - <nickName>gradient memoryconsumption stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="member_id" type="String" /> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="member_gradient_memory_consumption" type="double"/> - </payloadData> - </streamDefinition> ++ <description>gradient memoryconsumption stats</description> ++ <nickName>gradient memoryconsumption stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="member_id" type="String"/> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="member_gradient_memory_consumption" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="member_second_derivative_memory_consumption_stats" version="1.0.0"> - <description>second derivative memory consumption stats</description> - <nickName>second derivative memory consumption stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="member_id" type="String" /> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="member_second_derivative_memory_consumption" type="double"/> - </payloadData> - </streamDefinition> ++ <description>second derivative memory consumption stats</description> ++ <nickName>second derivative memory consumption stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="member_id" type="String"/> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="member_second_derivative_memory_consumption" type="double"/> ++ </payloadData> ++ </streamDefinition> + + <streamDefinition name="member_second_derivative_load_average_stats" version="1.0.0"> - <description>second derivative load average stats</description> - <nickName>second derivative load average stats</nickName> - <metaData> - </metaData> - <correlationData> - </correlationData> - <payloadData> - <property name="member_id" type="String" /> - <property name="cluster_id" type="String" /> - <property name="cluster_instance_id" type="String"/> - <property name="network_partition_id" type="String"/> - <property name="member_second_derivative_load_average" type="double"/> - </payloadData> - </streamDefinition> ++ <description>second derivative load average stats</description> ++ <nickName>second derivative load average stats</nickName> ++ <metaData> ++ </metaData> ++ <correlationData> ++ </correlationData> ++ <payloadData> ++ <property name="member_id" type="String"/> ++ <property name="cluster_id" type="String"/> ++ <property name="cluster_instance_id" type="String"/> ++ <property name="network_partition_id" type="String"/> ++ <property name="member_second_derivative_load_average" type="double"/> ++ </payloadData> ++ </streamDefinition> + + </streamManagerConfiguration> http://git-wip-us.apache.org/repos/asf/stratos/blob/218fc1f5/products/python-cartridge-agent/modules/integration/src/test/resources/suite-3/agent.conf ---------------------------------------------------------------------- diff --cc products/python-cartridge-agent/modules/integration/src/test/resources/suite-3/agent.conf index 0ee1dce,0ee1dce..0000000 deleted file mode 100755,100755 --- a/products/python-cartridge-agent/modules/integration/src/test/resources/suite-3/agent.conf +++ /dev/null @@@ -1,45 -1,45 +1,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. -- --[agent] --mb.ip =localhost --mb.port =1885 --listen.address =localhost --thrift.receiver.ip =localhost --thrift.receiver.port =7712 --thrift.server.admin.username =admin --thrift.server.admin.password =admin --cep.stats.publisher.enabled =true --lb.private.ip = --lb.public.ip = --enable.artifact.update =true --auto.commit =true --auto.checkout =true --artifact.update.interval =15 --artifact.clone.retries =5 --artifact.clone.interval =10 --port.check.timeout =600000 --enable.data.publisher =false --monitoring.server.ip =localhost --monitoring.server.port =7612 --monitoring.server.secure.port =7712 --monitoring.server.admin.username =admin --monitoring.server.admin.password =admin --log.file.paths =/tmp/agent.screen-adc-mt-test.log --metadata.service.url =https://localhost:9443 --super.tenant.repository.path =/repository/deployment/server/ --tenant.repository.path =/repository/tenants/ http://git-wip-us.apache.org/repos/asf/stratos/blob/218fc1f5/products/stratos/modules/integration/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/218fc1f5/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/IntegrationMockClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/218fc1f5/products/stratos/modules/integration/src/test/resources/stratos-testing.xml ---------------------------------------------------------------------- diff --cc products/stratos/modules/integration/src/test/resources/stratos-testing.xml index bb58de5,2e0d2a8..b9107c8 --- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml +++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml @@@ -21,62 -21,74 +21,62 @@@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > <suite name="StratosIntegrationSuite"> - - <test name="UserTest"> - <classes> - <class name="org.apache.stratos.integration.tests.users.UserTest"/> - </classes> - </test> - <test name="CartridgeTest"> - <classes> - <class name="org.apache.stratos.integration.tests.group.CartridgeTest"/> - </classes> - </test> - <test name="CartridgeGroupTest"> - <classes> - <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest"/> - </classes> - </test> - <test name="NetworkPartitionTest"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest"/> - </classes> - </test> - <test name="ApplicationPolicyTest"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest"/> - </classes> - </test> - <test name="DeploymentPolicyTest"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest"/> - </classes> - </test> - <test name="AutoscalingPolicyTest"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest"/> - </classes> - </test> - <test name="SampleApplicationsTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest"/> - </classes> - </test> - <test name="ApplicationUpdateTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest"/> - </classes> - </test> - <test name="SingleClusterScalingTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest"/> - </classes> - </test> - <test name="ApplicationBurstingTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest"/> - </classes> - </test> - <test name="PartitionRoundRobinClusterTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest"/> - </classes> - </test> - <test name="GroupStartupOrderTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.GroupStartupOrderTest"/> - </classes> - </test> ++ <!-- + <test name="CartridgeTest"> + <classes> + <class name="org.apache.stratos.integration.tests.group.CartridgeTest" /> + </classes> + </test> + <test name="CartridgeGroupTest" > + <classes> + <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" /> + </classes> + </test> + + <test name="NetworkPartitionTest"> + <classes> + <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" /> + </classes> + </test> + <test name="ApplicationPolicyTest"> + <classes> + <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" /> + </classes> + </test> + <test name="DeploymentPolicyTest"> + <classes> + <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest" /> + </classes> + </test> + <test name="AutoscalingPolicyTest"> + <classes> + <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" /> + </classes> + </test> + <test name="SampleApplicationsTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" /> + </classes> + </test> + <test name="ApplicationBurstingTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" /> + </classes> + </test> + <test name="SingleClusterScalingTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest" /> + </classes> + </test> + <test name="PartitionRoundRobinClusterTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" /> + </classes> + </test> + <test name="GroupTerminationBehaviorTest"> <classes> - <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest"/> + <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest" /> </classes> -- </test> -</suite> ++ </test>--> +</suite>
