Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9d02a599 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9d02a599 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9d02a599 Branch: refs/heads/master Commit: 9d02a599d764188a33307c9a20ebe05fc8a25a8b Parents: 0233d9b c066427 Author: gayangunarathne <[email protected]> Authored: Fri Sep 11 15:01:10 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Fri Sep 11 15:01:10 2015 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/util/AutoscalerUtil.java | 72 +- .../config/CloudControllerConfig.java | 4 - .../parser/CloudControllerConfigParser.java | 21 +- .../config/parser/IaasProviderConfigParser.java | 12 +- .../controller/iaases/PartitionValidator.java | 4 +- .../impl/CloudControllerServiceUtil.java | 5 +- .../util/CloudControllerConstants.java | 140 +-- .../controller/util/CloudControllerUtil.java | 58 +- dependencies/org.wso2.carbon.ui/pom.xml | 4 +- pom.xml | 64 ++ .../test/ADCMTAppTenantUserTest.java | 3 +- .../test/ADCMTAppTest.java | 3 +- .../python.cartridge.agent/test/ADCTest.java | 2 +- .../test/AgentStartupTest.java | 3 +- products/python-cartridge-agent/pom.xml | 2 +- .../modules/distribution/src/assembly/bin.xml | 142 +-- .../distribution/src/bin/add_entry_zone_file.sh | 70 -- .../src/bin/git-folder-structure.sh | 67 -- .../distribution/src/bin/manage-git-repo.sh | 138 --- .../src/bin/remove_entry_zone_file.sh | 75 -- .../distribution/src/bin/set-mysql-password.sh | 65 -- .../modules/distribution/src/bin/stratos.bat | 172 --- .../modules/distribution/src/bin/stratos.sh | 307 ----- .../distribution/src/bin/update-instance.sh | 54 - .../distribution/src/main/bin/stratos.bat | 172 +++ .../distribution/src/main/bin/stratos.sh | 307 +++++ products/stratos/modules/integration/pom.xml | 172 +-- .../integration/tests/RestConstants.java | 63 -- .../tests/StratosTestServerManager.java | 282 ----- .../integration/tests/TopologyHandler.java | 666 ----------- .../application/ApplicationBurstingTest.java | 242 ---- .../application/ApplicationUpdateTest.java | 261 ----- .../application/GroupStartupOrderTest.java | 260 ----- .../GroupTerminationBehaviorTest.java | 402 ------- .../PartitionOneAfterAnotherClusterTest.java | 298 ----- .../PartitionRoundRobinClusterTest.java | 311 ------ .../application/SampleApplicationsTest.java | 252 ----- .../application/SingleClusterScalingTest.java | 359 ------ .../tests/group/CartridgeGroupTest.java | 150 --- .../integration/tests/group/CartridgeTest.java | 191 ---- .../tests/policies/ApplicationPolicyTest.java | 190 ---- .../tests/policies/AutoscalingPolicyTest.java | 138 --- .../tests/policies/DeploymentPolicyTest.java | 230 ---- .../tests/policies/NetworkPartitionTest.java | 124 --- .../integration/tests/rest/ErrorResponse.java | 56 - .../integration/tests/rest/HttpResponse.java | 59 - .../tests/rest/HttpResponseHandler.java | 68 -- .../tests/rest/IntegrationMockClient.java | 102 -- .../integration/tests/rest/RestClient.java | 403 ------- .../tests/rest/WebClientWrapper.java | 62 -- .../integration/tests/users/TenantTest.java | 44 - .../integration/tests/users/UserTest.java | 115 -- ...cation-policy-application-bursting-test.json | 18 - .../app-bursting-single-cartriddge-group.json | 70 -- ...caling-policy-application-bursting-test.json | 14 - ...esb-php-group-application-bursting-test.json | 19 - .../mock/esb-application-bursting-test.json | 50 - .../mock/php-application-bursting-test.json | 51 - .../mock/tomcat-application-bursting-test.json | 53 - ...oyment-policy-application-bursting-test.json | 32 - ...k-partition-application-bursting-test-1.json | 15 - ...k-partition-application-bursting-test-2.json | 24 - ...cation-policy-application-policy-test-1.json | 18 - ...cation-policy-application-policy-test-2.json | 18 - ...lication-policy-application-policy-test.json | 18 - ...ork-partition-application-policy-test-1.json | 24 - ...ork-partition-application-policy-test-2.json | 15 - ...lication-policy-application-update-test.json | 18 - .../g-sc-G123-1-application-update-test-v1.json | 86 -- .../g-sc-G123-1-application-update-test.json | 86 -- ...oscaling-policy-application-update-test.json | 14 - ...rdige-nested-application-update-test-v1.json | 50 - ...artrdige-nested-application-update-test.json | 50 - .../mock/c1-application-update-test.json | 45 - .../mock/c2-application-update-test.json | 45 - .../mock/c3-application-update-test.json | 45 - ...yment-policy-application-update-test-v1.json | 36 - ...ployment-policy-application-update-test.json | 32 - ...-partition-application-update-test-1-v1.json | 28 - ...ork-partition-application-update-test-1.json | 15 - ...ork-partition-application-update-test-2.json | 24 - ...caling-policy-autoscaling-policy-test-1.json | 14 - ...caling-policy-autoscaling-policy-test-2.json | 14 - ...aling-policy-autoscaling-policy-test-v1.json | 14 - ...oscaling-policy-autoscaling-policy-test.json | 14 - .../g4-g5-g6-cartridge-group-test-v1.json | 50 - .../g4-g5-g6-cartridge-group-test.json | 50 - .../group-1-cartridge-group-test.json | 50 - .../group-2-cartridge-group-test.json | 50 - .../mock/c4-cartridge-group-test.json | 45 - .../mock/c5-cartridge-group-test.json | 124 --- .../mock/c6-cartridge-group-test.json | 45 - .../cartridges/mock/c0-cartridge-test-v1.json | 124 --- .../cartridges/mock/c0-cartridge-test.json | 124 --- .../cartridges/mock/c1-cartridge-test.json | 124 --- .../cartridges/mock/c2-cartridge-test.json | 124 --- .../test/resources/common/JMSOutputAdaptor.xml | 30 - .../src/test/resources/common/jndi.properties | 22 - .../src/test/resources/common/log4j.properties | 206 ---- .../src/test/resources/common/mock-iaas.xml | 123 -- .../src/test/resources/common/scaling.drl | 311 ------ ...loyment-policy-deployment-policy-test-1.json | 32 - ...loyment-policy-deployment-policy-test-2.json | 32 - ...oyment-policy-deployment-policy-test-v1.json | 36 - ...eployment-policy-deployment-policy-test.json | 32 - ...k-partition-deployment-policy-test-1-v1.json | 28 - ...work-partition-deployment-policy-test-1.json | 15 - ...work-partition-deployment-policy-test-2.json | 24 - ...cation-policy-application-bursting-test.json | 18 - ...ication-policy-group-startup-order-test.json | 13 - .../app-bursting-single-cartriddge-group.json | 70 -- .../applications/group-startup-order-test.json | 206 ---- ...caling-policy-application-bursting-test.json | 14 - ...scaling-policy-group-startup-order-test.json | 14 - ...esb-php-group-application-bursting-test.json | 19 - .../group6-group-startup-order-test.json | 44 - .../group8-group-startup-order-test.json | 18 - .../mock/esb-application-bursting-test.json | 50 - .../mock/esb-group-startup-order-test.json | 50 - .../mock/php-application-bursting-test.json | 51 - .../mock/php-group-startup-order-test.json | 51 - .../stratos-lb-group-startup-order-test.json | 44 - .../mock/tomcat-application-bursting-test.json | 53 - .../mock/tomcat-group-startup-order-test.json | 53 - .../mock/tomcat1-group-startup-order-test.json | 45 - .../mock/tomcat2-group-startup-order-test.json | 49 - .../mock/tomcat3-group-startup-order-test.json | 31 - ...oyment-policy-application-bursting-test.json | 32 - ...loyment-policy-group-startup-order-test.json | 18 - ...k-partition-application-bursting-test-1.json | 15 - ...k-partition-application-bursting-test-2.json | 24 - ...rk-partition-group-startup-order-test-1.json | 15 - ...rk-partition-group-startup-order-test-2.json | 24 - .../RegionOne.json | 17 - .../application-martin.json | 100 -- .../application-policy-1.json | 17 - .../application-s-g-c1-c2-c3-s.json | 130 --- .../application.json | 108 -- .../startup-order-termination-behavior/c1.json | 45 - .../startup-order-termination-behavior/c2.json | 45 - .../startup-order-termination-behavior/c3.json | 45 - .../startup-order-termination-behavior/c4.json | 45 - .../startup-order-termination-behavior/c5.json | 132 --- .../cartridge-groups-s-g-c1-c2-c3-s.json | 26 - .../cartridge-groups-working.json | 34 - .../cartridge-groups.json | 77 -- .../cartridge-groups.json.back | 53 - .../deploy.sh | 43 - .../economy-policy.json | 15 - .../static-1.json | 17 - .../wso2carbon 2.log | 992 ----------------- .../wso2carbon-working 2.log | 1053 ------------------ .../wso2carbon-working.log | 1053 ------------------ .../wso2carbon.log | 992 ----------------- ...-policy-group-termination-behavior-test.json | 17 - .../group-termination-behavior-test.json | 101 -- ...-policy-group-termination-behavior-test.json | 14 - ...-groups-group-termination-behavior-test.json | 58 - .../c1-group-termination-behavior-test.json | 45 - .../c2-group-termination-behavior-test.json | 45 - .../c3-group-termination-behavior-test.json | 45 - .../c4-group-termination-behavior-test.json | 45 - ...-policy-group-termination-behavior-test.json | 18 - ...ition-group-termination-behavior-test-1.json | 15 - .../src/test/resources/instrumentation.txt | 1 - .../src/test/resources/keys/wso2carbon.jks | Bin 33260 -> 0 bytes ...work-partition-network-partition-test-1.json | 15 - ...work-partition-network-partition-test-2.json | 15 - ...ork-partition-network-partition-test-v1.json | 28 - ...etwork-partition-network-partition-test.json | 15 - ...ation-policy-partition-round-robin-test.json | 13 - .../partition-round-robin-test.json | 28 - ...aling-policy-partition-round-robin-test.json | 14 - .../mock/c7-partition-round-robin-test.json | 45 - ...yment-policy-partition-round-robin-test.json | 22 - ...rk-partition-partition-round-robin-test.json | 24 - ...ication-policy-sample-applications-test.json | 18 - ...g-sc-G123-1-sample-applications-test-v1.json | 86 -- .../g-sc-G123-1-sample-applications-test.json | 86 -- .../sample-applications-test-1.json | 86 -- .../sample-applications-test-2.json | 86 -- ...scaling-policy-sample-applications-test.json | 14 - ...dige-nested-sample-applications-test-v1.json | 50 - ...rtrdige-nested-sample-applications-test.json | 50 - .../mock/c1-sample-applications-test.json | 45 - .../mock/c2-sample-applications-test.json | 45 - .../mock/c3-sample-applications-test.json | 45 - ...ment-policy-sample-applications-test-v1.json | 36 - ...loyment-policy-sample-applications-test.json | 32 - ...partition-sample-applications-test-1-v1.json | 28 - ...rk-partition-sample-applications-test-1.json | 15 - ...rk-partition-sample-applications-test-2.json | 24 - ...tion-policy-single-cluster-scaling-test.json | 13 - .../single-cluster-scaling-test.json | 28 - ...ling-policy-single-cluster-scaling-test.json | 14 - .../mock/c7-single-cluster-scaling-test.json | 45 - ...ment-policy-single-cluster-scaling-test.json | 22 - ...k-partition-single-cluster-scaling-test.json | 24 - .../src/test/resources/stratos-testing.xml | 82 -- .../src/test/resources/tenant/tenant1.json | 9 - .../src/test/resources/tenant/tenant2.json | 9 - .../test-conf/integration-test.properties | 30 - .../src/test/resources/user-test/tenant-1.json | 9 - .../src/test/resources/user-test/user-1-v1.json | 8 - .../src/test/resources/user-test/user-1.json | 8 - .../modules/integration/test-common/pom.xml | 126 +++ .../integration/common/RestConstants.java | 63 ++ .../common/StratosTestServerManager.java | 619 ++++++++++ .../integration/common/TopologyHandler.java | 689 ++++++++++++ .../apache/stratos/integration/common/Util.java | 84 ++ .../extensions/StratosServerExtension.java | 196 ++++ .../integration/common/rest/ErrorResponse.java | 56 + .../integration/common/rest/HttpResponse.java | 59 + .../common/rest/HttpResponseHandler.java | 68 ++ .../common/rest/IntegrationMockClient.java | 102 ++ .../integration/common/rest/RestClient.java | 403 +++++++ .../common/rest/WebClientWrapper.java | 62 ++ .../integration/test-integration/pom.xml | 226 ++++ .../tests/StratosIntegrationTest.java | 108 ++ .../application/ApplicationBurstingTest.java | 241 ++++ .../application/ApplicationUpdateTest.java | 275 +++++ .../application/GroupStartupOrderTest.java | 387 +++++++ .../GroupTerminationBehaviorTest.java | 430 +++++++ .../PartitionOneAfterAnotherClusterTest.java | 300 +++++ .../PartitionRoundRobinClusterTest.java | 312 ++++++ .../application/SampleApplicationsTest.java | 261 +++++ .../application/SingleClusterScalingTest.java | 373 +++++++ .../tests/group/CartridgeGroupTest.java | 149 +++ .../integration/tests/group/CartridgeTest.java | 191 ++++ .../tests/policies/ApplicationPolicyTest.java | 195 ++++ .../tests/policies/AutoscalingPolicyTest.java | 144 +++ .../tests/policies/DeploymentPolicyTest.java | 234 ++++ .../tests/policies/NetworkPartitionTest.java | 126 +++ .../integration/tests/users/TenantTest.java | 42 + .../integration/tests/users/UserTest.java | 114 ++ ...cation-policy-application-bursting-test.json | 18 + .../app-bursting-single-cartriddge-group.json | 70 ++ ...caling-policy-application-bursting-test.json | 14 + ...esb-php-group-application-bursting-test.json | 19 + .../mock/esb-application-bursting-test.json | 50 + .../mock/php-application-bursting-test.json | 51 + .../mock/tomcat-application-bursting-test.json | 53 + ...oyment-policy-application-bursting-test.json | 32 + ...k-partition-application-bursting-test-1.json | 15 + ...k-partition-application-bursting-test-2.json | 24 + ...cation-policy-application-policy-test-1.json | 18 + ...cation-policy-application-policy-test-2.json | 18 + ...lication-policy-application-policy-test.json | 18 + ...ork-partition-application-policy-test-1.json | 24 + ...ork-partition-application-policy-test-2.json | 15 + ...lication-policy-application-update-test.json | 18 + .../g-sc-G123-1-application-update-test-v1.json | 86 ++ .../g-sc-G123-1-application-update-test.json | 86 ++ ...oscaling-policy-application-update-test.json | 14 + ...rdige-nested-application-update-test-v1.json | 50 + ...artrdige-nested-application-update-test.json | 50 + .../mock/c1-application-update-test.json | 45 + .../mock/c2-application-update-test.json | 45 + .../mock/c3-application-update-test.json | 45 + ...yment-policy-application-update-test-v1.json | 36 + ...ployment-policy-application-update-test.json | 32 + ...-partition-application-update-test-1-v1.json | 28 + ...ork-partition-application-update-test-1.json | 15 + ...ork-partition-application-update-test-2.json | 24 + .../src/test/resources/automation.xml | 235 ++++ .../src/test/resources/automationSchema.xsd | 573 ++++++++++ ...caling-policy-autoscaling-policy-test-1.json | 14 + ...caling-policy-autoscaling-policy-test-2.json | 14 + ...aling-policy-autoscaling-policy-test-v1.json | 14 + ...oscaling-policy-autoscaling-policy-test.json | 14 + .../g4-g5-g6-cartridge-group-test-v1.json | 50 + .../g4-g5-g6-cartridge-group-test.json | 50 + .../group-1-cartridge-group-test.json | 50 + .../group-2-cartridge-group-test.json | 50 + .../mock/c4-cartridge-group-test.json | 45 + .../mock/c5-cartridge-group-test.json | 124 +++ .../mock/c6-cartridge-group-test.json | 45 + .../cartridges/mock/c0-cartridge-test-v1.json | 124 +++ .../cartridges/mock/c0-cartridge-test.json | 124 +++ .../cartridges/mock/c1-cartridge-test.json | 124 +++ .../cartridges/mock/c2-cartridge-test.json | 124 +++ .../test/resources/common/JMSOutputAdaptor.xml | 30 + .../src/test/resources/common/autoscaler.xml | 57 + .../common/cartridge-config.properties | 27 + .../test/resources/common/cloud-controller.xml | 81 ++ .../src/test/resources/common/identity.xml | 260 +++++ .../src/test/resources/common/jndi.properties | 22 + .../src/test/resources/common/log4j.properties | 206 ++++ .../src/test/resources/common/mock-iaas.xml | 123 ++ .../src/test/resources/common/scaling.drl | 324 ++++++ .../resources/common/thrift-client-config.xml | 27 + ...loyment-policy-deployment-policy-test-1.json | 32 + ...loyment-policy-deployment-policy-test-2.json | 32 + ...oyment-policy-deployment-policy-test-v1.json | 36 + ...eployment-policy-deployment-policy-test.json | 32 + ...k-partition-deployment-policy-test-1-v1.json | 28 + ...work-partition-deployment-policy-test-1.json | 15 + ...work-partition-deployment-policy-test-2.json | 24 + .../src/test/resources/filters.txt | 16 + ...ication-policy-group-startup-order-test.json | 13 + .../applications/group-startup-order-test.json | 206 ++++ ...scaling-policy-group-startup-order-test.json | 14 + .../group6-group-startup-order-test.json | 44 + .../group8-group-startup-order-test.json | 18 + .../mock/esb-group-startup-order-test.json | 50 + .../mock/php-group-startup-order-test.json | 51 + .../stratos-lb-group-startup-order-test.json | 44 + .../mock/tomcat-group-startup-order-test.json | 53 + .../mock/tomcat1-group-startup-order-test.json | 45 + .../mock/tomcat2-group-startup-order-test.json | 49 + .../mock/tomcat3-group-startup-order-test.json | 31 + ...loyment-policy-group-startup-order-test.json | 18 + ...rk-partition-group-startup-order-test-1.json | 15 + ...rk-partition-group-startup-order-test-2.json | 24 + ...-policy-group-termination-behavior-test.json | 17 + .../group-termination-behavior-test.json | 101 ++ ...-policy-group-termination-behavior-test.json | 14 + ...-groups-group-termination-behavior-test.json | 58 + .../c1-group-termination-behavior-test.json | 45 + .../c2-group-termination-behavior-test.json | 45 + .../c3-group-termination-behavior-test.json | 45 + .../c4-group-termination-behavior-test.json | 45 + ...-policy-group-termination-behavior-test.json | 18 + ...ition-group-termination-behavior-test-1.json | 15 + .../src/test/resources/instrumentation.txt | 1 + .../keystores/products/client-truststore.jks | Bin 0 -> 37935 bytes .../resources/keystores/products/userRP.jks | Bin 0 -> 33278 bytes .../resources/keystores/products/wso2carbon.jks | Bin 0 -> 33260 bytes ...work-partition-network-partition-test-1.json | 15 + ...work-partition-network-partition-test-2.json | 15 + ...ork-partition-network-partition-test-v1.json | 28 + ...etwork-partition-network-partition-test.json | 15 + ...ation-policy-partition-round-robin-test.json | 13 + .../partition-round-robin-test.json | 28 + ...aling-policy-partition-round-robin-test.json | 14 + .../mock/c7-partition-round-robin-test.json | 45 + ...yment-policy-partition-round-robin-test.json | 22 + ...rk-partition-partition-round-robin-test.json | 24 + ...ication-policy-sample-applications-test.json | 18 + ...g-sc-G123-1-sample-applications-test-v1.json | 86 ++ .../g-sc-G123-1-sample-applications-test.json | 86 ++ .../sample-applications-test-1.json | 86 ++ .../sample-applications-test-2.json | 86 ++ ...scaling-policy-sample-applications-test.json | 14 + ...dige-nested-sample-applications-test-v1.json | 50 + ...rtrdige-nested-sample-applications-test.json | 50 + .../mock/c1-sample-applications-test.json | 45 + .../mock/c2-sample-applications-test.json | 45 + .../mock/c3-sample-applications-test.json | 45 + ...ment-policy-sample-applications-test-v1.json | 36 + ...loyment-policy-sample-applications-test.json | 32 + ...partition-sample-applications-test-1-v1.json | 28 + ...rk-partition-sample-applications-test-1.json | 15 + ...rk-partition-sample-applications-test-2.json | 24 + ...tion-policy-single-cluster-scaling-test.json | 13 + .../single-cluster-scaling-test.json | 28 + ...ling-policy-single-cluster-scaling-test.json | 14 + .../mock/c7-single-cluster-scaling-test.json | 45 + ...ment-policy-single-cluster-scaling-test.json | 22 + ...k-partition-single-cluster-scaling-test.json | 24 + .../src/test/resources/stratos-testng.xml | 101 ++ .../src/test/resources/tenant/tenant1.json | 9 + .../src/test/resources/tenant/tenant2.json | 9 + .../src/test/resources/user-test/tenant-1.json | 9 + .../src/test/resources/user-test/user-1-v1.json | 8 + .../src/test/resources/user-test/user-1.json | 8 + 366 files changed, 13843 insertions(+), 17351 deletions(-) ----------------------------------------------------------------------
