You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/02/08 17:09:35 UTC
stratos git commit: Refining group scaling v1 sample application
Repository: stratos
Updated Branches:
refs/heads/master 163d1e51c -> 94f70b69e
Refining group scaling v1 sample application
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/94f70b69
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/94f70b69
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/94f70b69
Branch: refs/heads/master
Commit: 94f70b69e643850dce00cba274aad36affc7d2ee
Parents: 163d1e5
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Feb 8 21:39:27 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Feb 8 21:39:27 2015 +0530
----------------------------------------------------------------------
.../group-scaling-v1/artifacts/application.json | 47 ++++++++++++++
.../artifacts/autoscale-policy-c1.json | 14 ----
.../artifacts/autoscale-policy-c2.json | 14 ----
.../artifacts/autoscale-policy-c3.json | 14 ----
.../artifacts/autoscale-policy-c4.json | 14 ----
.../artifacts/autoscaling-policy-c1.json | 14 ++++
.../artifacts/autoscaling-policy-c2.json | 14 ++++
.../artifacts/autoscaling-policy-c3.json | 14 ++++
.../artifacts/autoscaling-policy-c4.json | 14 ++++
.../artifacts/composite_application.json | 47 --------------
.../artifacts/ec2/app_deployment_policy.json | 67 -------------------
.../artifacts/ec2/deployment-policy.json | 67 +++++++++++++++++++
.../kubernetes/app_deployment_policy.json | 68 --------------------
.../artifacts/kubernetes/deployment-policy.json | 68 ++++++++++++++++++++
.../artifacts/mock/app_deployment_policy.json | 67 -------------------
.../artifacts/mock/deployment-policy.json | 67 +++++++++++++++++++
.../openstack/app_deployment_policy.json | 67 -------------------
.../artifacts/openstack/deployment-policy.json | 67 +++++++++++++++++++
.../group-scaling-v1/scripts/common/deploy.sh | 12 ++--
.../group-scaling-v1/scripts/common/undeploy.sh | 14 ++--
20 files changed, 385 insertions(+), 385 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/application.json b/samples/applications/group-scaling-v1/artifacts/application.json
new file mode 100644
index 0000000..ce357a2
--- /dev/null
+++ b/samples/applications/group-scaling-v1/artifacts/application.json
@@ -0,0 +1,47 @@
+{
+ "applicationId": "group-scaling-v1",
+ "alias": "group-scaling-v1",
+ "components": {
+ "groups": [
+ {
+ "name": "group2",
+ "alias": "mygroup2",
+ "groupMinInstances": 1,
+ "groupMaxInstances": 2,
+ "cartridges": [
+ {
+ "type": "c2",
+ "cartridgeMin": 2,
+ "cartridgeMax": 4,
+ "subscribableInfo": {
+ "alias": "group2c2",
+ "autoscalingPolicy": "autoscaling-policy-c2",
+ "artifactRepository":{
+ "privateRepo":false,
+ "repoUrl":"https://github.com/imesh/stratos-c2-applications.git",
+ "repoUsername":"",
+ "repoPassword":""
+ }
+ }
+ },
+ {
+ "type": "c3",
+ "cartridgeMin": 1,
+ "cartridgeMax": 2,
+ "subscribableInfo": {
+ "alias": "group2c3",
+ "autoscalingPolicy": "autoscaling-policy-c3",
+ "artifactRepository":{
+ "privateRepo":false,
+ "repoUrl":"https://github.com/imesh/stratos-c3-applications.git",
+ "repoUsername":"",
+ "repoPassword":""
+ }
+ }
+ }
+ ]
+ }
+ ]
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c1.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c1.json b/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c1.json
deleted file mode 100755
index dacdeeb..0000000
--- a/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c1.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscale_policy_c1",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 80
- },
- "memoryConsumption": {
- "threshold": 20
- },
- "loadAverage": {
- "threshold": 50
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c2.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c2.json b/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c2.json
deleted file mode 100755
index b908013..0000000
--- a/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscale_policy_c2",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 90
- },
- "memoryConsumption": {
- "threshold": 5
- },
- "loadAverage": {
- "threshold": 50
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c3.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c3.json b/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c3.json
deleted file mode 100755
index f2942a0..0000000
--- a/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c3.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscale_policy_c3",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 100
- },
- "memoryConsumption": {
- "threshold": 10
- },
- "loadAverage": {
- "threshold": 50
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c4.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c4.json b/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c4.json
deleted file mode 100755
index 4b6db88..0000000
--- a/samples/applications/group-scaling-v1/artifacts/autoscale-policy-c4.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscale_policy_c4",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 50
- },
- "memoryConsumption": {
- "threshold": 28
- },
- "loadAverage": {
- "threshold": 75
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c1.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c1.json b/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c1.json
new file mode 100755
index 0000000..28d28e8
--- /dev/null
+++ b/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c1.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-c1",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 80
+ },
+ "memoryConsumption": {
+ "threshold": 20
+ },
+ "loadAverage": {
+ "threshold": 50
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c2.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c2.json b/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c2.json
new file mode 100755
index 0000000..b46f1fc
--- /dev/null
+++ b/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c2.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-c2",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 90
+ },
+ "memoryConsumption": {
+ "threshold": 5
+ },
+ "loadAverage": {
+ "threshold": 50
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c3.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c3.json b/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c3.json
new file mode 100755
index 0000000..25bab8f
--- /dev/null
+++ b/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c3.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-c3",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 100
+ },
+ "memoryConsumption": {
+ "threshold": 10
+ },
+ "loadAverage": {
+ "threshold": 50
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c4.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c4.json b/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c4.json
new file mode 100755
index 0000000..2da805a
--- /dev/null
+++ b/samples/applications/group-scaling-v1/artifacts/autoscaling-policy-c4.json
@@ -0,0 +1,14 @@
+{
+ "id": "autoscaling-policy-c4",
+ "loadThresholds": {
+ "requestsInFlight": {
+ "threshold": 50
+ },
+ "memoryConsumption": {
+ "threshold": 28
+ },
+ "loadAverage": {
+ "threshold": 75
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/composite_application.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/composite_application.json b/samples/applications/group-scaling-v1/artifacts/composite_application.json
deleted file mode 100644
index 4a8a605..0000000
--- a/samples/applications/group-scaling-v1/artifacts/composite_application.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "applicationId": "appscaling",
- "alias": "appscaling",
- "components": {
- "groups": [
- {
- "name": "group2",
- "alias": "mygroup2",
- "groupMinInstances": 1,
- "groupMaxInstances": 2,
- "cartridges": [
- {
- "type": "c2",
- "cartridgeMin": 2,
- "cartridgeMax": 4,
- "subscribableInfo": {
- "alias": "group2c2",
- "autoscalingPolicy": "autoscale_policy_c2",
- "artifactRepository":{
- "privateRepo":false,
- "repoUrl":"https://github.com/imesh/stratos-c2-applications.git",
- "repoUsername":"",
- "repoPassword":""
- }
- }
- },
- {
- "type": "c3",
- "cartridgeMin": 1,
- "cartridgeMax": 2,
- "subscribableInfo": {
- "alias": "group2c3",
- "autoscalingPolicy": "autoscale_policy_c3",
- "artifactRepository":{
- "privateRepo":false,
- "repoUrl":"https://github.com/imesh/stratos-c3-applications.git",
- "repoUsername":"",
- "repoPassword":""
- }
- }
- }
- ]
- }
- ]
- }
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/ec2/app_deployment_policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/ec2/app_deployment_policy.json b/samples/applications/group-scaling-v1/artifacts/ec2/app_deployment_policy.json
deleted file mode 100644
index 596edf9..0000000
--- a/samples/applications/group-scaling-v1/artifacts/ec2/app_deployment_policy.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "applicationId": "appscaling",
- "applicationPolicy": {
- "networkPartition": [
- {
- "id": "EC2-P1",
- "activeByDefault": "true",
- "partitions": [
- {
- "id": "P1",
- "provider": "ec2",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ]
- },
- {
- "id": "EC2-P2",
- "activeByDefault": "false",
- "partitions": [
- {
- "id": "P1",
- "provider": "ec2",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ]
- }
- ]
- },
- "childPolicies": [
- {
- "alias": "mygroup2",
- "networkPartition": [
- {
- "id": "EC2-P1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "P1",
- "max": 2
- }
- ]
- },
- {
- "id": "EC2-P2",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "P1",
- "max": 2
- }
- ]
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/ec2/deployment-policy.json b/samples/applications/group-scaling-v1/artifacts/ec2/deployment-policy.json
new file mode 100644
index 0000000..9f854ee
--- /dev/null
+++ b/samples/applications/group-scaling-v1/artifacts/ec2/deployment-policy.json
@@ -0,0 +1,67 @@
+{
+ "applicationId": "group-scaling-v1",
+ "applicationPolicy": {
+ "networkPartition": [
+ {
+ "id": "EC2-P1",
+ "activeByDefault": "true",
+ "partitions": [
+ {
+ "id": "P1",
+ "provider": "ec2",
+ "property": [
+ {
+ "name": "region",
+ "value": "RegionOne"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id": "EC2-P2",
+ "activeByDefault": "false",
+ "partitions": [
+ {
+ "id": "P1",
+ "provider": "ec2",
+ "property": [
+ {
+ "name": "region",
+ "value": "RegionOne"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ "childPolicies": [
+ {
+ "alias": "mygroup2",
+ "networkPartition": [
+ {
+ "id": "EC2-P1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "P1",
+ "max": 2
+ }
+ ]
+ },
+ {
+ "id": "EC2-P2",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "P1",
+ "max": 2
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/kubernetes/app_deployment_policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/kubernetes/app_deployment_policy.json b/samples/applications/group-scaling-v1/artifacts/kubernetes/app_deployment_policy.json
deleted file mode 100644
index 29075a3..0000000
--- a/samples/applications/group-scaling-v1/artifacts/kubernetes/app_deployment_policy.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "applicationId": "appscaling",
- "applicationPolicy": {
- "networkPartition": [
- {
- "id":"network-p1",
- "kubernetesClusterId":"kubernetes-cluster-1",
- "activeByDefault": "true",
- "partitions": [
- {
- "id": "P1",
- "provider": "kubernetes",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
- },
- {
- "id": "network-p2",
- "activeByDefault": "false",
- "partitions": [
- {
- "id": "P1",
- "provider": "kubernetes",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
- }
- ]
- },
- "childPolicies": [
- {
- "alias": "mygroup2",
- "networkPartition": [
- {
- "id": "network-p1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "P1",
- "max": 2
- }
- ]
- },
- {
- "id": "network-p2",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "P1",
- "max": 2
- }
- ]
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/kubernetes/deployment-policy.json b/samples/applications/group-scaling-v1/artifacts/kubernetes/deployment-policy.json
new file mode 100644
index 0000000..25e3bcb
--- /dev/null
+++ b/samples/applications/group-scaling-v1/artifacts/kubernetes/deployment-policy.json
@@ -0,0 +1,68 @@
+{
+ "applicationId": "group-scaling-v1",
+ "applicationPolicy": {
+ "networkPartition": [
+ {
+ "id":"network-p1",
+ "kubernetesClusterId":"kubernetes-cluster-1",
+ "activeByDefault": "true",
+ "partitions": [
+ {
+ "id": "P1",
+ "provider": "kubernetes",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id": "network-p2",
+ "activeByDefault": "false",
+ "partitions": [
+ {
+ "id": "P1",
+ "provider": "kubernetes",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ "childPolicies": [
+ {
+ "alias": "mygroup2",
+ "networkPartition": [
+ {
+ "id": "network-p1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "P1",
+ "max": 2
+ }
+ ]
+ },
+ {
+ "id": "network-p2",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "P1",
+ "max": 2
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/mock/app_deployment_policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/mock/app_deployment_policy.json b/samples/applications/group-scaling-v1/artifacts/mock/app_deployment_policy.json
deleted file mode 100644
index 671c9af..0000000
--- a/samples/applications/group-scaling-v1/artifacts/mock/app_deployment_policy.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "applicationId": "appscaling",
- "applicationPolicy": {
- "networkPartition": [
- {
- "id": "openstack_R1",
- "activeByDefault": "true",
- "partitions": [
- {
- "id": "P1",
- "provider": "mock",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ]
- },
- {
- "id": "openstack_R2",
- "activeByDefault": "false",
- "partitions": [
- {
- "id": "P1",
- "provider": "mock",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ]
- }
- ]
- },
- "childPolicies": [
- {
- "alias": "mygroup2",
- "networkPartition": [
- {
- "id": "openstack_R1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "P1",
- "max": 2
- }
- ]
- },
- {
- "id": "openstack_R2",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "P1",
- "max": 2
- }
- ]
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/mock/deployment-policy.json b/samples/applications/group-scaling-v1/artifacts/mock/deployment-policy.json
new file mode 100644
index 0000000..c9284d0
--- /dev/null
+++ b/samples/applications/group-scaling-v1/artifacts/mock/deployment-policy.json
@@ -0,0 +1,67 @@
+{
+ "applicationId": "group-scaling-v1",
+ "applicationPolicy": {
+ "networkPartition": [
+ {
+ "id": "openstack_R1",
+ "activeByDefault": "true",
+ "partitions": [
+ {
+ "id": "P1",
+ "provider": "mock",
+ "property": [
+ {
+ "name": "region",
+ "value": "RegionOne"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id": "openstack_R2",
+ "activeByDefault": "false",
+ "partitions": [
+ {
+ "id": "P1",
+ "provider": "mock",
+ "property": [
+ {
+ "name": "region",
+ "value": "RegionOne"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ "childPolicies": [
+ {
+ "alias": "mygroup2",
+ "networkPartition": [
+ {
+ "id": "openstack_R1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "P1",
+ "max": 2
+ }
+ ]
+ },
+ {
+ "id": "openstack_R2",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "P1",
+ "max": 2
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/openstack/app_deployment_policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/openstack/app_deployment_policy.json b/samples/applications/group-scaling-v1/artifacts/openstack/app_deployment_policy.json
deleted file mode 100644
index 13ecd24..0000000
--- a/samples/applications/group-scaling-v1/artifacts/openstack/app_deployment_policy.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "applicationId": "appscaling",
- "applicationPolicy": {
- "networkPartition": [
- {
- "id": "openstack_R1",
- "activeByDefault": "true",
- "partitions": [
- {
- "id": "P1",
- "provider": "openstack",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ]
- },
- {
- "id": "openstack_R2",
- "activeByDefault": "false",
- "partitions": [
- {
- "id": "P1",
- "provider": "openstack",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ]
- }
- ]
- },
- "childPolicies": [
- {
- "alias": "mygroup2",
- "networkPartition": [
- {
- "id": "openstack_R1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "P1",
- "max": 2
- }
- ]
- },
- {
- "id": "openstack_R2",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "P1",
- "max": 2
- }
- ]
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/artifacts/openstack/deployment-policy.json b/samples/applications/group-scaling-v1/artifacts/openstack/deployment-policy.json
new file mode 100644
index 0000000..3101722
--- /dev/null
+++ b/samples/applications/group-scaling-v1/artifacts/openstack/deployment-policy.json
@@ -0,0 +1,67 @@
+{
+ "applicationId": "group-scaling-v1",
+ "applicationPolicy": {
+ "networkPartition": [
+ {
+ "id": "openstack_R1",
+ "activeByDefault": "true",
+ "partitions": [
+ {
+ "id": "P1",
+ "provider": "openstack",
+ "property": [
+ {
+ "name": "region",
+ "value": "RegionOne"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id": "openstack_R2",
+ "activeByDefault": "false",
+ "partitions": [
+ {
+ "id": "P1",
+ "provider": "openstack",
+ "property": [
+ {
+ "name": "region",
+ "value": "RegionOne"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ "childPolicies": [
+ {
+ "alias": "mygroup2",
+ "networkPartition": [
+ {
+ "id": "openstack_R1",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "P1",
+ "max": 2
+ }
+ ]
+ },
+ {
+ "id": "openstack_R2",
+ "partitionAlgo": "one-after-another",
+ "partitions": [
+ {
+ "id": "P1",
+ "max": 2
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/scripts/common/deploy.sh b/samples/applications/group-scaling-v1/scripts/common/deploy.sh
index 0f68ac4..6ac05ee 100644
--- a/samples/applications/group-scaling-v1/scripts/common/deploy.sh
+++ b/samples/applications/group-scaling-v1/scripts/common/deploy.sh
@@ -19,16 +19,16 @@ if [[ -z "${iaas}" ]]; then
exit
fi
-echo "Adding autoscale policy c1..."
+echo "Adding autoscaling policy c1..."
curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/autoscaling-policy-c1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies
-echo "Adding autoscale policy c2..."
+echo "Adding autoscaling policy c2..."
curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/autoscaling-policy-c2.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies
-echo "Adding autoscale policy c3..."
+echo "Adding autoscaling policy c3..."
curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/autoscaling-policy-c3.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies
-echo "Adding autoscale policy c4..."
+echo "Adding autoscaling policy c4..."
curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/autoscaling-policy-c4.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies
echo "Adding c1 cartridge..."
@@ -49,9 +49,9 @@ curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/
sleep 1
echo "Creating application..."
-curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/composite_application.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications
+curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/application.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications
sleep 1
echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -d "@${iaas_artifacts_path}/app_deployment_policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/appscaling/deploy
+curl -X POST -H "Content-Type: application/json" -d "@${iaas_artifacts_path}/deployment-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/group-scaling-v1/deploy
http://git-wip-us.apache.org/repos/asf/stratos/blob/94f70b69/samples/applications/group-scaling-v1/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling-v1/scripts/common/undeploy.sh b/samples/applications/group-scaling-v1/scripts/common/undeploy.sh
index ea947ce..04dae04 100644
--- a/samples/applications/group-scaling-v1/scripts/common/undeploy.sh
+++ b/samples/applications/group-scaling-v1/scripts/common/undeploy.sh
@@ -6,12 +6,12 @@ host_port=9443
set -e
echo "Undeploying application..."
-curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/appscaling/undeploy
+curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/group-scaling-v1/undeploy
sleep 10
echo "Deleting application..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/appscaling
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/group-scaling-v1
echo "Removing groups..."
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/group2
@@ -22,8 +22,8 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/c3
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/c4
-echo "Removing autoscale policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscale-policy-c1
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscale-policy-c2
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscale-policy-c3
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscale-policy-c4
\ No newline at end of file
+echo "Removing autoscaling policies..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-c1
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-c2
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-c3
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-c4
\ No newline at end of file