http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json index f091e26..a02407b 100644 --- a/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json +++ b/products/stratos/modules/integration/src/test/resources/single-cluster-scaling-test/applications/single-cluster-scaling-test.json @@ -6,7 +6,7 @@ { "type": "c7-single-cluster-scaling-test", "cartridgeMin": 2, - "cartridgeMax": 5, + "cartridgeMax": 6, "subscribableInfo": { "alias": "my-c7", "autoscalingPolicy": "autoscaling-policy-single-cluster-scaling-test",
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/products/stratos/modules/integration/src/test/resources/stratos-testing.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml index 065ff5a..e8a48d2 100644 --- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml +++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml @@ -21,62 +21,74 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > <suite name="StratosIntegrationSuite"> - - <test name="CartridgeTest"> - <classes> - <class name="org.apache.stratos.integration.tests.group.CartridgeTest" /> - </classes> - </test> - <test name="CartridgeGroupTest" > - <classes> - <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" /> - </classes> - </test> - - <test name="NetworkPartitionTest"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" /> - </classes> - </test> - <test name="ApplicationPolicyTest"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" /> - </classes> - </test> - <test name="DeploymentPolicyTest"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest" /> - </classes> - </test> - <test name="AutoscalingPolicyTest"> - <classes> - <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" /> - </classes> - </test> - <test name="SampleApplicationsTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" /> - </classes> - </test> - <test name="ApplicationBurstingTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" /> - </classes> - </test> - <test name="SingleClusterScalingTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest" /> - </classes> - </test> - <test name="PartitionRoundRobinClusterTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" /> - </classes> - </test> - - <test name="GroupTerminationBehaviorTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest" /> - </classes> + <test name="UserTest"> + <classes> + <class name="org.apache.stratos.integration.tests.users.UserTest" /> + </classes> + </test> + <test name="CartridgeTest"> + <classes> + <class name="org.apache.stratos.integration.tests.group.CartridgeTest" /> + </classes> + </test> + <test name="CartridgeGroupTest" > + <classes> + <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" /> + </classes> + </test> + <test name="NetworkPartitionTest"> + <classes> + <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" /> + </classes> + </test> + <test name="ApplicationPolicyTest"> + <classes> + <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" /> + </classes> + </test> + <test name="DeploymentPolicyTest"> + <classes> + <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest" /> + </classes> + </test> + <test name="AutoscalingPolicyTest"> + <classes> + <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" /> + </classes> + </test> + <test name="SampleApplicationsTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" /> + </classes> + </test> + <test name="ApplicationUpdateTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest" /> + </classes> + </test> + <test name="SingleClusterScalingTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest" /> + </classes> + </test> + <test name="ApplicationBurstingTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" /> + </classes> + </test> + <test name="PartitionRoundRobinClusterTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" /> + </classes> + </test> + <test name="GroupStartupOrderTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.GroupStartupOrderTest" /> + </classes> + </test> + <test name="GroupTerminationBehaviorTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest" /> + </classes> </test> </suite> http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json b/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json deleted file mode 100644 index f575b1b..0000000 --- a/products/stratos/modules/integration/src/test/resources/tenant/tenant1.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin": "admin", - "firstName": "Frank", - "lastName": "Myers", - "adminPassword": "admin123", - "tenantDomain": "test1.com", - "email": "[email protected]", - "active": "true" -} http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json b/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json deleted file mode 100644 index 3d2baf2..0000000 --- a/products/stratos/modules/integration/src/test/resources/tenant/tenant2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin": "admin", - "firstName": "Frank", - "lastName": "Myers", - "adminPassword": "admin123", - "tenantDomain": "test2.com", - "email": "[email protected]", - "active": "true" -} http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/applications/simple/single-cartridge-app/scripts/common/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-cartridge-app/scripts/common/deploy.sh b/samples/applications/simple/single-cartridge-app/scripts/common/deploy.sh index b54439e..9643d2d 100755 --- a/samples/applications/simple/single-cartridge-app/scripts/common/deploy.sh +++ b/samples/applications/simple/single-cartridge-app/scripts/common/deploy.sh @@ -23,8 +23,6 @@ iaas=$1 host_ip="localhost" host_port=9443 -username="admin@test$2.com" -password="admin123" prgdir=`dirname "$0"` script_path=`cd "$prgdir"; pwd` @@ -36,8 +34,6 @@ autoscaling_policies_path=`cd "${script_path}/../../../../../autoscaling-policie network_partitions_path=`cd "${script_path}/../../../../../network-partitions/${iaas}"; pwd` deployment_policies_path=`cd "${script_path}/../../../../../deployment-policies"; pwd` application_policies_path=`cd "${script_path}/../../../../../application-policies"; pwd` -tenants_path=`cd "${script_path}/../../../../../tenants"; pwd` -kubernetes_clusters_path=`cd "${script_path}/../../../../../kubernetes-clusters"; pwd` set -e @@ -46,34 +42,27 @@ if [[ -z "${iaas}" ]]; then exit fi -echo ${tenants_path}/tenant1.json -echo "Adding a tenant..." -curl -X POST -H "Content-Type: application/json" -d "@${tenants_path}/tenant$2.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/tenants - echo ${autoscaling_policies_path}/autoscaling-policy-1.json echo "Adding autoscale policy..." -curl -X POST -H "Content-Type: application/json" -d "@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/autoscalingPolicies - -echo "Adding kubernetes cluster..." -curl -X POST -H "Content-Type: application/json" -d "@${kubernetes_clusters_path}/kubernetes-cluster-2.json" -k -u ${username}:${password} https://${host_ip}:${host_port}/api/kubernetesClusters +curl -X POST -H "Content-Type: application/json" -d "@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies echo "Adding network partitions..." -curl -X POST -H "Content-Type: application/json" -d "@${network_partitions_path}/network-partition-1.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/networkPartitions +curl -X POST -H "Content-Type: application/json" -d "@${network_partitions_path}/network-partition-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions echo "Adding deployment policy..." -curl -X POST -H "Content-Type: application/json" -d "@${deployment_policies_path}/deployment-policy-1.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/deploymentPolicies +curl -X POST -H "Content-Type: application/json" -d "@${deployment_policies_path}/deployment-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies echo "Adding php cartridge..." -curl -X POST -H "Content-Type: application/json" -d "@${iaas_cartridges_path}/php.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/cartridges +curl -X POST -H "Content-Type: application/json" -d "@${iaas_cartridges_path}/php.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges sleep 1 echo "Adding application policy..." -curl -X POST -H "Content-Type: application/json" -d "@${application_policies_path}/application-policy-1.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/applicationPolicies +curl -X POST -H "Content-Type: application/json" -d "@${application_policies_path}/application-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies sleep 1 echo "Adding application..." -curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/application.json" -k -v -u ${username}:${password} 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" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/applications/single-cartridge-app/deploy/application-policy-1 +curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-cartridge-app/deploy/application-policy-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh b/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh index 9852d4b..d387d86 100644 --- a/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh +++ b/samples/applications/simple/single-cartridge-app/scripts/common/undeploy.sh @@ -22,31 +22,29 @@ # host_ip="localhost" host_port=9443 -username="admin@test$1.com" -password="admin123" set -e echo "Undeploying application..." -curl -X POST -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/applications/single-cartridge-app/undeploy +curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-cartridge-app/undeploy sleep 10 echo "Deleting application..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/applications/single-cartridge-app +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-cartridge-app echo "Removing cartridges..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/cartridges/php +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/php echo "Removing autoscale policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1 echo "Removing deployment policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 echo "Removing application policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 echo "Removing network partitions..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/applications/simple/single-cartridge-app/scripts/kubernetes/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-cartridge-app/scripts/kubernetes/deploy.sh b/samples/applications/simple/single-cartridge-app/scripts/kubernetes/deploy.sh index f4b463c..548c166 100755 --- a/samples/applications/simple/single-cartridge-app/scripts/kubernetes/deploy.sh +++ b/samples/applications/simple/single-cartridge-app/scripts/kubernetes/deploy.sh @@ -23,8 +23,6 @@ host_ip="localhost" host_port=9443 iaas="kubernetes" -username="admin@test$2.com" -password="admin123" prgdir=`dirname "$0"` script_path=`cd "$prgdir"; pwd` @@ -32,7 +30,7 @@ common_folder=`cd "${script_path}/../common"; pwd` kubernetes_clusters_path=`cd "${script_path}/../../../../../kubernetes-clusters"; pwd` -#echo "Adding kubernetes cluster..." -#curl -X POST -H "Content-Type: application/json" -d "@${kubernetes_clusters_path}/kubernetes-cluster-2.json" -k -u ${username}:${password} https://${host_ip}:${host_port}/api/kubernetesClusters +echo "Adding kubernetes cluster..." +curl -X POST -H "Content-Type: application/json" -d "@${kubernetes_clusters_path}/kubernetes-cluster-2.json" -k -u admin:admin https://${host_ip}:${host_port}/api/kubernetesClusters -bash ${common_folder}/deploy.sh ${iaas} $1 +bash ${common_folder}/deploy.sh ${iaas} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/applications/simple/single-cartridge-app/scripts/mock/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-cartridge-app/scripts/mock/deploy.sh b/samples/applications/simple/single-cartridge-app/scripts/mock/deploy.sh index e5f2e36..d2dbc4c 100755 --- a/samples/applications/simple/single-cartridge-app/scripts/mock/deploy.sh +++ b/samples/applications/simple/single-cartridge-app/scripts/mock/deploy.sh @@ -26,4 +26,4 @@ prgdir=`dirname "$0"` script_path=`cd "$prgdir"; pwd` common_folder=`cd "${script_path}/../common"; pwd` -bash ${common_folder}/deploy.sh ${iaas} $1 +bash ${common_folder}/deploy.sh ${iaas} http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/applications/simple/single-cartridge-app/scripts/mock/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-cartridge-app/scripts/mock/undeploy.sh b/samples/applications/simple/single-cartridge-app/scripts/mock/undeploy.sh index 86149e2..aa246e6 100755 --- a/samples/applications/simple/single-cartridge-app/scripts/mock/undeploy.sh +++ b/samples/applications/simple/single-cartridge-app/scripts/mock/undeploy.sh @@ -24,4 +24,4 @@ prgdir=`dirname "$0"` script_path=`cd "$prgdir"; pwd` common_folder=`cd "${script_path}/../common"; pwd` -bash ${common_folder}/undeploy.sh $1 +bash ${common_folder}/undeploy.sh http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/applications/simple/single-group-app/scripts/common/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-group-app/scripts/common/deploy.sh b/samples/applications/simple/single-group-app/scripts/common/deploy.sh index cf55bce..b377f84 100755 --- a/samples/applications/simple/single-group-app/scripts/common/deploy.sh +++ b/samples/applications/simple/single-group-app/scripts/common/deploy.sh @@ -23,8 +23,6 @@ iaas=$1 host_ip="localhost" host_port=9443 -username="admin@test$2.com" -password="admin123" prgdir=`dirname "$0"` script_path=`cd "$prgdir"; pwd` @@ -37,7 +35,6 @@ autoscaling_policies_path=`cd "${script_path}/../../../../../autoscaling-policie network_partitions_path=`cd "${script_path}/../../../../../network-partitions/${iaas}"; pwd` deployment_policies_path=`cd "${script_path}/../../../../../deployment-policies"; pwd` application_policies_path=`cd "${script_path}/../../../../../application-policies"; pwd` -tenants_path=`cd "${script_path}/../../../../../tenants"; pwd` set -e @@ -46,44 +43,40 @@ if [[ -z "${iaas}" ]]; then exit fi -echo ${tenants_path}/tenant1.json -echo "Adding a tenant..." -curl -X POST -H "Content-Type: application/json" -d "@${tenants_path}/tenant$2.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/tenants - echo ${autoscaling_policies_path}/autoscaling-policy-1.json echo "Adding autoscale policy..." -curl -X POST -H "Content-Type: application/json" -d "@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/autoscalingPolicies +curl -X POST -H "Content-Type: application/json" -d "@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies echo "Adding network partitions..." -curl -X POST -H "Content-Type: application/json" -d "@${network_partitions_path}/network-partition-1.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/networkPartitions -curl -X POST -H "Content-Type: application/json" -d "@${network_partitions_path}/network-partition-2.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/networkPartitions +curl -X POST -H "Content-Type: application/json" -d "@${network_partitions_path}/network-partition-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions +curl -X POST -H "Content-Type: application/json" -d "@${network_partitions_path}/network-partition-2.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions echo "Adding deployment policy..." -curl -X POST -H "Content-Type: application/json" -d "@${deployment_policies_path}/deployment-policy-1.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/deploymentPolicies +curl -X POST -H "Content-Type: application/json" -d "@${deployment_policies_path}/deployment-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies echo "Adding tomcat cartridge..." -curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/tomcat.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/cartridges +curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/tomcat.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges echo "Adding esb cartridge..." -curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/esb.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/cartridges +curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/esb.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges echo "Adding php cartridge..." -curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/php.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/cartridges +curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/php.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges echo "Adding esb-php-group group..." -curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/esb-php-group.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/cartridgeGroups +curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/esb-php-group.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups sleep 1 echo "Adding application policy..." -curl -X POST -H "Content-Type: application/json" -d "@${application_policies_path}/application-policy-1.json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/applicationPolicies +curl -X POST -H "Content-Type: application/json" -d "@${application_policies_path}/application-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies sleep 1 echo "Creating application..." -curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/application.json" -k -v -u ${username}:${password} 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" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/applications/cartridge-group-app/deploy/application-policy-1 +curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/cartridge-group-app/deploy/application-policy-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/applications/simple/single-group-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-group-app/scripts/common/undeploy.sh b/samples/applications/simple/single-group-app/scripts/common/undeploy.sh index 857de8c..e294fd1 100644 --- a/samples/applications/simple/single-group-app/scripts/common/undeploy.sh +++ b/samples/applications/simple/single-group-app/scripts/common/undeploy.sh @@ -22,36 +22,35 @@ # host_ip="localhost" host_port=9443 -username="admin@test$1.com" -password="admin123" set -e echo "Undeploying application..." -curl -X POST -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/applications/cartridge-group-app/undeploy +curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/cartridge-group-app/undeploy -sleep 20 +sleep 10 echo "Deleting application..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/applications/cartridge-group-app +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/cartridge-group-app echo "Removing groups..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/cartridgeGroups/esb-php-group +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/esb-php-group echo "Removing cartridges..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/cartridges/tomcat -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/cartridges/esb -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/cartridges/php +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/tomcat +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/esb +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/php echo "Removing autoscale policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1 echo "Removing deployment policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1 echo "Removing application policies..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 echo "Removing network partitions..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 -curl -X DELETE -H "Content-Type: application/json" -k -v -u ${username}:${password} https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-2 + http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/applications/simple/single-group-app/scripts/mock/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-group-app/scripts/mock/deploy.sh b/samples/applications/simple/single-group-app/scripts/mock/deploy.sh index e5f2e36..d2dbc4c 100755 --- a/samples/applications/simple/single-group-app/scripts/mock/deploy.sh +++ b/samples/applications/simple/single-group-app/scripts/mock/deploy.sh @@ -26,4 +26,4 @@ prgdir=`dirname "$0"` script_path=`cd "$prgdir"; pwd` common_folder=`cd "${script_path}/../common"; pwd` -bash ${common_folder}/deploy.sh ${iaas} $1 +bash ${common_folder}/deploy.sh ${iaas} http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/applications/simple/single-group-app/scripts/mock/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-group-app/scripts/mock/undeploy.sh b/samples/applications/simple/single-group-app/scripts/mock/undeploy.sh index 86149e2..aa246e6 100755 --- a/samples/applications/simple/single-group-app/scripts/mock/undeploy.sh +++ b/samples/applications/simple/single-group-app/scripts/mock/undeploy.sh @@ -24,4 +24,4 @@ prgdir=`dirname "$0"` script_path=`cd "$prgdir"; pwd` common_folder=`cd "${script_path}/../common"; pwd` -bash ${common_folder}/undeploy.sh $1 +bash ${common_folder}/undeploy.sh http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/cartridges/kubernetes/php.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/php.json b/samples/cartridges/kubernetes/php.json index 7c4aeae..6fa8399 100755 --- a/samples/cartridges/kubernetes/php.json +++ b/samples/cartridges/kubernetes/php.json @@ -23,7 +23,7 @@ "iaasProvider": [ { "type": "kubernetes", - "imageId": "stratos/php:4.1.2", + "imageId": "stratos/php:4.2.0", "networkInterfaces": [ ], "property": [ http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/kubernetes-clusters/kubernetes-cluster-1.json ---------------------------------------------------------------------- diff --git a/samples/kubernetes-clusters/kubernetes-cluster-1.json b/samples/kubernetes-clusters/kubernetes-cluster-1.json index ce72f2b..399ba83 100644 --- a/samples/kubernetes-clusters/kubernetes-cluster-1.json +++ b/samples/kubernetes-clusters/kubernetes-cluster-1.json @@ -38,7 +38,7 @@ }, { "name": "payload_parameter.MB_PORT", - "value": "1884" + "value": "1883" }, { "name": "payload_parameter.CEP_IP", http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/kubernetes-clusters/kubernetes-cluster-2.json ---------------------------------------------------------------------- diff --git a/samples/kubernetes-clusters/kubernetes-cluster-2.json b/samples/kubernetes-clusters/kubernetes-cluster-2.json index 2472793..0bd2260 100644 --- a/samples/kubernetes-clusters/kubernetes-cluster-2.json +++ b/samples/kubernetes-clusters/kubernetes-cluster-2.json @@ -38,7 +38,7 @@ }, { "name": "payload_parameter.MB_PORT", - "value": "1884" + "value": "1883" }, { "name": "payload_parameter.CEP_IP", http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/tenants/tenant1.json ---------------------------------------------------------------------- diff --git a/samples/tenants/tenant1.json b/samples/tenants/tenant1.json deleted file mode 100644 index f575b1b..0000000 --- a/samples/tenants/tenant1.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin": "admin", - "firstName": "Frank", - "lastName": "Myers", - "adminPassword": "admin123", - "tenantDomain": "test1.com", - "email": "[email protected]", - "active": "true" -} http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/samples/tenants/tenant2.json ---------------------------------------------------------------------- diff --git a/samples/tenants/tenant2.json b/samples/tenants/tenant2.json deleted file mode 100644 index 3d2baf2..0000000 --- a/samples/tenants/tenant2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin": "admin", - "firstName": "Frank", - "lastName": "Myers", - "adminPassword": "admin123", - "tenantDomain": "test2.com", - "email": "[email protected]", - "active": "true" -}
