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/09 14:18:06 UTC
[1/3] stratos git commit: This closes #218 on GitHub
Repository: stratos
Updated Branches:
refs/heads/master f46c37965 -> cc498326d
This closes #218 on GitHub
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cc498326
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cc498326
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cc498326
Branch: refs/heads/master
Commit: cc498326d1be9255331082ca5f1cdf79e365011e
Parents: e570432
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Feb 9 18:48:03 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Feb 9 18:48:03 2015 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/3] stratos git commit: Define proper identifiers/aliases in each
sample applications
Posted by im...@apache.org.
Define proper identifiers/aliases in each sample applications
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e570432e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e570432e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e570432e
Branch: refs/heads/master
Commit: e570432e23b13b06dc8507ce9a53887d1a1c2d12
Parents: f46c379
Author: Dinithi <di...@wso2.com>
Authored: Mon Feb 9 17:16:15 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Feb 9 18:48:03 2015 +0530
----------------------------------------------------------------------
.../artifacts/ec2/deployment-policy.json | 16 ++++++-------
.../artifacts/kubernetes/deployment-policy.json | 16 ++++++-------
.../artifacts/mock/deployment-policy.json | 20 ++++++++--------
.../artifacts/openstack/deployment-policy.json | 16 ++++++-------
.../artifacts/ec2/deployment-policy.json | 16 ++++++-------
.../artifacts/kubernetes/deployment-policy.json | 16 ++++++-------
.../artifacts/mock/deployment-policy.json | 16 ++++++-------
.../artifacts/openstack/deployment-policy.json | 16 ++++++-------
.../sample-groups/scripts/common/deploy.sh | 4 ++--
.../artifacts/ec2/deployment-policy.json | 16 ++++++-------
.../artifacts/kubernetes/deployment-policy.json | 16 ++++++-------
.../artifacts/mock/deployment-policy.json | 16 ++++++-------
.../artifacts/openstack/deployment-policy.json | 16 ++++++-------
.../artifacts/ec2/deployment-policy.json | 16 ++++++-------
.../artifacts/kubernetes/deployment-policy.json | 16 ++++++-------
.../artifacts/mock/deployment-policy.json | 16 ++++++-------
.../artifacts/openstack/deployment-policy.json | 16 ++++++-------
.../more-complex-app/artifacts/application.json | 4 ++--
.../artifacts/ec2/deployment-policy.json | 24 ++++++++++----------
.../artifacts/kubernetes/deployment-policy.json | 24 ++++++++++----------
.../artifacts/mock/deployment-policy.json | 24 ++++++++++----------
.../artifacts/openstack/deployment-policy.json | 24 ++++++++++----------
.../more-complex-app/scripts/common/deploy.sh | 2 +-
.../more-complex-app/scripts/common/undeploy.sh | 4 ++--
.../artifacts/ec2/deployment-policy.json | 12 +++++-----
.../artifacts/kubernetes/deployment-policy.json | 12 +++++-----
.../artifacts/mock/deployment-policy.json | 12 +++++-----
.../artifacts/openstack/deployment-policy.json | 12 +++++-----
.../artifacts/application.json | 4 ++--
.../artifacts/ec2/deployment-policy.json | 10 ++++----
.../artifacts/kubernetes/deployment-policy.json | 10 ++++----
.../artifacts/mock/deployment-policy.json | 10 ++++----
.../artifacts/openstack/deployment-policy.json | 10 ++++----
.../scripts/common/deploy.sh | 2 +-
.../scripts/common/undeploy.sh | 4 ++--
.../single-group-v1/artifacts/application.json | 4 ++--
.../artifacts/ec2/deployment-policy.json | 14 ++++++------
.../artifacts/kubernetes/deployment-policy.json | 14 ++++++------
.../artifacts/mock/deployment-policy.json | 14 ++++++------
.../artifacts/openstack/deployment-policy.json | 14 ++++++------
.../single-group-v1/scripts/common/deploy.sh | 2 +-
.../single-group-v1/scripts/common/undeploy.sh | 4 ++--
.../single-group-v2/artifacts/application.json | 4 ++--
.../artifacts/ec2/deployment-policy.json | 16 ++++++-------
.../artifacts/kubernetes/deployment-policy.json | 16 ++++++-------
.../artifacts/mock/deployment-policy.json | 14 ++++++------
.../artifacts/openstack/deployment-policy.json | 16 ++++++-------
.../single-group-v2/scripts/common/deploy.sh | 2 +-
.../single-group-v2/scripts/common/undeploy.sh | 4 ++--
.../single-group-v3/artifacts/application.json | 4 ++--
.../artifacts/ec2/deployment-policy.json | 10 ++++----
.../artifacts/kubernetes/deployment-policy.json | 10 ++++----
.../artifacts/mock/deployment-policy.json | 10 ++++----
.../artifacts/openstack/deployment-policy.json | 10 ++++----
.../single-group-v3/scripts/common/deploy.sh | 2 +-
.../single-group-v3/scripts/common/undeploy.sh | 4 ++--
56 files changed, 328 insertions(+), 328 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/complex-app-with-lb/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app-with-lb/artifacts/ec2/deployment-policy.json b/samples/applications/complex-app-with-lb/artifacts/ec2/deployment-policy.json
index 856ef19..94ce8cb 100644
--- a/samples/applications/complex-app-with-lb/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/complex-app-with-lb/artifacts/ec2/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "ec2",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -39,11 +39,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/complex-app-with-lb/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app-with-lb/artifacts/kubernetes/deployment-policy.json b/samples/applications/complex-app-with-lb/artifacts/kubernetes/deployment-policy.json
index b95a096..3a6c693 100644
--- a/samples/applications/complex-app-with-lb/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/complex-app-with-lb/artifacts/kubernetes/deployment-policy.json
@@ -2,12 +2,12 @@
"applicationPolicy": {
"networkPartition": [
{
- "id":"network-p1",
+ "id":"network-partition-1",
"kubernetesClusterId":"kubernetes-cluster-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -40,11 +40,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -55,11 +55,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/complex-app-with-lb/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app-with-lb/artifacts/mock/deployment-policy.json b/samples/applications/complex-app-with-lb/artifacts/mock/deployment-policy.json
index 0917ac7..283aa67 100644
--- a/samples/applications/complex-app-with-lb/artifacts/mock/deployment-policy.json
+++ b/samples/applications/complex-app-with-lb/artifacts/mock/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "np1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "p1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "mylb",
"networkPartition": [
{
- "id": "np1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "p1",
+ "id": "partition-1",
"max": 5
}
]
@@ -39,11 +39,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "np1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "p1",
+ "id": "partition-1",
"max": 5
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "np1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "p1",
+ "id": "partition-1",
"max": 5
}
]
@@ -69,11 +69,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "np1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "p1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/complex-app-with-lb/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app-with-lb/artifacts/openstack/deployment-policy.json b/samples/applications/complex-app-with-lb/artifacts/openstack/deployment-policy.json
index 68ee7fd..66a28a0 100644
--- a/samples/applications/complex-app-with-lb/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/complex-app-with-lb/artifacts/openstack/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "openstack",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -39,11 +39,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/complex-app/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/ec2/deployment-policy.json b/samples/applications/complex-app/artifacts/ec2/deployment-policy.json
index 856ef19..94ce8cb 100644
--- a/samples/applications/complex-app/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/complex-app/artifacts/ec2/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "ec2",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -39,11 +39,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/complex-app/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/kubernetes/deployment-policy.json b/samples/applications/complex-app/artifacts/kubernetes/deployment-policy.json
index b95a096..3a6c693 100644
--- a/samples/applications/complex-app/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/complex-app/artifacts/kubernetes/deployment-policy.json
@@ -2,12 +2,12 @@
"applicationPolicy": {
"networkPartition": [
{
- "id":"network-p1",
+ "id":"network-partition-1",
"kubernetesClusterId":"kubernetes-cluster-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -40,11 +40,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -55,11 +55,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/complex-app/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/mock/deployment-policy.json b/samples/applications/complex-app/artifacts/mock/deployment-policy.json
index 72559a5..e90b9fb 100644
--- a/samples/applications/complex-app/artifacts/mock/deployment-policy.json
+++ b/samples/applications/complex-app/artifacts/mock/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -39,11 +39,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/complex-app/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/openstack/deployment-policy.json b/samples/applications/complex-app/artifacts/openstack/deployment-policy.json
index 68ee7fd..66a28a0 100644
--- a/samples/applications/complex-app/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/complex-app/artifacts/openstack/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "openstack",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -39,11 +39,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh b/samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh
index 6fd997a..ce2a5ee 100755
--- a/samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh
+++ b/samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh
@@ -9,8 +9,8 @@ script_path=`cd "$prgdir"; pwd`
artifacts_path=`cd "${script_path}/../../artifacts"; pwd`
iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
-cartridges_path=`cd "${script_path}/../../../../cartridges/${iaas}"; pwd`
-cartridges_groups_path=`cd "${script_path}/../../../../cartridges-groups"; pwd`
+cartridges_path=`cd "${script_path}/../../../../../cartridges/${iaas}"; pwd`
+cartridges_groups_path=`cd "${script_path}/../../../../../cartridges-groups"; pwd`
set -e
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/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
index 9f854ee..13c128b 100644
--- a/samples/applications/group-scaling-v1/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/group-scaling-v1/artifacts/ec2/deployment-policy.json
@@ -3,11 +3,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "ec2",
"property": [
{
@@ -19,11 +19,11 @@
]
},
{
- "id": "EC2-P2",
+ "id": "network-partition-2",
"activeByDefault": "false",
"partitions": [
{
- "id": "P1",
+ "id": "partition-2",
"provider": "ec2",
"property": [
{
@@ -41,21 +41,21 @@
"alias": "mygroup2",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
},
{
- "id": "EC2-P2",
+ "id": "network-partition-2",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-2",
"max": 2
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/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
index 25e3bcb..43a2cfa 100644
--- a/samples/applications/group-scaling-v1/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/group-scaling-v1/artifacts/kubernetes/deployment-policy.json
@@ -3,12 +3,12 @@
"applicationPolicy": {
"networkPartition": [
{
- "id":"network-p1",
+ "id":"network-partition-1",
"kubernetesClusterId":"kubernetes-cluster-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "kubernetes",
"property": [
{
@@ -20,11 +20,11 @@
]
},
{
- "id": "network-p2",
+ "id": "network-partition-2",
"activeByDefault": "false",
"partitions": [
{
- "id": "P1",
+ "id": "partition-2",
"provider": "kubernetes",
"property": [
{
@@ -42,21 +42,21 @@
"alias": "mygroup2",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
},
{
- "id": "network-p2",
+ "id": "network-partition-2",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-2",
"max": 2
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/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
index c9284d0..36ea752 100644
--- a/samples/applications/group-scaling-v1/artifacts/mock/deployment-policy.json
+++ b/samples/applications/group-scaling-v1/artifacts/mock/deployment-policy.json
@@ -3,11 +3,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -19,11 +19,11 @@
]
},
{
- "id": "openstack_R2",
+ "id": "network-partition-2",
"activeByDefault": "false",
"partitions": [
{
- "id": "P1",
+ "id": "partition-2",
"provider": "mock",
"property": [
{
@@ -41,21 +41,21 @@
"alias": "mygroup2",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
},
{
- "id": "openstack_R2",
+ "id": "network-partition-2",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-2",
"max": 2
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/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
index 3101722..6ecbe4b 100644
--- a/samples/applications/group-scaling-v1/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/group-scaling-v1/artifacts/openstack/deployment-policy.json
@@ -3,11 +3,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "openstack",
"property": [
{
@@ -19,11 +19,11 @@
]
},
{
- "id": "openstack_R2",
+ "id": "network-partition-2",
"activeByDefault": "false",
"partitions": [
{
- "id": "P1",
+ "id": "partition-2",
"provider": "openstack",
"property": [
{
@@ -41,21 +41,21 @@
"alias": "mygroup2",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
},
{
- "id": "openstack_R2",
+ "id": "network-partition-2",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-2",
"max": 2
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/group-scaling/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling/artifacts/ec2/deployment-policy.json b/samples/applications/group-scaling/artifacts/ec2/deployment-policy.json
index 767984f..b1f3699 100644
--- a/samples/applications/group-scaling/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/group-scaling/artifacts/ec2/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "ec2",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "myc4",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
@@ -39,11 +39,11 @@
"alias": "group1c1",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 4
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup2",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/group-scaling/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling/artifacts/kubernetes/deployment-policy.json b/samples/applications/group-scaling/artifacts/kubernetes/deployment-policy.json
index fb9bf09..53b81f0 100644
--- a/samples/applications/group-scaling/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/group-scaling/artifacts/kubernetes/deployment-policy.json
@@ -2,12 +2,12 @@
"applicationPolicy": {
"networkPartition": [
{
- "id":"network-p1",
+ "id":"network-partition-1",
"kubernetesClusterId":"kubernetes-cluster-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "kubernetes",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "myc4",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
@@ -40,11 +40,11 @@
"alias": "group1c1",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 4
}
]
@@ -55,11 +55,11 @@
"alias": "mygroup2",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/group-scaling/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling/artifacts/mock/deployment-policy.json b/samples/applications/group-scaling/artifacts/mock/deployment-policy.json
index 2dd8543..0210b3e 100644
--- a/samples/applications/group-scaling/artifacts/mock/deployment-policy.json
+++ b/samples/applications/group-scaling/artifacts/mock/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "myc4",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
@@ -39,11 +39,11 @@
"alias": "group1c1",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 4
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup2",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/group-scaling/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/group-scaling/artifacts/openstack/deployment-policy.json b/samples/applications/group-scaling/artifacts/openstack/deployment-policy.json
index 31c6662..a1bbc7c 100644
--- a/samples/applications/group-scaling/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/group-scaling/artifacts/openstack/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "openstack",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "myc4",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
@@ -39,11 +39,11 @@
"alias": "group1c1",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 4
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup2",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 2
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/more-complex-app/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/artifacts/application.json b/samples/applications/more-complex-app/artifacts/application.json
index 7796f9c..51756ec 100644
--- a/samples/applications/more-complex-app/artifacts/application.json
+++ b/samples/applications/more-complex-app/artifacts/application.json
@@ -1,6 +1,6 @@
{
- "applicationId": "app_boo",
- "alias": "app_boo_r2",
+ "applicationId": "more-complex-app",
+ "alias": "more-complex-app-v1",
"components": {
"groups": [
{
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/more-complex-app/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/artifacts/ec2/deployment-policy.json b/samples/applications/more-complex-app/artifacts/ec2/deployment-policy.json
index 9592a35..aaa36e8 100644
--- a/samples/applications/more-complex-app/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/more-complex-app/artifacts/ec2/deployment-policy.json
@@ -1,14 +1,14 @@
{
- "applicationId": "app_boo",
+ "applicationId": "more-complex-app",
"applicationPolicy": {
- "applicationId": "app_boo_r4",
+ "applicationId": "more-complex-app-v1",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "ec2",
"property": [
{
@@ -26,11 +26,11 @@
"alias": "mytomcat2",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -41,11 +41,11 @@
"alias": "mytomcat1",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -56,11 +56,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -71,11 +71,11 @@
"alias": "mygroup88",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/more-complex-app/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/artifacts/kubernetes/deployment-policy.json b/samples/applications/more-complex-app/artifacts/kubernetes/deployment-policy.json
index 9bb1027..f14fea7 100644
--- a/samples/applications/more-complex-app/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/more-complex-app/artifacts/kubernetes/deployment-policy.json
@@ -1,15 +1,15 @@
{
- "applicationId": "app_boo",
+ "applicationId": "more-complex-app",
"applicationPolicy": {
- "applicationId": "app_boo_r4",
+ "applicationId": "more-complex-app-v1",
"networkPartition": [
{
- "id":"network-p1",
+ "id":"network-partition-1",
"kubernetesClusterId":"kubernetes-cluster-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "kubernetes",
"property": [
{
@@ -27,11 +27,11 @@
"alias": "mytomcat2",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -42,11 +42,11 @@
"alias": "mytomcat1",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -57,11 +57,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -72,11 +72,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/more-complex-app/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/artifacts/mock/deployment-policy.json b/samples/applications/more-complex-app/artifacts/mock/deployment-policy.json
index 38bc5a6..f9c2f0d 100644
--- a/samples/applications/more-complex-app/artifacts/mock/deployment-policy.json
+++ b/samples/applications/more-complex-app/artifacts/mock/deployment-policy.json
@@ -1,14 +1,14 @@
{
- "applicationId": "app_boo",
+ "applicationId": "more-complex-app",
"applicationPolicy": {
- "applicationId": "app_boo_r4",
+ "applicationId": "more-complex-app-v1",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -26,11 +26,11 @@
"alias": "mytomcat2",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -41,11 +41,11 @@
"alias": "mytomcat1",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -56,11 +56,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -71,11 +71,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/more-complex-app/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/artifacts/openstack/deployment-policy.json b/samples/applications/more-complex-app/artifacts/openstack/deployment-policy.json
index d4d3936..c3d2b70 100644
--- a/samples/applications/more-complex-app/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/more-complex-app/artifacts/openstack/deployment-policy.json
@@ -1,14 +1,14 @@
{
- "applicationId": "app_boo",
+ "applicationId": "more-complex-app",
"applicationPolicy": {
- "applicationId": "app_boo_r4",
+ "applicationId": "more-complex-app-v1",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "openstack",
"property": [
{
@@ -26,11 +26,11 @@
"alias": "mytomcat2",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -41,11 +41,11 @@
"alias": "mytomcat1",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -56,11 +56,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -71,11 +71,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/more-complex-app/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/scripts/common/deploy.sh b/samples/applications/more-complex-app/scripts/common/deploy.sh
index d160d3d..618ee81 100755
--- a/samples/applications/more-complex-app/scripts/common/deploy.sh
+++ b/samples/applications/more-complex-app/scripts/common/deploy.sh
@@ -46,4 +46,4 @@ curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/applicat
sleep 1
echo "Deploying application..."
-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/app_boo/deploy
\ No newline at end of file
+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/more-complex-app/deploy
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/more-complex-app/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/more-complex-app/scripts/common/undeploy.sh b/samples/applications/more-complex-app/scripts/common/undeploy.sh
index 95e856d..11c40ed 100644
--- a/samples/applications/more-complex-app/scripts/common/undeploy.sh
+++ b/samples/applications/more-complex-app/scripts/common/undeploy.sh
@@ -6,13 +6,13 @@ 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/app_boo/undeploy
+curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/more-complex-app/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/app_boo
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/more-complex-app
echo "Removing groups..."
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/group8
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/nested-group/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/nested-group/artifacts/ec2/deployment-policy.json b/samples/applications/nested-group/artifacts/ec2/deployment-policy.json
index 10a840b..01affd0 100644
--- a/samples/applications/nested-group/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/nested-group/artifacts/ec2/deployment-policy.json
@@ -3,11 +3,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "ec2",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -40,11 +40,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/nested-group/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/nested-group/artifacts/kubernetes/deployment-policy.json b/samples/applications/nested-group/artifacts/kubernetes/deployment-policy.json
index 5efb478..b9cdfe3 100644
--- a/samples/applications/nested-group/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/nested-group/artifacts/kubernetes/deployment-policy.json
@@ -3,12 +3,12 @@
"applicationPolicy": {
"networkPartition": [
{
- "id":"network-p1",
+ "id":"network-partition-1",
"kubernetesClusterId":"kubernetes-cluster-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "kubernetes",
"property": [
{
@@ -26,11 +26,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -41,11 +41,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/nested-group/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/nested-group/artifacts/mock/deployment-policy.json b/samples/applications/nested-group/artifacts/mock/deployment-policy.json
index 66cbd9b..fdf73a2 100644
--- a/samples/applications/nested-group/artifacts/mock/deployment-policy.json
+++ b/samples/applications/nested-group/artifacts/mock/deployment-policy.json
@@ -3,11 +3,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -40,11 +40,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/nested-group/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/nested-group/artifacts/openstack/deployment-policy.json b/samples/applications/nested-group/artifacts/openstack/deployment-policy.json
index 6359569..c613401 100644
--- a/samples/applications/nested-group/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/nested-group/artifacts/openstack/deployment-policy.json
@@ -3,11 +3,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "openstack",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -40,11 +40,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-group-scaling/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-group-scaling/artifacts/application.json b/samples/applications/single-group-group-scaling/artifacts/application.json
index a2cf38c..45a8a72 100644
--- a/samples/applications/single-group-group-scaling/artifacts/application.json
+++ b/samples/applications/single-group-group-scaling/artifacts/application.json
@@ -1,6 +1,6 @@
{
- "applicationId": "app_group_v1",
- "alias": "mytestapp1",
+ "applicationId": "single-group-group-scaling",
+ "alias": "single-group-group-scaling-v1",
"components": {
"groups": [
{
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-group-scaling/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-group-scaling/artifacts/ec2/deployment-policy.json b/samples/applications/single-group-group-scaling/artifacts/ec2/deployment-policy.json
index 566c5f3..d99cd34 100644
--- a/samples/applications/single-group-group-scaling/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/single-group-group-scaling/artifacts/ec2/deployment-policy.json
@@ -1,13 +1,13 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single-group-group-scaling",
"applicationPolicy": {
"networkPartition": [
{
- "id": "EC-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "ec2",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "EC-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-group-scaling/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-group-scaling/artifacts/kubernetes/deployment-policy.json b/samples/applications/single-group-group-scaling/artifacts/kubernetes/deployment-policy.json
index ca8423c..c347514 100644
--- a/samples/applications/single-group-group-scaling/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/single-group-group-scaling/artifacts/kubernetes/deployment-policy.json
@@ -1,14 +1,14 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single-group-group-scaling",
"applicationPolicy": {
"networkPartition": [
{
- "id":"network-p1",
+ "id":"network-partition-1",
"kubernetesClusterId":"kubernetes-cluster-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "kubernetes",
"property": [
{
@@ -26,11 +26,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-group-scaling/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-group-scaling/artifacts/mock/deployment-policy.json b/samples/applications/single-group-group-scaling/artifacts/mock/deployment-policy.json
index 4ac69f9..382e0ad 100644
--- a/samples/applications/single-group-group-scaling/artifacts/mock/deployment-policy.json
+++ b/samples/applications/single-group-group-scaling/artifacts/mock/deployment-policy.json
@@ -1,13 +1,13 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single-group-group-scaling",
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-group-scaling/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-group-scaling/artifacts/openstack/deployment-policy.json b/samples/applications/single-group-group-scaling/artifacts/openstack/deployment-policy.json
index dd4d8c3..79771b3 100644
--- a/samples/applications/single-group-group-scaling/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/single-group-group-scaling/artifacts/openstack/deployment-policy.json
@@ -1,13 +1,13 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single-group-group-scaling",
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "openstack",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-group-scaling/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-group-scaling/scripts/common/deploy.sh b/samples/applications/single-group-group-scaling/scripts/common/deploy.sh
index 478828d..d67622a 100755
--- a/samples/applications/single-group-group-scaling/scripts/common/deploy.sh
+++ b/samples/applications/single-group-group-scaling/scripts/common/deploy.sh
@@ -37,4 +37,4 @@ curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/applicat
sleep 1
echo "Deploying application..."
-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/app_group_v1/deploy
\ No newline at end of file
+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/single-group-group-scaling/deploy
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-group-scaling/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-group-scaling/scripts/common/undeploy.sh b/samples/applications/single-group-group-scaling/scripts/common/undeploy.sh
index 81a8e9f..d80baa9 100644
--- a/samples/applications/single-group-group-scaling/scripts/common/undeploy.sh
+++ b/samples/applications/single-group-group-scaling/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/app_group_v1/undeploy
+curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-group-group-scaling/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/app_group_v1
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-group-group-scaling
echo "Removing groups..."
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/group6
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v1/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/artifacts/application.json b/samples/applications/single-group-v1/artifacts/application.json
index 444e105..369296f 100644
--- a/samples/applications/single-group-v1/artifacts/application.json
+++ b/samples/applications/single-group-v1/artifacts/application.json
@@ -1,6 +1,6 @@
{
- "applicationId": "app_group_v1",
- "alias": "mytestapp1",
+ "applicationId": "single_group_v1",
+ "alias": "single_group_v1",
"components": {
"groups": [
{
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v1/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/artifacts/ec2/deployment-policy.json b/samples/applications/single-group-v1/artifacts/ec2/deployment-policy.json
index a7bd03e..2b05288 100644
--- a/samples/applications/single-group-v1/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/single-group-v1/artifacts/ec2/deployment-policy.json
@@ -1,13 +1,13 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single_group_v1",
"applicationPolicy": {
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "ec2",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -40,11 +40,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v1/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/artifacts/kubernetes/deployment-policy.json b/samples/applications/single-group-v1/artifacts/kubernetes/deployment-policy.json
index 272b09a..6686bea 100644
--- a/samples/applications/single-group-v1/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/single-group-v1/artifacts/kubernetes/deployment-policy.json
@@ -1,14 +1,14 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single_group_v1",
"applicationPolicy": {
"networkPartition": [
{
- "id":"network-p1",
+ "id":"network-partition-1",
"kubernetesClusterId":"kubernetes-cluster-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "kubernetes",
"property": [
{
@@ -26,11 +26,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -41,11 +41,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v1/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/artifacts/mock/deployment-policy.json b/samples/applications/single-group-v1/artifacts/mock/deployment-policy.json
index d52e9b9..27df0d1 100644
--- a/samples/applications/single-group-v1/artifacts/mock/deployment-policy.json
+++ b/samples/applications/single-group-v1/artifacts/mock/deployment-policy.json
@@ -1,13 +1,13 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single_group_v1",
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -40,11 +40,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
[2/3] stratos git commit: Define proper identifiers/aliases in each
sample applications
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v1/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/artifacts/openstack/deployment-policy.json b/samples/applications/single-group-v1/artifacts/openstack/deployment-policy.json
index 0dcbe21..fe64e8d 100644
--- a/samples/applications/single-group-v1/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/single-group-v1/artifacts/openstack/deployment-policy.json
@@ -1,13 +1,13 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single_group_v1",
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "openstack",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -40,11 +40,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v1/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/common/deploy.sh b/samples/applications/single-group-v1/scripts/common/deploy.sh
index 4904db1..c9a23e8 100755
--- a/samples/applications/single-group-v1/scripts/common/deploy.sh
+++ b/samples/applications/single-group-v1/scripts/common/deploy.sh
@@ -41,5 +41,5 @@ echo "Creating application..."
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
echo "Deploying application..."
-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/app_group_v1/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/single_group_v1/deploy
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v1/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v1/scripts/common/undeploy.sh b/samples/applications/single-group-v1/scripts/common/undeploy.sh
index 5091785..312d459 100644
--- a/samples/applications/single-group-v1/scripts/common/undeploy.sh
+++ b/samples/applications/single-group-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/app_group_v1/undeploy
+curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single_group_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/app_group_v1
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single_group_v1
echo "Removing groups..."
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/group6
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v2/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/artifacts/application.json b/samples/applications/single-group-v2/artifacts/application.json
index c33b504..72fc991 100644
--- a/samples/applications/single-group-v2/artifacts/application.json
+++ b/samples/applications/single-group-v2/artifacts/application.json
@@ -1,6 +1,6 @@
{
- "applicationId": "app_group_v2",
- "alias": "mytestapp1",
+ "applicationId": "single_group_v2",
+ "alias": "single_group_v2",
"components": {
"groups": [
{
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v2/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/artifacts/ec2/deployment-policy.json b/samples/applications/single-group-v2/artifacts/ec2/deployment-policy.json
index 856ef19..94ce8cb 100644
--- a/samples/applications/single-group-v2/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/single-group-v2/artifacts/ec2/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "ec2",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -39,11 +39,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v2/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/artifacts/kubernetes/deployment-policy.json b/samples/applications/single-group-v2/artifacts/kubernetes/deployment-policy.json
index b95a096..3a6c693 100644
--- a/samples/applications/single-group-v2/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/single-group-v2/artifacts/kubernetes/deployment-policy.json
@@ -2,12 +2,12 @@
"applicationPolicy": {
"networkPartition": [
{
- "id":"network-p1",
+ "id":"network-partition-1",
"kubernetesClusterId":"kubernetes-cluster-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -40,11 +40,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -55,11 +55,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v2/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/artifacts/mock/deployment-policy.json b/samples/applications/single-group-v2/artifacts/mock/deployment-policy.json
index c5c4d4d..419fe2e 100644
--- a/samples/applications/single-group-v2/artifacts/mock/deployment-policy.json
+++ b/samples/applications/single-group-v2/artifacts/mock/deployment-policy.json
@@ -1,13 +1,13 @@
{
- "applicationId": "app_group_v2",
+ "applicationId": "single_group_v2",
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -40,11 +40,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v2/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/artifacts/openstack/deployment-policy.json b/samples/applications/single-group-v2/artifacts/openstack/deployment-policy.json
index 68ee7fd..66a28a0 100644
--- a/samples/applications/single-group-v2/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/single-group-v2/artifacts/openstack/deployment-policy.json
@@ -2,11 +2,11 @@
"applicationPolicy": {
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "openstack",
"property": [
{
@@ -24,11 +24,11 @@
"alias": "mytomcat",
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -39,11 +39,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
@@ -54,11 +54,11 @@
"alias": "mygroup8",
"networkPartition": [
{
- "id": "OS-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v2/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/common/deploy.sh b/samples/applications/single-group-v2/scripts/common/deploy.sh
index e77ccfa..b168a53 100755
--- a/samples/applications/single-group-v2/scripts/common/deploy.sh
+++ b/samples/applications/single-group-v2/scripts/common/deploy.sh
@@ -43,4 +43,4 @@ curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/applicat
sleep 1
echo "Deploying application..."
-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/app_group_v2/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/single_group_v2/deploy
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v2/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v2/scripts/common/undeploy.sh b/samples/applications/single-group-v2/scripts/common/undeploy.sh
index 790df2c..cc35816 100644
--- a/samples/applications/single-group-v2/scripts/common/undeploy.sh
+++ b/samples/applications/single-group-v2/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/complex-app/undeploy
+curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single_group_v2/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/complex-app
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single_group_v2
echo "Removing groups..."
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/group8
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v3/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/artifacts/application.json b/samples/applications/single-group-v3/artifacts/application.json
index 5baf319..a0eac04 100644
--- a/samples/applications/single-group-v3/artifacts/application.json
+++ b/samples/applications/single-group-v3/artifacts/application.json
@@ -1,6 +1,6 @@
{
- "applicationId": "app_group_v3",
- "alias": "mytestapp1",
+ "applicationId": "single_group_v3",
+ "alias": "single_group_v3",
"components": {
"groups": [
{
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v3/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/artifacts/ec2/deployment-policy.json b/samples/applications/single-group-v3/artifacts/ec2/deployment-policy.json
index 1565c2c..2665e2e 100644
--- a/samples/applications/single-group-v3/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/single-group-v3/artifacts/ec2/deployment-policy.json
@@ -1,13 +1,13 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single_group_v3",
"applicationPolicy": {
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "ec2",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "EC2-P1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v3/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/artifacts/kubernetes/deployment-policy.json b/samples/applications/single-group-v3/artifacts/kubernetes/deployment-policy.json
index ca8423c..c12e444 100644
--- a/samples/applications/single-group-v3/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/single-group-v3/artifacts/kubernetes/deployment-policy.json
@@ -1,14 +1,14 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single_group_v3",
"applicationPolicy": {
"networkPartition": [
{
- "id":"network-p1",
+ "id":"network-partition-1",
"kubernetesClusterId":"kubernetes-cluster-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "kubernetes",
"property": [
{
@@ -26,11 +26,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "network-p1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v3/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/artifacts/mock/deployment-policy.json b/samples/applications/single-group-v3/artifacts/mock/deployment-policy.json
index 4ac69f9..f9d9d92 100644
--- a/samples/applications/single-group-v3/artifacts/mock/deployment-policy.json
+++ b/samples/applications/single-group-v3/artifacts/mock/deployment-policy.json
@@ -1,13 +1,13 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single_group_v3",
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "mock",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v3/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/artifacts/openstack/deployment-policy.json b/samples/applications/single-group-v3/artifacts/openstack/deployment-policy.json
index dd4d8c3..13df308 100644
--- a/samples/applications/single-group-v3/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/single-group-v3/artifacts/openstack/deployment-policy.json
@@ -1,13 +1,13 @@
{
- "applicationId": "app_group_v1",
+ "applicationId": "single_group_v3",
"applicationPolicy": {
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"activeByDefault": "true",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"provider": "openstack",
"property": [
{
@@ -25,11 +25,11 @@
"alias": "mygroup6",
"networkPartition": [
{
- "id": "openstack_R1",
+ "id": "network-partition-1",
"partitionAlgo": "one-after-another",
"partitions": [
{
- "id": "P1",
+ "id": "partition-1",
"max": 5
}
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v3/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/common/deploy.sh b/samples/applications/single-group-v3/scripts/common/deploy.sh
index 5ad3538..7758b49 100755
--- a/samples/applications/single-group-v3/scripts/common/deploy.sh
+++ b/samples/applications/single-group-v3/scripts/common/deploy.sh
@@ -43,4 +43,4 @@ curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/applicat
sleep 1
echo "Deploying application..."
-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/app_group_v3/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/single_group_v3/deploy
http://git-wip-us.apache.org/repos/asf/stratos/blob/e570432e/samples/applications/single-group-v3/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-group-v3/scripts/common/undeploy.sh b/samples/applications/single-group-v3/scripts/common/undeploy.sh
index 790df2c..54bb0c0 100644
--- a/samples/applications/single-group-v3/scripts/common/undeploy.sh
+++ b/samples/applications/single-group-v3/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/complex-app/undeploy
+curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single_group_v3/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/complex-app
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single_group_v3
echo "Removing groups..."
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/group8