You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2017/12/02 05:34:20 UTC
[2/4] mesos git commit: Updated the tests to use MULTI_ROLE
frameworks by default.
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae45afc1/src/tests/reservation_endpoints_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reservation_endpoints_tests.cpp b/src/tests/reservation_endpoints_tests.cpp
index 3278732..4a3820d 100644
--- a/src/tests/reservation_endpoints_tests.cpp
+++ b/src/tests/reservation_endpoints_tests.cpp
@@ -78,7 +78,7 @@ public:
{
master::Flags flags = MesosTest::CreateMasterFlags();
flags.allocation_interval = Milliseconds(50);
- flags.roles = createFrameworkInfo().role();
+ flags.roles = createFrameworkInfo().roles(0);
return flags;
}
@@ -86,7 +86,7 @@ public:
FrameworkInfo createFrameworkInfo()
{
FrameworkInfo info = DEFAULT_FRAMEWORK_INFO;
- info.set_role("role");
+ info.set_roles(0, "role");
return info;
}
@@ -122,7 +122,7 @@ TEST_F(ReservationEndpointsTest, AvailableResources)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
Future<Response> response = process::http::post(
master.get()->pid,
@@ -151,7 +151,7 @@ TEST_F(ReservationEndpointsTest, AvailableResources)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
// The filter to decline the offer "forever".
Filters filtersForever;
@@ -177,7 +177,7 @@ TEST_F(ReservationEndpointsTest, AvailableResources)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -206,7 +206,7 @@ TEST_F(ReservationEndpointsTest, ReserveOfferedResources)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -227,7 +227,7 @@ TEST_F(ReservationEndpointsTest, ReserveOfferedResources)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers));
@@ -249,7 +249,7 @@ TEST_F(ReservationEndpointsTest, ReserveOfferedResources)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -278,7 +278,7 @@ TEST_F(ReservationEndpointsTest, UnreserveOfferedResources)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
Future<Response> response = process::http::post(
master.get()->pid,
@@ -307,7 +307,7 @@ TEST_F(ReservationEndpointsTest, UnreserveOfferedResources)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers));
@@ -329,7 +329,7 @@ TEST_F(ReservationEndpointsTest, UnreserveOfferedResources)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -365,7 +365,7 @@ TEST_F(ReservationEndpointsTest, ReserveAvailableAndOfferedResources)
Resources total = available + offered;
Resources dynamicallyReserved =
total.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -394,7 +394,7 @@ TEST_F(ReservationEndpointsTest, ReserveAvailableAndOfferedResources)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(available + offered, frameworkInfo.role())));
+ allocatedResources(available + offered, frameworkInfo.roles(0))));
// Launch a task on the 'available' resources portion of the offer, which
// recovers 'offered' resources portion.
@@ -424,7 +424,7 @@ TEST_F(ReservationEndpointsTest, ReserveAvailableAndOfferedResources)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(offered, frameworkInfo.role())));
+ allocatedResources(offered, frameworkInfo.roles(0))));
// Kill the task running on 'available' resources to make it available.
Future<TaskStatus> statusUpdate;
@@ -464,7 +464,7 @@ TEST_F(ReservationEndpointsTest, ReserveAvailableAndOfferedResources)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -496,11 +496,11 @@ TEST_F(ReservationEndpointsTest, UnreserveAvailableAndOfferedResources)
Resources available = Resources::parse("cpus:1;mem:128").get();
available = available.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
Resources offered = Resources::parse("mem:384").get();
offered = offered.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
Resources total = available + offered;
Resources unreserved = total.toUnreserved();
@@ -541,7 +541,7 @@ TEST_F(ReservationEndpointsTest, UnreserveAvailableAndOfferedResources)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(available + offered, frameworkInfo.role())));
+ allocatedResources(available + offered, frameworkInfo.roles(0))));
// Launch a task on the 'available' resources portion of the offer, which
// recovers 'offered' resources portion.
@@ -570,7 +570,7 @@ TEST_F(ReservationEndpointsTest, UnreserveAvailableAndOfferedResources)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(offered, frameworkInfo.role())));
+ allocatedResources(offered, frameworkInfo.roles(0))));
// Kill the task running on 'available' resources to make it available.
Future<TaskStatus> statusUpdate;
@@ -610,7 +610,7 @@ TEST_F(ReservationEndpointsTest, UnreserveAvailableAndOfferedResources)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -650,10 +650,10 @@ TEST_F(ReservationEndpointsTest, LabeledResources)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources labeledResources1 =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal(), labels1));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal(), labels1));
Resources labeledResources2 =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal(), labels2));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal(), labels2));
// Make two resource reservations with different labels.
Future<Response> response = process::http::post(
@@ -692,9 +692,9 @@ TEST_F(ReservationEndpointsTest, LabeledResources)
Resources offeredResources = Resources(offer.resources());
EXPECT_TRUE(offeredResources.contains(
- allocatedResources(labeledResources1, frameworkInfo.role())));
+ allocatedResources(labeledResources1, frameworkInfo.roles(0))));
EXPECT_TRUE(offeredResources.contains(
- allocatedResources(labeledResources2, frameworkInfo.role())));
+ allocatedResources(labeledResources2, frameworkInfo.roles(0))));
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers));
@@ -718,13 +718,13 @@ TEST_F(ReservationEndpointsTest, LabeledResources)
offeredResources = Resources(offer.resources());
EXPECT_FALSE(offeredResources.contains(
- allocatedResources(totalSlaveResources, frameworkInfo.role())));
+ allocatedResources(totalSlaveResources, frameworkInfo.roles(0))));
EXPECT_TRUE(offeredResources.contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
EXPECT_FALSE(offeredResources.contains(
- allocatedResources(labeledResources1, frameworkInfo.role())));
+ allocatedResources(labeledResources1, frameworkInfo.roles(0))));
EXPECT_TRUE(offeredResources.contains(
- allocatedResources(labeledResources2, frameworkInfo.role())));
+ allocatedResources(labeledResources2, frameworkInfo.roles(0))));
// Now that the first labeled reservation has been unreserved,
// attempting to unreserve it again should fail.
@@ -759,11 +759,11 @@ TEST_F(ReservationEndpointsTest, LabeledResources)
offeredResources = Resources(offer.resources());
EXPECT_TRUE(offeredResources.contains(
- allocatedResources(totalSlaveResources, frameworkInfo.role())));
+ allocatedResources(totalSlaveResources, frameworkInfo.roles(0))));
EXPECT_FALSE(offeredResources.contains(
- allocatedResources(labeledResources1, frameworkInfo.role())));
+ allocatedResources(labeledResources1, frameworkInfo.roles(0))));
EXPECT_FALSE(offeredResources.contains(
- allocatedResources(labeledResources2, frameworkInfo.role())));
+ allocatedResources(labeledResources2, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -850,7 +850,7 @@ TEST_F(ReservationEndpointsTest, InsufficientResources)
Resources unreserved = Resources::parse("cpus:4;mem:4096").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
process::http::Headers headers = createBasicAuthHeaders(DEFAULT_CREDENTIAL);
string body = createRequestBody(slaveId, dynamicallyReserved);
@@ -888,7 +888,7 @@ TEST_F(ReservationEndpointsTest, NoHeader)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
Future<Response> response = process::http::post(
master.get()->pid,
@@ -975,13 +975,13 @@ TEST_F(ReservationEndpointsTest, GoodReserveAndUnreserveACL)
DEFAULT_CREDENTIAL.principal());
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
// Create a master.
master::Flags masterFlags = CreateMasterFlags();
masterFlags.acls = acls;
masterFlags.allocation_interval = Milliseconds(50);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -1005,7 +1005,7 @@ TEST_F(ReservationEndpointsTest, GoodReserveAndUnreserveACL)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
// Reserve the resources.
Future<Response> response = process::http::post(
@@ -1094,13 +1094,13 @@ TEST_F(ReservationEndpointsTest, BadReserveACL)
reserve->mutable_roles()->set_type(mesos::ACL::Entity::NONE);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
// Create a master.
master::Flags masterFlags = CreateMasterFlags();
masterFlags.acls = acls;
masterFlags.allocation_interval = Milliseconds(50);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -1124,7 +1124,7 @@ TEST_F(ReservationEndpointsTest, BadReserveACL)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
// Attempt to reserve the resources.
Future<Response> response = process::http::post(
@@ -1151,13 +1151,13 @@ TEST_F(ReservationEndpointsTest, BadUnreserveACL)
unreserve->mutable_reserver_principals()->set_type(mesos::ACL::Entity::NONE);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
// Create a master.
master::Flags masterFlags = CreateMasterFlags();
masterFlags.acls = acls;
masterFlags.allocation_interval = Milliseconds(50);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -1181,7 +1181,7 @@ TEST_F(ReservationEndpointsTest, BadUnreserveACL)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
// Reserve the resources.
Future<Response> response = process::http::post(
@@ -1371,7 +1371,7 @@ TEST_F(ReservationEndpointsTest, ReserveAndUnreserveNoAuthentication)
Clock::pause();
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
// Create a master.
master::Flags masterFlags = CreateMasterFlags();
@@ -1403,7 +1403,7 @@ TEST_F(ReservationEndpointsTest, ReserveAndUnreserveNoAuthentication)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReservedWithNoPrincipal = unreserved.pushReservation(
- createDynamicReservationInfo(frameworkInfo.role()));
+ createDynamicReservationInfo(frameworkInfo.roles(0)));
// Try a reservation with no principal in `ReservationInfo` and no
// authentication headers.
@@ -1427,7 +1427,7 @@ TEST_F(ReservationEndpointsTest, ReserveAndUnreserveNoAuthentication)
Resources dynamicallyReservedWithPrincipal =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
// Try a reservation with a principal in `ReservationInfo` and no
// authentication headers.
@@ -1477,11 +1477,11 @@ TEST_F(ReservationEndpointsTest, DifferentPrincipalsSameRole)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved1 =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL.principal()));
Resources dynamicallyReserved2 =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), DEFAULT_CREDENTIAL_2.principal()));
+ frameworkInfo.roles(0), DEFAULT_CREDENTIAL_2.principal()));
Future<Response> response = process::http::post(
master.get()->pid,
@@ -1519,9 +1519,9 @@ TEST_F(ReservationEndpointsTest, DifferentPrincipalsSameRole)
Resources resources = Resources(offer.resources());
EXPECT_TRUE(resources.contains(
- allocatedResources(dynamicallyReserved1, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved1, frameworkInfo.roles(0))));
EXPECT_TRUE(resources.contains(
- allocatedResources(dynamicallyReserved2, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved2, frameworkInfo.roles(0))));
driver.stop();
driver.join();
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae45afc1/src/tests/reservation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reservation_tests.cpp b/src/tests/reservation_tests.cpp
index 470f734..70bf579 100644
--- a/src/tests/reservation_tests.cpp
+++ b/src/tests/reservation_tests.cpp
@@ -89,11 +89,11 @@ class ReservationTest : public MesosTest {};
TEST_F(ReservationTest, ReserveThenUnreserve)
{
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -117,7 +117,7 @@ TEST_F(ReservationTest, ReserveThenUnreserve)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -137,7 +137,7 @@ TEST_F(ReservationTest, ReserveThenUnreserve)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -153,7 +153,7 @@ TEST_F(ReservationTest, ReserveThenUnreserve)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -169,7 +169,7 @@ TEST_F(ReservationTest, ReserveThenUnreserve)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -186,7 +186,7 @@ TEST_F(ReservationTest, ReserveThenUnreserve)
TEST_F(ReservationTest, ReserveTwiceWithDoubleValue)
{
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
@@ -213,7 +213,7 @@ TEST_F(ReservationTest, ReserveTwiceWithDoubleValue)
Resources unreserved = Resources::parse("cpus:0.1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -230,7 +230,7 @@ TEST_F(ReservationTest, ReserveTwiceWithDoubleValue)
// In the first offer, expect an offer with unreserved resources.
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -246,7 +246,7 @@ TEST_F(ReservationTest, ReserveTwiceWithDoubleValue)
// In the second offer, expect an offer with reserved resources.
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -267,10 +267,10 @@ TEST_F(ReservationTest, ReserveTwiceWithDoubleValue)
Resources reserved = Resources::parse("cpus:0.2;mem:512").get();
Resources finalReservation =
reserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(finalReservation, frameworkInfo.role())));
+ allocatedResources(finalReservation, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -288,11 +288,11 @@ TEST_F(ReservationTest, ReserveTwiceWithDoubleValue)
TEST_F(ReservationTest, ReserveAndLaunchThenUnreserve)
{
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -316,7 +316,7 @@ TEST_F(ReservationTest, ReserveAndLaunchThenUnreserve)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -336,7 +336,7 @@ TEST_F(ReservationTest, ReserveAndLaunchThenUnreserve)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
// Create a task.
TaskInfo taskInfo =
@@ -367,7 +367,7 @@ TEST_F(ReservationTest, ReserveAndLaunchThenUnreserve)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -388,7 +388,7 @@ TEST_F(ReservationTest, ReserveAndLaunchThenUnreserve)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
EXPECT_CALL(exec, shutdown(_))
.Times(AtMost(1));
@@ -410,11 +410,11 @@ TEST_F(ReservationTest, ReserveShareWithinRole)
FrameworkInfo frameworkInfo1 = DEFAULT_FRAMEWORK_INFO;
frameworkInfo1.set_name("framework1");
- frameworkInfo1.set_role(role);
+ frameworkInfo1.set_roles(0, role);
FrameworkInfo frameworkInfo2 = DEFAULT_FRAMEWORK_INFO;
frameworkInfo1.set_name("framework2");
- frameworkInfo2.set_role(role);
+ frameworkInfo2.set_roles(0, role);
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
@@ -460,7 +460,7 @@ TEST_F(ReservationTest, ReserveShareWithinRole)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo1.role())));
+ allocatedResources(unreserved, frameworkInfo1.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched1, resourceOffers(&driver1, _))
@@ -481,7 +481,7 @@ TEST_F(ReservationTest, ReserveShareWithinRole)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo1.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo1.roles(0))));
// The filter to decline the offer "forever".
Filters filtersForever;
@@ -507,7 +507,7 @@ TEST_F(ReservationTest, ReserveShareWithinRole)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo1.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo1.roles(0))));
driver1.stop();
driver1.join();
@@ -525,11 +525,11 @@ TEST_F(ReservationTest, DropReserveTooLarge)
TestAllocator<> allocator;
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
EXPECT_CALL(allocator, initialize(_, _, _, _, _, _));
@@ -553,7 +553,7 @@ TEST_F(ReservationTest, DropReserveTooLarge)
Resources unreservedTooLarge = Resources::parse("cpus:1;mem:1024").get();
Resources dynamicallyReservedTooLarge =
unreservedTooLarge.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture the offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -575,7 +575,7 @@ TEST_F(ReservationTest, DropReserveTooLarge)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -604,7 +604,7 @@ TEST_F(ReservationTest, DropReserveTooLarge)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -618,11 +618,11 @@ TEST_F(ReservationTest, DropReserveTooLarge)
TEST_F(ReservationTest, SendingCheckpointResourcesMessage)
{
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -641,12 +641,12 @@ TEST_F(ReservationTest, SendingCheckpointResourcesMessage)
Resources unreserved1 = Resources::parse("cpus:8").get();
Resources reserved1 =
unreserved1.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
Resources unreserved2 = Resources::parse("mem:2048").get();
Resources reserved2 =
unreserved2.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -668,7 +668,7 @@ TEST_F(ReservationTest, SendingCheckpointResourcesMessage)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved1 + unreserved2, frameworkInfo.role())));
+ allocatedResources(unreserved1 + unreserved2, frameworkInfo.roles(0))));
Future<CheckpointResourcesMessage> message3 =
FUTURE_PROTOBUF(CheckpointResourcesMessage(), _, _);
@@ -720,11 +720,11 @@ TEST_F(ReservationTest, SendingCheckpointResourcesMessage)
TEST_F(ReservationTest, ResourcesCheckpointing)
{
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -743,7 +743,7 @@ TEST_F(ReservationTest, ResourcesCheckpointing)
Resources unreserved = Resources::parse("cpus:8;mem:2048").get();
Resources reserved = unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -764,7 +764,7 @@ TEST_F(ReservationTest, ResourcesCheckpointing)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
Future<CheckpointResourcesMessage> checkpointResources =
FUTURE_PROTOBUF(CheckpointResourcesMessage(), _, slave.get()->pid);
@@ -816,11 +816,11 @@ TEST_F(ReservationTest, ResourcesCheckpointing)
TEST_F(ReservationTest, MasterFailover)
{
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master1 = StartMaster(masterFlags);
ASSERT_SOME(master1);
@@ -838,7 +838,7 @@ TEST_F(ReservationTest, MasterFailover)
Resources unreserved = Resources::parse("cpus:8;mem:2048").get();
Resources reserved = unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -915,7 +915,7 @@ TEST_F(ReservationTest, MasterFailover)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(reserved, frameworkInfo.role())));
+ allocatedResources(reserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -937,11 +937,11 @@ TEST_F(ReservationTest, MasterFailover)
TEST_F(ReservationTest, CompatibleCheckpointedResources)
{
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -963,7 +963,7 @@ TEST_F(ReservationTest, CompatibleCheckpointedResources)
Resources unreserved = Resources::parse("cpus:8;mem:2048").get();
Resources reserved = unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -984,7 +984,7 @@ TEST_F(ReservationTest, CompatibleCheckpointedResources)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
Future<CheckpointResourcesMessage> checkpointResources =
FUTURE_PROTOBUF(CheckpointResourcesMessage(), _, _);
@@ -1044,11 +1044,11 @@ TEST_F(ReservationTest, CompatibleCheckpointedResources)
TEST_F(ReservationTest, CompatibleCheckpointedResourcesWithPersistentVolumes)
{
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -1070,12 +1070,12 @@ TEST_F(ReservationTest, CompatibleCheckpointedResourcesWithPersistentVolumes)
Resources unreserved = Resources::parse("cpus:8;mem:2048").get();
Resources reserved = unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
Resource unreservedDisk = Resources::parse("disk", "1024", "*").get();
Resource reservedDisk = unreservedDisk;
reservedDisk.add_reservations()->CopyFrom(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
Resource volume = reservedDisk;
volume.mutable_disk()->CopyFrom(createDiskInfo(
@@ -1102,7 +1102,7 @@ TEST_F(ReservationTest, CompatibleCheckpointedResourcesWithPersistentVolumes)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved + unreservedDisk, frameworkInfo.role())));
+ allocatedResources(unreserved + unreservedDisk, frameworkInfo.roles(0))));
Future<CheckpointResourcesMessage> message2 =
FUTURE_PROTOBUF(CheckpointResourcesMessage(), _, _);
@@ -1140,7 +1140,7 @@ TEST_F(ReservationTest, CompatibleCheckpointedResourcesWithPersistentVolumes)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(reserved + volume, frameworkInfo.role())));
+ allocatedResources(reserved + volume, frameworkInfo.roles(0))));
Future<OfferID> rescindedOfferId;
@@ -1193,11 +1193,11 @@ TEST_F(ReservationTest, CompatibleCheckpointedResourcesWithPersistentVolumes)
TEST_F(ReservationTest, IncompatibleCheckpointedResources)
{
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -1219,7 +1219,7 @@ TEST_F(ReservationTest, IncompatibleCheckpointedResources)
Resources unreserved = Resources::parse("cpus:8;mem:2048").get();
Resources reserved = unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -1239,7 +1239,7 @@ TEST_F(ReservationTest, IncompatibleCheckpointedResources)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
Future<CheckpointResourcesMessage> checkpointResources =
FUTURE_PROTOBUF(CheckpointResourcesMessage(), _, _);
@@ -1311,13 +1311,13 @@ TEST_F(ReservationTest, GoodACLReserveThenUnreserve)
DEFAULT_CREDENTIAL.principal());
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
// Create a master.
master::Flags masterFlags = CreateMasterFlags();
masterFlags.acls = acls;
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -1343,7 +1343,7 @@ TEST_F(ReservationTest, GoodACLReserveThenUnreserve)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -1363,7 +1363,7 @@ TEST_F(ReservationTest, GoodACLReserveThenUnreserve)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1379,7 +1379,7 @@ TEST_F(ReservationTest, GoodACLReserveThenUnreserve)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1395,7 +1395,7 @@ TEST_F(ReservationTest, GoodACLReserveThenUnreserve)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -1414,13 +1414,13 @@ TEST_F(ReservationTest, BadACLDropReserve)
reserve->mutable_roles()->set_type(mesos::ACL::Entity::ANY);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
// Create a master.
master::Flags masterFlags = CreateMasterFlags();
masterFlags.acls = acls;
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -1446,7 +1446,7 @@ TEST_F(ReservationTest, BadACLDropReserve)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -1466,7 +1466,7 @@ TEST_F(ReservationTest, BadACLDropReserve)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1483,7 +1483,7 @@ TEST_F(ReservationTest, BadACLDropReserve)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -1507,13 +1507,13 @@ TEST_F(ReservationTest, BadACLDropUnreserve)
unreserve->mutable_reserver_principals()->set_type(mesos::ACL::Entity::NONE);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
// Create a master.
master::Flags masterFlags = CreateMasterFlags();
masterFlags.acls = acls;
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -1540,12 +1540,12 @@ TEST_F(ReservationTest, BadACLDropUnreserve)
Resources unreserved1 = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved1 =
unreserved1.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
Resources unreserved2 = Resources::parse("cpus:0.5;mem:256").get();
Resources dynamicallyReserved2 =
unreserved2.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -1566,7 +1566,7 @@ TEST_F(ReservationTest, BadACLDropUnreserve)
// The slave's total resources are twice those defined by `unreserved1`.
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved1 + unreserved1, frameworkInfo.role())));
+ allocatedResources(unreserved1 + unreserved1, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1586,7 +1586,7 @@ TEST_F(ReservationTest, BadACLDropUnreserve)
EXPECT_TRUE(Resources(offer.resources()).contains(
allocatedResources(
dynamicallyReserved1 + unreserved1,
- frameworkInfo.role())));
+ frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1608,7 +1608,7 @@ TEST_F(ReservationTest, BadACLDropUnreserve)
EXPECT_TRUE(Resources(offer.resources()).contains(
allocatedResources(
dynamicallyReserved1 + dynamicallyReserved2 + unreserved2,
- frameworkInfo.role())));
+ frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -1636,13 +1636,13 @@ TEST_F(ReservationTest, ACLMultipleOperations)
unreserve->mutable_reserver_principals()->set_type(mesos::ACL::Entity::NONE);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
// Create a master.
master::Flags masterFlags = CreateMasterFlags();
masterFlags.acls = acls;
masterFlags.allocation_interval = Milliseconds(5);
- masterFlags.roles = frameworkInfo.role();
+ masterFlags.roles = frameworkInfo.roles(0);
Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -1674,12 +1674,12 @@ TEST_F(ReservationTest, ACLMultipleOperations)
Resources unreserved1 = Resources::parse("cpus:1;mem:512").get();
Resources dynamicallyReserved1 =
unreserved1.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
Resources unreserved2 = Resources::parse("cpus:0.5;mem:256").get();
Resources dynamicallyReserved2 =
unreserved2.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from 'resourceOffers'.
Future<vector<Offer>> offers;
@@ -1706,7 +1706,7 @@ TEST_F(ReservationTest, ACLMultipleOperations)
// The slave's total resources are twice those defined by `unreserved1`.
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved1 + unreserved1, frameworkInfo.role())));
+ allocatedResources(unreserved1 + unreserved1, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1729,7 +1729,7 @@ TEST_F(ReservationTest, ACLMultipleOperations)
EXPECT_TRUE(Resources(offer.resources()).contains(
allocatedResources(
dynamicallyReserved1 + unreserved1,
- frameworkInfo.role())));
+ frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1774,7 +1774,7 @@ TEST_F(ReservationTest, ACLMultipleOperations)
EXPECT_TRUE(Resources(offer.resources()).contains(
allocatedResources(
dynamicallyReserved1 + dynamicallyReserved2 + unreserved2,
- frameworkInfo.role())));
+ frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1811,7 +1811,7 @@ TEST_F(ReservationTest, ACLMultipleOperations)
EXPECT_TRUE(Resources(offer.resources()).contains(
allocatedResources(
dynamicallyReserved1 + dynamicallyReserved2 + unreserved2,
- frameworkInfo.role())));
+ frameworkInfo.roles(0))));
// Check that the task launched as expected.
EXPECT_EQ(TASK_FINISHED, failedTaskStatus->state());
@@ -1834,7 +1834,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithoutPrincipal)
// Create a framework without a principal.
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
frameworkInfo.clear_principal();
// Create a master with no framework authentication.
@@ -1864,7 +1864,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithoutPrincipal)
// Create dynamically reserved resources whose `ReservationInfo` does not
// contain a principal.
Resources dynamicallyReserved = unreserved.pushReservation(
- createDynamicReservationInfo(frameworkInfo.role()));
+ createDynamicReservationInfo(frameworkInfo.roles(0)));
// We use this to capture offers from `resourceOffers`.
Future<vector<Offer>> offers;
@@ -1886,7 +1886,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithoutPrincipal)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
// The expectation for the offer with reserved resources.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1905,7 +1905,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithoutPrincipal)
// Make sure that the reservation succeeded.
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
// An expectation for an offer with unreserved resources.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1925,7 +1925,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithoutPrincipal)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -1942,7 +1942,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithPrincipal)
// Create a framework with a principal.
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
// Create a master with no framework authentication.
master::Flags masterFlags = CreateMasterFlags();
@@ -1972,7 +1972,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithPrincipal)
// principal.
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from `resourceOffers`.
Future<vector<Offer>> offers;
@@ -1994,7 +1994,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithPrincipal)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
// The expectation for the offer with reserved resources.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -2013,7 +2013,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithPrincipal)
// Make sure that the reservation succeeded.
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
// An expectation for an offer with unreserved resources.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -2033,7 +2033,7 @@ TEST_F(ReservationTest, WithoutAuthenticationWithPrincipal)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -2047,7 +2047,7 @@ TEST_F(ReservationTest, DropReserveWithDifferentRole)
const string frameworkRole = "role";
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(frameworkRole);
+ frameworkInfo.set_roles(0, frameworkRole);
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
@@ -2092,7 +2092,7 @@ TEST_F(ReservationTest, DropReserveWithDifferentRole)
Resources unreserved = Resources::parse("cpus:1;mem:512").get();
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -2125,7 +2125,7 @@ TEST_F(ReservationTest, DropReserveWithDifferentRole)
offer = offers->front();
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -2139,12 +2139,12 @@ TEST_F(ReservationTest, PreventUnreservingAlienResources)
const string frameworkRole1 = "role1";
FrameworkInfo frameworkInfo1 = DEFAULT_FRAMEWORK_INFO;
frameworkInfo1.set_name("framework1");
- frameworkInfo1.set_role(frameworkRole1);
+ frameworkInfo1.set_roles(0, frameworkRole1);
const string frameworkRole2 = "role2";
FrameworkInfo frameworkInfo2 = DEFAULT_FRAMEWORK_INFO;
frameworkInfo2.set_name("framework2");
- frameworkInfo2.set_role(frameworkRole2);
+ frameworkInfo2.set_roles(0, frameworkRole2);
master::Flags masterFlags = CreateMasterFlags();
masterFlags.allocation_interval = Milliseconds(5);
@@ -2190,7 +2190,7 @@ TEST_F(ReservationTest, PreventUnreservingAlienResources)
const Resources unreserved = Resources::parse("cpus:1;mem:512").get();
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo1.role())));
+ allocatedResources(unreserved, frameworkInfo1.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched1, resourceOffers(&driver1, _))
@@ -2215,9 +2215,9 @@ TEST_F(ReservationTest, PreventUnreservingAlienResources)
offer = offers->front();
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo1.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo1.roles(0))));
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(halfMemory, frameworkInfo1.role())));
+ allocatedResources(halfMemory, frameworkInfo1.roles(0))));
// The filter to decline the offer "forever".
Filters filtersForever;
@@ -2242,9 +2242,9 @@ TEST_F(ReservationTest, PreventUnreservingAlienResources)
offer = offers->front();
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(halfMemory, frameworkInfo2.role())));
+ allocatedResources(halfMemory, frameworkInfo2.roles(0))));
EXPECT_FALSE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo2.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo2.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched2, resourceOffers(&driver2, _))
@@ -2262,9 +2262,9 @@ TEST_F(ReservationTest, PreventUnreservingAlienResources)
AWAIT_READY(offers);
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(halfMemory, frameworkInfo2.role())));
+ allocatedResources(halfMemory, frameworkInfo2.roles(0))));
EXPECT_FALSE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo2.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo2.roles(0))));
// Decline the offer "forever" in order to force `framework1` to
// receive the remaining resources.
@@ -2288,9 +2288,9 @@ TEST_F(ReservationTest, PreventUnreservingAlienResources)
// Make sure that the reservation is still in place.
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(halfMemory, frameworkInfo1.role())));
+ allocatedResources(halfMemory, frameworkInfo1.roles(0))));
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo1.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo1.roles(0))));
driver1.stop();
driver1.join();
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae45afc1/src/tests/role_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/role_tests.cpp b/src/tests/role_tests.cpp
index fc4c017..b40db5b 100644
--- a/src/tests/role_tests.cpp
+++ b/src/tests/role_tests.cpp
@@ -70,7 +70,7 @@ class RoleTest : public MesosTest {};
TEST_F(RoleTest, BadRegister)
{
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("invalid");
+ frameworkInfo.set_roles(0, "invalid");
master::Flags masterFlags = CreateMasterFlags();
masterFlags.roles = "foo,bar";
@@ -115,7 +115,7 @@ TEST_F(RoleTest, ImplicitRoleRegister)
ASSERT_SOME(slave);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("new-role-name");
+ frameworkInfo.set_roles(0, "new-role-name");
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -129,7 +129,7 @@ TEST_F(RoleTest, ImplicitRoleRegister)
Resources unreserved = Resources::parse("disk:1024").get();
Resources dynamicallyReserved =
unreserved.pushReservation(createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
// We use this to capture offers from `resourceOffers`.
Future<vector<Offer>> offers;
@@ -149,9 +149,9 @@ TEST_F(RoleTest, ImplicitRoleRegister)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
EXPECT_FALSE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
// The expectation for the next offer.
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -167,13 +167,13 @@ TEST_F(RoleTest, ImplicitRoleRegister)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
EXPECT_FALSE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
Resources volume = createPersistentVolume(
Megabytes(64),
- frameworkInfo.role(),
+ frameworkInfo.roles(0),
"id1",
"path1",
frameworkInfo.principal(),
@@ -193,11 +193,11 @@ TEST_F(RoleTest, ImplicitRoleRegister)
offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(volume, frameworkInfo.role())));
+ allocatedResources(volume, frameworkInfo.roles(0))));
EXPECT_FALSE(Resources(offer.resources()).contains(
- allocatedResources(dynamicallyReserved, frameworkInfo.role())));
+ allocatedResources(dynamicallyReserved, frameworkInfo.roles(0))));
EXPECT_FALSE(Resources(offer.resources()).contains(
- allocatedResources(unreserved, frameworkInfo.role())));
+ allocatedResources(unreserved, frameworkInfo.roles(0))));
driver.stop();
driver.join();
@@ -227,7 +227,7 @@ TEST_F(RoleTest, ImplicitRoleStaticReservation)
ASSERT_SOME(slave);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -258,7 +258,7 @@ TEST_F(RoleTest, ImplicitRoleStaticReservation)
Offer offer = offers.get()[0];
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(staticallyReserved, frameworkInfo.role())));
+ allocatedResources(staticallyReserved, frameworkInfo.roles(0))));
// Create a task to launch with the resources of `staticallyReserved`.
TaskInfo taskInfo =
@@ -467,7 +467,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RoleTest, EndpointImplicitRolesWeights)
ASSERT_SOME(master);
FrameworkInfo frameworkInfo1 = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo1.set_role("roleX");
+ frameworkInfo1.set_roles(0, "roleX");
MockScheduler sched1;
MesosSchedulerDriver driver1(
@@ -480,7 +480,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RoleTest, EndpointImplicitRolesWeights)
driver1.start();
FrameworkInfo frameworkInfo2 = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo2.set_role("roleZ");
+ frameworkInfo2.set_roles(0, "roleZ");
MockScheduler sched2;
MesosSchedulerDriver driver2(
@@ -673,10 +673,8 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(
ASSERT_SOME(master);
FrameworkInfo framework = DEFAULT_FRAMEWORK_INFO;
- framework.add_roles("role1");
+ framework.set_roles(0, "role1");
framework.add_roles("role2");
- framework.add_capabilities()->set_type(
- FrameworkInfo::Capability::MULTI_ROLE);
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -934,7 +932,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(RoleTest, VolumesInOverlappingHierarchies)
auto runTask = [&master, &PATH](
const string& role, const string& id) {
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role(role);
+ frameworkInfo.set_roles(0, role);
MockScheduler sched;
MesosSchedulerDriver driver(
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae45afc1/src/tests/scheduler_http_api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_http_api_tests.cpp b/src/tests/scheduler_http_api_tests.cpp
index cc03be0..4e17471 100644
--- a/src/tests/scheduler_http_api_tests.cpp
+++ b/src/tests/scheduler_http_api_tests.cpp
@@ -324,7 +324,7 @@ TEST_P(SchedulerHttpApiTest, RejectFrameworkWithInvalidRole)
Call::Subscribe* subscribe = call.mutable_subscribe();
v1::FrameworkInfo framework = v1::DEFAULT_FRAMEWORK_INFO;
// Set invalid role.
- framework.set_role("/test/test1");
+ framework.set_roles(0, "/test/test1");
subscribe->mutable_framework_info()->CopyFrom(framework);
// Retrieve the parameter passed as content type to this test.
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae45afc1/src/tests/scheduler_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_tests.cpp b/src/tests/scheduler_tests.cpp
index 5c42dc0..910d76f 100644
--- a/src/tests/scheduler_tests.cpp
+++ b/src/tests/scheduler_tests.cpp
@@ -1482,7 +1482,7 @@ TEST_P(SchedulerTest, NoOffersWithAllRolesSuppressed)
Call::Subscribe* subscribe = call.mutable_subscribe();
subscribe->mutable_framework_info()->CopyFrom(frameworkInfo);
- subscribe->add_suppressed_roles(frameworkInfo.role());
+ subscribe->add_suppressed_roles(frameworkInfo.roles(0));
mesos.send(call);
}
@@ -1508,7 +1508,7 @@ TEST_P(SchedulerTest, NoOffersWithAllRolesSuppressed)
v1::FrameworkInfo frameworkInfo = v1::DEFAULT_FRAMEWORK_INFO;
Call::Revive* revive = call.mutable_revive();
- revive->add_roles(frameworkInfo.role());
+ revive->add_roles(frameworkInfo.roles(0));
mesos.send(call);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae45afc1/src/tests/slave_authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_authorization_tests.cpp b/src/tests/slave_authorization_tests.cpp
index 4e55148..834ee05 100644
--- a/src/tests/slave_authorization_tests.cpp
+++ b/src/tests/slave_authorization_tests.cpp
@@ -166,7 +166,7 @@ TYPED_TEST(SlaveAuthorizerTest, FilterStateEndpoint)
// Register framework with user "bar".
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role");
+ frameworkInfo.set_roles(0, "role");
frameworkInfo.set_user("bar");
// Create an executor with user "bar".
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae45afc1/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 57fcae9..6207a50 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -2114,13 +2114,13 @@ TYPED_TEST(SlaveRecoveryTest, RemoveNonCheckpointingFramework)
Offer offer1 = offer;
Resources resources1 = allocatedResources(
- Resources::parse("cpus:1;mem:512").get(), frameworkInfo.role());
+ Resources::parse("cpus:1;mem:512").get(), frameworkInfo.roles(0));
offer1.mutable_resources()->CopyFrom(resources1);
tasks.push_back(createTask(offer1, "sleep 1000")); // Long-running task.
Offer offer2 = offer;
Resources resources2 = allocatedResources(
- Resources::parse("cpus:1;mem:512").get(), frameworkInfo.role());
+ Resources::parse("cpus:1;mem:512").get(), frameworkInfo.roles(0));
offer2.mutable_resources()->CopyFrom(resources2);
tasks.push_back(createTask(offer2, "sleep 1000")); // Long-running task,
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae45afc1/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 6fb5a6f..cd5e1e4 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -788,12 +788,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, GetExecutorInfo)
FrameworkID frameworkId;
frameworkId.set_value("20141010-221431-251662764-60288-32120-0000");
- FrameworkInfo frameworkInfo;
+ FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
frameworkInfo.mutable_id()->CopyFrom(frameworkId);
// Launch a task with the command executor.
Resources taskResources = Resources::parse("cpus:0.1;mem:32").get();
- taskResources.allocate(frameworkInfo.role());
+ taskResources.allocate(frameworkInfo.roles(0));
TaskInfo task;
task.set_name("task");
@@ -846,14 +846,14 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, GetExecutorInfoForTaskWithContainer)
MockSlave slave(CreateSlaveFlags(), &detector, &containerizer);
- FrameworkInfo frameworkInfo;
+ FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
frameworkInfo.mutable_id()->set_value(
"20141010-221431-251662764-60288-12345-0000");
// Launch a task with the command executor and ContainerInfo with
// NetworkInfo.
Resources taskResources = Resources::parse("cpus:0.1;mem:32").get();
- taskResources.allocate(frameworkInfo.role());
+ taskResources.allocate(frameworkInfo.roles(0));
TaskInfo task;
task.set_name("task");
@@ -923,12 +923,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(SlaveTest, ROOT_LaunchTaskInfoWithContainerInfo)
StandaloneMasterDetector detector;
MockSlave slave(flags, &detector, containerizer.get());
- FrameworkInfo frameworkInfo;
+ FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
frameworkInfo.mutable_id()->set_value(
"20141010-221431-251662764-60288-12345-0000");
Resources taskResources = Resources::parse("cpus:0.1;mem:32").get();
- taskResources.allocate(frameworkInfo.role());
+ taskResources.allocate(frameworkInfo.roles(0));
// Launch a task with the command executor and ContainerInfo with
// NetworkInfo.
@@ -1662,9 +1662,14 @@ TEST_F(SlaveTest, StateEndpoint)
EXPECT_EQ(1u, frameworks.values.size());
ASSERT_TRUE(frameworks.values[0].is<JSON::Object>());
- JSON::Object framework = frameworks.values[0].as<JSON::Object>();
- EXPECT_EQ("*", framework.values["role"]);
+ JSON::Object roles = {
+ { "roles", JSON::Array { DEFAULT_FRAMEWORK_INFO.roles(0) } }
+ };
+
+ EXPECT_TRUE(frameworks.values[0].contains(roles));
+
+ JSON::Object framework = frameworks.values[0].as<JSON::Object>();
EXPECT_EQ("default", framework.values["name"]);
EXPECT_EQ(model(resources.get()), state.values["resources"]);
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae45afc1/src/tests/upgrade_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/upgrade_tests.cpp b/src/tests/upgrade_tests.cpp
index 7c900b1..3c8a6fe 100644
--- a/src/tests/upgrade_tests.cpp
+++ b/src/tests/upgrade_tests.cpp
@@ -120,8 +120,15 @@ TEST_F(UpgradeTest, ReregisterOldAgentWithMultiRoleMaster)
ASSERT_SOME(slave);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
+ frameworkInfo.clear_capabilities();
+ frameworkInfo.clear_roles();
frameworkInfo.set_role("foo");
+ // TODO(bmahler): Introduce an easier way to strip just one
+ // of the capabilities without having to add back the others.
+ frameworkInfo.add_capabilities()->set_type(
+ FrameworkInfo::Capability::RESERVATION_REFINEMENT);
+
MockScheduler sched;
TestingMesosSchedulerDriver driver(&sched, &detector, frameworkInfo);
@@ -335,10 +342,7 @@ TEST_F(UpgradeTest, UpgradeSlaveIntoMultiRole)
AWAIT_READY(slaveRegisteredMessage);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.clear_role();
- frameworkInfo.add_roles("foo");
- frameworkInfo.add_capabilities()->set_type(
- FrameworkInfo::Capability::MULTI_ROLE);
+ frameworkInfo.set_roles(0, "foo");
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -408,6 +412,8 @@ TEST_F(UpgradeTest, MultiRoleSchedulerUpgrade)
ASSERT_SOME(agent);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
+ frameworkInfo.clear_capabilities();
+ frameworkInfo.clear_roles();
frameworkInfo.set_role("foo");
MockScheduler sched1;
@@ -602,7 +608,7 @@ TEST_F(UpgradeTest, UpgradeAgentIntoHierarchicalRoleForNonHierarchicalRole)
AWAIT_READY(slaveRegisteredMessage);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("foo");
+ frameworkInfo.set_roles(0, "foo");
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -729,7 +735,7 @@ TEST_F(UpgradeTest, UpgradeAgentIntoHierarchicalRoleForHierarchicalRole)
AWAIT_READY(slaveRegisteredMessage);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("foo/bar");
+ frameworkInfo.set_roles(0, "foo/bar");
MockScheduler sched;
MesosSchedulerDriver driver(
@@ -832,7 +838,7 @@ TEST_F(UpgradeTest, RefineResourceOnOldAgent)
AWAIT_READY(slaveRegisteredMessage);
FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
- frameworkInfo.set_role("role1/xyz");
+ frameworkInfo.set_roles(0, "role1/xyz");
// Check that `DEFAULT_FRAMEWORK_INFO` includes the
// RESERVATION_REFINEMENT framework capability.
@@ -859,13 +865,13 @@ TEST_F(UpgradeTest, RefineResourceOnOldAgent)
Resources baseReservation = Resources::parse("disk(role1):1024").get();
Resources refinedReservation = baseReservation.pushReservation(
createDynamicReservationInfo(
- frameworkInfo.role(), frameworkInfo.principal()));
+ frameworkInfo.roles(0), frameworkInfo.principal()));
Offer offer = offers->front();
// Expect a resource offer containing a static reservation for `role1`.
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(baseReservation, frameworkInfo.role())));
+ allocatedResources(baseReservation, frameworkInfo.roles(0))));
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers));
@@ -895,7 +901,7 @@ TEST_F(UpgradeTest, RefineResourceOnOldAgent)
// Expect another resource offer with the same static reservation.
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(baseReservation, frameworkInfo.role())));
+ allocatedResources(baseReservation, frameworkInfo.roles(0))));
TaskInfo taskInfo =
createTask(offer.slave_id(), refinedReservation, "sleep 100");
@@ -927,7 +933,7 @@ TEST_F(UpgradeTest, RefineResourceOnOldAgent)
// Expect another resource offer with the same static reservation.
EXPECT_TRUE(Resources(offer.resources()).contains(
- allocatedResources(baseReservation, frameworkInfo.role())));
+ allocatedResources(baseReservation, frameworkInfo.roles(0))));
// Make sure that any in-flight messages are delivered.
Clock::settle();