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:18 UTC
[3/5] FALCON-675 Request URLS moved from parameters into methods in
falcon-regression
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
index 9198901..db29b19 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
@@ -36,7 +36,6 @@ import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.OozieUtil;
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;
@@ -130,8 +129,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -183,8 +181,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -257,8 +254,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -342,8 +338,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -382,8 +377,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String originalProcessData = bundles[1].getProcessData();
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
@@ -417,8 +411,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
@@ -500,8 +493,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -587,14 +579,12 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
waitForProcessToReachACertainState(cluster3, bundles[1], Job.Status.RUNNING);
@@ -602,8 +592,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
EntityType.PROCESS);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
//now to update
while (Util
.parseResponse(updateProcessConcurrency(bundles[1],
@@ -622,8 +611,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
OozieUtil.verifyNewBundleCreation(cluster3, oldBundleId, oldNominalTimes,
bundles[1].getProcessData(), false, true);
AssertUtil.checkNotStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(cluster3.getProcessHelper()
- .resume(URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster3.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster3OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
Job.Status status = OozieUtil.getOozieJobStatus(cluster3.getFeedHelper().getOozieClient(),
@@ -682,8 +670,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
LOGGER.info("process to be scheduled: " + Util.prettyPrintXml(bundles[1].getProcessData()));
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
String oldBundleId = InstanceUtil
@@ -783,8 +770,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -852,8 +838,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -873,8 +858,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].getProcessObject().setOrder(getRandomExecutionType(bundles[1]));
//suspend
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
//now to update
String updateTime = new DateTime(DateTimeZone.UTC).plusMinutes(2).toString();
@@ -886,8 +870,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(10);
}
- AssertUtil.assertSucceeded(cluster3.getProcessHelper()
- .resume(URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster3.getProcessHelper().resume(bundles[1].getProcessData()));
String prismString = getResponse(prism, bundles[1].getProcessData(), true);
Assert.assertEquals(Util.getProcessObject(prismString).getParallel(),
@@ -929,8 +912,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -950,8 +932,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
inputFeed = Util.setFeedName(inputFeed, newFeedName);
LOGGER.info(inputFeed);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, inputFeed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(inputFeed));
while (Util.parseResponse(
prism.getProcessHelper()
@@ -983,8 +964,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0);
@@ -1003,10 +983,8 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
inputFeed = Util.setFeedName(inputFeed, newFeedName);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, inputFeed));
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(inputFeed));
while (Util.parseResponse(
prism.getProcessHelper()
@@ -1019,8 +997,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].getProcessData(), true, false);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 1, 10);
- AssertUtil.assertSucceeded(cluster3.getProcessHelper()
- .resume(URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster3.getProcessHelper().resume(bundles[1].getProcessData()));
bundles[1].verifyDependencyListing(cluster2);
@@ -1050,8 +1027,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, originalProcess));
+ cluster3.getProcessHelper().schedule(originalProcess));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, originalProcess, 0, 10);
@@ -1064,8 +1040,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
EntityType.PROCESS);
//submit new feed
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, inputFeed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(inputFeed));
Util.shutDownService(cluster3.getProcessHelper());
@@ -1114,8 +1089,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -1181,8 +1155,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -1200,8 +1173,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
newEndTime);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
while (Util.parseResponse(
prism.getProcessHelper()
.update((bundles[1].getProcessData()), bundles[1].getProcessData()))
@@ -1209,8 +1181,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
LOGGER.info("update didnt SUCCEED in last attempt");
TimeUtil.sleepSeconds(10);
}
- AssertUtil.assertSucceeded(cluster3.getProcessHelper()
- .resume(URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster3.getProcessHelper().resume(bundles[1].getProcessData()));
dualComparison(prism, cluster2, bundles[1].getProcessData());
@@ -1249,8 +1220,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
String oldBundleId = InstanceUtil
@@ -1301,8 +1271,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -1346,8 +1315,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -1385,9 +1353,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData())
- );
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -1410,9 +1376,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
waitForProcessToReachACertainState(cluster3, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData())
- );
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil.assertSucceeded(
prism.getProcessHelper()
@@ -1447,8 +1411,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -1467,13 +1430,11 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
waitForProcessToReachACertainState(cluster3, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil.assertSucceeded(
prism.getProcessHelper()
.update(bundles[1].getProcessData(), bundles[1].getProcessData()));
- AssertUtil.assertSucceeded(cluster3.getProcessHelper()
- .resume(URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster3.getProcessHelper().resume(bundles[1].getProcessData()));
List<String> oldNominalTimes =
OozieUtil.getActionsNominalTime(cluster3, oldBundleId, EntityType.PROCESS);
@@ -1579,8 +1540,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
private String getResponse(ColoHelper prism, String processData, boolean bool)
throws Exception {
- ServiceResponse response = prism.getProcessHelper()
- .getEntityDefinition(Util.URLS.GET_ENTITY_DEFINITION, processData);
+ ServiceResponse response = prism.getProcessHelper().getEntityDefinition(processData);
if (bool) {
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/prism/PrismClusterDeleteTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java
index a4c2dae..c601345 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java
@@ -75,7 +75,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
@Test(groups = {"multiCluster"})
public void testServer1ClusterDeleteInBothColos() throws Exception {
AssertUtil.assertSucceeded((prism.getClusterHelper()
- .submitEntity(Util.URLS.SUBMIT_URL, bundles[0].getClusters().get(0))));
+ .submitEntity(bundles[0].getClusters().get(0))));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -90,7 +90,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//lets now delete the cluster from both colos
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -127,7 +127,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
restartRequired = true;
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(Util.URLS.SUBMIT_URL, bundles[0].getClusters().get(0)));
+ .submitEntity(bundles[0].getClusters().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -146,7 +146,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//lets now delete the cluster from both colos
AssertUtil.assertPartial(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -177,7 +177,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//now bring up the service and roll forward the delete
Util.startService(cluster1.getClusterHelper());
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//get final data states:
List<String> server1ArchiveFinalState2 = cluster1.getClusterHelper().getArchiveInfo();
@@ -204,9 +204,9 @@ public class PrismClusterDeleteTest extends BaseTestClass {
public void testServer1ClusterDeleteAlreadyDeletedCluster() throws Exception {
restartRequired = true;
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(Util.URLS.SUBMIT_URL, bundles[0].getClusters().get(0)));
+ .submitEntity(bundles[0].getClusters().get(0)));
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -220,7 +220,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
List<String> initialServer2ArchiveStore = cluster2.getClusterHelper().getArchiveInfo();
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -255,12 +255,12 @@ public class PrismClusterDeleteTest extends BaseTestClass {
restartRequired = true;
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(Util.URLS.SUBMIT_URL, bundles[0].getClusters().get(0)));
+ .submitEntity(bundles[0].getClusters().get(0)));
Util.shutDownService(cluster1.getClusterHelper());
//lets now delete the cluster from both colos
AssertUtil.assertPartial(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//now lets get the final states
List<String> initialPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -278,7 +278,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//delete again
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//get final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -323,7 +323,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//delete
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//get final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -374,7 +374,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//delete
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//get final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -404,7 +404,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
Util.startService(cluster1.getFeedHelper());
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
List<String> server1StorePostUp = cluster1.getClusterHelper().getStoreInfo();
List<String> server1ArchivePostUp = cluster1.getClusterHelper().getArchiveInfo();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
index 630ca28..c767649 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
@@ -80,7 +80,7 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
*/
@Test(groups = {"multiCluster"})
public void submitFeedParallel() throws Exception {
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
for (int i = 1; i <= brothers.length; i++) {
brothers[i - 1] =
new Brother("brother" + i, "submit", EntityType.FEED, brotherGrimm, bundles[0],
@@ -104,9 +104,9 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
*/
@Test(groups = {"multiCluster"})
public void submitProcessParallel() throws Exception {
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(0));
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(1));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
+ prism.getFeedHelper().submitEntity(bundles[0].getDataSets().get(0));
+ prism.getFeedHelper().submitEntity(bundles[0].getDataSets().get(1));
for (int i = 1; i <= brothers.length; i++) {
brothers[i - 1] =
new Brother("brother" + i, "submit", EntityType.PROCESS, brotherGrimm, bundles[0],
@@ -181,11 +181,11 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
@Test(groups = {"multiCluster"})
public void resumeAndSuspendFeedParallel() throws Exception {
brothers = new Brother[4];
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
+ prism.getFeedHelper().submitEntity(feed);
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ prism.getFeedHelper().suspend(feed);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
for (int i = 1; i <= 2; i++) {
brothers[i - 1] =
@@ -217,15 +217,15 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
@Test(groups = {"multiCluster"})
public void resumeFeedParallel() throws Exception {
final double delay = 15;
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
+ prism.getFeedHelper().submitEntity(feed);
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
TimeUtil.sleepSeconds(delay);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
- prism.getFeedHelper().resume(URLS.RESUME_URL, feed);
+ prism.getFeedHelper().resume(feed);
TimeUtil.sleepSeconds(delay);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ prism.getFeedHelper().suspend(feed);
TimeUtil.sleepSeconds(delay);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
for (int i = 1; i <= brothers.length; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
index 9e3ed12..f67e2ce 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
@@ -32,7 +32,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.log4j.Logger;
@@ -107,8 +106,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -160,8 +158,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -192,8 +189,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getFeedHelper());
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
List<String> Server2ArchivePostUp = cluster2.getFeedHelper().getArchiveInfo();
List<String> Server2StorePostUp = cluster2.getFeedHelper().getStoreInfo();
@@ -219,8 +215,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
public void testServer1FeedDeleteAlreadyDeletedFeed() throws Exception {
restartRequired = true;
bundles[0].submitFeed();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -233,8 +228,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2Store = cluster2.getFeedHelper().getStoreInfo();
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -274,8 +268,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -292,8 +285,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getFeedHelper());
//delete again
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//get final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -337,8 +329,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2Store = cluster2.getFeedHelper().getStoreInfo();
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//get final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -377,13 +368,12 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[0].setCLusterColo(cluster1Colo);
logger.info("cluster bundle1: " + Util.prettyPrintXml(bundles[0].getClusters().get(0)));
- ServiceResponse r = prism.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
bundles[1].setCLusterColo(cluster2Colo);
logger.info("cluster bundle2: " + Util.prettyPrintXml(bundles[1].getClusters().get(0)));
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[1].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[1].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
String startTimeServer1 = "2012-10-01T12:00Z";
@@ -409,7 +399,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertSucceeded(prism.getFeedHelper().delete(Util.URLS.DELETE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed));
}
@@ -430,8 +420,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -469,8 +458,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[1].submitAndScheduleFeed();
//suspend Server1 colo thingy
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -484,8 +472,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -524,10 +511,8 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[1].submitAndScheduleFeed();
//suspend Server1 colo thingy
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -541,8 +526,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -580,8 +564,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[0].submitAndScheduleFeed();
bundles[1].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -598,8 +581,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -630,8 +612,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getClusterHelper());
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
List<String> Server1StorePostUp = cluster1.getFeedHelper().getStoreInfo();
List<String> Server1ArchivePostUp = cluster1.getFeedHelper().getArchiveInfo();
@@ -662,10 +643,8 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[0].submitAndScheduleFeed();
bundles[1].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
List<String> initialPrismArchiveStore = prism.getFeedHelper().getArchiveInfo();
@@ -681,8 +660,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//lets now delete the feed from both colos
- AssertUtil.assertFailed(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -713,8 +691,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getFeedHelper());
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
HashMap<String, List<String>> finalSystemState = getSystemState(EntityType.FEED);
@@ -754,8 +731,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -786,8 +762,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getClusterHelper());
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
HashMap<String, List<String>> systemStatePostUp = getSystemState(EntityType.FEED);
@@ -812,13 +787,12 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[0].setCLusterColo(cluster1Colo);
logger.info("cluster bundle1: " + Util.prettyPrintXml(bundles[0].getClusters().get(0)));
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
bundles[1].setCLusterColo(cluster2Colo);
logger.info("cluster bundle2: " + Util.prettyPrintXml(bundles[1].getClusters().get(0)));
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[1].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[1].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
String startTimeServer1 = "2012-10-01T12:00Z";
@@ -844,11 +818,11 @@ public class PrismFeedDeleteTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ r = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(r);
TimeUtil.sleepSeconds(15);
@@ -865,14 +839,14 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
- r = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ r = prism.getFeedHelper().suspend(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertPartial(r);
Assert
.assertTrue(r.getMessage().contains(cluster1Colo + "/org.apache.falcon.FalconException")
&& r.getMessage().contains(cluster2Colo + "/" + Util.readEntityName(feed)));
- ServiceResponse response = prism.getFeedHelper().delete(Util.URLS.DELETE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().delete(feed);
Assert.assertTrue(
response.getMessage().contains(cluster1Colo + "/org.apache.falcon.FalconException")
&& response.getMessage().contains(cluster2Colo + "/" + Util.readEntityName(feed)));
@@ -914,13 +888,12 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[0].setCLusterColo(cluster1Colo);
logger.info("cluster bundle1: " + Util.prettyPrintXml(bundles[0].getClusters().get(0)));
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
bundles[1].setCLusterColo(cluster2Colo);
logger.info("cluster bundle2: " + Util.prettyPrintXml(bundles[1].getClusters().get(0)));
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[1].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[1].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
String startTimeServer1 = "2012-10-01T12:00Z";
@@ -944,11 +917,11 @@ public class PrismFeedDeleteTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ r = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(r);
TimeUtil.sleepSeconds(15);
@@ -963,13 +936,13 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2Store = cluster2.getFeedHelper().getStoreInfo();
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
- r = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ r = prism.getFeedHelper().suspend(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
Util.shutDownService(cluster1.getFeedHelper());
- ServiceResponse response = prism.getFeedHelper().delete(Util.URLS.DELETE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().delete(feed);
Assert.assertTrue(response.getMessage().contains(cluster1Colo + "/org.apache.falcon" +
".FalconException")
&& response.getMessage().contains(cluster2Colo + "/" + Util.readEntityName(feed)));
@@ -1026,8 +999,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[1].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -1058,8 +1030,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getFeedHelper());
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
clusterName = Util.readEntityName(bundles[0].getDataSets().get(0));
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
index 8a14229..9e0fbed 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
@@ -29,7 +29,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;
@@ -127,7 +126,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ prism.getFeedHelper().submitAndSchedule(feed);
TimeUtil.sleepSeconds(10);
String bundleId =
@@ -200,7 +199,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ prism.getFeedHelper().submitAndSchedule(feed);
TimeUtil.sleepSeconds(10);
String postFix = "/US/" + cluster2.getClusterHelper().getColoName();
@@ -393,7 +392,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
//submit and schedule feed
logger.info("feed: " + Util.prettyPrintXml(feed));
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ prism.getFeedHelper().submitAndSchedule(feed);
TimeUtil.sleepSeconds(10);
//wait till 1st instance of replication coord is SUCCEEDED
@@ -595,7 +594,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
//submit and schedule feed
logger.info("feed: " + Util.prettyPrintXml(feed));
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ prism.getFeedHelper().submitAndSchedule(feed);
TimeUtil.sleepSeconds(10);
//wait till 1st instance of replication coord is SUCCEEDED
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
index 2d67583..7a5a91e 100755
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
@@ -31,7 +31,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;
@@ -230,7 +229,7 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertFailed(r, "submit of feed should have failed as the partition in source " +
"is blank");
@@ -278,11 +277,11 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(r);
TimeUtil.sleepSeconds(15);
@@ -373,8 +372,7 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r =
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitAndSchedule(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
@@ -466,11 +464,11 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
TimeUtil.sleepSeconds(15);
InstanceUtil.waitTillInstanceReachState(cluster1OC, Util.readEntityName(feed), 1,
@@ -563,7 +561,7 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
//clean target if old data exists
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertFailed(r, "Submission of feed should have failed.");
Assert.assertTrue(r.getMessage().contains(
"Partition expression has to be specified for cluster " +
@@ -619,11 +617,11 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
TimeUtil.sleepSeconds(15);
InstanceUtil.waitTillInstanceReachState(cluster1OC, Util.readEntityName(feed), 1,
@@ -720,11 +718,11 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(r);
TimeUtil.sleepSeconds(15);
@@ -802,11 +800,11 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
TimeUtil.sleepSeconds(15);
InstanceUtil.waitTillInstanceReachState(cluster1OC, Util.readEntityName(feed), 1,
CoordinatorAction.Status.SUCCEEDED, EntityType.FEED, 20);
@@ -890,7 +888,7 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertFailed(r, "is defined more than once for feed");
Assert.assertTrue(r.getMessage().contains("is defined more than once for feed"));
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
index a4c27d7..56e0af9 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.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;
@@ -142,8 +141,8 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed));
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
//change feed location path
feed = InstanceUtil.setFeedFilePath(feed, alternativeInputPath);
@@ -264,9 +263,9 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.TARGET, null);
//submit and schedule feeds
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed01);
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed02);
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_URL, outputFeed);
+ prism.getFeedHelper().submitAndSchedule(feed01);
+ prism.getFeedHelper().submitAndSchedule(feed02);
+ prism.getFeedHelper().submitAndSchedule(outputFeed);
//create a process with 2 clusters
@@ -291,8 +290,7 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
Util.readEntityName(feed02));
//submit and schedule process
- AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(URLS
- .SUBMIT_AND_SCHEDULE_URL, process));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process));
logger.info("Wait till process goes into running ");
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java
index af1620a..79ceacc 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java
@@ -82,38 +82,36 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[1].submitAndScheduleFeedUsingColoHelper(cluster2);
//suspend using prismHelper
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.SUSPENDED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
//suspend using prismHelper
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
//try using the colohelper
AssertUtil.assertSucceeded(cluster1.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ .suspend(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.SUSPENDED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
//suspend using prismHelper
AssertUtil.assertSucceeded(
- cluster1.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ cluster1.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
//suspend on the other one
AssertUtil.assertSucceeded(cluster1.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ .suspend(bundles[0].getDataSets().get(0)));
checkAndCompareStatus(cluster1, bundles[0], Job.Status.SUSPENDED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- cluster1.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ cluster1.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
}
@@ -125,27 +123,21 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[1].submitAndScheduleFeedUsingColoHelper(cluster2);
//delete using coloHelpers
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//suspend using prismHelper
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[1].getDataSets().get(0)));
//suspend on the other one
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
- AssertUtil.assertFailed(
- cluster1.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster1.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
}
@@ -155,25 +147,23 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[0].submitAndScheduleFeedUsingColoHelper(cluster1);
bundles[1].submitAndScheduleFeedUsingColoHelper(cluster2);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
checkAndCompareStatus(cluster1, bundles[0], Job.Status.SUSPENDED);
for (int i = 0; i < 2; i++) {
//suspend using prismHelper
AssertUtil.assertSucceeded(prism.getFeedHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ .resume(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
}
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
checkAndCompareStatus(cluster2, bundles[1], Job.Status.SUSPENDED);
for (int i = 0; i < 2; i++) {
AssertUtil.assertSucceeded(cluster1.getFeedHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ .resume(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.SUSPENDED);
@@ -183,7 +173,7 @@ public class PrismFeedResumeTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//suspend on the other one
AssertUtil.assertSucceeded(prism.getFeedHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ .resume(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
}
@@ -191,7 +181,7 @@ public class PrismFeedResumeTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//suspend on the other one
AssertUtil.assertSucceeded(cluster2.getFeedHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ .resume(bundles[1].getDataSets().get(0)));
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
}
@@ -199,15 +189,11 @@ public class PrismFeedResumeTest extends BaseTestClass {
@Test
public void testResumeNonExistentFeedOnBothColos() throws Exception {
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
-
- AssertUtil.assertFailed(
- cluster1.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
+
+ AssertUtil.assertFailed(cluster1.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
}
@Test
@@ -215,15 +201,11 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[0].submitFeed();
bundles[1].submitFeed();
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster1.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster1.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
}
@Test(groups = {"prism", "0.2"})
@@ -234,28 +216,26 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[0].submitAndScheduleFeedUsingColoHelper(cluster1);
bundles[1].submitAndScheduleFeedUsingColoHelper(cluster2);
AssertUtil.assertSucceeded(cluster1.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ .suspend(bundles[0].getDataSets().get(0)));
AssertUtil.assertSucceeded(cluster2.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ .suspend(bundles[1].getDataSets().get(0)));
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster2, bundles[1], Job.Status.SUSPENDED);
//resume on the other one
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
Util.startService(cluster1.getFeedHelper());
checkAndCompareStatus(cluster1, bundles[0], Job.Status.SUSPENDED);
AssertUtil.assertSucceeded(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
}
@@ -269,36 +249,29 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[1].submitAndScheduleFeedUsingColoHelper(cluster2);
//delete using prismHelper
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
Util.shutDownService(cluster1.getFeedHelper());
//suspend using prismHelper
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
//suspend using prismHelper
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[1].getDataSets().get(0)));
//suspend on the other one
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
}
@@ -309,12 +282,9 @@ public class PrismFeedResumeTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
}
@Test(groups = {"prism", "0.2"})
@@ -326,12 +296,9 @@ public class PrismFeedResumeTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
}
@@ -341,16 +308,11 @@ public class PrismFeedResumeTest extends BaseTestClass {
.checkStatus(coloHelper.getFeedHelper().getOozieClient(), EntityType.FEED, bundle,
expectedStatus);
String entity = bundle.getDataSets().get(0);
- Assert.assertEquals(
- Util.parseResponse(prism.getFeedHelper().getStatus(Util.URLS.STATUS_URL, entity))
- .getMessage(),
+ Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(entity)).getMessage(),
coloHelper.getFeedHelper().getColoName() + "/" + expectedStatus);
- Assert.assertEquals(
- Util.parseResponse(prism.getFeedHelper().getStatus(Util.URLS.STATUS_URL, entity))
- .getMessage(),
+ Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(entity)).getMessage(),
coloHelper.getFeedHelper().getColoName() + "/"
- + Util.parseResponse(
- coloHelper.getFeedHelper().getStatus(Util.URLS.STATUS_URL, entity)).getMessage());
+ + Util.parseResponse(coloHelper.getFeedHelper().getStatus(entity)).getMessage());
}
@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/prism/PrismFeedScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java
index ab2e95d..9a32932 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java
@@ -24,7 +24,6 @@ import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
import org.apache.falcon.regression.core.util.OSUtil;
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;
@@ -81,8 +80,7 @@ public class PrismFeedScheduleTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(bundles[0].getDataSets().get(0)));
bundles[0].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .suspend(URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
bundles[1].submitAndScheduleFeed();
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);