http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/mock-iaas.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/mock-iaas.xml b/products/stratos/modules/integration/src/test/resources/mock-iaas.xml deleted file mode 100644 index ab0b0bf..0000000 --- a/products/stratos/modules/integration/src/test/resources/mock-iaas.xml +++ /dev/null @@ -1,123 +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. - --> - -<mock-iaas enabled="true"> - <health-statistics> - <cartridge type="tomcat"> - <!-- factor:memory-consumption|load-average|requests-in-flight--> - <!-- mode:loop|continue|stop --> - <!-- Mode defines the action needs to be taken after the last sample value: - loop: start from beginning - continue: continue the last sample value - stop: stop publishing statistics --> - <pattern factor="memory-consumption" mode="continue"> - <!-- Sample values --> - <sampleValues>20,30,40,50,60,70,50,40,30,20</sampleValues> - <!-- Duration of each sample value in seconds --> - <sampleDuration>60</sampleDuration> - </pattern> - <pattern factor="load-average" mode="continue"> - <!-- Sample values --> - <sampleValues>20</sampleValues> - <!-- Duration of each sample value in seconds --> - <sampleDuration>60</sampleDuration> - </pattern> - </cartridge> - <cartridge type="c7-single-cluster-scaling-test"> - <!-- factor:memory-consumption|load-average|requests-in-flight--> - <!-- mode:loop|continue|stop --> - <!-- Mode defines the action needs to be taken after the last sample value: - loop: start from beginning - continue: continue the last sample value - stop: stop publishing statistics --> - <pattern factor="memory-consumption" mode="continue"> - <!-- Sample values --> - <sampleValues>60,60,10,10,10,10,10,10</sampleValues> - <!-- Duration of each sample value in seconds --> - <sampleDuration>60</sampleDuration> - </pattern> - <pattern factor="load-average" mode="continue"> - <!-- Sample values --> - <sampleValues>60,60,10,10,10,10,10,10</sampleValues> - <!-- Duration of each sample value in seconds --> - <sampleDuration>60</sampleDuration> - </pattern> - </cartridge> - <cartridge type="c7-partition-round-robin-test"> - <!-- factor:memory-consumption|load-average|requests-in-flight--> - <!-- mode:loop|continue|stop --> - <!-- Mode defines the action needs to be taken after the last sample value: - loop: start from beginning - continue: continue the last sample value - stop: stop publishing statistics --> - <pattern factor="memory-consumption" mode="stop"> - <!-- Sample values --> - <sampleValues>20,20,20,20</sampleValues> - <!-- Duration of each sample value in seconds --> - <sampleDuration>30</sampleDuration> - </pattern> - <pattern factor="load-average" mode="stop"> - <!-- Sample values --> - <sampleValues>20,20,20,20</sampleValues> - <!-- Duration of each sample value in seconds --> - <sampleDuration>30</sampleDuration> - </pattern> - </cartridge> - <!--<cartridge type="c3-group-termination-behavior-test"> - <!– factor:memory-consumption|load-average|requests-in-flight–> - <!– mode:loop|continue|stop –> - <!– Mode defines the action needs to be taken after the last sample value: - loop: start from beginning - continue: continue the last sample value - stop: stop publishing statistics –> - <pattern factor="memory-consumption" mode="stop"> - <!– Sample values –> - <sampleValues>20,20,20,</sampleValues> - <!– Duration of each sample value in seconds –> - <sampleDuration>60</sampleDuration> - </pattern> - <pattern factor="load-average" mode="stop"> - <!– Sample values –> - <sampleValues>20,20,20</sampleValues> - <!– Duration of each sample value in seconds –> - <sampleDuration>60</sampleDuration> - </pattern> - </cartridge>--> - <cartridge type="php"> - <!-- factor:memory-consumption|load-average|requests-in-flight--> - <!-- mode:loop|continue|stop --> - <!-- Mode defines the action needs to be taken after the last sample value: - loop: start from beginning - continue: continue the last sample value - stop: stop publishing statistics --> - <pattern factor="memory-consumption" mode="continue"> - <!-- Sample values --> - <sampleValues>20,30,40,50,60,70,50,40,30,20</sampleValues> - <!-- Duration of each sample value in seconds --> - <sampleDuration>60</sampleDuration> - </pattern> - <pattern factor="load-average" mode="continue"> - <!-- Sample values --> - <sampleValues>20</sampleValues> - <!-- Duration of each sample value in seconds --> - <sampleDuration>60</sampleDuration> - </pattern> - </cartridge> - </health-statistics> -</mock-iaas>
http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-1.json b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-1.json deleted file mode 100644 index d673796..0000000 --- a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "network-partition-network-partition-test-1", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-2.json b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-2.json deleted file mode 100644 index 3e1ba76..0000000 --- a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-2.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "network-partition-network-partition-test-2", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-v1.json b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-v1.json deleted file mode 100644 index ad4796f..0000000 --- a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test-v1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "id": "network-partition-network-partition-test", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - }, - { - "id": "partition-2", - "property": [ - { - "name": "region", - "value": "default1" - }, - { - "name": "zone", - "value": "z1" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test.json b/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test.json deleted file mode 100644 index 1ecc5ba..0000000 --- a/products/stratos/modules/integration/src/test/resources/network-partition-test/network-partitions/mock/network-partition-network-partition-test.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "network-partition-network-partition-test", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/application-policies/application-policy-partition-round-robin-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/application-policies/application-policy-partition-round-robin-test.json b/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/application-policies/application-policy-partition-round-robin-test.json deleted file mode 100644 index ffd9702..0000000 --- a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/application-policies/application-policy-partition-round-robin-test.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "application-policy-partition-round-robin-test", - "algorithm": "one-after-another", - "networkPartitions": [ - "network-partition-partition-round-robin-test" - ], - "properties": [ - { - "name": "key-2", - "value": "value-2" - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/applications/partition-round-robin-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/applications/partition-round-robin-test.json b/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/applications/partition-round-robin-test.json deleted file mode 100644 index 1726eb4..0000000 --- a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/applications/partition-round-robin-test.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "applicationId": "partition-round-robin-test", - "alias": "partition-round-robin-test", - "components": { - "cartridges": [ - { - "type": "c7-partition-round-robin-test", - "cartridgeMin": 6, - "cartridgeMax": 8, - "subscribableInfo": { - "alias": "my-c7", - "autoscalingPolicy": "autoscaling-policy-partition-round-robin-test", - "deploymentPolicy": "deployment-policy-partition-round-robin-test", - "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/395be450/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/autoscaling-policies/autoscaling-policy-partition-round-robin-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/autoscaling-policies/autoscaling-policy-partition-round-robin-test.json b/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/autoscaling-policies/autoscaling-policy-partition-round-robin-test.json deleted file mode 100644 index bca9b14..0000000 --- a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/autoscaling-policies/autoscaling-policy-partition-round-robin-test.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "autoscaling-policy-partition-round-robin-test", - "loadThresholds": { - "requestsInFlight": { - "threshold": 20 - }, - "memoryConsumption": { - "threshold": 30 - }, - "loadAverage": { - "threshold": 25 - } - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/cartridges/mock/c7-partition-round-robin-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/cartridges/mock/c7-partition-round-robin-test.json b/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/cartridges/mock/c7-partition-round-robin-test.json deleted file mode 100755 index 9a513ce..0000000 --- a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/cartridges/mock/c7-partition-round-robin-test.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "c7-partition-round-robin-test", - "provider": "apache", - "host": "stratos.apache.org", - "category": "data", - "displayName": "c7-partition-round-robin-test", - "description": "c7-partition-round-robin-test 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" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/deployment-policies/deployment-policy-partition-round-robin-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/deployment-policies/deployment-policy-partition-round-robin-test.json b/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/deployment-policies/deployment-policy-partition-round-robin-test.json deleted file mode 100644 index 721ffb9..0000000 --- a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/deployment-policies/deployment-policy-partition-round-robin-test.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "deployment-policy-partition-round-robin-test", - "networkPartitions": [ - { - "id": "network-partition-partition-round-robin-test", - "partitionAlgo": "round-robin", - "partitions": [ - { - "id": "network-partition-11-partition-1", - "partitionMax": 5 - }, - { - "id": "network-partition-11-partition-2", - "partitionMax": 5 - } - ] - } - ] -} - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/network-partitions/mock/network-partition-partition-round-robin-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/network-partitions/mock/network-partition-partition-round-robin-test.json b/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/network-partitions/mock/network-partition-partition-round-robin-test.json deleted file mode 100644 index 0386304..0000000 --- a/products/stratos/modules/integration/src/test/resources/partition-round-robin-cluster-test/network-partitions/mock/network-partition-partition-round-robin-test.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "id": "network-partition-partition-round-robin-test", - "provider": "mock", - "partitions": [ - { - "id": "network-partition-11-partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - }, - { - "id": "network-partition-11-partition-2", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-sample-applications-test.json deleted file mode 100644 index a4e83e6..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/application-policies/application-policy-sample-applications-test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "application-policy-sample-applications-test", - "algorithm": "one-after-another", - "networkPartitions": [ - "network-partition-sample-applications-test-1", - "network-partition-sample-applications-test-2" - ], - "properties": [ - { - "name": "networkPartitionGroups", - "value": "network-partition-sample-applications-test-1,network-partition-sample-applications-test-2" - }, - { - "name": "key-2", - "value": "value-2" - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-sample-applications-test-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-sample-applications-test-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-sample-applications-test-v1.json deleted file mode 100644 index 70cd69b..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-sample-applications-test-v1.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "alias": "g-sc-G123-1-sample-applications-test", - "applicationId": "g-sc-G123-1-sample-applications-test", - "components": { - "cartridges": [], - "groups": [ - { - "name": "G1-sample-applications-test", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group1-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "type": "c1-sample-applications-test", - "subscribableInfo": { - "alias": "c1-1x0-sample-applications-test", - "deploymentPolicy": "deployment-policy-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [ - { - "name": "G2-sample-applications-test", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group2-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 4, - "type": "c2-sample-applications-test", - "subscribableInfo": { - "alias": "c2-1x0-sample-applications-test", - "deploymentPolicy": "deployment-policy-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [ - { - "name": "G3-sample-applications-test", - "groupMaxInstances": 3, - "groupMinInstances": 2, - "deploymentPolicy": "deployment-policy-sample-applications-test", - "alias": "group3-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 2, - "cartridgeMax": 3, - "type": "c3-sample-applications-test", - "subscribableInfo": { - "alias": "c3-1x0-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [] - } - ] - } - ] - } - ] - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-sample-applications-test.json deleted file mode 100644 index ca40d63..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/g-sc-G123-1-sample-applications-test.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "alias": "g-sc-G123-1-sample-applications-test", - "applicationId": "g-sc-G123-1-sample-applications-test", - "components": { - "cartridges": [], - "groups": [ - { - "name": "G1-sample-applications-test", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group1-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c1-sample-applications-test", - "subscribableInfo": { - "alias": "c1-1x0-sample-applications-test", - "deploymentPolicy": "deployment-policy-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [ - { - "name": "G2-sample-applications-test", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group2-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c2-sample-applications-test", - "subscribableInfo": { - "alias": "c2-1x0-sample-applications-test", - "deploymentPolicy": "deployment-policy-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [ - { - "name": "G3-sample-applications-test", - "groupMaxInstances": 2, - "groupMinInstances": 1, - "deploymentPolicy": "deployment-policy-sample-applications-test", - "alias": "group3-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c3-sample-applications-test", - "subscribableInfo": { - "alias": "c3-1x0-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [] - } - ] - } - ] - } - ] - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/sample-applications-test-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/sample-applications-test-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/sample-applications-test-1.json deleted file mode 100644 index 532bee6..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/sample-applications-test-1.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "alias": "sample-applications-test-1", - "applicationId": "sample-applications-test-1", - "components": { - "cartridges": [], - "groups": [ - { - "name": "G1-sample-applications-test", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group1-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c1-sample-applications-test", - "subscribableInfo": { - "alias": "c1-1x0-sample-applications-test", - "deploymentPolicy": "deployment-policy-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [ - { - "name": "G2-sample-applications-test", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group2-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c2-sample-applications-test", - "subscribableInfo": { - "alias": "c2-1x0-sample-applications-test", - "deploymentPolicy": "deployment-policy-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [ - { - "name": "G3-sample-applications-test", - "groupMaxInstances": 2, - "groupMinInstances": 1, - "deploymentPolicy": "deployment-policy-sample-applications-test", - "alias": "group3-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c3-sample-applications-test", - "subscribableInfo": { - "alias": "c3-1x0-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [] - } - ] - } - ] - } - ] - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/sample-applications-test-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/sample-applications-test-2.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/sample-applications-test-2.json deleted file mode 100644 index 6427d7e..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/applications/sample-applications-test-2.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "alias": "sample-applications-test-2", - "applicationId": "sample-applications-test-2", - "components": { - "cartridges": [], - "groups": [ - { - "name": "G1-sample-applications-test", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group1-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c1-sample-applications-test", - "subscribableInfo": { - "alias": "c1-1x0-sample-applications-test", - "deploymentPolicy": "deployment-policy-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [ - { - "name": "G2-sample-applications-test", - "groupMaxInstances": 1, - "groupMinInstances": 1, - "alias": "group2-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c2-sample-applications-test", - "subscribableInfo": { - "alias": "c2-1x0-sample-applications-test", - "deploymentPolicy": "deployment-policy-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [ - { - "name": "G3-sample-applications-test", - "groupMaxInstances": 2, - "groupMinInstances": 1, - "deploymentPolicy": "deployment-policy-sample-applications-test", - "alias": "group3-sample-applications-test", - "cartridges": [ - { - "cartridgeMin": 1, - "cartridgeMax": 2, - "type": "c3-sample-applications-test", - "subscribableInfo": { - "alias": "c3-1x0-sample-applications-test", - "artifactRepository": { - "repoUsername": "user", - "repoUrl": "http://stratos.apache.org:10080/git/default.git";, - "privateRepo": true, - "repoPassword": "c-policy" - }, - "autoscalingPolicy": "autoscaling-policy-sample-applications-test" - } - } - ], - "groups": [] - } - ] - } - ] - } - ] - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-sample-applications-test.json deleted file mode 100644 index 5bd90ab..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/autoscaling-policies/autoscaling-policy-sample-applications-test.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "autoscaling-policy-sample-applications-test", - "loadThresholds": { - "requestsInFlight": { - "threshold": 35 - }, - "memoryConsumption": { - "threshold": 45 - }, - "loadAverage": { - "threshold": 25 - } - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json deleted file mode 100644 index 9d1fc7b..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test-v1.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "G1-sample-applications-test", - "dependencies": { - "terminationBehaviour": "terminate-none", - "startupOrders": [ - { - "aliases": [ - "group.group2-sample-applications-test", - "cartridge.c1-1x0-sample-applications-test" - ] - } - ] - }, - "cartridges": [ - "c1-sample-applications-test" - ], - "groups": [ - { - "name": "G2-sample-applications-test", - "dependencies": { - "terminationBehaviour": "terminate-dependents", - "startupOrders": [ - { - "aliases": [ - "group.group3-sample-applications-test", - "cartridge.c2-1x0-sample-applications-test" - ] - } - ] - }, - "cartridges": [ - "c2-sample-applications-test" - ], - "groups": [ - { - "name": "G3-sample-applications-test", - "dependencies": { - "terminationBehaviour": "terminate-all", - "startupOrders": [] - }, - "cartridges": [ - "c3-sample-applications-test" - ], - "groups": [] - } - ] - } - ] -} - http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json deleted file mode 100644 index 9d1fc7b..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges-groups/cartrdige-nested-sample-applications-test.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "G1-sample-applications-test", - "dependencies": { - "terminationBehaviour": "terminate-none", - "startupOrders": [ - { - "aliases": [ - "group.group2-sample-applications-test", - "cartridge.c1-1x0-sample-applications-test" - ] - } - ] - }, - "cartridges": [ - "c1-sample-applications-test" - ], - "groups": [ - { - "name": "G2-sample-applications-test", - "dependencies": { - "terminationBehaviour": "terminate-dependents", - "startupOrders": [ - { - "aliases": [ - "group.group3-sample-applications-test", - "cartridge.c2-1x0-sample-applications-test" - ] - } - ] - }, - "cartridges": [ - "c2-sample-applications-test" - ], - "groups": [ - { - "name": "G3-sample-applications-test", - "dependencies": { - "terminationBehaviour": "terminate-all", - "startupOrders": [] - }, - "cartridges": [ - "c3-sample-applications-test" - ], - "groups": [] - } - ] - } - ] -} - http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1-sample-applications-test.json deleted file mode 100755 index 26f8588..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c1-sample-applications-test.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "c1-sample-applications-test", - "provider": "apache", - "host": "stratos.apache.org", - "category": "data", - "displayName": "c1-sample-applications-test", - "description": "c1-sample-applications-test 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" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2-sample-applications-test.json deleted file mode 100755 index 0f3c61f..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c2-sample-applications-test.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "c2-sample-applications-test", - "provider": "apache", - "host": "stratos.apache.org", - "category": "data", - "displayName": "c2-sample-applications-test", - "description": "c2-sample-applications-test 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" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3-sample-applications-test.json deleted file mode 100755 index c959d53..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/cartridges/mock/c3-sample-applications-test.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "c3-sample-applications-test", - "provider": "apache", - "host": "stratos.apache.org", - "category": "data", - "displayName": "c3-sample-applications-test", - "description": "c3-sample-applications-test 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" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json deleted file mode 100644 index 0e35536..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test-v1.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "id": "deployment-policy-sample-applications-test", - "networkPartitions": [ - { - "id": "network-partition-sample-applications-test-1", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 25 - }, - { - "id": "partition-2", - "partitionMax": 20 - } - ] - }, - { - "id": "network-partition-sample-applications-test-2", - "partitionAlgo": "round-robin", - "partitions": [ - { - "id": "network-partition-2-partition-1", - "partitionMax": 15 - }, - { - "id": "network-partition-2-partition-2", - "partitionMax": 5 - } - ] - } - ] -} - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test.json deleted file mode 100644 index 2e26c25..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/deployment-policies/deployment-policy-sample-applications-test.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "id": "deployment-policy-sample-applications-test", - "networkPartitions": [ - { - "id": "network-partition-sample-applications-test-1", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 20 - } - ] - }, - { - "id": "network-partition-sample-applications-test-2", - "partitionAlgo": "round-robin", - "partitions": [ - { - "id": "network-partition-2-partition-1", - "partitionMax": 10 - }, - { - "id": "network-partition-2-partition-2", - "partitionMax": 9 - } - ] - } - ] -} - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json deleted file mode 100644 index 2df920e..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1-v1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "id": "network-partition-sample-applications-test-1", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - }, - { - "id": "partition-2", - "property": [ - { - "name": "region", - "value": "default1" - }, - { - "name": "zone", - "value": "z1" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1.json deleted file mode 100644 index 8d7aed5..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "network-partition-sample-applications-test-1", - "provider": "mock", - "partitions": [ - { - "id": "partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-2.json b/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-2.json deleted file mode 100644 index 2fd5411..0000000 --- a/products/stratos/modules/integration/src/test/resources/sample-applications-test/network-partitions/mock/network-partition-sample-applications-test-2.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "id": "network-partition-sample-applications-test-2", - "provider": "mock", - "partitions": [ - { - "id": "network-partition-2-partition-1", - "property": [ - { - "name": "region", - "value": "default" - } - ] - }, - { - "id": "network-partition-2-partition-2", - "property": [ - { - "name": "region", - "value": "default" - } - ] - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/scaling.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/scaling.drl b/products/stratos/modules/integration/src/test/resources/scaling.drl deleted file mode 100644 index 69d9111..0000000 --- a/products/stratos/modules/integration/src/test/resources/scaling.drl +++ /dev/null @@ -1,311 +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.autoscaler - -import org.apache.stratos.messaging.domain.topology.Service; -import org.apache.stratos.messaging.domain.topology.Cluster; -import org.apache.stratos.autoscaler.context.AutoscalerContext; -import org.apache.stratos.autoscaler.context.member.MemberStatsContext; -import org.apache.stratos.autoscaler.util.AutoscalerConstants; -import org.apache.stratos.autoscaler.context.partition.network.NetworkPartitionContext; -import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; -import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; -import org.apache.stratos.autoscaler.pojo.policy.autoscale.RequestsInFlight; -import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadThresholds; -import org.apache.stratos.autoscaler.pojo.policy.autoscale.MemoryConsumption; -import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadAverage; -import org.apache.stratos.autoscaler.algorithms.PartitionAlgorithm; -import org.apache.stratos.autoscaler.algorithms.partition.OneAfterAnother; -import org.apache.stratos.autoscaler.algorithms.partition.RoundRobin; -import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext; -import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; -import org.apache.stratos.cloud.controller.stub.domain.Partition; -import org.apache.stratos.cloud.controller.stub.domain.MemberContext; -import org.apache.stratos.autoscaler.context.cluster.ClusterInstanceContext; - -import org.apache.stratos.autoscaler.pojo.policy.autoscale.LoadAverage -import org.apache.stratos.autoscaler.pojo.policy.autoscale.MemoryConsumption - -global org.apache.stratos.autoscaler.rule.RuleLog log; -global org.apache.stratos.autoscaler.rule.RuleTasksDelegator delegator; -global org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy autoscalePolicy; -global java.lang.String applicationId; -global java.lang.String clusterId; -global java.lang.Boolean rifReset; -global java.lang.Boolean mcReset; -global java.lang.Boolean laReset; -global java.lang.Boolean arspiReset; -global java.lang.String algorithmName; - -rule "Scaling Rule" -dialect "mvel" - when - clusterInstanceContext : ClusterInstanceContext () - - loadThresholds : LoadThresholds() from autoscalePolicy.getLoadThresholds() - partitionAlgorithm : PartitionAlgorithm() from delegator.getPartitionAlgorithm(algorithmName) - - eval(log.debug("Running scale up rule: [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + - " [cluster] " + clusterId)) - eval(log.debug("[scaling] [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster] " - + clusterId + " Algorithm name: " + algorithmName)) - - - rifThreshold : Float() from loadThresholds.getRequestsInFlightThreshold() - - rifAverage : Float() from clusterInstanceContext.getAverageRequestsInFlight() - rifGradient : Float() from clusterInstanceContext.getRequestsInFlightGradient() - rifSecondDerivative : Float() from clusterInstanceContext.getRequestsInFlightSecondDerivative() - rifPredictedValue : Double() from delegator.getPredictedValueForNextMinute(rifAverage, rifGradient, rifSecondDerivative, 1) - - mcThreshold : Float() from loadThresholds.getMemoryConsumptionThreshold() - - mcPredictedValue : Double() from delegator.getMemoryConsumptionPredictedValue(clusterInstanceContext) - - laThreshold : Float() from loadThresholds.getLoadAverageThreshold() - - laPredictedValue : Double() from delegator.getLoadAveragePredictedValue(clusterInstanceContext) - - activeInstancesCount : Integer() from clusterInstanceContext.getActiveMemberCount() - maxInstancesCount : Integer() from clusterInstanceContext.getMaxInstanceCount() - minInstancesCount : Integer() from clusterInstanceContext.getMinInstanceCount() - requestsServedPerInstance : Float() from clusterInstanceContext.getRequestsServedPerInstance() - averageRequestsServedPerInstance : Float() from clusterInstanceContext.getAverageRequestsServedPerInstance() - - numberOfInstancesReuquiredBasedOnRif : Integer() from delegator.getNumberOfInstancesRequiredBasedOnRif( - rifPredictedValue, rifThreshold) - numberOfInstancesReuquiredBasedOnMemoryConsumption : Integer() from - delegator.getNumberOfInstancesRequiredBasedOnMemoryConsumption(mcThreshold, mcPredictedValue, minInstancesCount, - maxInstancesCount) - numberOfInstancesReuquiredBasedOnLoadAverage : Integer() from - delegator.getNumberOfInstancesRequiredBasedOnLoadAverage(laThreshold, laPredictedValue, minInstancesCount) - - numberOfRequiredInstances : Integer() from delegator.getMaxNumberOfInstancesRequired( - numberOfInstancesReuquiredBasedOnRif, numberOfInstancesReuquiredBasedOnMemoryConsumption, mcReset, - numberOfInstancesReuquiredBasedOnLoadAverage, laReset) - - - - scaleUp : Boolean() from (activeInstancesCount < numberOfRequiredInstances) - scaleDown : Boolean() from (activeInstancesCount > numberOfRequiredInstances || (numberOfRequiredInstances == 1 && activeInstancesCount == 1)) - - - eval(log.debug("[scaling] " + "[cluster] " + clusterId + " RIF Resetted?: " + rifReset)) - eval(log.debug("[scaling] " + "[cluster] " + clusterId + " RIF predicted value: " + rifPredictedValue)) - eval(log.debug("[scaling] " + "[cluster] " + clusterId + " RIF threshold: " + rifThreshold)) - - eval(log.debug("[scaling] " + "[cluster] " + clusterId + " MC predicted value: " + mcPredictedValue)) - eval(log.debug("[scaling] " + "[cluster] " + clusterId + " MC threshold: " + mcThreshold)) - - eval(log.debug("[scaling] " + "[cluster] " + clusterId + " LA predicted value: " + laPredictedValue)) - eval(log.debug("[scaling] " + "[cluster] " + clusterId + " LA threshold: " + laThreshold)) - - eval(log.debug("[scaling] " + "[cluster] " + clusterId + " Scale-up action: " + scaleUp)) - eval(log.debug("[scaling] " + "[cluster] " + clusterId + " Scale-down action: " + scaleDown)) - - then - - log.debug("[scaling] Number of required instances based on stats: " + numberOfRequiredInstances + " " + - "[active instances count] " + activeInstancesCount + " [network-partition] " + - clusterInstanceContext.getNetworkPartitionId() + " [cluster] " + clusterId); - - int nonTerminatedMembers = clusterInstanceContext.getNonTerminatedMemberCount(); - if(scaleUp){ - - int clusterMaxMembers = clusterInstanceContext.getMaxInstanceCount(); - if (nonTerminatedMembers < clusterMaxMembers) { - - int additionalInstances = 0; - if(clusterMaxMembers < numberOfRequiredInstances){ - - additionalInstances = clusterMaxMembers - nonTerminatedMembers; - log.info("[scale-up] Required member count based on stat based scaling is higher than max, hence" - + " notifying to parent for possible group scaling or app bursting. [cluster] " + clusterId - + " [instance id]" + clusterInstanceContext.getId() + " [max] " + clusterMaxMembers - + " [number of required instances] " + numberOfRequiredInstances - + " [additional instances to be created] " + additionalInstances); - delegator.delegateScalingOverMaxNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(), - clusterInstanceContext.getId()); - } else { - - additionalInstances = numberOfRequiredInstances - nonTerminatedMembers; - } - - clusterInstanceContext.resetScaleDownRequestsCount(); - - log.debug("[scale-up] " + " [has scaling dependents] " + clusterInstanceContext.hasScalingDependants() + - " [cluster] " + clusterId ); - if(clusterInstanceContext.hasScalingDependants()) { - - log.debug("[scale-up] Notifying dependencies [cluster] " + clusterId); - delegator.delegateScalingDependencyNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(), - clusterInstanceContext.getId(), numberOfRequiredInstances, clusterInstanceContext.getMinInstanceCount()); - } else { - - boolean partitionsAvailable = true; - int count = 0; - - while(count != additionalInstances && partitionsAvailable){ - - ClusterLevelPartitionContext partitionContext = (ClusterLevelPartitionContext) partitionAlgorithm.getNextScaleUpPartitionContext(clusterInstanceContext.getPartitionCtxtsAsAnArray()); - if(partitionContext != null){ - - log.info("[scale-up] Partition available, hence trying to spawn an instance to scale up! " + - " [application id] " + applicationId + - " [cluster] " + clusterId + " [instance id] " + clusterInstanceContext.getId() + - " [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + - " [partition] " + partitionContext.getPartitionId() + - " scaleup due to RIF: " + (rifReset && (rifPredictedValue > rifThreshold)) + - " [rifPredictedValue] " + rifPredictedValue + " [rifThreshold] " + rifThreshold + - " scaleup due to MC: " + (mcReset && (mcPredictedValue > mcThreshold)) + - " [mcPredictedValue] " + mcPredictedValue + " [mcThreshold] " + mcThreshold + - " scaleup due to LA: " + (laReset && (laPredictedValue > laThreshold)) + - " [laPredictedValue] " + laPredictedValue + " [laThreshold] " + laThreshold); - - log.debug("[scale-up] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId ); - delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId()); - count++; - } else { - - log.warn("[scale-up] No more partition available even though " + - "cartridge-max is not reached!, [cluster] " + clusterId + - " Please update deployment-policy with new partitions or with higher " + - "partition-max"); - partitionsAvailable = false; - } - } - } - } else { - log.info("[scale-up] Trying to scale up over max, hence not scaling up cluster itself and - notifying to parent for possible group scaling or app bursting. - [cluster] " + clusterId + " [instance id]" + clusterInstanceContext.getId() + - " [max] " + clusterMaxMembers); - delegator.delegateScalingOverMaxNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(), - clusterInstanceContext.getId()); - } - } else if(scaleDown){ - - if(nonTerminatedMembers > clusterInstanceContext.getMinInstanceCount){ - - log.debug("[scale-down] Decided to Scale down [cluster] " + clusterId); - if(clusterInstanceContext.getScaleDownRequestsCount() >= 0 ){ - - log.debug("[scale-down] Reached scale down requests threshold [cluster] " + clusterId + " Count " + - clusterInstanceContext.getScaleDownRequestsCount()); - - if(clusterInstanceContext.hasScalingDependants()) { - - log.debug("[scale-up] Notifying dependencies [cluster] " + clusterId); - delegator.delegateScalingDependencyNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(), - clusterInstanceContext.getId(), numberOfRequiredInstances, clusterInstanceContext.getMinInstanceCount()); - } else{ - - MemberStatsContext selectedMemberStatsContext = null; - double lowestOverallLoad = 0.0; - boolean foundAValue = false; - ClusterLevelPartitionContext partitionContext = (ClusterLevelPartitionContext) partitionAlgorithm.getNextScaleDownPartitionContext(clusterInstanceContext.getPartitionCtxtsAsAnArray()); - if(partitionContext != null) { - log.info("[scale-down] Partition available to scale down " + - " [application id] " + applicationId + - " [cluster] " + clusterId + " [instance id] " + clusterInstanceContext.getId() + - " [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + - " [partition] " + partitionContext.getPartitionId() + - " scaledown due to RIF: " + (rifReset && (rifPredictedValue < rifThreshold)) + - " [rifPredictedValue] " + rifPredictedValue + " [rifThreshold] " + rifThreshold + - " scaledown due to MC: " + (mcReset && (mcPredictedValue < mcThreshold)) + - " [mcPredictedValue] " + mcPredictedValue + " [mcThreshold] " + mcThreshold + - " scaledown due to LA: " + (laReset && (laPredictedValue < laThreshold)) + - " [laPredictedValue] " + laPredictedValue + " [laThreshold] " + laThreshold - ); - - - for(MemberStatsContext memberStatsContext: partitionContext.getMemberStatsContexts().values()){ - - LoadAverage loadAverage = memberStatsContext.getLoadAverage(); - log.debug("[scale-down] " + " [cluster] " - + clusterId + " [member] " + memberStatsContext.getMemberId() + " Load average: " + loadAverage); - - MemoryConsumption memoryConsumption = memberStatsContext.getMemoryConsumption(); - log.debug("[scale-down] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " - + clusterId + " [member] " + memberStatsContext.getMemberId() + " Memory consumption: " + - memoryConsumption); - - double predictedCpu = delegator.getPredictedValueForNextMinute(loadAverage.getAverage(), - loadAverage.getGradient(),loadAverage.getSecondDerivative(), 1); - log.debug("[scale-down] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " - + clusterId + " [member] " + memberStatsContext.getMemberId() + " Predicted CPU: " + predictedCpu); - - double predictedMemoryConsumption = delegator.getPredictedValueForNextMinute( - memoryConsumption.getAverage(),memoryConsumption.getGradient(),memoryConsumption.getSecondDerivative(), 1); - log.debug("[scale-down] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " - + clusterId + " [member] " + memberStatsContext.getMemberId() + " Predicted memory consumption: " + - predictedMemoryConsumption); - - double overallLoad = (predictedCpu + predictedMemoryConsumption) / 2; - log.debug("[scale-down] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " - + clusterId + " [member] " + memberStatsContext.getMemberId() + " Overall load: " + overallLoad); - - if(!foundAValue){ - foundAValue = true; - selectedMemberStatsContext = memberStatsContext; - lowestOverallLoad = overallLoad; - } else if(overallLoad < lowestOverallLoad){ - selectedMemberStatsContext = memberStatsContext; - lowestOverallLoad = overallLoad; - } - - } - if(selectedMemberStatsContext != null) { - log.info("[scale-down] Trying to terminating an instace to scale down!" ); - log.debug("[scale-down] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " - + clusterId + " Member with lowest overall load: " + selectedMemberStatsContext.getMemberId()); - - delegator.delegateTerminate(partitionContext, selectedMemberStatsContext.getMemberId()); - } - } else { - log.warn("Partition is not available to scale-down..!!!!"); - } - } - } else{ - log.debug("[scale-down] Not reached scale down requests threshold. " + clusterId + " Count " + - clusterInstanceContext.getScaleDownRequestsCount()); - clusterInstanceContext.increaseScaleDownRequestsCount(); - - } - } else { - log.debug("[scale-down] Min is reached, hence not scaling down [cluster] " + clusterId + " [instance id]" - + clusterInstanceContext.getId()); - //if(clusterInstanceContext.isInGroupScalingEnabledSubtree()){ - - delegator.delegateScalingDownBeyondMinNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(), - clusterInstanceContext.getId()); - //} - } - } else{ - log.debug("[scaling] No decision made to either scale up or scale down ... [cluster] " + clusterId + " [instance id]" - + clusterInstanceContext.getId()); - - } - -end - - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/application-policies/application-policy-single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/application-policies/application-policy-single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/application-policies/application-policy-single-cluster-scaling-test.json deleted file mode 100644 index 866f568..0000000 --- a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/application-policies/application-policy-single-cluster-scaling-test.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "application-policy-single-cluster-scaling-test", - "algorithm": "one-after-another", - "networkPartitions": [ - "network-partition-single-cluster-scaling-test" - ], - "properties": [ - { - "name": "key-2", - "value": "value-2" - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json deleted file mode 100644 index a02407b..0000000 --- a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "applicationId": "single-cluster-scaling-test", - "alias": "single-cluster-scaling-test", - "components": { - "cartridges": [ - { - "type": "c7-single-cluster-scaling-test", - "cartridgeMin": 2, - "cartridgeMax": 6, - "subscribableInfo": { - "alias": "my-c7", - "autoscalingPolicy": "autoscaling-policy-single-cluster-scaling-test", - "deploymentPolicy": "deployment-policy-single-cluster-scaling-test", - "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/395be450/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/autoscaling-policies/autoscaling-policy-single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/autoscaling-policies/autoscaling-policy-single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/autoscaling-policies/autoscaling-policy-single-cluster-scaling-test.json deleted file mode 100644 index 31602d1..0000000 --- a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/autoscaling-policies/autoscaling-policy-single-cluster-scaling-test.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": "autoscaling-policy-single-cluster-scaling-test", - "loadThresholds": { - "requestsInFlight": { - "threshold": 20 - }, - "memoryConsumption": { - "threshold": 30 - }, - "loadAverage": { - "threshold": 25 - } - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/395be450/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/cartridges/mock/c7-single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/cartridges/mock/c7-single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/cartridges/mock/c7-single-cluster-scaling-test.json deleted file mode 100755 index c8abf51..0000000 --- a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/cartridges/mock/c7-single-cluster-scaling-test.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "c7-single-cluster-scaling-test", - "provider": "apache", - "host": "stratos.apache.org", - "category": "data", - "displayName": "c7-single-cluster-scaling-test", - "description": "c7-single-cluster-scaling-test 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" - } - ] - } - ] -}
