You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2014/09/08 15:06:20 UTC
[5/5] git commit: FALCON-675 Request URLS moved from parameters into
methods in falcon-regression
FALCON-675 Request URLS moved from parameters into methods in falcon-regression
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/051a3d29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/051a3d29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/051a3d29
Branch: refs/heads/master
Commit: 051a3d29143e0bdaa74469916502114a64b18adb
Parents: 245b6b4
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Fri Sep 5 15:24:56 2014 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Mon Sep 8 16:05:41 2014 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 4 +
.../falcon/regression/core/bundle/Bundle.java | 54 +++----
.../core/helpers/ClusterEntityHelperImpl.java | 14 +-
.../core/interfaces/IEntityManagerHelper.java | 130 +++++++--------
.../regression/core/supportClasses/Brother.java | 16 +-
.../falcon/regression/core/util/BundleUtil.java | 3 +-
.../regression/core/util/CleanupUtil.java | 11 +-
.../falcon/regression/core/util/Util.java | 3 +-
.../falcon/regression/AuthorizationTest.java | 78 ++++-----
.../regression/EmbeddedPigScriptTest.java | 28 ++--
.../regression/FeedClusterUpdateTest.java | 76 ++++-----
.../regression/FeedInstanceStatusTest.java | 15 +-
.../falcon/regression/FeedReplicationTest.java | 12 +-
.../falcon/regression/FeedResumeTest.java | 26 ++-
.../falcon/regression/FeedScheduleTest.java | 27 ++--
.../falcon/regression/FeedStatusTest.java | 28 ++--
.../regression/FeedSubmitAndScheduleTest.java | 26 ++-
.../falcon/regression/FeedSubmitTest.java | 21 ++-
.../falcon/regression/FeedSuspendTest.java | 28 ++--
.../falcon/regression/InstanceSummaryTest.java | 2 +-
.../apache/falcon/regression/NewRetryTest.java | 92 ++++++-----
.../ProcessInstanceColoMixedTest.java | 11 +-
.../regression/ProcessInstanceResumeTest.java | 3 +-
.../regression/ProcessInstanceRunningTest.java | 28 ++--
.../regression/ProcessInstanceStatusTest.java | 13 +-
.../regression/ProcessInstanceSuspendTest.java | 5 +-
.../regression/hcat/HCatFeedOperationsTest.java | 33 ++--
.../regression/hcat/HCatReplicationTest.java | 10 +-
.../regression/hcat/HCatRetentionTest.java | 8 +-
.../regression/lineage/LineageApiTest.java | 10 +-
.../regression/prism/EntityDryRunTest.java | 9 +-
.../prism/FeedDelayParallelTimeoutTest.java | 4 +-
.../prism/NewPrismProcessUpdateTest.java | 114 +++++--------
.../prism/PrismClusterDeleteTest.java | 28 ++--
.../prism/PrismConcurrentRequestTest.java | 26 +--
.../regression/prism/PrismFeedDeleteTest.java | 109 +++++--------
.../prism/PrismFeedLateReplicationTest.java | 9 +-
.../PrismFeedReplicationPartitionExpTest.java | 30 ++--
.../prism/PrismFeedReplicationUpdateTest.java | 14 +-
.../regression/prism/PrismFeedResumeTest.java | 136 ++++++----------
.../regression/prism/PrismFeedScheduleTest.java | 4 +-
.../regression/prism/PrismFeedSnSTest.java | 116 ++++++--------
.../regression/prism/PrismFeedSuspendTest.java | 107 ++++---------
.../regression/prism/PrismFeedUpdateTest.java | 18 +--
.../prism/PrismProcessDeleteTest.java | 94 ++++-------
.../prism/PrismProcessResumeTest.java | 159 ++++++-------------
.../prism/PrismProcessScheduleTest.java | 53 +++----
.../regression/prism/PrismProcessSnSTest.java | 57 +++----
.../prism/PrismProcessSuspendTest.java | 97 ++++-------
.../regression/prism/PrismSubmitTest.java | 108 +++++--------
.../prism/RescheduleKilledProcessTest.java | 31 ++--
.../RescheduleProcessInFinalStatesTest.java | 20 ++-
.../falcon/regression/prism/RetentionTest.java | 6 +-
.../prism/UpdateAtSpecificTimeTest.java | 25 ++-
.../falcon/regression/ui/LineageGraphTest.java | 2 +-
.../falcon/regression/ui/ProcessUITest.java | 2 +-
56 files changed, 840 insertions(+), 1353 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 231f33e..b74a4ee 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -9,8 +9,12 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-675 Request URLS moved from parameters into methods in falcon-regression (Ruslan
+ Ostafiychuk)
+
FALCON-656 add test in falcon regression's Authorization test where non-feed owner updates
a feed with a dependent process(Karishma via Samarth Gupta)
+
FALCON-674 General code factored out for ProcessInstance* tests (Paul Isaychuk via Ruslan
Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
index 57c7292..6d8b032 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
@@ -46,7 +46,6 @@ import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.log4j.Logger;
import org.joda.time.DateTime;
@@ -80,22 +79,19 @@ public class Bundle {
public void submitFeed() throws URISyntaxException, IOException, AuthenticationException, JAXBException {
submitClusters(prismHelper);
- AssertUtil.assertSucceeded(
- prismHelper.getFeedHelper().submitEntity(URLS.SUBMIT_URL, dataSets.get(0)));
+ AssertUtil.assertSucceeded(prismHelper.getFeedHelper().submitEntity(dataSets.get(0)));
}
public void submitAndScheduleFeed() throws Exception {
submitClusters(prismHelper);
- AssertUtil.assertSucceeded(prismHelper.getFeedHelper().submitAndSchedule(
- URLS.SUBMIT_AND_SCHEDULE_URL, dataSets.get(0)));
+ AssertUtil.assertSucceeded(prismHelper.getFeedHelper().submitAndSchedule(dataSets.get(0)));
}
public void submitAndScheduleFeedUsingColoHelper(ColoHelper coloHelper) throws Exception {
submitFeed();
- AssertUtil.assertSucceeded(
- coloHelper.getFeedHelper().schedule(Util.URLS.SCHEDULE_URL, dataSets.get(0)));
+ AssertUtil.assertSucceeded(coloHelper.getFeedHelper().schedule(dataSets.get(0)));
}
public void submitAndScheduleAllFeeds()
@@ -103,8 +99,7 @@ public class Bundle {
submitClusters(prismHelper);
for (String feed : dataSets) {
- AssertUtil.assertSucceeded(
- prismHelper.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prismHelper.getFeedHelper().submitAndSchedule(feed));
}
}
@@ -112,8 +107,7 @@ public class Bundle {
IOException, URISyntaxException, AuthenticationException {
submitClusters(prismHelper);
submitFeeds(prismHelper);
- ServiceResponse r = prismHelper.getProcessHelper().submitEntity(URLS.SUBMIT_URL,
- processData);
+ ServiceResponse r = prismHelper.getProcessHelper().submitEntity(processData);
if (shouldSucceed) {
AssertUtil.assertSucceeded(r);
}
@@ -128,23 +122,20 @@ public class Bundle {
submitFeeds(prismHelper);
- AssertUtil.assertSucceeded(prismHelper.getProcessHelper().submitAndSchedule(
- URLS.SUBMIT_AND_SCHEDULE_URL, processData));
+ AssertUtil.assertSucceeded(prismHelper.getProcessHelper().submitAndSchedule(processData));
}
public void submitAndScheduleProcess() throws Exception {
submitAndScheduleAllFeeds();
- AssertUtil.assertSucceeded(prismHelper.getProcessHelper().submitAndSchedule(
- URLS.SUBMIT_AND_SCHEDULE_URL, processData));
+ AssertUtil.assertSucceeded(prismHelper.getProcessHelper().submitAndSchedule(processData));
}
public void submitAndScheduleProcessUsingColoHelper(ColoHelper coloHelper) throws Exception {
submitProcess(true);
- AssertUtil.assertSucceeded(
- coloHelper.getProcessHelper().schedule(URLS.SCHEDULE_URL, processData));
+ AssertUtil.assertSucceeded(coloHelper.getProcessHelper().schedule(processData));
}
public List<String> getClusters() {
@@ -271,7 +262,7 @@ public class Bundle {
//lets submit all data first
submitFeeds(helper);
- return helper.getProcessHelper().submitEntity(URLS.SUBMIT_URL, getProcessData());
+ return helper.getProcessHelper().submitEntity(getProcessData());
}
/**
@@ -293,8 +284,7 @@ public class Bundle {
}
//lets schedule the damn thing now :)
- ServiceResponse scheduleResult =
- helper.getProcessHelper().schedule(URLS.SCHEDULE_URL, getProcessData());
+ ServiceResponse scheduleResult = helper.getProcessHelper().schedule(getProcessData());
AssertUtil.assertSucceeded(scheduleResult);
TimeUtil.sleepSeconds(7);
return scheduleResult.getMessage();
@@ -696,16 +686,14 @@ public class Bundle {
public void submitClusters(ColoHelper helper, String user)
throws JAXBException, IOException, URISyntaxException, AuthenticationException {
for (String cluster : this.clusters) {
- AssertUtil.assertSucceeded(
- helper.getClusterHelper().submitEntity(URLS.SUBMIT_URL, cluster, user));
+ AssertUtil.assertSucceeded(helper.getClusterHelper().submitEntity(cluster, user));
}
}
public void submitFeeds(ColoHelper helper)
throws JAXBException, IOException, URISyntaxException, AuthenticationException {
for (String feed : this.dataSets) {
- AssertUtil.assertSucceeded(
- helper.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed));
+ AssertUtil.assertSucceeded(helper.getFeedHelper().submitEntity(feed));
}
}
@@ -757,14 +745,14 @@ public class Bundle {
public void deleteBundle(ColoHelper helper) {
try {
- helper.getProcessHelper().delete(URLS.DELETE_URL, getProcessData());
+ helper.getProcessHelper().delete(getProcessData());
} catch (Exception e) {
e.getStackTrace();
}
for (String dataset : getDataSets()) {
try {
- helper.getFeedHelper().delete(URLS.DELETE_URL, dataset);
+ helper.getFeedHelper().delete(dataset);
} catch (Exception e) {
e.getStackTrace();
}
@@ -772,7 +760,7 @@ public class Bundle {
for (String cluster : this.getClusters()) {
try {
- helper.getClusterHelper().delete(URLS.DELETE_URL, cluster);
+ helper.getClusterHelper().delete(cluster);
} catch (Exception e) {
e.getStackTrace();
}
@@ -807,8 +795,7 @@ public class Bundle {
for (Bundle bundle : bundles) {
ServiceResponse r =
- prismHelper.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, bundle.getClusters().get(0));
+ prismHelper.getClusterHelper().submitEntity(bundle.getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"), r.getMessage());
}
@@ -871,21 +858,18 @@ public class Bundle {
throws IOException, JAXBException, URISyntaxException, AuthenticationException {
for (int i = 0; i < getClusters().size(); i++) {
- ServiceResponse r = helper.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, getClusters().get(i));
+ ServiceResponse r = helper.getClusterHelper().submitEntity(getClusters().get(i));
if (checkSuccess) {
AssertUtil.assertSucceeded(r);
}
}
for (int i = 0; i < getDataSets().size(); i++) {
- ServiceResponse r = helper.getFeedHelper().submitAndSchedule(
- URLS.SUBMIT_AND_SCHEDULE_URL, getDataSets().get(i));
+ ServiceResponse r = helper.getFeedHelper().submitAndSchedule(getDataSets().get(i));
if (checkSuccess) {
AssertUtil.assertSucceeded(r);
}
}
- ServiceResponse r = helper.getProcessHelper().submitAndSchedule(
- URLS.SUBMIT_AND_SCHEDULE_URL, getProcessData());
+ ServiceResponse r = helper.getProcessHelper().submitAndSchedule(getProcessData());
if (checkSuccess) {
AssertUtil.assertSucceeded(r);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/ClusterEntityHelperImpl.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/ClusterEntityHelperImpl.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/ClusterEntityHelperImpl.java
index babf178..49e4b06 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/ClusterEntityHelperImpl.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/ClusterEntityHelperImpl.java
@@ -23,7 +23,6 @@ import org.apache.falcon.regression.core.response.InstancesSummaryResult;
import org.apache.falcon.regression.core.response.InstancesResult;
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import java.io.IOException;
import java.net.URISyntaxException;
@@ -46,29 +45,28 @@ public class ClusterEntityHelperImpl extends IEntityManagerHelper {
return Util.readEntityName(entity);
}
- public ServiceResponse getStatus(URLS url, String data, String user) {
+ public ServiceResponse getStatus(String data, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
- public ServiceResponse resume(URLS url, String data, String user) {
+ public ServiceResponse resume(String data, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
- public ServiceResponse schedule(URLS url, String data, String user) {
+ public ServiceResponse schedule(String data, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
- public ServiceResponse submitAndSchedule(URLS url, String data, String user) {
+ public ServiceResponse submitAndSchedule(String data, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
- public ServiceResponse suspend(URLS url, String data, String user) {
+ public ServiceResponse suspend(String data, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
@Override
- public InstancesResult getRunningInstance(
- URLS processRunningInstance, String name, String user) {
+ public InstancesResult getRunningInstance(String name, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
index bf99740..7f8ac6a 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
@@ -253,130 +253,122 @@ public abstract class IEntityManagerHelper {
return StringUtils.join(parts, "/");
}
- public ServiceResponse listEntities(URLS url)
+ public ServiceResponse listEntities()
throws IOException, URISyntaxException, AuthenticationException {
- return listEntities(url, null);
+ return listEntities(null);
}
- public ServiceResponse listEntities(Util.URLS url, String user)
+ public ServiceResponse listEntities(String user)
throws IOException, URISyntaxException, AuthenticationException {
LOGGER.info("fetching " + getEntityType() + " list");
- return Util.sendRequest(createUrl(this.hostname + url.getValue(), getEntityType() + colo),
- "get", null, user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.LIST_URL.getValue(),
+ getEntityType() + colo), "get", null, user);
}
- public ServiceResponse submitEntity(URLS url, String data)
+ public ServiceResponse submitEntity(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return submitEntity(url, data, null);
+ return submitEntity(data, null);
}
- public ServiceResponse submitEntity(URLS url, String data, String user)
+ public ServiceResponse submitEntity(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
LOGGER.info("Submitting " + getEntityType() + ": \n" + Util.prettyPrintXml(data));
- return Util.sendRequest(createUrl(this.hostname + url.getValue(), getEntityType() + colo),
- "post", data, user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.SUBMIT_URL.getValue(),
+ getEntityType() + colo), "post", data, user);
}
- public ServiceResponse schedule(URLS scheduleUrl, String processData)
+ public ServiceResponse schedule(String processData)
throws IOException, URISyntaxException, AuthenticationException {
- return schedule(scheduleUrl, processData, null);
+ return schedule(processData, null);
}
- public ServiceResponse schedule(URLS scheduleUrl, String processData, String user)
+ public ServiceResponse schedule(String processData, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(createUrl(this.hostname + scheduleUrl.getValue(), getEntityType(),
- getEntityName(processData) + colo), "post", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.SCHEDULE_URL.getValue(),
+ getEntityType(), getEntityName(processData) + colo), "post", user);
}
- public ServiceResponse submitAndSchedule(URLS url, String data)
+ public ServiceResponse submitAndSchedule(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return submitAndSchedule(url, data, null);
+ return submitAndSchedule(data, null);
}
- public ServiceResponse submitAndSchedule(URLS url, String data, String user)
+ public ServiceResponse submitAndSchedule(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
LOGGER.info("Submitting " + getEntityType() + ": \n" + Util.prettyPrintXml(data));
- return Util.sendRequest(createUrl(this.hostname + url.getValue(), getEntityType()), "post",
- data, user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.SUBMIT_AND_SCHEDULE_URL.getValue(),
+ getEntityType()), "post", data, user);
}
- public ServiceResponse deleteByName(URLS deleteUrl, String entityName, String user)
+ public ServiceResponse deleteByName(String entityName, String user)
throws AuthenticationException, IOException, URISyntaxException {
- return Util.sendRequest(
- createUrl(this.hostname + deleteUrl.getValue(), getEntityType(), entityName + colo),
- "delete", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.DELETE_URL.getValue(),
+ getEntityType(), entityName + colo), "delete", user);
}
- public ServiceResponse delete(URLS deleteUrl, String data)
+ public ServiceResponse delete(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return delete(deleteUrl, data, null);
+ return delete(data, null);
}
- public ServiceResponse delete(URLS deleteUrl, String data, String user)
+ public ServiceResponse delete(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(
- createUrl(this.hostname + deleteUrl.getValue(), getEntityType(),
- getEntityName(data) + colo),
- "delete", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.DELETE_URL.getValue(),
+ getEntityType(), getEntityName(data) + colo), "delete", user);
}
- public ServiceResponse suspend(URLS suspendUrl, String data)
+ public ServiceResponse suspend(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return suspend(suspendUrl, data, null);
+ return suspend(data, null);
}
- public ServiceResponse suspend(URLS url, String data, String user)
+ public ServiceResponse suspend(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(
- createUrl(this.hostname + url.getValue(), getEntityType(), getEntityName(data) + colo),
- "post", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.SUSPEND_URL.getValue(),
+ getEntityType(), getEntityName(data) + colo), "post", user);
}
- public ServiceResponse resume(URLS url, String data)
+ public ServiceResponse resume(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return resume(url, data, null);
+ return resume(data, null);
}
- public ServiceResponse resume(URLS url, String data, String user)
+ public ServiceResponse resume(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(
- createUrl(this.hostname + url.getValue(), getEntityType(), getEntityName(data) + colo),
- "post", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.RESUME_URL.getValue(),
+ getEntityType(), getEntityName(data) + colo), "post", user);
}
- public ServiceResponse getStatus(URLS url, String data)
+ public ServiceResponse getStatus(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return getStatus(url, data, null);
+ return getStatus(data, null);
}
- public ServiceResponse getStatus(Util.URLS url, String data, String user)
+ public ServiceResponse getStatus(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(
- createUrl(this.hostname + url.getValue(), getEntityType(), getEntityName(data) + colo),
- "get", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.STATUS_URL.getValue(),
+ getEntityType(), getEntityName(data) + colo), "get", user);
}
- public ServiceResponse getEntityDefinition(URLS url, String data)
+ public ServiceResponse getEntityDefinition(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return getEntityDefinition(url, data, null);
+ return getEntityDefinition(data, null);
}
- public ServiceResponse getEntityDefinition(URLS url, String data, String user)
+ public ServiceResponse getEntityDefinition(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(
- createUrl(this.hostname + url.getValue(), getEntityType(), getEntityName(data) + colo),
- "get", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.GET_ENTITY_DEFINITION.getValue(),
+ getEntityType(), getEntityName(data) + colo), "get", user);
}
- public InstancesResult getRunningInstance(URLS processRunningInstance, String name)
+ public InstancesResult getRunningInstance(String name)
throws IOException, URISyntaxException, AuthenticationException {
- return getRunningInstance(processRunningInstance, name, null);
+ return getRunningInstance(name, null);
}
- public InstancesResult getRunningInstance(
- URLS processRunningInstance, String name, String user)
+ public InstancesResult getRunningInstance(String name, String user)
throws IOException, URISyntaxException, AuthenticationException {
- String url = createUrl(this.hostname + processRunningInstance.getValue(), getEntityType(),
+ String url = createUrl(this.hostname + URLS.INSTANCE_RUNNING.getValue(), getEntityType(),
name + allColo);
return (InstancesResult) InstanceUtil.sendRequestProcessInstance(url, user);
}
@@ -389,8 +381,8 @@ public abstract class IEntityManagerHelper {
public InstancesResult getProcessInstanceStatus(
String entityName, String params, String user)
throws IOException, URISyntaxException, AuthenticationException {
- String url = createUrl(this.hostname + Util.URLS.INSTANCE_STATUS.getValue(),
- getEntityType(), entityName, "");
+ String url = createUrl(this.hostname + URLS.INSTANCE_STATUS.getValue(), getEntityType(),
+ entityName, "");
return (InstancesResult) InstanceUtil
.createAndSendRequestProcessInstance(url, params, allColo, user);
}
@@ -404,8 +396,8 @@ public abstract class IEntityManagerHelper {
public InstancesResult getProcessInstanceSuspend(
String entityName, String params, String user)
throws IOException, URISyntaxException, AuthenticationException {
- String url = createUrl(this.hostname + Util.URLS.INSTANCE_SUSPEND.getValue(),
- getEntityType(), entityName, "");
+ String url = createUrl(this.hostname + URLS.INSTANCE_SUSPEND.getValue(), getEntityType(),
+ entityName, "");
return (InstancesResult) InstanceUtil
.createAndSendRequestProcessInstance(url, params, allColo, user);
}
@@ -417,7 +409,7 @@ public abstract class IEntityManagerHelper {
public ServiceResponse update(String oldEntity, String newEntity, String user)
throws IOException, URISyntaxException, AuthenticationException {
- String url = createUrl(this.hostname + Util.URLS.UPDATE.getValue(), getEntityType(),
+ String url = createUrl(this.hostname + URLS.UPDATE.getValue(), getEntityType(),
getEntityName(oldEntity));
return Util.sendRequest(url + colo, "post", newEntity, user);
}
@@ -468,8 +460,8 @@ public abstract class IEntityManagerHelper {
public InstancesResult getProcessInstanceResume(String entityName, String params,
String user)
throws IOException, URISyntaxException, AuthenticationException {
- String url = createUrl(this.hostname + Util.URLS.INSTANCE_RESUME.getValue(),
- getEntityType(), entityName, "");
+ String url = createUrl(this.hostname + URLS.INSTANCE_RESUME.getValue(), getEntityType(),
+ entityName, "");
return (InstancesResult) InstanceUtil
.createAndSendRequestProcessInstance(url, params, allColo, user);
}
@@ -504,8 +496,8 @@ public abstract class IEntityManagerHelper {
public InstancesResult getInstanceParams(String entityName, String params)
throws AuthenticationException, IOException, URISyntaxException {
- String url = createUrl(this.hostname + Util.URLS.INSTANCE_PARAMS.getValue(),
- getEntityType(), entityName, "");
+ String url = createUrl(this.hostname + URLS.INSTANCE_PARAMS.getValue(), getEntityType(),
+ entityName, "");
return (InstancesResult) InstanceUtil
.createAndSendRequestProcessInstance(url, params, allColo, null);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/Brother.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/Brother.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/Brother.java
index 3fa17e2..5d2708a 100755
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/Brother.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/Brother.java
@@ -76,28 +76,28 @@ public class Brother extends Thread {
try {
switch (url) {
case SUBMIT_URL:
- output = entityManagerHelper.submitEntity(url, data);
+ output = entityManagerHelper.submitEntity(data);
break;
case GET_ENTITY_DEFINITION:
- output = entityManagerHelper.getEntityDefinition(url, data);
+ output = entityManagerHelper.getEntityDefinition(data);
break;
case DELETE_URL:
- output = entityManagerHelper.delete(url, data);
+ output = entityManagerHelper.delete(data);
break;
case SUSPEND_URL:
- output = entityManagerHelper.suspend(url, data);
+ output = entityManagerHelper.suspend(data);
break;
case SCHEDULE_URL:
- output = entityManagerHelper.schedule(url, data);
+ output = entityManagerHelper.schedule(data);
break;
case RESUME_URL:
- output = entityManagerHelper.resume(url, data);
+ output = entityManagerHelper.resume(data);
break;
case SUBMIT_AND_SCHEDULE_URL:
- output = entityManagerHelper.submitAndSchedule(url, data);
+ output = entityManagerHelper.submitAndSchedule(data);
break;
case STATUS_URL:
- output = entityManagerHelper.getStatus(url, data);
+ output = entityManagerHelper.getStatus(data);
break;
default:
LOGGER.error("Unexpected url: " + url);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
index a069dc5..922c030 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
@@ -118,8 +118,7 @@ public final class BundleUtil {
public static void submitAllClusters(ColoHelper prismHelper, Bundle... b)
throws IOException, URISyntaxException, AuthenticationException {
for (Bundle aB : b) {
- ServiceResponse r = prismHelper.getClusterHelper()
- .submitEntity(Util.URLS.SUBMIT_URL, aB.getClusters().get(0));
+ ServiceResponse r = prismHelper.getClusterHelper().submitEntity(aB.getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
index 5415083..bf99291 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
@@ -73,8 +73,7 @@ public final class CleanupUtil {
private static EntitiesResult getEntitiesResultOfOneType(
IEntityManagerHelper iEntityManagerHelper)
throws IOException, URISyntaxException, AuthenticationException, JAXBException {
- final ServiceResponse clusterResponse =
- iEntityManagerHelper.listEntities(Util.URLS.LIST_URL);
+ final ServiceResponse clusterResponse = iEntityManagerHelper.listEntities();
JAXBContext jc = JAXBContext.newInstance(EntitiesResult.class);
Unmarshaller u = jc.createUnmarshaller();
return (EntitiesResult) u.unmarshal(
@@ -86,7 +85,7 @@ public final class CleanupUtil {
final List<String> clusters = getAllClusters(prism);
for (String cluster : clusters) {
try {
- prism.getClusterHelper().deleteByName(Util.URLS.DELETE_URL, cluster, null);
+ prism.getClusterHelper().deleteByName(cluster, null);
} catch (Exception e) {
LOGGER.warn("Caught exception: " + ExceptionUtils.getStackTrace(e));
}
@@ -103,7 +102,7 @@ public final class CleanupUtil {
final List<String> feeds = getAllFeeds(prism);
for (String feed : feeds) {
try {
- prism.getFeedHelper().deleteByName(Util.URLS.DELETE_URL, feed, null);
+ prism.getFeedHelper().deleteByName(feed, null);
} catch (Exception e) {
LOGGER.warn("Caught exception: " + ExceptionUtils.getStackTrace(e));
}
@@ -121,7 +120,7 @@ public final class CleanupUtil {
final List<String> processes = getAllProcesses(prism);
for (String process : processes) {
try {
- entityManagerHelper.deleteByName(Util.URLS.DELETE_URL, process, null);
+ entityManagerHelper.deleteByName(process, null);
} catch (Exception e) {
LOGGER.warn("Caught exception: " + ExceptionUtils.getStackTrace(e));
}
@@ -141,7 +140,7 @@ public final class CleanupUtil {
public static void deleteQuietly(IEntityManagerHelper helper, String feed) {
try {
- helper.delete(Util.URLS.DELETE_URL, feed);
+ helper.delete(feed);
} catch (Exception e) {
LOGGER.info("Caught exception: " + ExceptionUtils.getStackTrace(e));
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
index 6485784..8fdf65a 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
@@ -608,8 +608,7 @@ public final class Util {
} else {
helper = cluster.getClusterHelper();
}
- ServiceResponse response = helper.getEntityDefinition(URLS
- .GET_ENTITY_DEFINITION, entity);
+ ServiceResponse response = helper.getEntityDefinition(entity);
if (shouldReturn) {
AssertUtil.assertSucceeded(response);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
index 49b13b5..b309ea7 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
@@ -96,7 +96,7 @@ public class AuthorizationTest extends BaseTestClass {
bundles[0].submitClusters(prism);
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
final ServiceResponse serviceResponse = prism.getClusterHelper().delete(
- Util.URLS.DELETE_URL, bundles[0].getClusters().get(0), MerlinConstants.USER2_NAME);
+ bundles[0].getClusters().get(0), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Entity submitted by first user should not be deletable by second user");
}
@@ -109,7 +109,7 @@ public class AuthorizationTest extends BaseTestClass {
bundles[0].submitProcess(true);
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
final ServiceResponse serviceResponse = prism.getProcessHelper().delete(
- Util.URLS.DELETE_URL, bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
+ bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Entity submitted by first user should not be deletable by second user");
}
@@ -122,7 +122,7 @@ public class AuthorizationTest extends BaseTestClass {
bundles[0].submitFeed();
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
final ServiceResponse serviceResponse = prism.getFeedHelper().delete(
- Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0), MerlinConstants.USER2_NAME);
+ bundles[0].getDataSets().get(0), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Entity submitted by first user should not be deletable by second user");
}
@@ -138,8 +138,8 @@ public class AuthorizationTest extends BaseTestClass {
Job.Status.RUNNING);
//try to delete process by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getProcessHelper().delete(Util.URLS
- .DELETE_URL, bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getProcessHelper()
+ .delete(bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Process scheduled by first user should not be deleted by second user");
}
@@ -151,13 +151,11 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit, schedule feed by U1
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
//delete feed by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getFeedHelper().delete(Util.URLS
- .DELETE_URL, feed, MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getFeedHelper().delete(feed, MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Feed scheduled by first user should not be deleted by second user");
}
@@ -170,14 +168,13 @@ public class AuthorizationTest extends BaseTestClass {
bundles[0].submitFeedsScheduleProcess(prism);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL,
- bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
Job.Status.SUSPENDED);
//try to delete process by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getProcessHelper().delete(Util.URLS
- .DELETE_URL, bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getProcessHelper()
+ .delete(bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Process suspended by first user should not be deleted by second user");
}
@@ -189,14 +186,13 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit, schedule, suspend feed by U1
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed));
- AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
//delete feed by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getFeedHelper().delete(Util.URLS
- .DELETE_URL, feed, MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getFeedHelper()
+ .delete(feed, MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Feed scheduled by first user should not be deleted by second user");
}
@@ -211,13 +207,12 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit, schedule by U1
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
//try to suspend by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getFeedHelper().suspend(Util.URLS
- .SUSPEND_URL, feed, MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getFeedHelper()
+ .suspend(feed, MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Feed scheduled by first user should not be suspended by second user");
}
@@ -231,8 +226,8 @@ public class AuthorizationTest extends BaseTestClass {
Job.Status.RUNNING);
//try to suspend process by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getProcessHelper().suspend(Util.URLS
- .SUSPEND_URL, bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getProcessHelper()
+ .suspend(bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Process scheduled by first user should not be suspended by second user");
}
@@ -247,14 +242,13 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit, schedule and then suspend feed by User1
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed));
- AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
//try to resume feed by User2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getFeedHelper().resume(Util.URLS
- .RESUME_URL, feed, MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getFeedHelper()
+ .resume(feed, MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Feed suspended by first user should not be resumed by second user");
}
@@ -265,14 +259,13 @@ public class AuthorizationTest extends BaseTestClass {
public void u1SuspendU2ResumeProcess() throws Exception {
//submit, schedule, suspend process by U1
bundles[0].submitFeedsScheduleProcess(prism);
- AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL,
- bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
Job.Status.SUSPENDED);
//try to resume process by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getProcessHelper().resume(Util.URLS
- .RESUME_URL, bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getProcessHelper()
+ .resume(bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Process suspended by first user should not be resumed by second user");
}
@@ -529,10 +522,8 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit feed
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(Util.URLS.SUBMIT_URL, feed));
- String definition = prism.getFeedHelper()
- .getEntityDefinition(Util.URLS.GET_ENTITY_DEFINITION,
- feed).getMessage();
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(feed));
+ String definition = prism.getFeedHelper().getEntityDefinition(feed).getMessage();
Assert.assertTrue(definition.contains(Util
.readEntityName(feed)) && !definition.contains("(feed) not found"),
"Feed should be already submitted");
@@ -555,8 +546,7 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit and schedule feed
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
//update feed definition
String newFeed = Util.setFeedPathValue(feed, baseHDFSDir + "/randomPath" +
@@ -579,8 +569,7 @@ public class AuthorizationTest extends BaseTestClass {
//submit process
bundles[0].submitBundle(prism);
String definition = prism.getProcessHelper()
- .getEntityDefinition(Util.URLS.GET_ENTITY_DEFINITION,
- bundles[0].getProcessData()).getMessage();
+ .getEntityDefinition(bundles[0].getProcessData()).getMessage();
Assert.assertTrue(definition.contains(processName)
&&
!definition.contains("(process) not found"), "Process should be already submitted");
@@ -627,14 +616,13 @@ public class AuthorizationTest extends BaseTestClass {
bundles[0].submitClusters(prism);
bundles[0].submitFeeds(prism);
//schedule input feed by U1
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(
- Util.URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
//by U2 schedule process dependant on scheduled feed by U1
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- ServiceResponse serviceResponse = prism.getProcessHelper().submitAndSchedule(Util
- .URLS.SUBMIT_AND_SCHEDULE_URL, process, MerlinConstants.USER2_NAME);
+ ServiceResponse serviceResponse = prism.getProcessHelper()
+ .submitAndSchedule(process, MerlinConstants.USER2_NAME);
AssertUtil.assertSucceeded(serviceResponse);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
index a0986fa..99ffe37 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
@@ -37,7 +37,6 @@ import org.apache.falcon.regression.core.util.InstanceUtil;
import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.hadoop.fs.FileSystem;
import org.apache.log4j.Logger;
@@ -126,41 +125,37 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void getResumedProcessInstance() throws Exception {
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
- prism.getProcessHelper().suspend(URLS.SUSPEND_URL, process);
+ prism.getProcessHelper().suspend(process);
TimeUtil.sleepSeconds(TIMEOUT);
- ServiceResponse status = prism.getProcessHelper().getStatus(URLS.STATUS_URL, process);
+ ServiceResponse status = prism.getProcessHelper().getStatus(process);
Assert.assertTrue(status.getMessage().contains("SUSPENDED"), "Process not suspended.");
- prism.getProcessHelper().resume(URLS.RESUME_URL, process);
+ prism.getProcessHelper().resume(process);
TimeUtil.sleepSeconds(TIMEOUT);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
- InstancesResult r = prism.getProcessHelper()
- .getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
}
@Test(groups = {"singleCluster"})
public void getSuspendedProcessInstance() throws Exception {
- prism.getProcessHelper().suspend(URLS.SUSPEND_URL, process);
+ prism.getProcessHelper().suspend(process);
TimeUtil.sleepSeconds(TIMEOUT);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.SUSPENDED);
- InstancesResult r = prism.getProcessHelper()
- .getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccessWOInstances(r);
}
@Test(groups = {"singleCluster"})
public void getRunningProcessInstance() throws Exception {
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
- InstancesResult r = prism.getProcessHelper()
- .getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
}
@Test(groups = {"singleCluster"})
public void getKilledProcessInstance() throws Exception {
- prism.getProcessHelper().delete(URLS.DELETE_URL, process);
- InstancesResult r = prism.getProcessHelper()
- .getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ prism.getProcessHelper().delete(process);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
Assert.assertEquals(r.getStatusCode(), ResponseKeys.PROCESS_NOT_FOUND,
"Unexpected status code");
}
@@ -168,13 +163,12 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void getSucceededProcessInstance() throws Exception {
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
- InstancesResult r = prism.getProcessHelper()
- .getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
int counter = OSUtil.IS_WINDOWS ? 100 : 50;
InstanceUtil.waitForBundleToReachState(cluster, Util.getProcessName(bundles[0]
.getProcessData()), Job.Status.SUCCEEDED, counter);
- r = prism.getProcessHelper().getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccessWOInstances(r);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
index 17120e9..3499a4b 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
@@ -30,7 +30,6 @@ import org.apache.falcon.regression.core.util.InstanceUtil;
import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.core.util.XmlUtil;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.hadoop.fs.FileSystem;
@@ -126,13 +125,12 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = cluster2.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = cluster2.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -184,8 +182,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
"REPLICATION"), 0);
@@ -224,13 +221,12 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = cluster2.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = cluster2.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -284,8 +280,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
@@ -319,13 +314,12 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = cluster2.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = cluster2.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -379,8 +373,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
@@ -414,14 +407,13 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = cluster2.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = cluster2.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -473,8 +465,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
@@ -508,13 +499,12 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = cluster2.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = cluster2.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -568,8 +558,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
@@ -614,14 +603,13 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = prism.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -667,12 +655,10 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- response =
- cluster3.getFeedHelper().getEntityDefinition(URLS.GET_ENTITY_DEFINITION, feedUpdated);
+ response = cluster3.getFeedHelper().getEntityDefinition(feedUpdated);
AssertUtil.assertFailed(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
"REPLICATION"), 0);
@@ -746,14 +732,12 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL,
- feedOriginalSubmit);
+ response = prism.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -805,20 +789,14 @@ public class FeedClusterUpdateTest extends BaseTestClass {
//verify xmls definitions
- response =
- cluster1.getFeedHelper().getEntityDefinition(URLS.GET_ENTITY_DEFINITION, feedUpdated);
+ response = cluster1.getFeedHelper().getEntityDefinition(feedUpdated);
AssertUtil.assertFailed(response);
- response = cluster2.getFeedHelper().getEntityDefinition(URLS
- .GET_ENTITY_DEFINITION, feedUpdated);
+ response = cluster2.getFeedHelper().getEntityDefinition(feedUpdated);
AssertUtil.assertFailed(response);
- response = cluster3.getFeedHelper().getEntityDefinition(URLS
- .GET_ENTITY_DEFINITION, feedUpdated);
- Assert.assertTrue(XmlUtil.isIdentical(feedUpdated,
- response.getMessage()));
- response = prism.getFeedHelper().getEntityDefinition(URLS
- .GET_ENTITY_DEFINITION, feedUpdated);
- Assert.assertTrue(XmlUtil.isIdentical(feedUpdated,
- response.getMessage()));
+ response = cluster3.getFeedHelper().getEntityDefinition(feedUpdated);
+ Assert.assertTrue(XmlUtil.isIdentical(feedUpdated, response.getMessage()));
+ response = prism.getFeedHelper().getEntityDefinition(feedUpdated);
+ Assert.assertTrue(XmlUtil.isIdentical(feedUpdated, response.getMessage()));
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
index 1e01101..33a81d0 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
@@ -30,7 +30,6 @@ import org.apache.falcon.regression.core.util.InstanceUtil;
import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.core.util.XmlUtil;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.hadoop.fs.FileSystem;
@@ -93,15 +92,15 @@ public class FeedInstanceStatusTest extends BaseTestClass {
logger.info("cluster bundle1: " + Util.prettyPrintXml(bundles[0].getClusters().get(0)));
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0)));
+ .submitEntity(bundles[0].getClusters().get(0)));
logger.info("cluster bundle2: " + Util.prettyPrintXml(bundles[1].getClusters().get(0)));
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, bundles[1].getClusters().get(0)));
+ .submitEntity(bundles[1].getClusters().get(0)));
logger.info("cluster bundle3: " + Util.prettyPrintXml(bundles[2].getClusters().get(0)));
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, bundles[2].getClusters().get(0)));
+ .submitEntity(bundles[2].getClusters().get(0)));
String feed = bundles[0].getDataSets().get(0);
String feedName = Util.readEntityName(feed);
@@ -135,11 +134,11 @@ public class FeedInstanceStatusTest extends BaseTestClass {
"?start=" + TimeUtil.addMinsToTime(startTime, 100)
+ "&end=" + TimeUtil.addMinsToTime(startTime, 120));
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(feed));
prism.getFeedHelper().getProcessInstanceStatus(feedName,
"?start=" + startTime + "&end=" + TimeUtil.addMinsToTime(startTime, 100));
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
// both replication instances
prism.getFeedHelper().getProcessInstanceStatus(feedName,
@@ -215,7 +214,7 @@ public class FeedInstanceStatusTest extends BaseTestClass {
.addMinsToTime(startTime, 20) + "&end=" + TimeUtil.addMinsToTime(startTime, 40));
//get running instances
- prism.getFeedHelper().getRunningInstance(URLS.INSTANCE_RUNNING, feedName);
+ prism.getFeedHelper().getRunningInstance(feedName);
//rerun succeeded instance
prism.getFeedHelper().getProcessInstanceRerun(feedName, "?start=" + startTime);
@@ -237,7 +236,7 @@ public class FeedInstanceStatusTest extends BaseTestClass {
+ "&end=" + TimeUtil.addMinsToTime(startTime, 110));
//kill feed
- prism.getFeedHelper().delete(URLS.DELETE_URL, feed);
+ prism.getFeedHelper().delete(feed);
InstancesResult responseInstance = prism.getFeedHelper().getProcessInstanceStatus(feedName,
"?start=" + startTime + "&end=" + TimeUtil.addMinsToTime(startTime, 110));
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
index fa28a01..197c3c6 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
@@ -134,9 +134,7 @@ public class FeedReplicationTest extends BaseTestClass {
//submit and schedule feed
LOGGER.info("Feed : " + Util.prettyPrintXml(feed));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
//upload necessary data
DateTime date = new DateTime(startTime, DateTimeZone.UTC);
@@ -213,9 +211,7 @@ public class FeedReplicationTest extends BaseTestClass {
//submit and schedule feed
LOGGER.info("Feed : " + Util.prettyPrintXml(feed));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
//upload necessary data
DateTime date = new DateTime(startTime, DateTimeZone.UTC);
@@ -305,9 +301,7 @@ public class FeedReplicationTest extends BaseTestClass {
//submit and schedule feed
LOGGER.info("Feed : " + Util.prettyPrintXml(feed));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
//upload necessary data
DateTime date = new DateTime(startTime, DateTimeZone.UTC);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
index a3f37ab..bb629b8 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
@@ -26,7 +26,6 @@ import org.apache.falcon.regression.core.interfaces.IEntityManagerHelper;
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
import org.apache.oozie.client.Job;
@@ -74,12 +73,11 @@ public class FeedResumeTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void resumeSuspendedFeed() throws Exception {
- AssertUtil
- .assertSucceeded(feedHelper.submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
- AssertUtil.assertSucceeded(feedHelper.suspend(URLS.SUSPEND_URL, feed));
+ AssertUtil.assertSucceeded(feedHelper.submitAndSchedule(feed));
+ AssertUtil.assertSucceeded(feedHelper.suspend(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
- AssertUtil.assertSucceeded(feedHelper.resume(URLS.RESUME_URL, feed));
- ServiceResponse response = feedHelper.getStatus(URLS.STATUS_URL, feed);
+ AssertUtil.assertSucceeded(feedHelper.resume(feed));
+ ServiceResponse response = feedHelper.getStatus(feed);
String colo = feedHelper.getColo();
Assert.assertTrue(response.getMessage().contains(colo + "/RUNNING"));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
@@ -93,7 +91,7 @@ public class FeedResumeTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void resumeNonExistentFeed() throws Exception {
- AssertUtil.assertFailed(feedHelper.resume(URLS.RESUME_URL, feed));
+ AssertUtil.assertFailed(feedHelper.resume(feed));
}
/**
@@ -103,10 +101,9 @@ public class FeedResumeTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void resumeDeletedFeed() throws Exception {
- AssertUtil
- .assertSucceeded(feedHelper.submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
- AssertUtil.assertSucceeded(feedHelper.delete(URLS.DELETE_URL, feed));
- AssertUtil.assertFailed(feedHelper.resume(URLS.RESUME_URL, feed));
+ AssertUtil.assertSucceeded(feedHelper.submitAndSchedule(feed));
+ AssertUtil.assertSucceeded(feedHelper.delete(feed));
+ AssertUtil.assertFailed(feedHelper.resume(feed));
}
/**
@@ -116,11 +113,10 @@ public class FeedResumeTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void resumeScheduledFeed() throws Exception {
- AssertUtil
- .assertSucceeded(feedHelper.submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(feedHelper.submitAndSchedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
- AssertUtil.assertSucceeded(feedHelper.resume(URLS.RESUME_URL, feed));
- ServiceResponse response = feedHelper.getStatus(URLS.STATUS_URL, feed);
+ AssertUtil.assertSucceeded(feedHelper.resume(feed));
+ ServiceResponse response = feedHelper.getStatus(feed);
String colo = feedHelper.getColo();
Assert.assertTrue(response.getMessage().contains(colo + "/RUNNING"));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
index 5d87e6e..8500d84 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
@@ -24,7 +24,6 @@ import org.apache.falcon.regression.core.helpers.ColoHelper;
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
import org.apache.oozie.client.Job;
@@ -71,15 +70,15 @@ public class FeedScheduleTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void scheduleAlreadyScheduledFeed() throws Exception {
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ response = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
//now try re-scheduling again
- response = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ response = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
}
@@ -92,11 +91,11 @@ public class FeedScheduleTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void scheduleValidFeed() throws Exception {
//submit feed
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
//now schedule the thing
- response = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ response = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
}
@@ -108,14 +107,13 @@ public class FeedScheduleTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void scheduleSuspendedFeed() throws Exception {
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
//now suspend
- AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
//now schedule this!
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
}
@@ -126,14 +124,13 @@ public class FeedScheduleTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void scheduleKilledFeed() throws Exception {
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
//now suspend
- AssertUtil.assertSucceeded(prism.getFeedHelper().delete(URLS.DELETE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.KILLED);
//now schedule this!
- AssertUtil.assertFailed(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertFailed(prism.getFeedHelper().schedule(feed));
}
/**
@@ -143,7 +140,7 @@ public class FeedScheduleTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void scheduleNonExistentFeed() throws Exception {
- AssertUtil.assertFailed(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertFailed(prism.getFeedHelper().schedule(feed));
}
@AfterClass(alwaysRun = true)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
index 8ce88d4..6278513 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
@@ -26,7 +26,6 @@ import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
import org.apache.oozie.client.Job;
@@ -61,7 +60,7 @@ public class FeedStatusTest extends BaseTestClass {
//submit the cluster
ServiceResponse response =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
AssertUtil.assertSucceeded(response);
feed = bundles[0].getInputFeedFromBundle();
}
@@ -79,12 +78,11 @@ public class FeedStatusTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getStatusForScheduledFeed() throws Exception {
- ServiceResponse response =
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
LOGGER.info("Feed: " + Util.prettyPrintXml(feed));
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().getStatus(URLS.STATUS_URL, feed);
+ response = prism.getFeedHelper().getStatus(feed);
AssertUtil.assertSucceeded(response);
@@ -101,15 +99,14 @@ public class FeedStatusTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getStatusForSuspendedFeed() throws Exception {
- ServiceResponse response =
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ response = prism.getFeedHelper().suspend(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().getStatus(URLS.STATUS_URL, feed);
+ response = prism.getFeedHelper().getStatus(feed);
AssertUtil.assertSucceeded(response);
String colo = prism.getFeedHelper().getColo();
@@ -125,11 +122,11 @@ public class FeedStatusTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getStatusForSubmittedFeed() throws Exception {
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().getStatus(URLS.STATUS_URL, feed);
+ response = prism.getFeedHelper().getStatus(feed);
AssertUtil.assertSucceeded(response);
String colo = prism.getFeedHelper().getColo();
@@ -144,14 +141,13 @@ public class FeedStatusTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getStatusForDeletedFeed() throws Exception {
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().delete(URLS.DELETE_URL, feed);
+ response = prism.getFeedHelper().delete(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().getStatus(URLS.STATUS_URL, feed);
+ response = prism.getFeedHelper().getStatus(feed);
AssertUtil.assertFailed(response);
Assert.assertTrue(
@@ -166,7 +162,7 @@ public class FeedStatusTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getStatusForNonExistentFeed() throws Exception {
- ServiceResponse response = prism.getFeedHelper().getStatus(URLS.STATUS_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().getStatus(feed);
AssertUtil.assertFailed(response);
Assert.assertTrue(
response.getMessage().contains(Util.readEntityName(feed) + " (FEED) not found"));