Repository: aurora Updated Branches: refs/heads/master f88b7f3bf -> cd4df56c9
http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/mesos/MesosSchedulerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/MesosSchedulerImplTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/MesosSchedulerImplTest.java index ed48934..9bb319b 100644 --- a/src/test/java/org/apache/aurora/scheduler/mesos/MesosSchedulerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/mesos/MesosSchedulerImplTest.java @@ -39,17 +39,15 @@ import org.apache.aurora.scheduler.storage.Storage.StorageException; import org.apache.aurora.scheduler.storage.entities.IHostAttributes; import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; import org.apache.aurora.scheduler.testing.FakeStatsProvider; -import org.apache.mesos.Protos.ExecutorID; -import org.apache.mesos.Protos.FrameworkID; -import org.apache.mesos.Protos.MasterInfo; -import org.apache.mesos.Protos.OfferID; -import org.apache.mesos.Protos.SlaveID; -import org.apache.mesos.Protos.TaskID; -import org.apache.mesos.Protos.TaskState; -import org.apache.mesos.Protos.TaskStatus; -import org.apache.mesos.Protos.TaskStatus.Reason; -import org.apache.mesos.Protos.TaskStatus.Source; +import org.apache.mesos.Protos; import org.apache.mesos.SchedulerDriver; +import org.apache.mesos.v1.Protos.FrameworkID; +import org.apache.mesos.v1.Protos.OfferID; +import org.apache.mesos.v1.Protos.TaskID; +import org.apache.mesos.v1.Protos.TaskState; +import org.apache.mesos.v1.Protos.TaskStatus; +import org.apache.mesos.v1.Protos.TaskStatus.Reason; +import org.apache.mesos.v1.Protos.TaskStatus.Source; import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; @@ -58,7 +56,6 @@ import org.slf4j.LoggerFactory; import static org.apache.aurora.gen.MaintenanceMode.DRAINING; import static org.apache.aurora.gen.MaintenanceMode.NONE; -import static org.apache.mesos.Protos.Offer; import static org.easymock.EasyMock.anyString; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; @@ -72,20 +69,23 @@ public class MesosSchedulerImplTest extends EasyMockTest { FrameworkID.newBuilder().setValue(FRAMEWORK_ID).build(); private static final String SLAVE_HOST = "slave-hostname"; - private static final SlaveID SLAVE_ID = SlaveID.newBuilder().setValue("slave-id").build(); + private static final Protos.SlaveID SLAVE_ID = + Protos.SlaveID.newBuilder().setValue("slave-id").build(); private static final String SLAVE_HOST_2 = "slave-hostname-2"; - private static final SlaveID SLAVE_ID_2 = SlaveID.newBuilder().setValue("slave-id-2").build(); - private static final ExecutorID EXECUTOR_ID = - ExecutorID.newBuilder().setValue("executor-id").build(); + private static final Protos.SlaveID SLAVE_ID_2 = + Protos.SlaveID.newBuilder().setValue("slave-id-2").build(); + private static final Protos.ExecutorID EXECUTOR_ID = + Protos.ExecutorID.newBuilder().setValue("executor-id").build(); private static final OfferID OFFER_ID = OfferID.newBuilder().setValue("offer-id").build(); - private static final HostOffer OFFER = new HostOffer( - Offer.newBuilder() - .setFrameworkId(FRAMEWORK) + private static final Protos.Offer OFFER = Protos.Offer.newBuilder() + .setFrameworkId(ProtosConversion.convert(FRAMEWORK)) .setSlaveId(SLAVE_ID) .setHostname(SLAVE_HOST) - .setId(OFFER_ID) - .build(), + .setId(ProtosConversion.convert(OFFER_ID)) + .build(); + private static final HostOffer HOST_OFFER = new HostOffer( + ProtosConversion.convert(OFFER), IHostAttributes.build( new HostAttributes() .setHost(SLAVE_HOST) @@ -93,12 +93,13 @@ public class MesosSchedulerImplTest extends EasyMockTest { .setMode(NONE) .setAttributes(ImmutableSet.of()))); private static final OfferID OFFER_ID_2 = OfferID.newBuilder().setValue("offer-id-2").build(); - private static final HostOffer OFFER_2 = new HostOffer( - Offer.newBuilder(OFFER.getOffer()) + private static final Protos.Offer OFFER_2 = Protos.Offer.newBuilder(OFFER) .setSlaveId(SLAVE_ID_2) .setHostname(SLAVE_HOST_2) - .setId(OFFER_ID_2) - .build(), + .setId(ProtosConversion.convert(OFFER_ID_2)) + .build(); + private static final HostOffer HOST_OFFER_2 = new HostOffer( + ProtosConversion.convert(OFFER_2), IHostAttributes.build( new HostAttributes() .setHost(SLAVE_HOST_2) @@ -108,7 +109,7 @@ public class MesosSchedulerImplTest extends EasyMockTest { private static final TaskStatus STATUS_NO_REASON = TaskStatus.newBuilder() .setState(TaskState.TASK_RUNNING) - .setSource(Source.SOURCE_SLAVE) + .setSource(Source.SOURCE_AGENT) .setMessage("message") .setTimestamp(1D) .setTaskId(TaskID.newBuilder().setValue("task-id").build()) @@ -192,8 +193,8 @@ public class MesosSchedulerImplTest extends EasyMockTest { new AbstractOfferTest() { @Override void respondToOffer() { - expectOfferAttributesSaved(OFFER); - offerManager.addOffer(OFFER); + expectOfferAttributesSaved(HOST_OFFER); + offerManager.addOffer(HOST_OFFER); } }.run(); } @@ -208,8 +209,8 @@ public class MesosSchedulerImplTest extends EasyMockTest { new AbstractOfferTest() { @Override void respondToOffer() { - expectOfferAttributesSaved(OFFER); - offerManager.addOffer(OFFER); + expectOfferAttributesSaved(HOST_OFFER); + offerManager.addOffer(HOST_OFFER); } }.run(); } @@ -220,14 +221,14 @@ public class MesosSchedulerImplTest extends EasyMockTest { @Override void respondToOffer() { IHostAttributes draining = - IHostAttributes.build(OFFER.getAttributes().newBuilder().setMode(DRAINING)); - expect(storageUtil.attributeStore.getHostAttributes(OFFER.getOffer().getHostname())) + IHostAttributes.build(HOST_OFFER.getAttributes().newBuilder().setMode(DRAINING)); + expect(storageUtil.attributeStore.getHostAttributes(HOST_OFFER.getOffer().getHostname())) .andReturn(Optional.of(draining)); IHostAttributes saved = IHostAttributes.build( - Conversions.getAttributes(OFFER.getOffer()).newBuilder().setMode(DRAINING)); + Conversions.getAttributes(HOST_OFFER.getOffer()).newBuilder().setMode(DRAINING)); expect(storageUtil.attributeStore.saveHostAttributes(saved)).andReturn(true); - HostOffer offer = new HostOffer(OFFER.getOffer(), draining); + HostOffer offer = new HostOffer(HOST_OFFER.getOffer(), draining); offerManager.addOffer(offer); } }.run(); @@ -270,15 +271,18 @@ public class MesosSchedulerImplTest extends EasyMockTest { new AbstractRegisteredTest() { @Override void expectations() { - expectOfferAttributesSaved(OFFER); - expectOfferAttributesSaved(OFFER_2); - offerManager.addOffer(OFFER); - offerManager.addOffer(OFFER_2); + expectOfferAttributesSaved(HOST_OFFER); + expectOfferAttributesSaved(HOST_OFFER_2); + offerManager.addOffer(HOST_OFFER); + offerManager.addOffer(HOST_OFFER_2); } @Override void test() { - scheduler.resourceOffers(driver, ImmutableList.of(OFFER.getOffer(), OFFER_2.getOffer())); + scheduler.resourceOffers(driver, + ImmutableList.of( + ProtosConversion.convert(HOST_OFFER.getOffer()), + ProtosConversion.convert(HOST_OFFER_2.getOffer()))); } }.run(); } @@ -321,7 +325,7 @@ public class MesosSchedulerImplTest extends EasyMockTest { public void testReregistered() { control.replay(); - scheduler.reregistered(driver, MasterInfo.getDefaultInstance()); + scheduler.reregistered(driver, Protos.MasterInfo.getDefaultInstance()); } @Test @@ -330,7 +334,7 @@ public class MesosSchedulerImplTest extends EasyMockTest { control.replay(); - scheduler.offerRescinded(driver, OFFER_ID); + scheduler.offerRescinded(driver, ProtosConversion.convert(OFFER_ID)); assertEquals(1L, statsProvider.getLongValue("offers_rescinded")); } @@ -413,7 +417,10 @@ public class MesosSchedulerImplTest extends EasyMockTest { control.replay(); - scheduler.registered(driver, FRAMEWORK, MasterInfo.getDefaultInstance()); + scheduler.registered( + driver, + ProtosConversion.convert(FRAMEWORK), + Protos.MasterInfo.getDefaultInstance()); test(); } @@ -438,7 +445,9 @@ public class MesosSchedulerImplTest extends EasyMockTest { @Override void test() { - scheduler.resourceOffers(driver, ImmutableList.of(OFFER.getOffer())); + scheduler.resourceOffers( + driver, + ImmutableList.of(ProtosConversion.convert(HOST_OFFER.getOffer()))); } } @@ -456,7 +465,7 @@ public class MesosSchedulerImplTest extends EasyMockTest { @Override void test() { - scheduler.statusUpdate(driver, status); + scheduler.statusUpdate(driver, ProtosConversion.convert(status)); } } http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java index 234acc1..93cc34c 100644 --- a/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java @@ -44,20 +44,20 @@ import org.apache.aurora.scheduler.storage.entities.IAssignedTask; import org.apache.aurora.scheduler.storage.entities.IJobKey; import org.apache.aurora.scheduler.storage.entities.IServerInfo; import org.apache.aurora.scheduler.storage.entities.ITaskConfig; -import org.apache.mesos.Protos; -import org.apache.mesos.Protos.CommandInfo.URI; -import org.apache.mesos.Protos.ContainerInfo; -import org.apache.mesos.Protos.ContainerInfo.DockerInfo; -import org.apache.mesos.Protos.ContainerInfo.MesosInfo; -import org.apache.mesos.Protos.ContainerInfo.Type; -import org.apache.mesos.Protos.ExecutorInfo; -import org.apache.mesos.Protos.Offer; -import org.apache.mesos.Protos.Parameter; -import org.apache.mesos.Protos.Resource; -import org.apache.mesos.Protos.SlaveID; -import org.apache.mesos.Protos.TaskInfo; -import org.apache.mesos.Protos.Volume; -import org.apache.mesos.Protos.Volume.Mode; +import org.apache.mesos.v1.Protos; +import org.apache.mesos.v1.Protos.AgentID; +import org.apache.mesos.v1.Protos.CommandInfo.URI; +import org.apache.mesos.v1.Protos.ContainerInfo; +import org.apache.mesos.v1.Protos.ContainerInfo.DockerInfo; +import org.apache.mesos.v1.Protos.ContainerInfo.MesosInfo; +import org.apache.mesos.v1.Protos.ContainerInfo.Type; +import org.apache.mesos.v1.Protos.ExecutorInfo; +import org.apache.mesos.v1.Protos.Offer; +import org.apache.mesos.v1.Protos.Parameter; +import org.apache.mesos.v1.Protos.Resource; +import org.apache.mesos.v1.Protos.TaskInfo; +import org.apache.mesos.v1.Protos.Volume; +import org.apache.mesos.v1.Protos.Volume.Mode; import org.junit.Before; import org.junit.Test; @@ -122,11 +122,11 @@ public class MesosTaskFactoryImplTest extends EasyMockTest { TestExecutorSettings.THERMOS_TASK_PREFIX)).build(), false /* populate discovery info */); - private static final SlaveID SLAVE = SlaveID.newBuilder().setValue("slave-id").build(); + private static final AgentID SLAVE = AgentID.newBuilder().setValue("slave-id").build(); private static final Offer OFFER_THERMOS_EXECUTOR = Protos.Offer.newBuilder() .setId(Protos.OfferID.newBuilder().setValue("offer-id")) .setFrameworkId(Protos.FrameworkID.newBuilder().setValue("framework-id")) - .setSlaveId(SLAVE) + .setAgentId(SLAVE) .setHostname("slave-hostname") .addAllResources(mesosScalarFromBag(bagFromResources( TASK_CONFIG.getResources()).add(THERMOS_EXECUTOR.getExecutorOverhead( http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/mesos/ProtosConversionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/ProtosConversionTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/ProtosConversionTest.java new file mode 100644 index 0000000..86e065c --- /dev/null +++ b/src/test/java/org/apache/aurora/scheduler/mesos/ProtosConversionTest.java @@ -0,0 +1,41 @@ +/** + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.aurora.scheduler.mesos; + +import org.apache.mesos.Protos; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class ProtosConversionTest { + + @Test + public void testOfferIDRoundTrip() { + Protos.OfferID offerID = Protos.OfferID.newBuilder().setValue("offer-id").build(); + + assertEquals(offerID, ProtosConversion.convert(ProtosConversion.convert(offerID))); + } + + @Test + public void testOfferRoundTrip() { + Protos.Offer offer = Protos.Offer.newBuilder() + .setFrameworkId(Protos.FrameworkID.newBuilder().setValue("framework-id").build()) + .setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-id").build()) + .setHostname("hostname") + .setId(Protos.OfferID.newBuilder().setValue("offer-id").build()) + .build(); + + assertEquals(offer, ProtosConversion.convert(ProtosConversion.convert(offer))); + } +} http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java index 35620a1..38e9135 100644 --- a/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java +++ b/src/test/java/org/apache/aurora/scheduler/mesos/SchedulerDriverServiceTest.java @@ -17,15 +17,16 @@ import com.google.common.base.Optional; import org.apache.aurora.common.testing.easymock.EasyMockTest; import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; -import org.apache.mesos.Protos; import org.apache.mesos.Scheduler; import org.apache.mesos.SchedulerDriver; import org.junit.Before; import org.junit.Test; -import static org.apache.mesos.Protos.FrameworkInfo; import static org.apache.mesos.Protos.Status.DRIVER_ABORTED; import static org.apache.mesos.Protos.Status.DRIVER_RUNNING; +import static org.apache.mesos.Protos.TaskID; +import static org.apache.mesos.v1.Protos.FrameworkID; +import static org.apache.mesos.v1.Protos.FrameworkInfo; import static org.easymock.EasyMock.expect; public class SchedulerDriverServiceTest extends EasyMockTest { @@ -50,8 +51,8 @@ public class SchedulerDriverServiceTest extends EasyMockTest { private Driver driverService; private SchedulerDriver schedulerDriver; - private static Protos.TaskID createTaskId(String taskId) { - return Protos.TaskID.newBuilder().setValue(taskId).build(); + private static TaskID createTaskId(String taskId) { + return TaskID.newBuilder().setValue(taskId).build(); } @Before @@ -136,7 +137,7 @@ public class SchedulerDriverServiceTest extends EasyMockTest { FrameworkInfo.Builder builder = SETTINGS.getFrameworkInfo().toBuilder(); if (frameworkId.isPresent()) { - builder.setId(Protos.FrameworkID.newBuilder().setValue(frameworkId.get())); + builder.setId(FrameworkID.newBuilder().setValue(frameworkId.get())); } expect(driverFactory.create( http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java index a48c85b..abef3f0 100644 --- a/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java +++ b/src/test/java/org/apache/aurora/scheduler/mesos/TaskStatusStatsTest.java @@ -25,9 +25,9 @@ import org.apache.aurora.common.stats.StatsProvider.RequestTimer; import org.apache.aurora.common.testing.easymock.EasyMockTest; import org.apache.aurora.common.util.testing.FakeClock; import org.apache.aurora.scheduler.events.PubsubEvent.TaskStatusReceived; -import org.apache.mesos.Protos.TaskState; -import org.apache.mesos.Protos.TaskStatus.Reason; -import org.apache.mesos.Protos.TaskStatus.Source; +import org.apache.mesos.v1.Protos.TaskState; +import org.apache.mesos.v1.Protos.TaskStatus.Reason; +import org.apache.mesos.v1.Protos.TaskStatus.Source; import org.junit.Before; import org.junit.Test; @@ -71,7 +71,7 @@ public class TaskStatusStatsTest extends EasyMockTest { .andReturn(masterLostCounter); AtomicLong slaveDisconnectedCounter = new AtomicLong(); - expect(statsProvider.makeCounter(reasonCounterName(Reason.REASON_SLAVE_DISCONNECTED))) + expect(statsProvider.makeCounter(reasonCounterName(Reason.REASON_AGENT_DISCONNECTED))) .andReturn(slaveDisconnectedCounter); AtomicLong memoryLimitCounter = new AtomicLong(); @@ -95,7 +95,7 @@ public class TaskStatusStatsTest extends EasyMockTest { eventBus.post(new TaskStatusReceived( TaskState.TASK_LOST, Optional.of(Source.SOURCE_MASTER), - Optional.of(Reason.REASON_SLAVE_DISCONNECTED), + Optional.of(Reason.REASON_AGENT_DISCONNECTED), Optional.of(agoMicros(ONE_SECOND)))); eventBus.post(new TaskStatusReceived( TaskState.TASK_FAILED, @@ -122,14 +122,14 @@ public class TaskStatusStatsTest extends EasyMockTest { eventBus.post(new TaskStatusReceived( TaskState.TASK_LOST, Optional.of(Source.SOURCE_MASTER), - Optional.of(Reason.REASON_SLAVE_DISCONNECTED), + Optional.of(Reason.REASON_AGENT_DISCONNECTED), Optional.absent())); // No time tracking for this since the timestamp is the current time. eventBus.post(new TaskStatusReceived( TaskState.TASK_LOST, Optional.of(Source.SOURCE_MASTER), - Optional.of(Reason.REASON_SLAVE_DISCONNECTED), + Optional.of(Reason.REASON_AGENT_DISCONNECTED), Optional.of(clock.nowMillis() * 1000) )); http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/offers/OfferManagerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/offers/OfferManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/offers/OfferManagerImplTest.java index fb8bd85..49d4e82 100644 --- a/src/test/java/org/apache/aurora/scheduler/offers/OfferManagerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/offers/OfferManagerImplTest.java @@ -37,10 +37,10 @@ import org.apache.aurora.scheduler.storage.entities.IHostAttributes; import org.apache.aurora.scheduler.storage.entities.IScheduledTask; import org.apache.aurora.scheduler.testing.FakeScheduledExecutor; import org.apache.aurora.scheduler.testing.FakeStatsProvider; -import org.apache.mesos.Protos; -import org.apache.mesos.Protos.Filters; -import org.apache.mesos.Protos.Offer.Operation; -import org.apache.mesos.Protos.TaskInfo; +import org.apache.mesos.v1.Protos; +import org.apache.mesos.v1.Protos.Filters; +import org.apache.mesos.v1.Protos.Offer.Operation; +import org.apache.mesos.v1.Protos.TaskInfo; import org.junit.Before; import org.junit.Test; @@ -84,7 +84,7 @@ public class OfferManagerImplTest extends EasyMockTest { private static final TaskInfo TASK_INFO = TaskInfo.newBuilder() .setName("taskName") .setTaskId(Protos.TaskID.newBuilder().setValue(Tasks.id(TASK))) - .setSlaveId(MESOS_OFFER.getSlaveId()) + .setAgentId(MESOS_OFFER.getAgentId()) .build(); private static Operation launch = Operation.newBuilder() .setType(Operation.Type.LAUNCH) @@ -280,7 +280,7 @@ public class OfferManagerImplTest extends EasyMockTest { control.replay(); offerManager.addOffer(OFFER_A); - assertEquals(Optional.of(OFFER_A), offerManager.getOffer(OFFER_A.getOffer().getSlaveId())); + assertEquals(Optional.of(OFFER_A), offerManager.getOffer(OFFER_A.getOffer().getAgentId())); assertEquals(1L, statsProvider.getLongValue(OUTSTANDING_OFFERS)); clock.advance(RETURN_DELAY); } http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/offers/Offers.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/offers/Offers.java b/src/test/java/org/apache/aurora/scheduler/offers/Offers.java index c0899b0..129b443 100644 --- a/src/test/java/org/apache/aurora/scheduler/offers/Offers.java +++ b/src/test/java/org/apache/aurora/scheduler/offers/Offers.java @@ -13,10 +13,10 @@ */ package org.apache.aurora.scheduler.offers; -import org.apache.mesos.Protos.FrameworkID; -import org.apache.mesos.Protos.Offer; -import org.apache.mesos.Protos.OfferID; -import org.apache.mesos.Protos.SlaveID; +import org.apache.mesos.v1.Protos.AgentID; +import org.apache.mesos.v1.Protos.FrameworkID; +import org.apache.mesos.v1.Protos.Offer; +import org.apache.mesos.v1.Protos.OfferID; /** * Utility class for creating resource offers in unit tests. @@ -36,7 +36,7 @@ public final class Offers { return Offer.newBuilder() .setId(OfferID.newBuilder().setValue(offerId)) .setFrameworkId(FrameworkID.newBuilder().setValue("framework_id")) - .setSlaveId(SlaveID.newBuilder().setValue("slave_id-" + offerId)) + .setAgentId(AgentID.newBuilder().setValue("slave_id-" + offerId)) .setHostname(hostName) .build(); } http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/preemptor/PendingTaskProcessorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/preemptor/PendingTaskProcessorTest.java b/src/test/java/org/apache/aurora/scheduler/preemptor/PendingTaskProcessorTest.java index 5c115f3..4da4e9d 100644 --- a/src/test/java/org/apache/aurora/scheduler/preemptor/PendingTaskProcessorTest.java +++ b/src/test/java/org/apache/aurora/scheduler/preemptor/PendingTaskProcessorTest.java @@ -47,7 +47,7 @@ import org.apache.aurora.scheduler.storage.entities.IScheduledTask; import org.apache.aurora.scheduler.storage.entities.ITaskConfig; import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; import org.apache.aurora.scheduler.testing.FakeStatsProvider; -import org.apache.mesos.Protos; +import org.apache.mesos.v1.Protos; import org.junit.Before; import org.junit.Test; @@ -291,7 +291,7 @@ public class PendingTaskProcessorTest extends EasyMockTest { Protos.Offer.Builder builder = Protos.Offer.newBuilder(); builder.getIdBuilder().setValue("id"); builder.getFrameworkIdBuilder().setValue("framework-id"); - builder.getSlaveIdBuilder().setValue(slaveId); + builder.getAgentIdBuilder().setValue(slaveId); builder.setHostname(slaveId); return new HostOffer( builder.build(), http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptionVictimFilterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptionVictimFilterTest.java b/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptionVictimFilterTest.java index 64da234..02bfc51 100644 --- a/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptionVictimFilterTest.java +++ b/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptionVictimFilterTest.java @@ -52,7 +52,7 @@ import org.apache.aurora.scheduler.storage.entities.IHostAttributes; import org.apache.aurora.scheduler.storage.entities.ITaskConfig; import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; import org.apache.aurora.scheduler.testing.FakeStatsProvider; -import org.apache.mesos.Protos; +import org.apache.mesos.v1.Protos; import org.easymock.EasyMock; import org.easymock.IExpectationSetters; import org.junit.Before; @@ -75,8 +75,8 @@ import static org.apache.aurora.scheduler.resources.ResourceType.CPUS; import static org.apache.aurora.scheduler.resources.ResourceType.DISK_MB; import static org.apache.aurora.scheduler.resources.ResourceType.PORTS; import static org.apache.aurora.scheduler.resources.ResourceType.RAM_MB; -import static org.apache.mesos.Protos.Offer; -import static org.apache.mesos.Protos.Resource; +import static org.apache.mesos.v1.Protos.Offer; +import static org.apache.mesos.v1.Protos.Resource; import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; @@ -592,7 +592,7 @@ public class PreemptionVictimFilterTest extends EasyMockTest { Offer.Builder builder = Offer.newBuilder(); builder.getIdBuilder().setValue(offerId); builder.getFrameworkIdBuilder().setValue("framework-id"); - builder.getSlaveIdBuilder().setValue(SLAVE_ID); + builder.getAgentIdBuilder().setValue(SLAVE_ID); builder.setHostname(HOST_A); builder.addAllResources(resources); http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorImplTest.java b/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorImplTest.java index 3b932c9..f14cba1 100644 --- a/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/preemptor/PreemptorImplTest.java @@ -40,7 +40,7 @@ import org.apache.aurora.scheduler.storage.entities.IHostAttributes; import org.apache.aurora.scheduler.storage.entities.IScheduledTask; import org.apache.aurora.scheduler.storage.entities.ITaskConfig; import org.apache.aurora.scheduler.testing.FakeStatsProvider; -import org.apache.mesos.Protos; +import org.apache.mesos.v1.Protos; import org.junit.Before; import org.junit.Test; @@ -82,7 +82,7 @@ public class PreemptorImplTest extends EasyMockTest { slotCache = createMock(new Clazz<BiCache<PreemptionProposal, TaskGroupKey>>() { }); statsProvider = new FakeStatsProvider(); OfferManager offerManager = createMock(OfferManager.class); - expect(offerManager.getOffer(anyObject(Protos.SlaveID.class))) + expect(offerManager.getOffer(anyObject(Protos.AgentID.class))) .andReturn(Optional.of(OFFER)) .anyTimes(); http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskReconcilerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskReconcilerTest.java b/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskReconcilerTest.java index cc6f44d..fb489ad 100644 --- a/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskReconcilerTest.java +++ b/src/test/java/org/apache/aurora/scheduler/reconciliation/TaskReconcilerTest.java @@ -38,7 +38,7 @@ import org.apache.aurora.scheduler.storage.entities.IScheduledTask; import org.apache.aurora.scheduler.storage.entities.ITaskConfig; import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; import org.apache.aurora.scheduler.testing.FakeScheduledExecutor; -import org.apache.mesos.Protos; +import org.apache.mesos.v1.Protos; import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/resources/AcceptedOfferTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/resources/AcceptedOfferTest.java b/src/test/java/org/apache/aurora/scheduler/resources/AcceptedOfferTest.java index 2777d72..dded9c3 100644 --- a/src/test/java/org/apache/aurora/scheduler/resources/AcceptedOfferTest.java +++ b/src/test/java/org/apache/aurora/scheduler/resources/AcceptedOfferTest.java @@ -23,8 +23,8 @@ import org.apache.aurora.gen.AssignedTask; import org.apache.aurora.gen.TaskConfig; import org.apache.aurora.scheduler.TierInfo; import org.apache.aurora.scheduler.storage.entities.IAssignedTask; -import org.apache.mesos.Protos; -import org.apache.mesos.Protos.Resource; +import org.apache.mesos.v1.Protos; +import org.apache.mesos.v1.Protos.Resource; import org.junit.Test; import static org.apache.aurora.scheduler.base.TaskTestUtil.DEV_TIER; http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/resources/MesosResourceConverterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/resources/MesosResourceConverterTest.java b/src/test/java/org/apache/aurora/scheduler/resources/MesosResourceConverterTest.java index 2f67ef4..e13fe71 100644 --- a/src/test/java/org/apache/aurora/scheduler/resources/MesosResourceConverterTest.java +++ b/src/test/java/org/apache/aurora/scheduler/resources/MesosResourceConverterTest.java @@ -19,7 +19,7 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import org.apache.mesos.Protos.Resource; +import org.apache.mesos.v1.Protos.Resource; import org.junit.Test; import static org.apache.aurora.scheduler.resources.MesosResourceConverter.RANGES; http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/resources/PortMapperTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/resources/PortMapperTest.java b/src/test/java/org/apache/aurora/scheduler/resources/PortMapperTest.java index 244c9de..cef795b 100644 --- a/src/test/java/org/apache/aurora/scheduler/resources/PortMapperTest.java +++ b/src/test/java/org/apache/aurora/scheduler/resources/PortMapperTest.java @@ -15,7 +15,7 @@ package org.apache.aurora.scheduler.resources; import org.apache.aurora.gen.AssignedTask; import org.apache.aurora.scheduler.storage.entities.IAssignedTask; -import org.apache.mesos.Protos; +import org.apache.mesos.v1.Protos; import org.junit.Test; import static org.apache.aurora.scheduler.base.TaskTestUtil.JOB; http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/resources/ResourceManagerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/resources/ResourceManagerTest.java b/src/test/java/org/apache/aurora/scheduler/resources/ResourceManagerTest.java index 133cd23..b8b8edb 100644 --- a/src/test/java/org/apache/aurora/scheduler/resources/ResourceManagerTest.java +++ b/src/test/java/org/apache/aurora/scheduler/resources/ResourceManagerTest.java @@ -24,9 +24,9 @@ import org.apache.aurora.gen.AssignedTask; import org.apache.aurora.scheduler.TierInfo; import org.apache.aurora.scheduler.storage.entities.IAssignedTask; import org.apache.aurora.scheduler.storage.entities.IResource; -import org.apache.mesos.Protos; -import org.apache.mesos.Protos.Offer; -import org.apache.mesos.Protos.Value.Scalar; +import org.apache.mesos.v1.Protos; +import org.apache.mesos.v1.Protos.Offer; +import org.apache.mesos.v1.Protos.Value.Scalar; import org.junit.Test; import static org.apache.aurora.gen.Resource.diskMb; @@ -44,7 +44,7 @@ import static org.apache.aurora.scheduler.resources.ResourceType.CPUS; import static org.apache.aurora.scheduler.resources.ResourceType.DISK_MB; import static org.apache.aurora.scheduler.resources.ResourceType.PORTS; import static org.apache.aurora.scheduler.resources.ResourceType.RAM_MB; -import static org.apache.mesos.Protos.Value.Type.SCALAR; +import static org.apache.mesos.v1.Protos.Value.Type.SCALAR; import static org.junit.Assert.assertEquals; public class ResourceManagerTest { @@ -72,7 +72,7 @@ public class ResourceManagerTest { Offer offer = Offer.newBuilder() .setId(Protos.OfferID.newBuilder().setValue("offer-id")) .setFrameworkId(Protos.FrameworkID.newBuilder().setValue("framework-id")) - .setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-id")) + .setAgentId(Protos.AgentID.newBuilder().setValue("slave-id")) .setHostname("hostname") .addAllResources(ImmutableSet.of(resource1, resource2, resource3)).build(); http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/resources/ResourceTestUtil.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/resources/ResourceTestUtil.java b/src/test/java/org/apache/aurora/scheduler/resources/ResourceTestUtil.java index 7dc8c17..e04f611 100644 --- a/src/test/java/org/apache/aurora/scheduler/resources/ResourceTestUtil.java +++ b/src/test/java/org/apache/aurora/scheduler/resources/ResourceTestUtil.java @@ -28,8 +28,8 @@ import org.apache.aurora.scheduler.base.Numbers; import org.apache.aurora.scheduler.storage.entities.IResource; import org.apache.aurora.scheduler.storage.entities.IResourceAggregate; import org.apache.aurora.scheduler.storage.entities.ITaskConfig; -import org.apache.mesos.Protos; -import org.apache.mesos.Protos.Value.Type; +import org.apache.mesos.v1.Protos; +import org.apache.mesos.v1.Protos.Value.Type; import static org.apache.aurora.gen.Resource.diskMb; import static org.apache.aurora.gen.Resource.numCpus; @@ -136,7 +136,7 @@ public final class ResourceTestUtil { return Protos.Offer.newBuilder() .setId(Protos.OfferID.newBuilder().setValue("offer-id")) .setFrameworkId(Protos.FrameworkID.newBuilder().setValue("framework-id")) - .setSlaveId(Protos.SlaveID.newBuilder().setValue("slave-id")) + .setAgentId(Protos.AgentID.newBuilder().setValue("slave-id")) .setHostname("hostname") .addAllResources(ImmutableSet.copyOf(resources)).build(); } http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java index fbcc400..24176fe 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java @@ -56,7 +56,7 @@ import org.apache.aurora.scheduler.storage.entities.IAssignedTask; import org.apache.aurora.scheduler.storage.entities.IHostAttributes; import org.apache.aurora.scheduler.storage.entities.IScheduledTask; import org.apache.aurora.scheduler.storage.entities.ITaskConfig; -import org.apache.mesos.Protos.SlaveID; +import org.apache.mesos.v1.Protos.AgentID; import org.easymock.Capture; import org.easymock.EasyMock; import org.easymock.IArgumentMatcher; @@ -564,7 +564,7 @@ public class StateManagerImplTest extends EasyMockTest { storeProvider, taskId, host.getHost(), - SlaveID.newBuilder().setValue(host.getSlaveId()).build(), + AgentID.newBuilder().setValue(host.getSlaveId()).build(), e -> IAssignedTask.build(e.newBuilder().setAssignedPorts(ports)))); } } http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java index f8bb25b..cf2d25e 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java @@ -44,15 +44,15 @@ import org.apache.aurora.scheduler.storage.entities.IHostAttributes; import org.apache.aurora.scheduler.storage.entities.IScheduledTask; import org.apache.aurora.scheduler.storage.entities.ITaskConfig; import org.apache.aurora.scheduler.testing.FakeStatsProvider; -import org.apache.mesos.Protos.FrameworkID; -import org.apache.mesos.Protos.OfferID; -import org.apache.mesos.Protos.Resource; -import org.apache.mesos.Protos.SlaveID; -import org.apache.mesos.Protos.TaskID; -import org.apache.mesos.Protos.TaskInfo; -import org.apache.mesos.Protos.Value.Range; -import org.apache.mesos.Protos.Value.Ranges; -import org.apache.mesos.Protos.Value.Type; +import org.apache.mesos.v1.Protos.AgentID; +import org.apache.mesos.v1.Protos.FrameworkID; +import org.apache.mesos.v1.Protos.OfferID; +import org.apache.mesos.v1.Protos.Resource; +import org.apache.mesos.v1.Protos.TaskID; +import org.apache.mesos.v1.Protos.TaskInfo; +import org.apache.mesos.v1.Protos.Value.Range; +import org.apache.mesos.v1.Protos.Value.Ranges; +import org.apache.mesos.v1.Protos.Value.Type; import org.junit.Before; import org.junit.Test; @@ -70,7 +70,7 @@ import static org.apache.aurora.scheduler.state.TaskAssigner.TaskAssignerImpl.AS import static org.apache.aurora.scheduler.state.TaskAssigner.TaskAssignerImpl.ASSIGNER_LAUNCH_FAILURES; import static org.apache.aurora.scheduler.state.TaskAssigner.TaskAssignerImpl.LAUNCH_FAILED_MSG; import static org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider; -import static org.apache.mesos.Protos.Offer; +import static org.apache.mesos.v1.Protos.Offer; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; @@ -82,7 +82,7 @@ public class TaskAssignerImplTest extends EasyMockTest { private static final int PORT = 1000; private static final Offer MESOS_OFFER = offer(mesosRange(PORTS, PORT)); - private static final String SLAVE_ID = MESOS_OFFER.getSlaveId().getValue(); + private static final String SLAVE_ID = MESOS_OFFER.getAgentId().getValue(); private static final HostOffer OFFER = new HostOffer(MESOS_OFFER, IHostAttributes.build(new HostAttributes() .setHost(MESOS_OFFER.getHostname()) @@ -93,7 +93,7 @@ public class TaskAssignerImplTest extends EasyMockTest { private static final TaskInfo TASK_INFO = TaskInfo.newBuilder() .setName("taskName") .setTaskId(TaskID.newBuilder().setValue(Tasks.id(TASK))) - .setSlaveId(MESOS_OFFER.getSlaveId()) + .setAgentId(MESOS_OFFER.getAgentId()) .build(); private static final Map<String, TaskGroupKey> NO_RESERVATION = ImmutableMap.of(); private static final UnusedResource UNUSED = new UnusedResource( @@ -103,7 +103,7 @@ public class TaskAssignerImplTest extends EasyMockTest { Offer.newBuilder() .setId(OfferID.newBuilder().setValue("offerId0")) .setFrameworkId(FrameworkID.newBuilder().setValue("frameworkId")) - .setSlaveId(SlaveID.newBuilder().setValue("slaveId0")) + .setAgentId(AgentID.newBuilder().setValue("slaveId0")) .setHostname("hostName0") .addResources(Resource.newBuilder() .setName("ports") @@ -319,7 +319,7 @@ public class TaskAssignerImplTest extends EasyMockTest { Offer.newBuilder() .setId(OfferID.newBuilder().setValue("offerId0")) .setFrameworkId(FrameworkID.newBuilder().setValue("frameworkId")) - .setSlaveId(SlaveID.newBuilder().setValue("slaveId0")) + .setAgentId(AgentID.newBuilder().setValue("slaveId0")) .setHostname("hostName0") .addResources(Resource.newBuilder() .setName("ports") @@ -380,7 +380,7 @@ public class TaskAssignerImplTest extends EasyMockTest { eq(storeProvider), eq(Tasks.id(TASK)), eq(offer.getHostname()), - eq(offer.getSlaveId()), + eq(offer.getAgentId()), anyObject())).andReturn(TASK.getAssignedTask()); } } http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/stats/AsyncStatsModuleTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/stats/AsyncStatsModuleTest.java b/src/test/java/org/apache/aurora/scheduler/stats/AsyncStatsModuleTest.java index 75bac6f..50a09a6 100644 --- a/src/test/java/org/apache/aurora/scheduler/stats/AsyncStatsModuleTest.java +++ b/src/test/java/org/apache/aurora/scheduler/stats/AsyncStatsModuleTest.java @@ -22,7 +22,7 @@ import org.apache.aurora.scheduler.offers.OfferManager; import org.apache.aurora.scheduler.resources.ResourceTestUtil; import org.apache.aurora.scheduler.stats.SlotSizeCounter.MachineResource; import org.apache.aurora.scheduler.storage.entities.IHostAttributes; -import org.apache.mesos.Protos; +import org.apache.mesos.v1.Protos; import org.junit.Test; import static org.apache.aurora.scheduler.resources.ResourceTestUtil.mesosScalar; @@ -41,7 +41,7 @@ public class AsyncStatsModuleTest extends EasyMockTest { new HostOffer(Protos.Offer.newBuilder() .setId(Protos.OfferID.newBuilder().setValue("offerId")) .setFrameworkId(Protos.FrameworkID.newBuilder().setValue("frameworkId")) - .setSlaveId(Protos.SlaveID.newBuilder().setValue("slaveId")) + .setAgentId(Protos.AgentID.newBuilder().setValue("slaveId")) .setHostname("hostName") .addResources(mesosScalar(CPUS, 2.0, true)) .addResources(mesosScalar(CPUS, 4.0, false)) http://git-wip-us.apache.org/repos/asf/aurora/blob/cd4df56c/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java b/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java index 86861e1..f2275c7 100644 --- a/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java +++ b/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java @@ -62,7 +62,7 @@ import org.apache.aurora.scheduler.storage.db.DbModule; import org.apache.aurora.scheduler.storage.entities.IResourceAggregate; import org.apache.aurora.scheduler.storage.entities.IServerInfo; import org.apache.aurora.scheduler.thrift.aop.AnnotatedAuroraAdmin; -import org.apache.mesos.Protos.FrameworkInfo; +import org.apache.mesos.v1.Protos.FrameworkInfo; import org.apache.shiro.subject.Subject; import org.junit.Test;
