You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/04 10:40:40 UTC
[8/8] stratos git commit: Merge master integration tests
Merge master integration tests
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e57a2f73
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e57a2f73
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e57a2f73
Branch: refs/heads/tenant-isolation
Commit: e57a2f73559f62b929b84720c452471d11cf7498
Parents: ed951fb
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Tue Aug 4 13:17:55 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Tue Aug 4 13:17:55 2015 +0530
----------------------------------------------------------------------
.../util/converter/ObjectConverter.java | 2 +-
.../tests/ApplicationPolicyTest.java | 8 ++--
.../integration/tests/ApplicationTest.java | 15 ++++----
.../tests/AutoscalingPolicyTest.java | 16 ++++----
.../integration/tests/CartridgeGroupTest.java | 8 ++--
.../integration/tests/CartridgeTest.java | 8 ++--
.../integration/tests/DeploymentPolicyTest.java | 8 ++--
.../integration/tests/NetworkPartitionTest.java | 8 ++--
.../tests/SampleApplicationsTest.java | 39 ++++++++++----------
.../integration/tests/rest/RestClient.java | 20 ++++++----
10 files changed, 68 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e57a2f73/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index e466d5c..fd80297 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -799,7 +799,7 @@ public class ObjectConverter {
List<PartitionReferenceBean> partitionBeans = new ArrayList<PartitionReferenceBean>();
for (PartitionRef partition : partitions) {
PartitionReferenceBean partitionBean = new PartitionReferenceBean();
- partitionBean.setUuid(partition.getId());
+ partitionBean.setId(partition.getId());
partitionBean.setPartitionMax(partition.getPartitionMax());
partitionBeans.add(partitionBean);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e57a2f73/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
index b1b37b2..c5ee5d1 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationPolicyTest.java
@@ -45,7 +45,7 @@ public class ApplicationPolicyTest extends StratosArtifactsUtils {
String content = getJsonStringFromFile(applicationPolicies + networkPartitionId);
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATION_POLICIES).build();
- HttpResponse response = restClient.doPost(uri, content);
+ HttpResponse response = restClient.doPost(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -70,7 +70,7 @@ public class ApplicationPolicyTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATION_POLICIES + "/" +
networkPartitionId).build();
- HttpResponse response = restClient.doGet(uri);
+ HttpResponse response = restClient.doGet(uri, "admin", "admin");
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
if (response != null) {
@@ -96,7 +96,7 @@ public class ApplicationPolicyTest extends StratosArtifactsUtils {
try {
String content = getJsonStringFromFile(applicationPoliciesUpdate + networkPartitionId);
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATION_POLICIES).build();
- HttpResponse response = restClient.doPut(uri, content);
+ HttpResponse response = restClient.doPut(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -120,7 +120,7 @@ public class ApplicationPolicyTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATION_POLICIES + "/" +
networkPartitionId).build();
- HttpResponse response = restClient.doDelete(uri);
+ HttpResponse response = restClient.doDelete(uri, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e57a2f73/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
index 284401e..27eb4b5 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/ApplicationTest.java
@@ -25,7 +25,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.client.utils.URIBuilder;
import org.apache.stratos.common.beans.application.ApplicationBean;
-import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
import org.apache.stratos.integration.tests.rest.ErrorResponse;
import org.apache.stratos.integration.tests.rest.HttpResponse;
import org.apache.stratos.integration.tests.rest.RestClient;
@@ -46,7 +45,7 @@ public class ApplicationTest extends StratosArtifactsUtils {
String content = getJsonStringFromFile(applications + applicationId);
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS).build();
- HttpResponse response = restClient.doPost(uri, content);
+ HttpResponse response = restClient.doPost(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -72,7 +71,7 @@ public class ApplicationTest extends StratosArtifactsUtils {
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS + "/" + applicationId +
RestConstants.APPLICATIONS_DEPLOY + "/" + applicationPolicyId).build();
- HttpResponse response = restClient.doPost(uri, "");
+ HttpResponse response = restClient.doPost(uri, "", "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -98,7 +97,7 @@ public class ApplicationTest extends StratosArtifactsUtils {
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS + "/" + applicationId +
RestConstants.APPLICATIONS_UNDEPLOY).build();
- HttpResponse response = restClient.doPost(uri, "");
+ HttpResponse response = restClient.doPost(uri, "", "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -124,7 +123,7 @@ public class ApplicationTest extends StratosArtifactsUtils {
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS + "/" + applicationId +
RestConstants.APPLICATIONS_UNDEPLOY + "?force=true").build();
- HttpResponse response = restClient.doPost(uri, "");
+ HttpResponse response = restClient.doPost(uri, "", "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -149,7 +148,7 @@ public class ApplicationTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS + "/" +
applicationId).build();
- HttpResponse response = restClient.doGet(uri);
+ HttpResponse response = restClient.doGet(uri, "admin", "admin");
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
if (response != null) {
@@ -175,7 +174,7 @@ public class ApplicationTest extends StratosArtifactsUtils {
try {
String content = getJsonStringFromFile(applicationsUpdate + applicationId);
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS).build();
- HttpResponse response = restClient.doPut(uri, content);
+ HttpResponse response = restClient.doPut(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -199,7 +198,7 @@ public class ApplicationTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.APPLICATIONS + "/" +
applicationId).build();
- HttpResponse response = restClient.doDelete(uri);
+ HttpResponse response = restClient.doDelete(uri, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e57a2f73/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
index f5f3786..52c4c0c 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/AutoscalingPolicyTest.java
@@ -39,12 +39,12 @@ public class AutoscalingPolicyTest extends StratosArtifactsUtils {
String autoscalingPolicyUpdate = "/autoscaling-policies/update/";
- public boolean addAutoscalingPolicy(String autoscalingPolicyName, String endpoint, RestClient restClient) {
+ public boolean addAutoscalingPolicy(String autoscalingPolicyName, String endpoint, RestClient restClient, String userName, String password) {
try {
String content = getJsonStringFromFile(autoscalingPolicy + autoscalingPolicyName);
URI uri = new URIBuilder(endpoint + RestConstants.AUTOSCALING_POLICIES).build();
- HttpResponse response = restClient.doPost(uri, content);
+ HttpResponse response = restClient.doPost(uri, content, userName, password);
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -65,11 +65,11 @@ public class AutoscalingPolicyTest extends StratosArtifactsUtils {
}
public AutoscalePolicyBean getAutoscalingPolicy(String autoscalingPolicyName, String endpoint,
- RestClient restClient) {
+ RestClient restClient, String userName, String password) {
try {
URI uri = new URIBuilder(endpoint + RestConstants.AUTOSCALING_POLICIES + "/" +
autoscalingPolicyName).build();
- HttpResponse response = restClient.doGet(uri);
+ HttpResponse response = restClient.doGet(uri, userName, password);
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
if (response != null) {
@@ -91,11 +91,11 @@ public class AutoscalingPolicyTest extends StratosArtifactsUtils {
}
}
- public boolean updateAutoscalingPolicy(String autoscalingPolicyName, String endpoint, RestClient restClient) {
+ public boolean updateAutoscalingPolicy(String autoscalingPolicyName, String endpoint, RestClient restClient, String userName, String password) {
try {
String content = getJsonStringFromFile(autoscalingPolicyUpdate + autoscalingPolicyName);
URI uri = new URIBuilder(endpoint + RestConstants.AUTOSCALING_POLICIES).build();
- HttpResponse response = restClient.doPut(uri, content);
+ HttpResponse response = restClient.doPut(uri, content, userName, password);
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -115,11 +115,11 @@ public class AutoscalingPolicyTest extends StratosArtifactsUtils {
}
}
- public boolean removeAutoscalingPolicy(String autoscalingPolicyName, String endpoint, RestClient restClient) {
+ public boolean removeAutoscalingPolicy(String autoscalingPolicyName, String endpoint, RestClient restClient, String userName, String password) {
try {
URI uri = new URIBuilder(endpoint + RestConstants.AUTOSCALING_POLICIES + "/" +
autoscalingPolicyName).build();
- HttpResponse response = restClient.doDelete(uri);
+ HttpResponse response = restClient.doDelete(uri, userName, password);
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e57a2f73/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
index 43adecd..c299571 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeGroupTest.java
@@ -45,7 +45,7 @@ public class CartridgeGroupTest extends StratosArtifactsUtils {
String content = getJsonStringFromFile(cartridgeGroups + groupName);
URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGE_GROUPS).build();
- HttpResponse response = restClient.doPost(uri, content);
+ HttpResponse response = restClient.doPost(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -71,7 +71,7 @@ public class CartridgeGroupTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGE_GROUPS + "/" +
groupName).build();
- HttpResponse response = restClient.doGet(uri);
+ HttpResponse response = restClient.doGet(uri, "admin", "admin");
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
if (response != null) {
@@ -97,7 +97,7 @@ public class CartridgeGroupTest extends StratosArtifactsUtils {
try {
String content = getJsonStringFromFile(cartridgeGroupsUpdate + groupName);
URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGE_GROUPS).build();
- HttpResponse response = restClient.doPut(uri, content);
+ HttpResponse response = restClient.doPut(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -121,7 +121,7 @@ public class CartridgeGroupTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGE_GROUPS + "/" +
groupName).build();
- HttpResponse response = restClient.doDelete(uri);
+ HttpResponse response = restClient.doDelete(uri, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e57a2f73/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java
index 7cd5412..522f0ee 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/CartridgeTest.java
@@ -45,7 +45,7 @@ public class CartridgeTest extends StratosArtifactsUtils {
String content = getJsonStringFromFile(cartridges + cartridgeType);
URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGES).build();
- HttpResponse response = restClient.doPost(uri, content);
+ HttpResponse response = restClient.doPost(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -70,7 +70,7 @@ public class CartridgeTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGES + "/" +
cartridgeType).build();
- HttpResponse response = restClient.doGet(uri);
+ HttpResponse response = restClient.doGet(uri, "admin", "admin");
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
if (response != null) {
@@ -96,7 +96,7 @@ public class CartridgeTest extends StratosArtifactsUtils {
try {
String content = getJsonStringFromFile(cartridgesUpdate + cartridgeType);
URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGES).build();
- HttpResponse response = restClient.doPut(uri, content);
+ HttpResponse response = restClient.doPut(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -120,7 +120,7 @@ public class CartridgeTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.CARTRIDGES + "/" +
cartridgeType).build();
- HttpResponse response = restClient.doDelete(uri);
+ HttpResponse response = restClient.doDelete(uri, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e57a2f73/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
index e7e80eb..6ee2dd1 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/DeploymentPolicyTest.java
@@ -45,7 +45,7 @@ public class DeploymentPolicyTest extends StratosArtifactsUtils {
String content = getJsonStringFromFile(deploymentPolicies + deploymentPolicyId);
URI uri = new URIBuilder(endpoint + RestConstants.DEPLOYMENT_POLICIES).build();
- HttpResponse response = restClient.doPost(uri, content);
+ HttpResponse response = restClient.doPost(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -70,7 +70,7 @@ public class DeploymentPolicyTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.DEPLOYMENT_POLICIES + "/" +
deploymentPolicyId).build();
- HttpResponse response = restClient.doGet(uri);
+ HttpResponse response = restClient.doGet(uri, "admin", "admin");
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
if (response != null) {
@@ -96,7 +96,7 @@ public class DeploymentPolicyTest extends StratosArtifactsUtils {
try {
String content = getJsonStringFromFile(deploymentPoliciesUpdate + deploymentPolicyId);
URI uri = new URIBuilder(endpoint + RestConstants.DEPLOYMENT_POLICIES).build();
- HttpResponse response = restClient.doPut(uri, content);
+ HttpResponse response = restClient.doPut(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -122,7 +122,7 @@ public class DeploymentPolicyTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.DEPLOYMENT_POLICIES + "/" +
deploymentPolicyId).build();
- HttpResponse response = restClient.doDelete(uri);
+ HttpResponse response = restClient.doDelete(uri, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e57a2f73/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
index f0b46cf..aa31562 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/NetworkPartitionTest.java
@@ -45,7 +45,7 @@ public class NetworkPartitionTest extends StratosArtifactsUtils {
String content = getJsonStringFromFile(networkPartitions + networkPartitionId);
URI uri = new URIBuilder(endpoint + RestConstants.NETWORK_PARTITIONS).build();
- HttpResponse response = restClient.doPost(uri, content);
+ HttpResponse response = restClient.doPost(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -70,7 +70,7 @@ public class NetworkPartitionTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.NETWORK_PARTITIONS + "/" +
networkPartitionId).build();
- HttpResponse response = restClient.doGet(uri);
+ HttpResponse response = restClient.doGet(uri, "admin", "admin");
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
if (response != null) {
@@ -96,7 +96,7 @@ public class NetworkPartitionTest extends StratosArtifactsUtils {
try {
String content = getJsonStringFromFile(networkPartitionsUpdate + networkPartitionId);
URI uri = new URIBuilder(endpoint + RestConstants.NETWORK_PARTITIONS).build();
- HttpResponse response = restClient.doPut(uri, content);
+ HttpResponse response = restClient.doPut(uri, content, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
@@ -120,7 +120,7 @@ public class NetworkPartitionTest extends StratosArtifactsUtils {
try {
URI uri = new URIBuilder(endpoint + RestConstants.NETWORK_PARTITIONS + "/" +
networkPartitionId).build();
- HttpResponse response = restClient.doDelete(uri);
+ HttpResponse response = restClient.doDelete(uri, "admin", "admin");
if (response != null) {
if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return true;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e57a2f73/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
index 42e8837..5881c32 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java
@@ -29,7 +29,6 @@ import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext;
import org.apache.stratos.common.beans.PropertyBean;
import org.apache.stratos.common.beans.application.ApplicationBean;
import org.apache.stratos.common.beans.cartridge.CartridgeBean;
-import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean;
import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
@@ -112,30 +111,30 @@ public class SampleApplicationsTest extends StratosTestServerManager {
public void testAutoscalingPolicy() {
try {
boolean added = autoscalingPolicyTest.addAutoscalingPolicy("autoscaling-policy-c0.json",
- endpoint, restClient);
+ endpoint, restClient, "admin", "admin");
assertEquals(added, true);
AutoscalePolicyBean bean = autoscalingPolicyTest.getAutoscalingPolicy("autoscaling-policy-c0", endpoint,
- restClient);
+ restClient, "admin", "admin");
assertEquals(bean.getId(), "autoscaling-policy-c0");
assertEquals(bean.getLoadThresholds().getRequestsInFlight().getThreshold(), 35.0, 0.0);
assertEquals(bean.getLoadThresholds().getMemoryConsumption().getThreshold(), 45.0, 0.0);
assertEquals(bean.getLoadThresholds().getLoadAverage().getThreshold(), 25.0, 0.0);
- /* boolean updated = autoscalingPolicyTest.updateAutoscalingPolicy("autoscaling-policy-c0.json",
+ /* boolean updated = autoscalingPolicyTest.updateAutoscalingPolicy("autoscaling-policy-c0.json",
endpoint, restClient);
assertEquals(updated, true);
AutoscalePolicyBean updatedBean = autoscalingPolicyTest.getAutoscalingPolicy("autoscaling-policy-c0", endpoint,
restClient);
assertEquals(updatedBean.getLoadThresholds().getRequestsInFlight().getThreshold(), 30.0, 0.0);
assertEquals(updatedBean.getLoadThresholds().getMemoryConsumption().getThreshold(), 40.0, 0.0);
- assertEquals(updatedBean.getLoadThresholds().getLoadAverage().getThreshold(), 20.0, 0.0);*/
+ assertEquals(updatedBean.getLoadThresholds().getLoadAverage().getThreshold(), 20.0, 0.0); */
boolean removed = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-c0", endpoint,
- restClient);
+ restClient, "admin", "admin");
assertEquals(removed, true);
AutoscalePolicyBean beanRemoved = autoscalingPolicyTest.getAutoscalingPolicy("autoscaling-policy-c0", endpoint,
- restClient);
+ restClient, "admin", "admin");
assertEquals(beanRemoved, null);
} catch (Exception e) {
@@ -183,6 +182,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
restClient);
assertEquals(removedC3, false);
+
boolean removed = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
restClient);
assertEquals(removed, true);
@@ -213,7 +213,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
public void testApplication() {
try {
boolean addedScalingPolicy = autoscalingPolicyTest.addAutoscalingPolicy("autoscaling-policy-1.json",
- endpoint, restClient);
+ endpoint, restClient, "admin", "admin");
assertEquals(addedScalingPolicy, true);
boolean addedC1 = cartridgeTest.addCartridge("c1.json", endpoint, restClient);
@@ -225,12 +225,12 @@ public class SampleApplicationsTest extends StratosTestServerManager {
boolean addedC3 = cartridgeTest.addCartridge("c3.json", endpoint, restClient);
assertEquals(addedC3, true);
- boolean addedG1 = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json",
+ /* boolean addedG1 = cartridgeGroupTest.addCartridgeGroup("cartrdige-nested.json",
endpoint, restClient);
assertEquals(addedG1, true);
CartridgeGroupBean beanG1 = cartridgeGroupTest.getCartridgeGroup("G1", endpoint,
restClient);
- assertEquals(beanG1.getName(), "G1");
+ assertEquals(beanG1.getName(), "G1"); */
boolean addedN1 = networkPartitionTest.addNetworkPartition("network-partition-1.json",
endpoint, restClient);
@@ -314,12 +314,12 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(updatedBean.getComponents().getGroups().get(0).getGroups().get(0).getGroups().get(0).getCartridges().get(0).getCartridgeMax(), 3);
- boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
+ /* boolean removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
restClient);
- assertEquals(removedGroup, false);
+ assertEquals(removedGroup, false); */
boolean removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1", endpoint,
- restClient);
+ restClient, "admin", "admin");
assertEquals(removedAuto, false);
boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1", endpoint,
@@ -339,9 +339,9 @@ public class SampleApplicationsTest extends StratosTestServerManager {
restClient);
assertEquals(beanRemoved, null);
- removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
+ /*removedGroup = cartridgeGroupTest.removeCartridgeGroup("G1", endpoint,
restClient);
- assertEquals(removedGroup, true);
+ assertEquals(removedGroup, true); */
boolean removedC1 = cartridgeTest.removeCartridge("c1", endpoint,
restClient);
@@ -356,7 +356,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(removedC3, true);
removedAuto = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-1", endpoint,
- restClient);
+ restClient, "admin", "admin");
assertEquals(removedAuto, true);
removedDep = deploymentPolicyTest.removeDeploymentPolicy("deployment-policy-1", endpoint,
@@ -385,7 +385,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
initializeTopologyEventReceiver();
boolean addedScalingPolicy = autoscalingPolicyTest.addAutoscalingPolicy("autoscaling-policy-1.json",
- endpoint, restClient);
+ endpoint, restClient, "admin", "admin");
assertEquals(addedScalingPolicy, true);
boolean addedC1 = cartridgeTest.addCartridge("c1.json", endpoint, restClient);
@@ -581,7 +581,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
}
}
-
+ @Test
public void testDeploymentPolicy() {
try {
boolean addedN1 = networkPartitionTest.addNetworkPartition("network-partition-1.json",
@@ -622,6 +622,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(updated, true);
//update deployment policy with new partition and max values
+ /*
boolean updatedDep = deploymentPolicyTest.updateDeploymentPolicy("deployment-policy-1.json",
endpoint, restClient);
assertEquals(updatedDep, true);
@@ -647,7 +648,7 @@ public class SampleApplicationsTest extends StratosTestServerManager {
assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getId(),
"network-partition-2-partition-2");
assertEquals(updatedBean.getNetworkPartitions().get(1).getPartitions().get(1).getPartitionMax(), 5);
-
+ */
boolean removedNet = networkPartitionTest.removeNetworkPartition("network-partition-1", endpoint,
restClient);
//Trying to remove the used network partition
http://git-wip-us.apache.org/repos/asf/stratos/blob/e57a2f73/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
index fb5ff51..208f960 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java
@@ -49,10 +49,12 @@ public class RestClient {
*
* @param resourcePath This should be REST endpoint
* @param jsonParamString The json string which should be executed from the post request
+ * @param userName
+ * @param password
* @return The HttpResponse
* @throws Exception if any errors occur when executing the request
*/
- public HttpResponse doPost(URI resourcePath, String jsonParamString) throws Exception {
+ public HttpResponse doPost(URI resourcePath, String jsonParamString, String userName, String password) throws Exception {
HttpPost postRequest = null;
try {
postRequest = new HttpPost(resourcePath);
@@ -60,7 +62,7 @@ public class RestClient {
input.setContentType("application/json");
postRequest.setEntity(input);
- String userPass = "admin" + ":" + "admin";
+ String userPass = userName + ":" + password;
String basicAuth = "Basic " + javax.xml.bind.DatatypeConverter.printBase64Binary(userPass.getBytes("UTF-8"));
postRequest.addHeader("Authorization", basicAuth);
@@ -74,16 +76,18 @@ public class RestClient {
* Handle http get request. Return String
*
* @param resourcePath This should be REST endpoint
+ * @param userName
+ * @param password
* @return The HttpResponse
* @throws org.apache.http.client.ClientProtocolException and IOException
* if any errors occur when executing the request
*/
- public HttpResponse doGet(URI resourcePath) throws Exception {
+ public HttpResponse doGet(URI resourcePath, String userName, String password) throws Exception {
HttpGet getRequest = null;
try {
getRequest = new HttpGet(resourcePath);
getRequest.addHeader("Content-Type", "application/json");
- String userPass = "admin" + ":" + "admin";
+ String userPass = userName + ":" + password;
String basicAuth = "Basic " + javax.xml.bind.DatatypeConverter.printBase64Binary(userPass.getBytes("UTF-8"));
getRequest.addHeader("Authorization", basicAuth);
@@ -93,12 +97,12 @@ public class RestClient {
}
}
- public HttpResponse doDelete(URI resourcePath) throws Exception {
+ public HttpResponse doDelete(URI resourcePath, String userName, String password) throws Exception {
HttpDelete httpDelete = null;
try {
httpDelete = new HttpDelete(resourcePath);
httpDelete.addHeader("Content-Type", "application/json");
- String userPass = "admin" + ":" + "admin";
+ String userPass = userName + ":" + password;
String basicAuth = "Basic " + javax.xml.bind.DatatypeConverter.printBase64Binary(userPass.getBytes("UTF-8"));
httpDelete.addHeader("Authorization", basicAuth);
return httpClient.execute(httpDelete, new HttpResponseHandler());
@@ -107,7 +111,7 @@ public class RestClient {
}
}
- public HttpResponse doPut(URI resourcePath, String jsonParamString) throws Exception {
+ public HttpResponse doPut(URI resourcePath, String jsonParamString, String userName, String password) throws Exception {
HttpPut putRequest = null;
try {
@@ -116,7 +120,7 @@ public class RestClient {
StringEntity input = new StringEntity(jsonParamString);
input.setContentType("application/json");
putRequest.setEntity(input);
- String userPass = "admin" + ":" + "admin";
+ String userPass = userName + ":" + password;
String basicAuth = "Basic " + javax.xml.bind.DatatypeConverter.printBase64Binary(userPass.getBytes("UTF-8"));
putRequest.addHeader("Authorization", basicAuth);
return httpClient.execute(putRequest, new HttpResponseHandler());