Resolve merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f78e627b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f78e627b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f78e627b Branch: refs/heads/stratos-4.1.x Commit: f78e627b6969eb5bfeef42b4eac0b92abe75600d Parents: 89c821f f14d741 Author: Dinithi <[email protected]> Authored: Thu Sep 10 22:21:16 2015 +0530 Committer: Dinithi <[email protected]> Committed: Thu Sep 10 22:21:16 2015 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/util/AutoscalerUtil.java | 74 +- .../iaases/kubernetes/KubernetesIaas.java | 51 +- .../applications/application_requests.jag | 3 + .../console/controllers/rest/rest_calls.jag | 4 + .../console/themes/theme0/css/custom.css | 2 +- .../theme0/partials/applications_form.hbs | 59 +- .../metadata/service/api/MetadataApi.java | 4 +- .../service/registry/CarbonRegistry.java | 307 -------- .../metadata/service/registry/DataStore.java | 2 - .../service/registry/MetadataApiRegistry.java | 307 ++++++++ .../rest/endpoint/api/StratosApiV41.java | 73 +- .../rest/endpoint/api/StratosApiV41Utils.java | 66 +- pom.xml | 64 ++ products/stratos/modules/integration/pom.xml | 161 +---- .../integration/tests/RestConstants.java | 55 -- .../tests/StratosTestServerManager.java | 232 ------ .../integration/tests/TopologyHandler.java | 697 ------------------- .../application/ApplicationBurstingTest.java | 227 ------ .../application/ApplicationUpdateTest.java | 243 ------- .../application/GroupStartupOrderTest.java | 362 ---------- .../GroupTerminationBehaviorTest.java | 428 ------------ .../PartitionOneAfterAnotherClusterTest.java | 298 -------- .../PartitionRoundRobinClusterTest.java | 305 -------- .../application/SampleApplicationsTest.java | 409 ----------- .../application/SingleClusterScalingTest.java | 365 ---------- .../tests/group/CartridgeGroupTest.java | 266 ------- .../integration/tests/group/CartridgeTest.java | 199 ------ .../tests/policies/ApplicationPolicyTest.java | 237 ------- .../tests/policies/AutoscalingPolicyTest.java | 170 ----- .../tests/policies/DeploymentPolicyTest.java | 281 -------- .../tests/policies/NetworkPartitionTest.java | 168 ----- .../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 | 387 ---------- .../tests/rest/WebClientWrapper.java | 62 -- .../integration/tests/users/TenantTest.java | 44 -- .../integration/tests/users/UserTest.java | 115 --- .../src/test/resources/JMSOutputAdaptor.xml | 30 - ...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 ---- ...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 - ...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 - .../src/test/resources/jndi.properties | 22 - .../src/test/resources/keys/wso2carbon.jks | Bin 33260 -> 0 bytes .../src/test/resources/mock-iaas.xml | 123 ---- ...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 - .../integration/src/test/resources/scaling.drl | 311 --------- ...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 | 94 --- .../test-conf/integration-test.properties | 26 - .../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 | 53 ++ .../common/StratosTestServerManager.java | 620 +++++++++++++++++ .../integration/common/TopologyHandler.java | 677 ++++++++++++++++++ .../apache/stratos/integration/common/Util.java | 83 +++ .../extensions/StratosServerExtension.java | 196 ++++++ .../integration/common/rest/ErrorResponse.java | 54 ++ .../integration/common/rest/HttpResponse.java | 54 ++ .../common/rest/HttpResponseHandler.java | 66 ++ .../common/rest/IntegrationMockClient.java | 100 +++ .../integration/common/rest/RestClient.java | 385 ++++++++++ .../common/rest/WebClientWrapper.java | 60 ++ .../integration/test-integration/pom.xml | 226 ++++++ .../tests/StratosIntegrationTest.java | 55 ++ .../application/ApplicationBurstingTest.java | 235 +++++++ .../application/ApplicationUpdateTest.java | 247 +++++++ .../application/GroupStartupOrderTest.java | 377 ++++++++++ .../GroupTerminationBehaviorTest.java | 427 ++++++++++++ .../PartitionOneAfterAnotherClusterTest.java | 291 ++++++++ .../PartitionRoundRobinClusterTest.java | 298 ++++++++ .../application/SampleApplicationsTest.java | 419 +++++++++++ .../application/SingleClusterScalingTest.java | 369 ++++++++++ .../tests/group/CartridgeGroupTest.java | 272 ++++++++ .../integration/tests/group/CartridgeTest.java | 203 ++++++ .../tests/policies/ApplicationPolicyTest.java | 243 +++++++ .../tests/policies/AutoscalingPolicyTest.java | 173 +++++ .../tests/policies/DeploymentPolicyTest.java | 285 ++++++++ .../tests/policies/NetworkPartitionTest.java | 170 +++++ .../integration/tests/users/TenantTest.java | 42 ++ .../integration/tests/users/UserTest.java | 112 +++ ...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 | 234 +++++++ .../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 | 311 +++++++++ .../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/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 + 317 files changed, 14020 insertions(+), 11370 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f78e627b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 6402251,098e6c7..47fad4b --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@@ -1896,9 -1900,15 +1900,18 @@@ public class StratosApiV41Utils if (autoscalerServiceClient != null) { try { autoscalerServiceClient.undeployApplication(applicationId, force); + + try { + clearMetadata(applicationId); + } catch (RegistryException e) { + String message = "Could not remove application metadata: [application-id] " + applicationId; + log.error(message, e); + throw new RestAPIException(message, e); + } + } catch (RemoteException e) { + } catch (RemoteException | AutoscalerServiceApplicationDefinitionExceptionException + | AutoscalerServiceRemoteExceptionException | + AutoscalerServiceStratosManagerServiceApplicationSignUpExceptionExceptionException e) { String message = "Could not undeploy application: [application-id] " + applicationId; log.error(message, e); throw new RestAPIException(message, e);
