Skip to content

Commit 51e8d53

Browse files
slfan1989slfan1989
committed
YARN-11577. Fix CheckStyle.
1 parent 50ac9d8 commit 51e8d53

File tree

3 files changed

+287
-1
lines changed

3 files changed

+287
-1
lines changed

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestFederationSubCluster.java

+16-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication;
4444
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
4545
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
46+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewReservation;
4647
import org.apache.hadoop.yarn.server.router.webapp.HTTPMethods;
4748
import org.apache.hadoop.yarn.server.router.webapp.JavaProcess;
4849
import org.slf4j.Logger;
@@ -60,7 +61,11 @@
6061
import static javax.servlet.http.HttpServletResponse.SC_OK;
6162
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
6263
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
63-
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.*;
64+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RM_WEB_SERVICE_PATH;
65+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES;
66+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_NEW_APPLICATION;
67+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS;
68+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_NEW;
6469
import static org.apache.hadoop.yarn.server.router.webapp.TestRouterWebServicesREST.waitWebAppRunning;
6570
import static org.junit.Assert.assertEquals;
6671

@@ -301,6 +306,16 @@ public String submitApplication(String routerAddress) {
301306
return appId;
302307
}
303308

309+
public NewReservation getNewReservationId(String routerAddress) {
310+
Client clientToRM = Client.create();
311+
clientToRM.setConnectTimeout(3000);
312+
clientToRM.setReadTimeout(3000);
313+
WebResource toRM = clientToRM.resource(routerAddress).
314+
path(RM_WEB_SERVICE_PATH + RESERVATION_NEW);
315+
ClientResponse response = toRM.accept(APPLICATION_XML).post(ClientResponse.class);
316+
return response.getEntity(NewReservation.class);
317+
}
318+
304319
public static String format(String format, Object... args) {
305320
Pattern p = Pattern.compile("\\{.*?}");
306321
Matcher m = p.matcher(format);

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/capacity/TestYarnFederationWithCapacityScheduler.java

+130
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
package org.apache.hadoop.yarn.server.router.subcluster.capacity;
1919

2020
import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
21+
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
22+
import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
2123
import com.sun.jersey.api.client.ClientResponse;
2224
import org.apache.hadoop.test.GenericTestUtils;
2325
import org.apache.hadoop.util.Sets;
26+
import org.apache.hadoop.yarn.api.records.ApplicationTimeoutType;
2427
import org.apache.hadoop.yarn.exceptions.YarnException;
2528
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
2629
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
@@ -38,6 +41,13 @@
3841
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptInfo;
3942
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
4043
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
44+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
45+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
46+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
47+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewReservation;
48+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
49+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
50+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
4151
import org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster;
4252
import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterInfo;
4353
import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterUserInfo;
@@ -71,6 +81,13 @@
7181
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_APPATTEMPTS;
7282
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_STATE;
7383
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_PRIORITY;
84+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_QUEUE;
85+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_TIMEOUTS;
86+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_TIMEOUT;
87+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_NEW;
88+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_SUBMIT;
89+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_UPDATE;
90+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_DELETE;
7491
import static org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster.format;
7592
import static org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster.getNodeId;
7693
import static org.apache.hadoop.yarn.server.router.webapp.HTTPMethods.POST;
@@ -394,4 +411,117 @@ public void testUpdateAppPriority() throws Exception {
394411
assertNotNull(ci.getPriority());
395412
assertEquals(1, ci.getPriority());
396413
}
414+
415+
@Test
416+
public void testAppQueue() throws Exception {
417+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
418+
AppQueue appQueue = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
419+
RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
420+
AppQueue.class, null, null);
421+
assertNotNull(appQueue);
422+
String queue = appQueue.getQueue();
423+
assertEquals("root.default", queue);
424+
}
425+
426+
@Test
427+
public void testUpdateAppQueue() throws Exception {
428+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
429+
AppQueue appQueue = new AppQueue("root.default");
430+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
431+
RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
432+
null, null, appQueue, PUT);
433+
assertEquals(SC_OK, response.getStatus());
434+
AppQueue appQueue1 = response.getEntity(AppQueue.class);
435+
assertNotNull(appQueue1);
436+
String queue1 = appQueue1.getQueue();
437+
assertEquals("root.default", queue1);
438+
}
439+
440+
@Test
441+
public void testAppTimeouts() throws Exception {
442+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
443+
AppTimeoutsInfo appTimeoutsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
444+
RM_WEB_SERVICE_PATH + format(APPS_TIMEOUTS, appId),
445+
AppTimeoutsInfo.class, null, null);
446+
assertNotNull(appTimeoutsInfo);
447+
ArrayList<AppTimeoutInfo> appTimeouts = appTimeoutsInfo.getAppTimeouts();
448+
assertNotNull(appTimeouts);
449+
assertEquals(1, appTimeouts.size());
450+
AppTimeoutInfo appTimeoutInfo = appTimeouts.get(0);
451+
assertNotNull(appTimeoutInfo);
452+
assertEquals(ApplicationTimeoutType.LIFETIME, appTimeoutInfo.getTimeoutType());
453+
assertEquals("UNLIMITED", appTimeoutInfo.getExpireTime());
454+
}
455+
456+
@Test
457+
public void testAppTimeout() throws Exception {
458+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
459+
String pathApp = RM_WEB_SERVICE_PATH + format(APPS_TIMEOUTS, appId);
460+
AppTimeoutInfo appTimeoutInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
461+
pathApp + "/" + "LIFETIME", AppTimeoutInfo.class, null, null);
462+
assertNotNull(appTimeoutInfo);
463+
}
464+
465+
@Test
466+
public void testUpdateAppTimeouts() throws Exception {
467+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
468+
AppTimeoutInfo appTimeoutInfo = new AppTimeoutInfo();
469+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
470+
RM_WEB_SERVICE_PATH + format(APPS_TIMEOUT, appId),
471+
null, null, appTimeoutInfo, PUT);
472+
assertEquals(SC_BAD_REQUEST, response.getStatus());
473+
String entity = response.getEntity(String.class);
474+
assertNotNull(entity);
475+
}
476+
477+
@Test
478+
public void testNewReservation() throws Exception {
479+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
480+
RM_WEB_SERVICE_PATH + RESERVATION_NEW,
481+
null, null, null, POST);
482+
assertEquals(SC_OK, response.getStatus());
483+
NewReservation ci = response.getEntity(NewReservation.class);
484+
assertNotNull(ci);
485+
}
486+
487+
@Test
488+
public void testSubmitReservation() throws Exception {
489+
ReservationSubmissionRequestInfo context = new ReservationSubmissionRequestInfo();
490+
NewReservation newReservationId =
491+
testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
492+
context.setReservationId(newReservationId.getReservationId());
493+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
494+
RM_WEB_SERVICE_PATH + RESERVATION_SUBMIT, null, null, context, POST);
495+
assertEquals(SC_BAD_REQUEST, response.getStatus());
496+
String entity = response.getEntity(String.class);
497+
assertNotNull(entity);
498+
}
499+
500+
@Test
501+
public void testUpdateReservation() throws Exception {
502+
NewReservation newReservationId =
503+
testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
504+
String reservationId = newReservationId.getReservationId();
505+
ReservationUpdateRequestInfo context = new ReservationUpdateRequestInfo();
506+
context.setReservationId(reservationId);
507+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
508+
RM_WEB_SERVICE_PATH + RESERVATION_UPDATE, null, null, context, POST);
509+
assertEquals(SC_BAD_REQUEST, response.getStatus());
510+
String entity = response.getEntity(String.class);
511+
assertNotNull(entity);
512+
}
513+
514+
@Test
515+
public void testDeleteReservation() throws Exception {
516+
NewReservation newReservationId =
517+
testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
518+
String reservationId = newReservationId.getReservationId();
519+
ReservationDeleteRequestInfo context = new ReservationDeleteRequestInfo();
520+
context.setReservationId(reservationId);
521+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
522+
RM_WEB_SERVICE_PATH + RESERVATION_DELETE, null, null, context, POST);
523+
assertEquals(SC_SERVICE_UNAVAILABLE, response.getStatus());
524+
String entity = response.getEntity(String.class);
525+
assertNotNull(entity);
526+
}
397527
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/fair/TestYarnFederationWithFairScheduler.java

+141
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@
1818
package org.apache.hadoop.yarn.server.router.subcluster.fair;
1919

2020
import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
21+
import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
22+
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
2123
import com.sun.jersey.api.client.ClientResponse;
2224
import org.apache.hadoop.test.GenericTestUtils;
2325
import org.apache.hadoop.util.Sets;
2426
import org.apache.hadoop.yarn.api.records.Resource;
2527
import org.apache.hadoop.yarn.api.records.ResourceOption;
28+
import org.apache.hadoop.yarn.api.records.ApplicationTimeoutType;
2629
import org.apache.hadoop.yarn.exceptions.YarnException;
2730
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
2831
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
@@ -42,6 +45,13 @@
4245
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptInfo;
4346
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
4447
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
48+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
49+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
50+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
51+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewReservation;
52+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
53+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
54+
import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
4555
import org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster;
4656
import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterInfo;
4757
import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterUserInfo;
@@ -75,6 +85,13 @@
7585
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_APPATTEMPTS;
7686
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_STATE;
7787
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_PRIORITY;
88+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_QUEUE;
89+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_TIMEOUTS;
90+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_TIMEOUT;
91+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_NEW;
92+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_SUBMIT;
93+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_UPDATE;
94+
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_DELETE;
7895
import static org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster.format;
7996
import static org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster.getNodeId;
8097
import static org.apache.hadoop.yarn.server.router.webapp.HTTPMethods.POST;
@@ -393,4 +410,128 @@ public void testAppPriority() throws Exception {
393410
assertNotNull(appPriority);
394411
assertEquals(0, appPriority.getPriority());
395412
}
413+
414+
@Test
415+
public void testUpdateAppPriority() throws Exception {
416+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
417+
AppPriority appPriority = new AppPriority(1);
418+
// FairScheduler does not support Update Application Priority.
419+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
420+
RM_WEB_SERVICE_PATH + format(APPS_APPID_PRIORITY, appId),
421+
null, null, appPriority, PUT);
422+
assertEquals(SC_SERVICE_UNAVAILABLE, response.getStatus());
423+
}
424+
425+
@Test
426+
public void testAppQueue() throws Exception {
427+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
428+
AppQueue appQueue = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
429+
RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
430+
AppQueue.class, null, null);
431+
assertNotNull(appQueue);
432+
String queue = appQueue.getQueue();
433+
assertEquals("root.dr_dot_who", queue);
434+
}
435+
436+
@Test
437+
public void testUpdateAppQueue() throws Exception {
438+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
439+
AppQueue appQueue = new AppQueue("root.a");
440+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
441+
RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
442+
null, null, appQueue, PUT);
443+
assertEquals(SC_OK, response.getStatus());
444+
AppQueue appQueue1 = response.getEntity(AppQueue.class);
445+
assertNotNull(appQueue1);
446+
String queue1 = appQueue1.getQueue();
447+
assertEquals("root.a", queue1);
448+
}
449+
450+
@Test
451+
public void testAppTimeouts() throws Exception {
452+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
453+
AppTimeoutsInfo appTimeoutsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
454+
RM_WEB_SERVICE_PATH + format(APPS_TIMEOUTS, appId),
455+
AppTimeoutsInfo.class, null, null);
456+
assertNotNull(appTimeoutsInfo);
457+
ArrayList<AppTimeoutInfo> appTimeouts = appTimeoutsInfo.getAppTimeouts();
458+
assertNotNull(appTimeouts);
459+
assertEquals(1, appTimeouts.size());
460+
AppTimeoutInfo appTimeoutInfo = appTimeouts.get(0);
461+
assertNotNull(appTimeoutInfo);
462+
assertEquals(ApplicationTimeoutType.LIFETIME, appTimeoutInfo.getTimeoutType());
463+
assertEquals("UNLIMITED", appTimeoutInfo.getExpireTime());
464+
}
465+
466+
@Test
467+
public void testAppTimeout() throws Exception {
468+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
469+
String pathApp = RM_WEB_SERVICE_PATH + format(APPS_TIMEOUTS, appId);
470+
AppTimeoutInfo appTimeoutInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
471+
pathApp + "/" + "LIFETIME", AppTimeoutInfo.class, null, null);
472+
assertNotNull(appTimeoutInfo);
473+
}
474+
475+
@Test
476+
public void testUpdateAppTimeouts() throws Exception {
477+
String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
478+
AppTimeoutInfo appTimeoutInfo = new AppTimeoutInfo();
479+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
480+
RM_WEB_SERVICE_PATH + format(APPS_TIMEOUT, appId),
481+
null, null, appTimeoutInfo, PUT);
482+
assertEquals(SC_BAD_REQUEST, response.getStatus());
483+
String entity = response.getEntity(String.class);
484+
assertNotNull(entity);
485+
}
486+
487+
@Test
488+
public void testNewReservation() throws Exception {
489+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
490+
RM_WEB_SERVICE_PATH + RESERVATION_NEW,
491+
null, null, null, POST);
492+
assertEquals(SC_OK, response.getStatus());
493+
NewReservation ci = response.getEntity(NewReservation.class);
494+
assertNotNull(ci);
495+
}
496+
497+
@Test
498+
public void testSubmitReservation() throws Exception {
499+
ReservationSubmissionRequestInfo context = new ReservationSubmissionRequestInfo();
500+
NewReservation newReservationId =
501+
testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
502+
context.setReservationId(newReservationId.getReservationId());
503+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
504+
RM_WEB_SERVICE_PATH + RESERVATION_SUBMIT, null, null, context, POST);
505+
assertEquals(SC_BAD_REQUEST, response.getStatus());
506+
String entity = response.getEntity(String.class);
507+
assertNotNull(entity);
508+
}
509+
510+
@Test
511+
public void testUpdateReservation() throws Exception {
512+
NewReservation newReservationId =
513+
testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
514+
String reservationId = newReservationId.getReservationId();
515+
ReservationUpdateRequestInfo context = new ReservationUpdateRequestInfo();
516+
context.setReservationId(reservationId);
517+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
518+
RM_WEB_SERVICE_PATH + RESERVATION_UPDATE, null, null, context, POST);
519+
assertEquals(SC_BAD_REQUEST, response.getStatus());
520+
String entity = response.getEntity(String.class);
521+
assertNotNull(entity);
522+
}
523+
524+
@Test
525+
public void testDeleteReservation() throws Exception {
526+
NewReservation newReservationId =
527+
testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
528+
String reservationId = newReservationId.getReservationId();
529+
ReservationDeleteRequestInfo context = new ReservationDeleteRequestInfo();
530+
context.setReservationId(reservationId);
531+
ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
532+
RM_WEB_SERVICE_PATH + RESERVATION_DELETE, null, null, context, POST);
533+
assertEquals(SC_SERVICE_UNAVAILABLE, response.getStatus());
534+
String entity = response.getEntity(String.class);
535+
assertNotNull(entity);
536+
}
396537
}

0 commit comments

Comments
 (0)