refining the resources to have the samples with the reference of the test case
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ce00b955 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ce00b955 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ce00b955 Branch: refs/heads/data-publisher-integration Commit: ce00b955b73cf45a7386f5faa6bf69ed6242d391 Parents: 5b84404 Author: reka <[email protected]> Authored: Thu Aug 6 19:02:26 2015 +0530 Committer: reka <[email protected]> Committed: Thu Aug 6 19:33:43 2015 +0530 ---------------------------------------------------------------------- .../tests/ApplicationBurstingTest.java | 190 ++++++++++++++++++- .../tests/ApplicationPolicyTest.java | 2 + .../integration/tests/ApplicationTest.java | 29 --- .../tests/AutoscalingPolicyTest.java | 2 + .../integration/tests/CartridgeGroupTest.java | 11 +- .../integration/tests/CartridgeTest.java | 2 + .../integration/tests/DeploymentPolicyTest.java | 12 +- .../integration/tests/NetworkPartitionTest.java | 6 +- .../integration/tests/RestConstants.java | 2 +- .../tests/SampleApplicationsTest.java | 44 ++--- .../application-policy-3.json | 18 ++ .../app-bursting-single-cartriddge-group.json | 70 +++++++ .../autoscaling-policy-2.json | 14 ++ .../cartridges-groups/esb-php-group.json | 19 ++ .../cartridges/mock/esb.json | 50 +++++ .../cartridges/mock/php.json | 51 +++++ .../cartridges/mock/tomcat.json | 53 ++++++ .../deployment-policy-4.json | 32 ++++ .../mock/network-partition-10.json | 24 +++ .../mock/network-partition-9.json | 15 ++ .../application-policy-1.json | 18 -- .../application-policy-2.json | 18 -- .../application-policy-3.json | 18 ++ .../mock/network-partition-10.json | 24 +++ .../mock/network-partition-9.json | 15 ++ .../simple/single-cartridge-app/README.md | 25 --- .../single-cartridge-app/g-sc-G123-1-v1.json | 86 --------- .../single-cartridge-app/g-sc-G123-1-v2.json | 86 --------- .../single-cartridge-app/g-sc-G123-1-v3.json | 86 --------- .../single-cartridge-app/g-sc-G123-1.json | 86 --------- .../autoscaling-policy-1.json | 14 -- .../autoscaling-policy-c0-v1.json | 14 -- .../autoscaling-policy-c0.json | 14 -- .../autoscaling-policy-c0-v1.json | 14 ++ .../autoscaling-policy-c0.json | 14 ++ .../cartridges-groups/g4-g5-g6-v1.json | 50 +++++ .../cartridges-groups/g4-g5-g6.json | 50 +++++ .../cartridges/mock/c4.json | 45 +++++ .../cartridges/mock/c5.json | 124 ++++++++++++ .../cartridges/mock/c6.json | 45 +++++ .../cartridge-test/cartridges/mock/c0-v1.json | 124 ++++++++++++ .../cartridge-test/cartridges/mock/c0.json | 124 ++++++++++++ .../cartridges-groups/cartrdige-nested-v1.json | 50 ----- .../cartridges-groups/cartrdige-nested.json | 50 ----- .../cartridges-groups/g4-g5-g6-v1.json | 50 ----- .../resources/cartridges-groups/g4-g5-g6.json | 50 ----- .../test/resources/cartridges/mock/c0-v1.json | 124 ------------ .../src/test/resources/cartridges/mock/c0.json | 124 ------------ .../src/test/resources/cartridges/mock/c1.json | 45 ----- .../src/test/resources/cartridges/mock/c2.json | 45 ----- .../src/test/resources/cartridges/mock/c3.json | 45 ----- .../src/test/resources/cartridges/mock/c4.json | 45 ----- .../src/test/resources/cartridges/mock/c5.json | 124 ------------ .../src/test/resources/cartridges/mock/c6.json | 45 ----- .../deployment-policy-1-v1.json | 36 ---- .../deployment-policy-1.json | 32 ---- .../deployment-policy-2-v1.json | 36 ---- .../deployment-policy-2.json | 32 ---- .../deployment-policy-3.json | 32 ---- .../deployment-policy-2-v1.json | 36 ++++ .../deployment-policy-2.json | 32 ++++ .../mock/network-partition-5-v1.json | 28 +++ .../mock/network-partition-5.json | 15 ++ .../mock/network-partition-6.json | 24 +++ .../mock/network-partition-3-v1.json | 28 +++ .../mock/network-partition-3.json | 15 ++ .../mock/network-partition-1-v1.json | 28 --- .../mock/network-partition-1.json | 15 -- .../mock/network-partition-2.json | 24 --- .../mock/network-partition-3-v1.json | 28 --- .../mock/network-partition-3.json | 15 -- .../mock/network-partition-5-v1.json | 28 --- .../mock/network-partition-5.json | 15 -- .../mock/network-partition-6.json | 24 --- .../mock/network-partition-7.json | 15 -- .../mock/network-partition-8.json | 24 --- .../application-policy-1.json | 18 ++ .../applications/g-sc-G123-1-v1.json | 86 +++++++++ .../applications/g-sc-G123-1-v2.json | 86 +++++++++ .../applications/g-sc-G123-1-v3.json | 86 +++++++++ .../applications/g-sc-G123-1.json | 86 +++++++++ .../autoscaling-policy-1.json | 14 ++ .../cartridges-groups/cartrdige-nested-v1.json | 50 +++++ .../cartridges-groups/cartrdige-nested.json | 50 +++++ .../cartridges/mock/c1.json | 45 +++++ .../cartridges/mock/c2.json | 45 +++++ .../cartridges/mock/c3.json | 45 +++++ .../deployment-policy-1-v1.json | 36 ++++ .../deployment-policy-1.json | 32 ++++ .../mock/network-partition-1-v1.json | 28 +++ .../mock/network-partition-1.json | 15 ++ .../mock/network-partition-2.json | 24 +++ .../integration/src/test/resources/testng.xml | 5 + 93 files changed, 2156 insertions(+), 1694 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java index cefd786..518c7cb 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationBurstingTest.java @@ -18,8 +18,11 @@ */ package org.apache.stratos.integration.tests; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.beans.application.ApplicationBean; import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean; +import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean; import org.testng.annotations.Test; import static junit.framework.Assert.assertEquals; @@ -29,9 +32,192 @@ import static junit.framework.Assert.assertTrue; * This will handle the application bursting test cases */ public class ApplicationBurstingTest extends StratosTestServerManager { + private static final Log log = LogFactory.getLog(SampleApplicationsTest.class); + private static final String TEST_PATH = "/application-bursting-test"; + @Test - public void testApplication() { - assertTrue("test passes", true); + public void testDeployApplication() { + try { + log.info("Started application Bursting test case**************************************"); + + String autoscalingPolicyId = "autoscaling-policy-2"; + + boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH + + "/" + autoscalingPolicyId + ".json", + RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME); + assertEquals(addedScalingPolicy, true); + + boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "esb.json", + RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); + assertEquals(addedC1, true); + + boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "php.json", + RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); + assertEquals(addedC2, true); + + boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "tomcat.json", + RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); + assertEquals(addedC3, true); + + boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH + + "/" + "esb-php-group.json", RestConstants.CARTRIDGE_GROUPS, + RestConstants.CARTRIDGE_GROUPS_NAME); + assertEquals(addedG1, true); + + CartridgeGroupBean beanG1 = (CartridgeGroupBean) restClient. + getEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group", + CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME); + assertEquals(beanG1.getName(), "esb-php-group"); + + boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + + "network-partition-9.json", + RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); + assertEquals(addedN1, true); + + boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + + "network-partition-10.json", + RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); + assertEquals(addedN2, true); + + boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" + + "deployment-policy-4.json", + RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME); + assertEquals(addedDep, true); + + boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" + + "app-bursting-single-cartriddge-group.json", RestConstants.APPLICATIONS, + RestConstants.APPLICATIONS_NAME); + assertEquals(added, true); + + ApplicationBean bean = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS, + "cartridge-group-app", ApplicationBean.class, RestConstants.APPLICATIONS_NAME); + assertEquals(bean.getApplicationId(), "cartridge-group-app"); + + boolean addAppPolicy = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" + + "application-policy-3.json", RestConstants.APPLICATION_POLICIES, + RestConstants.APPLICATION_POLICIES_NAME); + assertEquals(addAppPolicy, true); + + ApplicationPolicyBean policyBean = (ApplicationPolicyBean) restClient.getEntity( + RestConstants.APPLICATION_POLICIES, + "application-policy-3", ApplicationPolicyBean.class, + RestConstants.APPLICATION_POLICIES_NAME); + + //deploy the application + String resourcePath = RestConstants.APPLICATIONS + "/" + "cartridge-group-app" + + RestConstants.APPLICATIONS_DEPLOY + "/" + "application-policy-3"; + boolean deployed = restClient.deployEntity(resourcePath, + RestConstants.APPLICATIONS_NAME); + assertEquals(deployed, true); + + //Application active handling + TopologyHandler.getInstance().assertApplicationActivation(bean.getApplicationId()); + + //Group active handling + TopologyHandler.getInstance().assertGroupActivation(bean.getApplicationId()); + + //Cluster active handling + TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId()); + + boolean removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group", + RestConstants.CARTRIDGE_GROUPS_NAME); + assertEquals(removedGroup, false); + + boolean removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES, + autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME); + assertEquals(removedAuto, false); + + boolean removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, + "network-partition-9", + RestConstants.NETWORK_PARTITIONS_NAME); + //Trying to remove the used network partition + assertEquals(removedNet, false); + + boolean removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES, + "deployment-policy-4", RestConstants.DEPLOYMENT_POLICIES_NAME); + assertEquals(removedDep, false); + + //Un-deploying the application + String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "cartridge-group-app" + + RestConstants.APPLICATIONS_UNDEPLOY; + + boolean unDeployed = restClient.undeployEntity(resourcePathUndeploy, + RestConstants.APPLICATIONS_NAME); + assertEquals(unDeployed, true); + + boolean undeploy = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app"); + if (!undeploy) { + //Need to forcefully undeploy the application + log.info("Force undeployment is going to start for the [application] " + "cartridge-group-app"); + + restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "cartridge-group-app" + + RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS); + + boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app"); + assertEquals(String.format("Forceful undeployment failed for the application %s", + "cartridge-group-app"), forceUndeployed, true); + + } + + boolean removed = restClient.removeEntity(RestConstants.APPLICATIONS, "cartridge-group-app", + RestConstants.APPLICATIONS_NAME); + assertEquals(removed, true); + + ApplicationBean beanRemoved = (ApplicationBean) restClient.getEntity(RestConstants.APPLICATIONS, + "cartridge-group-app", ApplicationBean.class, RestConstants.APPLICATIONS_NAME); + assertEquals(beanRemoved, null); + + removedGroup = restClient.removeEntity(RestConstants.CARTRIDGE_GROUPS, "esb-php-group", + RestConstants.CARTRIDGE_GROUPS_NAME); + assertEquals(removedGroup, true); + + boolean removedC1 = restClient.removeEntity(RestConstants.CARTRIDGES, "esb", + RestConstants.CARTRIDGES_NAME); + assertEquals(removedC1, true); + + boolean removedC2 = restClient.removeEntity(RestConstants.CARTRIDGES, "php", + RestConstants.CARTRIDGES_NAME); + assertEquals(removedC2, true); + + boolean removedC3 = restClient.removeEntity(RestConstants.CARTRIDGES, "tomcat", + RestConstants.CARTRIDGES_NAME); + assertEquals(removedC3, true); + + removedAuto = restClient.removeEntity(RestConstants.AUTOSCALING_POLICIES, + autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME); + assertEquals(removedAuto, true); + + removedDep = restClient.removeEntity(RestConstants.DEPLOYMENT_POLICIES, + "deployment-policy-4", RestConstants.DEPLOYMENT_POLICIES_NAME); + assertEquals(removedDep, true); + + removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, + "network-partition-9", RestConstants.NETWORK_PARTITIONS_NAME); + assertEquals(removedNet, false); + + boolean removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, + "network-partition-10", RestConstants.NETWORK_PARTITIONS_NAME); + assertEquals(removedN2, false); + + boolean removeAppPolicy = restClient.removeEntity(RestConstants.APPLICATION_POLICIES, + "application-policy-3", RestConstants.APPLICATION_POLICIES_NAME); + assertEquals(removeAppPolicy, true); + + removedNet = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, + "network-partition-9", RestConstants.NETWORK_PARTITIONS_NAME); + assertEquals(removedNet, true); + + removedN2 = restClient.removeEntity(RestConstants.NETWORK_PARTITIONS, + "network-partition-10", RestConstants.NETWORK_PARTITIONS_NAME); + assertEquals(removedN2, true); + + log.info("Ended application bursting test case**************************************"); + + } catch (Exception e) { + log.error("An error occurred while handling application bursting", e); + assertTrue("An error occurred while handling application bursting", false); + } } } + http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java index b727e82..cc9f976 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java @@ -34,6 +34,8 @@ import static junit.framework.Assert.assertTrue; */ public class ApplicationPolicyTest extends StratosTestServerManager { private static final Log log = LogFactory.getLog(ApplicationPolicyTest.class); + private static final String TEST_PATH = "/application-policy-test"; + @Test public void testApplicationPolicy() { http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java deleted file mode 100644 index 8ceec4d..0000000 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.stratos.integration.tests; - -import org.apache.stratos.messaging.message.receiver.application.ApplicationsEventReceiver; -import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver; - -/** - * Super class for application test cases - */ -public class ApplicationTest extends StratosTestServerManager { - -} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java index d841552..bcacfc8 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java @@ -31,6 +31,8 @@ import static junit.framework.Assert.assertTrue; */ public class AutoscalingPolicyTest extends StratosTestServerManager { private static final Log log = LogFactory.getLog(AutoscalingPolicyTest.class); + private static final String TEST_PATH = "/autoscaling-policy-test"; + @Test public void testAutoscalingPolicy() { http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java index 8bc3a9e..873fa5a 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java @@ -32,25 +32,26 @@ import static junit.framework.Assert.assertTrue; */ public class CartridgeGroupTest extends StratosTestServerManager { private static final Log log = LogFactory.getLog(CartridgeGroupTest.class); + private static final String TEST_PATH = "/cartridge-group-test"; @Test public void testCartridgeGroup() { try { log.info("Started Cartridge group test case**************************************"); - boolean addedC1 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c4.json", + boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c4.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c4"), addedC1, true); - boolean addedC2 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c5.json", + boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c5.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c5"), addedC2, true); - boolean addedC3 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c6.json", + boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c6.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); assertEquals(String.format("Cartridge did not added: [cartridge-name] %s", "c6"), addedC3, true); - boolean added = restClient.addEntity(RestConstants.CARTRIDGE_GROUPS_PATH + + boolean added = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH + "/" + "g4-g5-g6.json", RestConstants.CARTRIDGE_GROUPS, RestConstants.CARTRIDGE_GROUPS_NAME); assertEquals(String.format("Cartridge Group did not added: [cartridge-group-name] %s", @@ -61,7 +62,7 @@ public class CartridgeGroupTest extends StratosTestServerManager { assertEquals(String.format("Cartridge Group name did not match: [cartridge-group-name] %s", "g4-g5-g6.json"), bean.getName(), "G4"); - boolean updated = restClient.updateEntity(RestConstants.CARTRIDGE_GROUPS_PATH + + boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH + "/" + "g4-g5-g6-v1.json", RestConstants.CARTRIDGE_GROUPS, RestConstants.CARTRIDGE_GROUPS_NAME); assertEquals(String.format("Cartridge Group did not updated: [cartridge-group-name] %s", http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java index 26eb881..638d742 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java @@ -33,6 +33,8 @@ import static junit.framework.Assert.assertTrue; */ public class CartridgeTest extends StratosTestServerManager { private static final Log log = LogFactory.getLog(CartridgeTest.class); + private static final String TEST_PATH = "/cartridge-group-test"; + @Test public void testCartridge() { http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java index 6c1f4e0..b384e46 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java @@ -33,6 +33,8 @@ import static junit.framework.Assert.assertTrue; */ public class DeploymentPolicyTest extends StratosTestServerManager { private static final Log log = LogFactory.getLog(DeploymentPolicyTest.class); + private static final String TEST_PATH = "/deployment-policy-test"; + @Test public void testDeploymentPolicy() { @@ -40,17 +42,17 @@ public class DeploymentPolicyTest extends StratosTestServerManager { String deploymentPolicyId = "deployment-policy-2"; log.info("Started deployment policy test case**************************************"); - boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" + + boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + "network-partition-5" + ".json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); assertEquals(addedN1, true); - boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" + + boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + "network-partition-6" + ".json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); assertEquals(addedN2, true); - boolean addedDep = restClient.addEntity(RestConstants.DEPLOYMENT_POLICIES_PATH + "/" + + boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" + deploymentPolicyId + ".json", RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME); assertEquals(addedDep, true); @@ -77,13 +79,13 @@ public class DeploymentPolicyTest extends StratosTestServerManager { assertEquals(bean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 9); //update network partition - boolean updated = restClient.updateEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" + + boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + "network-partition-5-v1.json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); assertEquals(updated, true); //update deployment policy with new partition and max values - boolean updatedDep = restClient.updateEntity(RestConstants.DEPLOYMENT_POLICIES_PATH + + boolean updatedDep = restClient.updateEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" + deploymentPolicyId + "-v1.json", RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME); assertEquals(updatedDep, true); http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java index a2ec9dc..741d8be 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java @@ -32,6 +32,8 @@ import static junit.framework.Assert.assertTrue; */ public class NetworkPartitionTest extends StratosTestServerManager { private static final Log log = LogFactory.getLog(NetworkPartitionTest.class); + private static final String TEST_PATH = "/network-partition-test"; + @Test public void testNetworkPartition() { @@ -39,7 +41,7 @@ public class NetworkPartitionTest extends StratosTestServerManager { String networkPartitionId = "network-partition-3"; log.info("Started network partition test case**************************************"); - boolean added = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" + + boolean added = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + networkPartitionId + ".json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); @@ -54,7 +56,7 @@ public class NetworkPartitionTest extends StratosTestServerManager { assertEquals(bean.getPartitions().get(0).getProperty().get(0).getName(), "region"); assertEquals(bean.getPartitions().get(0).getProperty().get(0).getValue(), "default"); - boolean updated = restClient.updateEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" + + boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + networkPartitionId + "-v1.json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java index 181aaa5..bf7de6c 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/RestConstants.java @@ -44,7 +44,7 @@ public class RestConstants { public static final String NETWORK_PARTITIONS_NAME = "networkPartition"; public static final String DEPLOYMENT_POLICIES_PATH = "/deployment-policies/"; public static final String DEPLOYMENT_POLICIES_NAME = "deploymentPolicy"; - public static final String APPLICATIONS_PATH = "/applications/simple/single-cartridge-app/"; + public static final String APPLICATIONS_PATH = "/applications/"; public static final String APPLICATIONS_NAME = "application"; public static final String APPLICATION_POLICIES_PATH = "/application-policies/"; public static final String APPLICATION_POLICIES_NAME = "applicationPolicy"; http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java index 7641b18..b2960e2 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java @@ -34,7 +34,7 @@ import static junit.framework.Assert.assertTrue; */ public class SampleApplicationsTest extends StratosTestServerManager { private static final Log log = LogFactory.getLog(SampleApplicationsTest.class); - + private static final String TEST_PATH = "/sample-applications-test"; @Test public void testApplication() { @@ -42,24 +42,24 @@ public class SampleApplicationsTest extends StratosTestServerManager { String autoscalingPolicyId = "autoscaling-policy-1"; try { - boolean addedScalingPolicy = restClient.addEntity(RestConstants.AUTOSCALING_POLICIES_PATH + boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH + "/" + autoscalingPolicyId + ".json", RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME); assertEquals(addedScalingPolicy, true); - boolean addedC1 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c1.json", + boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c1.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); assertEquals(addedC1, true); - boolean addedC2 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c2.json", + boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c2.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); assertEquals(addedC2, true); - boolean addedC3 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c3.json", + boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c3.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); assertEquals(addedC3, true); - boolean addedG1 = restClient.addEntity(RestConstants.CARTRIDGE_GROUPS_PATH + + boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH + "/" + "cartrdige-nested.json", RestConstants.CARTRIDGE_GROUPS, RestConstants.CARTRIDGE_GROUPS_NAME); assertEquals(addedG1, true); @@ -69,22 +69,22 @@ public class SampleApplicationsTest extends StratosTestServerManager { CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME); assertEquals(beanG1.getName(), "G1"); - boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" + + boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + "network-partition-1.json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); assertEquals(addedN1, true); - boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" + + boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + "network-partition-2.json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); assertEquals(addedN2, true); - boolean addedDep = restClient.addEntity(RestConstants.DEPLOYMENT_POLICIES_PATH + "/" + + boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" + "deployment-policy-1.json", RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME); assertEquals(addedDep, true); - boolean added = restClient.addEntity(RestConstants.APPLICATIONS_PATH + "/" + + boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" + "g-sc-G123-1.json", RestConstants.APPLICATIONS, RestConstants.APPLICATIONS_NAME); assertEquals(added, true); @@ -120,7 +120,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMin(), 1); assertEquals(bean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 2); - boolean updated = restClient.updateEntity(RestConstants.APPLICATIONS_PATH + "/g-sc-G123-1-v1.json", + boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/g-sc-G123-1-v1.json", RestConstants.APPLICATIONS, RestConstants.APPLICATIONS_NAME); assertEquals(updated, true); @@ -229,24 +229,24 @@ public class SampleApplicationsTest extends StratosTestServerManager { String autoscalingPolicyId = "autoscaling-policy-1"; - boolean addedScalingPolicy = restClient.addEntity(RestConstants.AUTOSCALING_POLICIES_PATH + boolean addedScalingPolicy = restClient.addEntity(TEST_PATH + RestConstants.AUTOSCALING_POLICIES_PATH + "/" + autoscalingPolicyId + ".json", RestConstants.AUTOSCALING_POLICIES, RestConstants.AUTOSCALING_POLICIES_NAME); assertEquals(addedScalingPolicy, true); - boolean addedC1 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c1.json", + boolean addedC1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c1.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); assertEquals(addedC1, true); - boolean addedC2 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c2.json", + boolean addedC2 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c2.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); assertEquals(addedC2, true); - boolean addedC3 = restClient.addEntity(RestConstants.CARTRIDGES_PATH + "/" + "c3.json", + boolean addedC3 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGES_PATH + "/" + "c3.json", RestConstants.CARTRIDGES, RestConstants.CARTRIDGES_NAME); assertEquals(addedC3, true); - boolean addedG1 = restClient.addEntity(RestConstants.CARTRIDGE_GROUPS_PATH + + boolean addedG1 = restClient.addEntity(TEST_PATH + RestConstants.CARTRIDGE_GROUPS_PATH + "/" + "cartrdige-nested.json", RestConstants.CARTRIDGE_GROUPS, RestConstants.CARTRIDGE_GROUPS_NAME); assertEquals(addedG1, true); @@ -256,22 +256,22 @@ public class SampleApplicationsTest extends StratosTestServerManager { CartridgeGroupBean.class, RestConstants.CARTRIDGE_GROUPS_NAME); assertEquals(beanG1.getName(), "G1"); - boolean addedN1 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" + + boolean addedN1 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + "network-partition-1.json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); assertEquals(addedN1, true); - boolean addedN2 = restClient.addEntity(RestConstants.NETWORK_PARTITIONS_PATH + "/" + + boolean addedN2 = restClient.addEntity(TEST_PATH + RestConstants.NETWORK_PARTITIONS_PATH + "/" + "network-partition-2.json", RestConstants.NETWORK_PARTITIONS, RestConstants.NETWORK_PARTITIONS_NAME); assertEquals(addedN2, true); - boolean addedDep = restClient.addEntity(RestConstants.DEPLOYMENT_POLICIES_PATH + "/" + + boolean addedDep = restClient.addEntity(TEST_PATH + RestConstants.DEPLOYMENT_POLICIES_PATH + "/" + "deployment-policy-1.json", RestConstants.DEPLOYMENT_POLICIES, RestConstants.DEPLOYMENT_POLICIES_NAME); assertEquals(addedDep, true); - boolean added = restClient.addEntity(RestConstants.APPLICATIONS_PATH + "/" + + boolean added = restClient.addEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" + "g-sc-G123-1.json", RestConstants.APPLICATIONS, RestConstants.APPLICATIONS_NAME); assertEquals(added, true); @@ -280,7 +280,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { "g-sc-G123-1", ApplicationBean.class, RestConstants.APPLICATIONS_NAME); assertEquals(bean.getApplicationId(), "g-sc-G123-1"); - boolean addAppPolicy = restClient.addEntity(RestConstants.APPLICATION_POLICIES_PATH + "/" + + boolean addAppPolicy = restClient.addEntity(TEST_PATH + RestConstants.APPLICATION_POLICIES_PATH + "/" + "application-policy-1.json", RestConstants.APPLICATION_POLICIES, RestConstants.APPLICATION_POLICIES_NAME); assertEquals(addAppPolicy, true); @@ -307,7 +307,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId()); //Updating application - boolean updated = restClient.updateEntity(RestConstants.APPLICATIONS_PATH + "/" + + boolean updated = restClient.updateEntity(TEST_PATH + RestConstants.APPLICATIONS_PATH + "/" + "g-sc-G123-1-v1.json", RestConstants.APPLICATIONS, RestConstants.APPLICATIONS_NAME); assertEquals(updated, true); http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json new file mode 100644 index 0000000..2cecc06 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/application-policies/application-policy-3.json @@ -0,0 +1,18 @@ +{ + "id": "application-policy-3", + "algorithm": "one-after-another", + "networkPartitions": [ + "network-partition-9", + "network-partition-10" + ], + "properties": [ + { + "name": "networkPartitionGroups", + "value": "network-partition-9|network-partition-10" + }, + { + "name": "key-2", + "value": "value-2" + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json new file mode 100644 index 0000000..4e00d60 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/applications/app-bursting-single-cartriddge-group.json @@ -0,0 +1,70 @@ +{ + "applicationId": "cartridge-group-app", + "alias": "my-cartridge-group-app", + "components": { + "groups": [ + { + "name": "esb-php-group", + "alias": "my-esb-php-group", + "deploymentPolicy": "deployment-policy-4", + "groupMinInstances": 1, + "groupMaxInstances": 2, + "cartridges": [ + { + "type": "esb", + "cartridgeMin": 1, + "cartridgeMax": 2, + "subscribableInfo": { + "alias": "my-esb", + "autoscalingPolicy": "autoscaling-policy-2", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-esb-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + }, + { + "type": "php", + "cartridgeMin": 2, + "cartridgeMax": 4, + "lvsVirtualIP": "192.168.56.50|255.255.255.0", + "subscribableInfo": { + "alias": "my-php", + "autoscalingPolicy": "autoscaling-policy-2", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-php-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + } + ] + } + ], + "cartridges": [ + { + "type": "tomcat", + "cartridgeMin": 2, + "cartridgeMax": 4, + "subscribableInfo": { + "alias": "my-tomcat", + "autoscalingPolicy": "autoscaling-policy-2", + "deploymentPolicy": "deployment-policy-4", + "artifactRepository": { + "privateRepo": false, + "repoUrl": "https://github.com/imesh/stratos-tomcat-applications.git";, + "repoUsername": "", + "repoPassword": "" + } + } + } + ], + "dependencies": { + "terminationBehaviour": "terminate-none" + } + } +} + http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json new file mode 100644 index 0000000..944aa82 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/autoscaling-policies/autoscaling-policy-2.json @@ -0,0 +1,14 @@ +{ + "id": "autoscaling-policy-2", + "loadThresholds": { + "requestsInFlight": { + "threshold": 35 + }, + "memoryConsumption": { + "threshold": 45 + }, + "loadAverage": { + "threshold": 25 + } + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json new file mode 100644 index 0000000..008c735 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges-groups/esb-php-group.json @@ -0,0 +1,19 @@ +{ + "name": "esb-php-group", + "cartridges": [ + "esb", + "php" + ], + "dependencies": { + "startupOrders": [ + { + "aliases": [ + "cartridge.my-esb", + "cartridge.my-php" + ] + } + ], + "terminationBehaviour": "terminate-none" + } +} + http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json new file mode 100755 index 0000000..571e7e1 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/esb.json @@ -0,0 +1,50 @@ +{ + "type": "esb", + "provider": "apache", + "host": "stratos.apache.org", + "category": "framework", + "displayName": "esb", + "description": "esb Cartridge", + "version": "7", + "multiTenant": "false", + "portMapping": [ + { + "name": "http-22", + "protocol": "http", + "port": "22", + "proxyPort": "8280" + } + ], + "deployment": { + }, + "iaasProvider": [ + { + "type": "mock", + "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e", + "networkInterfaces": [ + { + "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" + } + ], + "property": [ + { + "name": "instanceType", + "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" + }, + { + "name": "keyPair", + "value": "vishanth-key" + }, + { + "name": "securityGroups", + "value": "default" + } + ] + } + ], + "metadataKeys": [ + "server_ip", + "username", + "password" + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json new file mode 100755 index 0000000..5d53e3a --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/php.json @@ -0,0 +1,51 @@ +{ + "type": "php", + "provider": "apache", + "category": "framework", + "host": "php.stratos.org", + "displayName": "php", + "description": "php Cartridge", + "version": "7", + "multiTenant": "false", + "portMapping": [ + { + "name": "http-80", + "protocol": "http", + "port": "8080", + "proxyPort": "8280" + }, + { + "name": "http-22", + "protocol": "tcp", + "port": "22", + "proxyPort": "8222" + } + ], + "deployment": { + }, + "iaasProvider": [ + { + "type": "mock", + "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e", + "networkInterfaces": [ + { + "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" + } + ], + "property": [ + { + "name": "instanceType", + "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" + }, + { + "name": "keyPair", + "value": "reka" + }, + { + "name": "securityGroups", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json new file mode 100755 index 0000000..395687d --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/cartridges/mock/tomcat.json @@ -0,0 +1,53 @@ +{ + "type": "tomcat", + "provider": "apache", + "host": "tomcat.stratos.org", + "category": "framework", + "displayName": "tomcat", + "description": "tomcat Cartridge", + "version": "7", + "multiTenant": "false", + "portMapping": [ + { + "name": "http-22", + "protocol": "http", + "port": "22", + "proxyPort": "8280" + }, + { + "protocol": "http", + "port": "8080", + "proxyPort": "80" + } + ], + "deployment": { + }, + "iaasProvider": [ + { + "type": "mock", + "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e", + "networkInterfaces": [ + { + "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" + } + ], + "property": [ + { + "name": "instanceType", + "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" + }, + { + "name": "keyPair", + "value": "vishanth-key" + }, + { + "name": "securityGroups", + "value": "default" + } + ] + } + ], + "metadataKeys": [ + "url" + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json new file mode 100644 index 0000000..f9935d7 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/deployment-policies/deployment-policy-4.json @@ -0,0 +1,32 @@ +{ + "id": "deployment-policy-4", + "networkPartitions": [ + { + "id": "network-partition-9", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 4 + } + ] + }, + { + "id": "network-partition-10", + "partitionAlgo": "round-robin", + "partitions": [ + { + "id": "network-partition-10-partition-1", + "partitionMax": 4 + }, + { + "id": "network-partition-10-partition-2", + "partitionMax": 4 + } + ] + } + ] +} + + + http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json new file mode 100644 index 0000000..1e1ec23 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-10.json @@ -0,0 +1,24 @@ +{ + "id": "network-partition-10", + "provider": "mock", + "partitions": [ + { + "id": "network-partition-10-partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + }, + { + "id": "network-partition-10-partition-2", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json new file mode 100644 index 0000000..9f12343 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-bursting-test/network-partitions/mock/network-partition-9.json @@ -0,0 +1,15 @@ +{ + "id": "network-partition-9", + "provider": "mock", + "partitions": [ + { + "id": "partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json b/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json deleted file mode 100644 index 17858bb..0000000 --- a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-1.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "application-policy-1", - "algorithm": "one-after-another", - "networkPartitions": [ - "network-partition-1", - "network-partition-2" - ], - "properties": [ - { - "name": "networkPartitionGroups", - "value": "network-partition-1,network-partition-2" - }, - { - "name": "key-2", - "value": "value-2" - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json b/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json deleted file mode 100644 index 1137942..0000000 --- a/products/stratos/modules/integration/src/test/resources/application-policies/application-policy-2.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "application-policy-2", - "algorithm": "one-after-another", - "networkPartitions": [ - "network-partition-7", - "network-partition-8" - ], - "properties": [ - { - "name": "networkPartitionGroups", - "value": "network-partition-7,network-partition-8" - }, - { - "name": "key-2", - "value": "value-2" - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-3.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-3.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-3.json new file mode 100644 index 0000000..2cecc06 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/application-policies/application-policy-3.json @@ -0,0 +1,18 @@ +{ + "id": "application-policy-3", + "algorithm": "one-after-another", + "networkPartitions": [ + "network-partition-9", + "network-partition-10" + ], + "properties": [ + { + "name": "networkPartitionGroups", + "value": "network-partition-9|network-partition-10" + }, + { + "name": "key-2", + "value": "value-2" + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-10.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-10.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-10.json new file mode 100644 index 0000000..1e1ec23 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-10.json @@ -0,0 +1,24 @@ +{ + "id": "network-partition-10", + "provider": "mock", + "partitions": [ + { + "id": "network-partition-10-partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + }, + { + "id": "network-partition-10-partition-2", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-9.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-9.json b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-9.json new file mode 100644 index 0000000..9f12343 --- /dev/null +++ b/products/stratos/modules/integration/src/test/resources/application-policy-test/network-partitions/mock/network-partition-9.json @@ -0,0 +1,15 @@ +{ + "id": "network-partition-9", + "provider": "mock", + "partitions": [ + { + "id": "partition-1", + "property": [ + { + "name": "region", + "value": "default" + } + ] + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/README.md ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/README.md b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/README.md deleted file mode 100644 index 4e092ea..0000000 --- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/README.md +++ /dev/null @@ -1,25 +0,0 @@ -Single Cartridge Application -============================ -A simple application with a php cartridge. - -Application view ----------------- -single-cartridge-app <br /> --- single-cartridge-app-1 <br /> --- -- my-php <br /> - -Application folder structure ----------------------------- --- artifacts/[iaas]/ IaaS specific artifacts <br /> --- scripts/common/ Common scripts for all iaases <br /> --- scripts/[iaas] IaaS specific scripts <br /> - -How to run ----------- -cd scripts/[iaas]/ <br /> -./deploy.sh <br /> - -How to undeploy ---------------- -cd scripts/[iaas]/ <br /> -./undeploy.sh <br /> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json deleted file mode 100644 index ff332c0..0000000 --- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v1.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "alias": "g-sc-G123-1", - "applicationId": "g-sc-G123-1", - "components": { - "cartridges": [], - "groups": [ - { - "name": "G1", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group1", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "type": "c1", - "subscribableInfo": { - "alias": "c1-1x0", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [ - { - "name": "G2", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group2", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 4, - "type": "c2", - "subscribableInfo": { - "alias": "c2-1x0", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [ - { - "name": "G3", - "groupMaxInstances": 3, - "groupMinInstances": 2, - "deploymentPolicy": "static-1", - "alias": "group3", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "type": "c3", - "subscribableInfo": { - "alias": "c3-1x0", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [] - } - ] - } - ] - } - ] - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json deleted file mode 100644 index 6f827c2..0000000 --- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v2.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "alias": "g-sc-G123-1", - "applicationId": "g-sc-G123-1", - "components": { - "cartridges": [], - "groups": [ - { - "name": "G1", - "groupMaxInstances": 5, - "groupMinInstances": 2, - "alias": "group1", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "type": "c1", - "subscribableInfo": { - "alias": "c1-1x0", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [ - { - "name": "G2", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group2", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 4, - "type": "c2", - "subscribableInfo": { - "alias": "c2-1x0", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [ - { - "name": "G3", - "groupMaxInstances": 3, - "groupMinInstances": 2, - "deploymentPolicy": "static-1", - "alias": "group3", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "type": "c3", - "subscribableInfo": { - "alias": "c3-1x0", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [] - } - ] - } - ] - } - ] - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json deleted file mode 100644 index a6e5fd7..0000000 --- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1-v3.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "alias": "g-sc-G123-1", - "applicationId": "g-sc-G123-1", - "components": { - "cartridges": [], - "groups": [ - { - "name": "G1", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group1", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "type": "c1", - "subscribableInfo": { - "alias": "c1-1x0", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [ - { - "name": "G2", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group2", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 4, - "type": "c2", - "subscribableInfo": { - "alias": "c2-1x0", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [ - { - "name": "G3", - "groupMaxInstances": 4, - "groupMinInstances": 3, - "deploymentPolicy": "static-1", - "alias": "group3", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "type": "c3", - "subscribableInfo": { - "alias": "c3-1x0", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [] - } - ] - } - ] - } - ] - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1.json b/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1.json deleted file mode 100644 index 76d72c8..0000000 --- a/products/stratos/modules/integration/src/test/resources/applications/simple/single-cartridge-app/g-sc-G123-1.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "alias": "g-sc-G123-1", - "applicationId": "g-sc-G123-1", - "components": { - "cartridges": [], - "groups": [ - { - "name": "G1", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group1", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c1", - "subscribableInfo": { - "alias": "c1-1x0", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [ - { - "name": "G2", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group2", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c2", - "subscribableInfo": { - "alias": "c2-1x0", - "deploymentPolicy": "deployment-policy-1", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [ - { - "name": "G3", - "groupMaxInstances": 2, - "groupMinInstances": 1, - "deploymentPolicy": "deployment-policy-1", - "alias": "group3", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c3", - "subscribableInfo": { - "alias": "c3-1x0", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-1" - } - } - ], - "groups": [] - } - ] - } - ] - } - ] - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json deleted file mode 100644 index f82403b..0000000 --- a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-1.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "autoscaling-policy-1", - "loadThresholds": { - "requestsInFlight": { - "threshold": 35 - }, - "memoryConsumption": { - "threshold": 45 - }, - "loadAverage": { - "threshold": 25 - } - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/ce00b955/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json b/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json deleted file mode 100644 index 31c2b84..0000000 --- a/products/stratos/modules/integration/src/test/resources/autoscaling-policies/autoscaling-policy-c0-v1.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "autoscaling-policy-c0", - "loadThresholds": { - "requestsInFlight": { - "threshold": 30 - }, - "memoryConsumption": { - "threshold": 40 - }, - "loadAverage": { - "threshold": 20 - } - } -}
