mesos git commit: Added validation test for task group task using NetworkInfos.

[vi...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 7429846df -> 2d7bb9dfd


Added validation test for task group task using NetworkInfos.

NetworkInfos can only be set on the task group executor.

Review: https://reviews.apache.org/r/51437


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2d7bb9df
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2d7bb9df
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2d7bb9df

Branch: refs/heads/master
Commit: 2d7bb9dfd99e370790aa10a4a657c4848a1b533b
Parents: 7429846
Author: Vinod Kone <vi...@gmail.com>
Authored: Thu Aug 25 10:39:24 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Aug 26 12:17:40 2016 -0700

----------------------------------------------------------------------
 src/master/validation.cpp             |  5 ++
 src/tests/master_validation_tests.cpp | 74 ++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/2d7bb9df/src/master/validation.cpp
----------------------------------------------------------------------
diff --git a/src/master/validation.cpp b/src/master/validation.cpp
index 36447ff..15e2ecc 100644
--- a/src/master/validation.cpp
+++ b/src/master/validation.cpp
@@ -994,10 +994,15 @@ Option<Error> validateTask(
   }
 
   // Now do `TaskGroup` specific validation.
+
   if (task.has_executor()) {
     return Error("'TaskInfo.executor' must not be set");
   }
 
+  if (task.has_container() && task.container().network_infos().size() > 0) {
+    return Error("NetworkInfos must not be set on the task");
+  }
+
   return None();
 }
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/2d7bb9df/src/tests/master_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp
index 56e931c..1df76f5 100644
--- a/src/tests/master_validation_tests.cpp
+++ b/src/tests/master_validation_tests.cpp
@@ -1740,6 +1740,80 @@ TEST_F(TaskGroupValidationTest, ExecutorWithoutFrameworkId)
   driver.join();
 }
 
+
+// This test verifies that a task group task
+// that has `NetworkInfo` set is invalid.
+TEST_F(TaskGroupValidationTest, TaskUsesNetworkInfo)
+{
+  Try<Owned<cluster::Master>> master = StartMaster();
+  ASSERT_SOME(master);
+
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
+  ASSERT_SOME(slave);
+
+  MockScheduler sched;
+  MesosSchedulerDriver driver(
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
+
+  EXPECT_CALL(sched, registered(&driver, _, _))
+    .Times(1);
+
+  Future<vector<Offer>> offers;
+  EXPECT_CALL(sched, resourceOffers(&driver, _))
+    .WillOnce(FutureArg<1>(&offers))
+    .WillRepeatedly(Return()); // Ignore subsequent offers.
+
+  driver.start();
+
+  AWAIT_READY(offers);
+  EXPECT_NE(0u, offers->size());
+  Offer offer = offers.get()[0];
+
+  Resources resources = Resources::parse("cpus:1;mem:512;disk:32").get();
+
+  ExecutorInfo executor(DEFAULT_EXECUTOR_INFO);
+  executor.set_type(ExecutorInfo::CUSTOM);
+  executor.mutable_resources()->CopyFrom(resources);
+
+  // Create a task that has NetworkInfos set.
+  TaskInfo task;
+  task.set_name("test");
+  task.mutable_task_id()->set_value("1");
+  task.mutable_slave_id()->MergeFrom(offer.slave_id());
+  task.mutable_resources()->MergeFrom(resources);
+  task.mutable_container()->set_type(ContainerInfo::MESOS);
+  task.mutable_container()->add_network_infos();
+
+  TaskGroupInfo taskGroup;
+  taskGroup.add_tasks()->CopyFrom(task);
+
+  Future<TaskStatus> status;
+  EXPECT_CALL(sched, statusUpdate(&driver, _))
+    .WillOnce(FutureArg<1>(&status));
+
+  Offer::Operation operation;
+  operation.set_type(Offer::Operation::LAUNCH_GROUP);
+
+  Offer::Operation::LaunchGroup* launchGroup =
+    operation.mutable_launch_group();
+
+  launchGroup->mutable_executor()->CopyFrom(executor);
+  launchGroup->mutable_task_group()->CopyFrom(taskGroup);
+
+  driver.acceptOffers({offers.get()[0].id()}, {operation});
+
+  AWAIT_READY(status);
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_ERROR, status->state());
+  EXPECT_EQ(TaskStatus::REASON_TASK_GROUP_INVALID, status->reason());
+  EXPECT_EQ("Task '1' is invalid: NetworkInfos must not be set on the task",
+            status->message());
+
+  driver.stop();
+  driver.join();
+}
+
 } // namespace tests {
 } // namespace internal {
 } // namespace mesos {