You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2015/12/09 18:06:28 UTC
[03/21] stratos git commit: Merge branch 'stratos-4.1.x' into
singup_deletion_cleanup
Merge branch 'stratos-4.1.x' into singup_deletion_cleanup
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bfb50f4b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bfb50f4b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bfb50f4b
Branch: refs/heads/stratos-4.1.x
Commit: bfb50f4b3a8711091e633de0fb0877d3aa14530a
Parents: dbd2f07 64f05a5
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Tue Dec 1 11:08:38 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Tue Dec 1 11:08:38 2015 +0530
----------------------------------------------------------------------
.../AutoscalerTopologyEventReceiver.java | 277 ++--
.../services/impl/AutoscalerServiceImpl.java | 38 +-
.../cluster/ClusterStatusActiveProcessor.java | 22 +-
.../group/GroupStatusActiveProcessor.java | 84 +-
.../processor/group/GroupStatusProcessor.java | 10 +-
.../group/GroupStatusTerminatedProcessor.java | 42 +-
.../CloudControllerServiceComponent.java | 2 +-
.../messaging/topology/TopologyBuilder.java | 67 +-
.../publisher/ThriftStatisticsPublisher.java | 31 +-
.../test/ThriftClientConfigParserTest.java | 73 +-
.../test/ThriftStatisticsPublisherTest.java | 70 ++
.../src/test/resources/thrift-client-config.xml | 53 +-
.../domain/application/Application.java | 11 +-
.../processor/MessageProcessorChain.java | 2 +
.../ApplicationCreatedMessageProcessor.java | 25 +-
.../ApplicationDeletedMessageProcessor.java | 12 +-
...cationInstanceActivatedMessageProcessor.java | 42 +-
...licationInstanceCreatedMessageProcessor.java | 25 +-
...tionInstanceInactivatedMessageProcessor.java | 40 +-
...ationInstanceTerminatedMessageProcessor.java | 25 +-
...tionInstanceTerminatingMessageProcessor.java | 41 +-
.../ApplicationsMessageProcessorChain.java | 38 +-
.../ApplicationSignUpMessageProcessorChain.java | 13 +
...rStatusClusterActivatedMessageProcessor.java | 10 +-
...StatusClusterInactivateMessageProcessor.java | 10 +-
...sClusterInstanceCreatedMessageProcessor.java | 10 +-
...usterStatusClusterResetMessageProcessor.java | 10 +-
...StatusClusterTerminatedMessageProcessor.java | 10 +-
...tatusClusterTerminatingMessageProcessor.java | 10 +-
.../ClusterStatusMessageProcessorChain.java | 18 +
.../DomainMappingMessageProcessorChain.java | 11 +
.../stat/HealthStatMessageProcessorChain.java | 41 +-
.../InitializerMessageProcessorChain.java | 15 +
.../InstanceNotifierMessageProcessorChain.java | 12 +
.../InstanceStatusMessageProcessorChain.java | 14 +
.../tenant/TenantMessageProcessorChain.java | 14 +
.../topology/TopologyMessageProcessorChain.java | 48 +
.../ApplicationsEventMessageDelegator.java | 4 +
.../application/ApplicationsEventReceiver.java | 4 +
.../notifier/InstanceNotifierEventReceiver.java | 62 +-
.../metadata/service/api/MetadataApi.java | 18 +-
.../metadata/service/registry/DataStore.java | 21 +-
.../service/registry/MetadataApiRegistry.java | 37 +-
.../iaas/internal/MockIaasServiceComponent.java | 6 -
.../iaas/services/impl/MockIaasServiceImpl.java | 65 +-
.../iaas/services/impl/MockIaasServiceUtil.java | 23 -
.../mock/iaas/services/impl/MockInstance.java | 187 ++-
.../publisher/MockHealthStatisticsNotifier.java | 56 +-
.../mock/iaas/test/MockIaasServiceTest.java | 149 ++-
.../src/test/resources/jndi.properties | 22 +
.../src/test/resources/thrift-client-config.xml | 50 +
.../cartridge.agent/cartridge.agent/agent.py | 62 +-
.../cartridge.agent/healthstats.py | 16 +-
.../modules/artifactmgt/git/agentgithandler.py | 7 +-
.../modules/event/eventhandler.py | 1180 +++++++++---------
.../modules/util/cartridgeagentutils.py | 4 +-
.../plugins/DefaultArtifactCheckout.py | 6 +-
.../cartridge.agent/publisher.py | 72 +-
.../cartridge.agent/subscriber.py | 8 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 6 +-
extensions/cep/modules/distribution/pom.xml | 10 +
.../modules/distribution/src/assembly/bin.xml | 9 +
.../stratos-cep-extension/wso2cep-3.1.0/pom.xml | 2 +-
extensions/cep/pom.xml | 2 +-
.../artifacts/metering-dashboard/capps/pom.xml | 14 +-
.../monitoring-dashboard/capps/pom.xml | 12 -
.../scaling_decision_1.0.0.json | 4 +-
.../load-balancer/modules/aws-extension/pom.xml | 2 +-
pom.xml | 12 +-
.../integration/tests/ADCExtensionTestCase.java | 32 +-
.../tests/ADCMTAppTenantUserTestCase.java | 47 +-
.../integration/tests/ADCMTAppTestCase.java | 46 +-
.../agent/integration/tests/ADCTestCase.java | 44 +-
.../tests/ADCValidationTestCase.java | 163 +++
.../integration/tests/AgentStartupTestCase.java | 44 +-
.../integration/tests/CEPHAModeTestCase.java | 63 +-
.../tests/MessageBrokerHATestCase.java | 68 +-
.../tests/PythonAgentIntegrationTest.java | 82 +-
.../resources/ADCValidationTestCase/agent.conf | 46 +
.../resources/ADCValidationTestCase/logging.ini | 52 +
.../ADCValidationTestCase/payload/launch-params | 1 +
.../MessageBrokerHATestCase/agent.conf | 2 +-
.../src/test/resources/log4j.properties | 2 +-
.../src/test/resources/test-suite-all.xml | 1 +
.../src/test/resources/test-suite-smoke.xml | 2 +
.../integration/common/RestConstants.java | 1 +
.../common/StratosTestServerManager.java | 102 +-
.../integration/common/TopologyHandler.java | 511 +++++---
.../integration/common/rest/RestClient.java | 61 +-
.../tests/StratosIntegrationTest.java | 5 +-
.../integration/tests/adc/GitHookTestCase.java | 108 +-
.../ApplicationBurstingTestCase.java | 145 +--
.../ApplicationStartupOrderTestCase.java | 165 +--
.../application/ApplicationUpdateTestCase.java | 131 +-
.../application/GroupStartupOrderTestCase.java | 229 ++--
.../GroupTerminationBehaviorTestCase.java | 196 ++-
.../application/MetadataServiceTestCase.java | 32 +-
...PartitionOneAfterAnotherClusterTestCase.java | 148 ++-
.../PartitionRoundRobinClusterTestCase.java | 129 +-
.../SampleApplicationStartupTestCase.java | 46 +-
.../application/SampleApplicationsTestCase.java | 401 +++---
.../SingleClusterScalingTestCase.java | 131 +-
.../tests/cartridge/CartridgeGroupTestCase.java | 241 ++++
.../tests/cartridge/CartridgeTestCase.java | 183 +++
.../tests/group/CartridgeGroupTestCase.java | 251 ----
.../tests/group/CartridgeTestCase.java | 183 ---
.../tests/iaas/IaaSProviderTestCase.java | 28 +-
.../iaas/IaasProviderAttributeTestCase.java | 61 +-
.../policies/ApplicationPolicyTestCase.java | 111 +-
.../policies/AutoscalingPolicyTestCase.java | 5 +-
.../policies/DeploymentPolicyTestCase.java | 7 +-
.../policies/NetworkPartitionTestCase.java | 7 +-
.../server/StratosServerRestartTestCase.java | 90 +-
.../integration/tests/users/TenantTestCase.java | 8 +-
.../integration/tests/users/UserTestCase.java | 5 +-
.../src/test/resources/common/log4j.properties | 14 +-
.../src/test/resources/test-suite-all.xml | 4 +-
.../src/test/resources/test-suite-smoke.xml | 2 +-
118 files changed, 4338 insertions(+), 3506 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfb50f4b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfb50f4b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/util/cartridgeagentutils.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bfb50f4b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/plugins/DefaultArtifactCheckout.py
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/plugins/DefaultArtifactCheckout.py
index 52648a1,27cf99c..0a45d91
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/plugins/DefaultArtifactCheckout.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/plugins/DefaultArtifactCheckout.py
@@@ -113,19 -101,3 +113,19 @@@ class DefaultArtifactCheckout(IArtifact
self.log.info("Retrying git clone operation...")
AgentGitHandler.retry_clone(git_repo)
AgentGitHandler.add_repo(git_repo)
+
+ def initial_artifacts_exists(self, dir):
+ try:
+ return os.path.exists(dir) and os.listdir(dir)
+ except OSError as e:
+ self.log.error('Unable to check if directory exists | non-empty, error: %s' % e)
+ return False
+
+ def backup_initial_artifacts(self, src):
+ self.log.info('Initial artifacts exists, taking backup to ' + Utils.strip_trailing_slash(src)
+ + constants.BACKUP_DIR_SUFFIX +
+ ' directory')
+ try:
+ shutil.copytree(src, Utils.strip_trailing_slash(src) + constants.BACKUP_DIR_SUFFIX)
+ except OSError as e:
- self.log.error('Directory not copied. Error: %s' % e)
++ self.log.error('Directory not copied. Error: %s' % e)