aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject [2/9] Refactors java and python code to the Apache namespace.
Date Tue, 31 Dec 2013 21:28:03 GMT
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/MemLockStoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemLockStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemLockStoreTest.java
index 9187578..88b7378 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemLockStoreTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemLockStoreTest.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.LockKey;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.storage.LockStore;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.LockKey;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.storage.LockStore;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageSchedulerCoreImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageSchedulerCoreImplTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageSchedulerCoreImplTest.java
index f4ffdc4..cbed31f 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageSchedulerCoreImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageSchedulerCoreImplTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
 
-import com.twitter.aurora.scheduler.state.BaseSchedulerCoreImplTest;
-import com.twitter.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.state.BaseSchedulerCoreImplTest;
+import org.apache.aurora.scheduler.storage.Storage;
 
 public class MemStorageSchedulerCoreImplTest extends BaseSchedulerCoreImplTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
index 8f932c5..81e90f3 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemStorageTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
 
 import java.util.Set;
 import java.util.concurrent.Callable;
@@ -28,26 +28,26 @@ import com.google.common.collect.Iterables;
 import com.google.common.testing.TearDown;
 import com.google.common.testing.junit4.TearDownTestCase;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.MutateWork;
-import com.twitter.aurora.scheduler.storage.Storage.StoreProvider;
-import com.twitter.aurora.scheduler.storage.Storage.Work;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
 import com.twitter.common.quantity.Amount;
 import com.twitter.common.quantity.Time;
 import com.twitter.common.util.concurrent.ExecutorServiceShutdown;
 
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.MutateWork;
+import org.apache.aurora.scheduler.storage.Storage.StoreProvider;
+import org.apache.aurora.scheduler.storage.Storage.Work;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/MemTaskStoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemTaskStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemTaskStoreTest.java
index 18b4379..0aba36a 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemTaskStoreTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemTaskStoreTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.storage.mem;
+package org.apache.aurora.scheduler.storage.mem;
 
 import java.util.Map;
 import java.util.Set;
@@ -24,29 +24,29 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskQuery;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.Tasks;
+import org.apache.aurora.scheduler.storage.TaskStore.Mutable.TaskMutation;
+import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
+import org.apache.aurora.scheduler.storage.entities.ITaskConfig;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskQuery;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.Tasks;
-import com.twitter.aurora.scheduler.storage.TaskStore.Mutable.TaskMutation;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
+import static org.apache.aurora.gen.ScheduleStatus.RUNNING;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import static com.twitter.aurora.gen.ScheduleStatus.RUNNING;
-
 public class MemTaskStoreTest {
 
   private static final IScheduledTask TASK_A = makeTask("a");

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
index 7e641b7..17319b3 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.thrift;
+package org.apache.aurora.scheduler.thrift;
 
 import java.util.Set;
 
@@ -27,94 +27,97 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 
+import com.twitter.common.testing.easymock.EasyMockTest;
+import com.twitter.common.util.Clock;
+import com.twitter.common.util.testing.FakeClock;
+
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.auth.CapabilityValidator.AuditCheck;
+import org.apache.aurora.auth.CapabilityValidator.Capability;
+import org.apache.aurora.auth.SessionValidator.AuthFailedException;
+import org.apache.aurora.gen.AddInstancesConfig;
+import org.apache.aurora.gen.AssignedTask;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.ConfigRewrite;
+import org.apache.aurora.gen.Constraint;
+import org.apache.aurora.gen.ExecutorConfig;
+import org.apache.aurora.gen.HostStatus;
+import org.apache.aurora.gen.Hosts;
+import org.apache.aurora.gen.Identity;
+import org.apache.aurora.gen.InstanceConfigRewrite;
+import org.apache.aurora.gen.InstanceKey;
+import org.apache.aurora.gen.JobConfigRewrite;
+import org.apache.aurora.gen.JobConfigValidation;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.JobSummary;
+import org.apache.aurora.gen.JobSummaryResult;
+import org.apache.aurora.gen.LimitConstraint;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.LockKey;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.RewriteConfigsRequest;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.ScheduledTask;
+import org.apache.aurora.gen.SessionKey;
+import org.apache.aurora.gen.TaskConfig;
+import org.apache.aurora.gen.TaskConstraint;
+import org.apache.aurora.gen.TaskQuery;
+import org.apache.aurora.gen.ValueConstraint;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.base.Query;
+import org.apache.aurora.scheduler.base.ScheduleException;
+import org.apache.aurora.scheduler.configuration.ConfigurationManager;
+import org.apache.aurora.scheduler.configuration.SanitizedConfiguration;
+import org.apache.aurora.scheduler.state.CronJobManager;
+import org.apache.aurora.scheduler.state.LockManager;
+import org.apache.aurora.scheduler.state.LockManager.LockException;
+import org.apache.aurora.scheduler.state.MaintenanceController;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.backup.Recovery;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.apache.aurora.scheduler.storage.entities.ILock;
+import org.apache.aurora.scheduler.storage.entities.ILockKey;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+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.thrift.aop.AopModule;
+
 import org.easymock.IExpectationSetters;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.auth.CapabilityValidator.AuditCheck;
-import com.twitter.aurora.auth.CapabilityValidator.Capability;
-import com.twitter.aurora.auth.SessionValidator.AuthFailedException;
-import com.twitter.aurora.gen.AddInstancesConfig;
-import com.twitter.aurora.gen.AssignedTask;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.ConfigRewrite;
-import com.twitter.aurora.gen.Constraint;
-import com.twitter.aurora.gen.ExecutorConfig;
-import com.twitter.aurora.gen.HostStatus;
-import com.twitter.aurora.gen.Hosts;
-import com.twitter.aurora.gen.Identity;
-import com.twitter.aurora.gen.InstanceConfigRewrite;
-import com.twitter.aurora.gen.InstanceKey;
-import com.twitter.aurora.gen.JobConfigRewrite;
-import com.twitter.aurora.gen.JobConfigValidation;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.JobSummary;
-import com.twitter.aurora.gen.JobSummaryResult;
-import com.twitter.aurora.gen.LimitConstraint;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.LockKey;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.ResponseCode;
-import com.twitter.aurora.gen.RewriteConfigsRequest;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.ScheduledTask;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.aurora.gen.TaskConfig;
-import com.twitter.aurora.gen.TaskConstraint;
-import com.twitter.aurora.gen.TaskQuery;
-import com.twitter.aurora.gen.ValueConstraint;
-import com.twitter.aurora.scheduler.base.JobKeys;
-import com.twitter.aurora.scheduler.base.Query;
-import com.twitter.aurora.scheduler.base.ScheduleException;
-import com.twitter.aurora.scheduler.configuration.ConfigurationManager;
-import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration;
-import com.twitter.aurora.scheduler.state.CronJobManager;
-import com.twitter.aurora.scheduler.state.LockManager;
-import com.twitter.aurora.scheduler.state.LockManager.LockException;
-import com.twitter.aurora.scheduler.state.MaintenanceController;
-import com.twitter.aurora.scheduler.state.SchedulerCore;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.backup.Recovery;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup;
-import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration;
-import com.twitter.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.aurora.scheduler.storage.entities.ILock;
-import com.twitter.aurora.scheduler.storage.entities.ILockKey;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.entities.IScheduledTask;
-import com.twitter.aurora.scheduler.storage.entities.ITaskConfig;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.aurora.scheduler.thrift.aop.AopModule;
-import com.twitter.common.testing.easymock.EasyMockTest;
-import com.twitter.common.util.Clock;
-import com.twitter.common.util.testing.FakeClock;
+import static org.apache.aurora.auth.CapabilityValidator.Capability.ROOT;
+import static org.apache.aurora.auth.SessionValidator.SessionContext;
+import static org.apache.aurora.gen.LockValidation.CHECKED;
+import static org.apache.aurora.gen.MaintenanceMode.DRAINING;
+import static org.apache.aurora.gen.MaintenanceMode.NONE;
+import static org.apache.aurora.gen.MaintenanceMode.SCHEDULED;
+import static org.apache.aurora.gen.ResponseCode.AUTH_FAILED;
+import static org.apache.aurora.gen.ResponseCode.ERROR;
+import static org.apache.aurora.gen.ResponseCode.INVALID_REQUEST;
+import static org.apache.aurora.gen.ResponseCode.LOCK_ERROR;
+import static org.apache.aurora.gen.ResponseCode.OK;
+import static org.apache.aurora.gen.ResponseCode.WARNING;
+import static org.apache.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
+import static org.apache.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE;
+import static org.apache.aurora.scheduler.thrift.SchedulerThriftInterface.transitionMessage;
 
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import static com.twitter.aurora.auth.CapabilityValidator.Capability.ROOT;
-import static com.twitter.aurora.auth.SessionValidator.SessionContext;
-import static com.twitter.aurora.gen.LockValidation.CHECKED;
-import static com.twitter.aurora.gen.MaintenanceMode.DRAINING;
-import static com.twitter.aurora.gen.MaintenanceMode.NONE;
-import static com.twitter.aurora.gen.MaintenanceMode.SCHEDULED;
-import static com.twitter.aurora.gen.ResponseCode.AUTH_FAILED;
-import static com.twitter.aurora.gen.ResponseCode.ERROR;
-import static com.twitter.aurora.gen.ResponseCode.INVALID_REQUEST;
-import static com.twitter.aurora.gen.ResponseCode.LOCK_ERROR;
-import static com.twitter.aurora.gen.ResponseCode.OK;
-import static com.twitter.aurora.gen.ResponseCode.WARNING;
-import static com.twitter.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT;
-import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE;
-import static com.twitter.aurora.scheduler.thrift.SchedulerThriftInterface.transitionMessage;
-
 public class SchedulerThriftInterfaceTest extends EasyMockTest {
 
   private static final String ROLE = "bar_role";

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/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 7737124..53bc519 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/ThriftIT.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.thrift;
+package org.apache.aurora.scheduler.thrift;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -25,35 +25,37 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
+import com.twitter.common.application.ShutdownRegistry;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.auth.CapabilityValidator.Capability;
+import org.apache.aurora.auth.SessionValidator;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.SessionKey;
+import org.apache.aurora.scheduler.cron.CronScheduler;
+import org.apache.aurora.scheduler.state.LockManager;
+import org.apache.aurora.scheduler.state.MaintenanceController;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+import org.apache.aurora.scheduler.state.StateManager;
+import org.apache.aurora.scheduler.storage.Storage;
+import org.apache.aurora.scheduler.storage.backup.Recovery;
+import org.apache.aurora.scheduler.storage.backup.StorageBackup;
+import org.apache.aurora.scheduler.storage.entities.IQuota;
+import org.apache.aurora.scheduler.storage.testing.StorageTestUtil;
+import org.apache.aurora.scheduler.thrift.auth.ThriftAuthModule;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.auth.CapabilityValidator.Capability;
-import com.twitter.aurora.auth.SessionValidator;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.aurora.scheduler.cron.CronScheduler;
-import com.twitter.aurora.scheduler.state.LockManager;
-import com.twitter.aurora.scheduler.state.MaintenanceController;
-import com.twitter.aurora.scheduler.state.SchedulerCore;
-import com.twitter.aurora.scheduler.state.StateManager;
-import com.twitter.aurora.scheduler.storage.Storage;
-import com.twitter.aurora.scheduler.storage.backup.Recovery;
-import com.twitter.aurora.scheduler.storage.backup.StorageBackup;
-import com.twitter.aurora.scheduler.storage.entities.IQuota;
-import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil;
-import com.twitter.aurora.scheduler.thrift.auth.ThriftAuthModule;
-import com.twitter.common.application.ShutdownRegistry;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.auth.SessionValidator.SessionContext;
+import static org.apache.aurora.gen.ResponseCode.AUTH_FAILED;
+import static org.apache.aurora.gen.ResponseCode.OK;
 
 import static org.easymock.EasyMock.expectLastCall;
-import static org.junit.Assert.assertEquals;
 
-import static com.twitter.aurora.auth.SessionValidator.SessionContext;
-import static com.twitter.aurora.gen.ResponseCode.AUTH_FAILED;
-import static com.twitter.aurora.gen.ResponseCode.OK;
+import static org.junit.Assert.assertEquals;
 
 public class ThriftIT extends EasyMockTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptorTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptorTest.java
index c1907ac..e32d828 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptorTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/APIVersionInterceptorTest.java
@@ -1,4 +1,4 @@
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.AbstractModule;
@@ -6,24 +6,26 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.matcher.Matchers;
 
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.APIVersion;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.GetJobsResult;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.Result;
+import org.apache.aurora.scheduler.thrift.auth.DecoratedThrift;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import com.twitter.aurora.gen.APIVersion;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.GetJobsResult;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.Result;
-import com.twitter.aurora.scheduler.thrift.auth.DecoratedThrift;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.gen.ResponseCode.OK;
 
 import static org.easymock.EasyMock.expect;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import static com.twitter.aurora.gen.ResponseCode.OK;
-
 public class APIVersionInterceptorTest extends EasyMockTest {
 
   private static final String ROLE = "bob";

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/AopModuleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/AopModuleTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/AopModuleTest.java
index 2a97aba..a0f2bdb 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/AopModuleTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/AopModuleTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
 
 import java.util.Map;
 
@@ -23,18 +23,20 @@ import com.google.inject.CreationException;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.auth.CapabilityValidator;
+import org.apache.aurora.gen.AuroraAdmin.Iface;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.SessionKey;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import com.twitter.aurora.auth.CapabilityValidator;
-import com.twitter.aurora.gen.AuroraAdmin.Iface;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.ResponseCode;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.common.testing.easymock.EasyMockTest;
-
 import static org.easymock.EasyMock.expect;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptorTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptorTest.java
index 81b2cf3..bd29ecc 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptorTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/FeatureToggleInterceptorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
 
 import java.lang.reflect.Method;
 
@@ -24,18 +24,21 @@ import com.google.inject.Injector;
 import com.google.inject.TypeLiteral;
 import com.google.inject.matcher.Matchers;
 
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.ResponseCode;
+import org.apache.aurora.gen.TaskQuery;
+import org.apache.aurora.scheduler.thrift.auth.DecoratedThrift;
+
 import org.easymock.EasyMock;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.ResponseCode;
-import com.twitter.aurora.gen.TaskQuery;
-import com.twitter.aurora.scheduler.thrift.auth.DecoratedThrift;
-import com.twitter.common.testing.easymock.EasyMockTest;
-
 import static org.easymock.EasyMock.expect;
+
 import static org.junit.Assert.assertSame;
 
 public class FeatureToggleInterceptorTest extends EasyMockTest {

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
index 37c0da2..0894131 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/ForwardingThrift.java
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
 
 import java.util.Set;
 
-import org.apache.thrift.TException;
+import org.apache.aurora.gen.AddInstancesConfig;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.Hosts;
+import org.apache.aurora.gen.JobConfigValidation;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobKey;
+import org.apache.aurora.gen.Lock;
+import org.apache.aurora.gen.LockKey;
+import org.apache.aurora.gen.LockValidation;
+import org.apache.aurora.gen.Quota;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.RewriteConfigsRequest;
+import org.apache.aurora.gen.ScheduleStatus;
+import org.apache.aurora.gen.SessionKey;
+import org.apache.aurora.gen.TaskQuery;
 
-import com.twitter.aurora.gen.AddInstancesConfig;
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.Hosts;
-import com.twitter.aurora.gen.JobConfigValidation;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.JobKey;
-import com.twitter.aurora.gen.Lock;
-import com.twitter.aurora.gen.LockKey;
-import com.twitter.aurora.gen.LockValidation;
-import com.twitter.aurora.gen.Quota;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.RewriteConfigsRequest;
-import com.twitter.aurora.gen.ScheduleStatus;
-import com.twitter.aurora.gen.SessionKey;
-import com.twitter.aurora.gen.TaskQuery;
+import org.apache.thrift.TException;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/MockDecoratedThrift.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/MockDecoratedThrift.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/MockDecoratedThrift.java
index 289dff5..e8ec77e 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/MockDecoratedThrift.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/MockDecoratedThrift.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,8 +25,8 @@ import javax.inject.Inject;
 import com.google.inject.Binder;
 import com.google.inject.BindingAnnotation;
 
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.scheduler.thrift.auth.DecoratedThrift;
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.scheduler.thrift.auth.DecoratedThrift;
 
 /**
  * An injected forwarding thrift implementation that delegates to a bound mock interface.

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptorTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptorTest.java
index 8a5cb17..f6cd7e0 100644
--- a/src/test/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptorTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/thrift/aop/ThriftStatsExporterInterceptorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twitter.aurora.scheduler.thrift.aop;
+package org.apache.aurora.scheduler.thrift.aop;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.AbstractModule;
@@ -21,24 +21,26 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.matcher.Matchers;
 
+import com.twitter.common.stats.Stats;
+import com.twitter.common.testing.easymock.EasyMockTest;
+
+import org.apache.aurora.gen.AuroraAdmin;
+import org.apache.aurora.gen.GetJobsResult;
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.Response;
+import org.apache.aurora.gen.Result;
+import org.apache.aurora.scheduler.thrift.auth.DecoratedThrift;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import com.twitter.aurora.gen.AuroraAdmin;
-import com.twitter.aurora.gen.GetJobsResult;
-import com.twitter.aurora.gen.JobConfiguration;
-import com.twitter.aurora.gen.Response;
-import com.twitter.aurora.gen.Result;
-import com.twitter.aurora.scheduler.thrift.auth.DecoratedThrift;
-import com.twitter.common.stats.Stats;
-import com.twitter.common.testing.easymock.EasyMockTest;
+import static org.apache.aurora.gen.ResponseCode.OK;
 
 import static org.easymock.EasyMock.expect;
+
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 
-import static com.twitter.aurora.gen.ResponseCode.OK;
-
 public class ThriftStatsExporterInterceptorTest extends EasyMockTest {
 
   private static final String ROLE = "bob";

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/BUILD b/src/test/python/BUILD
index 487398f..3801b31 100644
--- a/src/test/python/BUILD
+++ b/src/test/python/BUILD
@@ -1,7 +1,7 @@
 python_test_suite(
   name = 'all',
   dependencies = [
-    pants('src/test/python/twitter/aurora:all'),
-    pants('src/test/python/twitter/thermos:all'),
+    pants('src/test/python/apache/aurora:all'),
+    pants('src/test/python/apache/thermos:all'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/BUILD b/src/test/python/apache/aurora/BUILD
index 09dc572..ab88f66 100644
--- a/src/test/python/apache/aurora/BUILD
+++ b/src/test/python/apache/aurora/BUILD
@@ -1,10 +1,10 @@
 python_test_suite(
   name = 'all',
   dependencies = [
-    pants('src/test/python/twitter/aurora/admin:all'),
-    pants('src/test/python/twitter/aurora/client:all'),
-    pants('src/test/python/twitter/aurora/common:all'),
-    pants('src/test/python/twitter/aurora/config:all'),
-    pants('src/test/python/twitter/aurora/executor:all'),
+    pants('src/test/python/apache/aurora/admin:all'),
+    pants('src/test/python/apache/aurora/client:all'),
+    pants('src/test/python/apache/aurora/common:all'),
+    pants('src/test/python/apache/aurora/config:all'),
+    pants('src/test/python/apache/aurora/executor:all'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/admin/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/admin/BUILD b/src/test/python/apache/aurora/admin/BUILD
index 232ec68..c5468d2 100644
--- a/src/test/python/apache/aurora/admin/BUILD
+++ b/src/test/python/apache/aurora/admin/BUILD
@@ -7,9 +7,9 @@ python_test_suite(name = 'all',
 python_tests(name = 'mesos_maintenance',
   sources = ['test_mesos_maintenance.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/common:cluster'),
-    pants('src/main/python/twitter/aurora/admin:mesos_maintenance'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+    pants('src/main/python/apache/aurora/common:cluster'),
+    pants('src/main/python/apache/aurora/admin:mesos_maintenance'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
   ],
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/admin/test_mesos_maintenance.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/admin/test_mesos_maintenance.py b/src/test/python/apache/aurora/admin/test_mesos_maintenance.py
index fc4b6c1..4d85b4c 100644
--- a/src/test/python/apache/aurora/admin/test_mesos_maintenance.py
+++ b/src/test/python/apache/aurora/admin/test_mesos_maintenance.py
@@ -1,9 +1,9 @@
 import unittest
 
-from twitter.aurora.admin.mesos_maintenance import MesosMaintenance
-from twitter.aurora.common.cluster import Cluster
+from apache.aurora.admin.mesos_maintenance import MesosMaintenance
+from apache.aurora.common.cluster import Cluster
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     Hosts,
     Response,
     ResponseCode,
@@ -21,7 +21,7 @@ MOCK_TEST_HOSTS = ['us-west-001.example.com']
 
 
 class TestMesosMaintenance(unittest.TestCase):
-  @mock.patch("twitter.aurora.client.api.AuroraClientAPI.start_maintenance")
+  @mock.patch("apache.aurora.client.api.AuroraClientAPI.start_maintenance")
   def test_start_maintenance(self, mock_api):
     mock_api.return_value = Response(responseCode=ResponseCode.OK)
     maintenance = MesosMaintenance(DEFAULT_CLUSTER, 'quiet')

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/BUILD b/src/test/python/apache/aurora/client/BUILD
index 108a0fc..27ebaf5 100644
--- a/src/test/python/apache/aurora/client/BUILD
+++ b/src/test/python/apache/aurora/client/BUILD
@@ -2,9 +2,9 @@ python_test_suite(name = 'all',
   dependencies = [
     pants(':binding_helper'),
     pants(':config'),
-    pants('src/test/python/twitter/aurora/client/api:all'),
-    pants('src/test/python/twitter/aurora/client/commands:all'),
-    pants('src/test/python/twitter/aurora/client/hooks:all'),
+    pants('src/test/python/apache/aurora/client/api:all'),
+    pants('src/test/python/apache/aurora/client/commands:all'),
+    pants('src/test/python/apache/aurora/client/hooks:all'),
   ],
 )
 
@@ -12,18 +12,18 @@ python_tests(
   name = 'binding_helper',
   sources = ['test_binding_helper.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:pystachio'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('src/main/python/twitter/aurora/client:binding_helper'),
-    pants('src/main/python/twitter/aurora/config'),
+    pants('src/main/python/apache/aurora/client:binding_helper'),
+    pants('src/main/python/apache/aurora/config'),
   ],
 )
 
 python_tests(name = 'config',
   sources = ['test_config.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
-    pants('src/main/python/twitter/aurora/client:config'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('src/main/python/apache/aurora/client:config'),
   ],
 )
 
@@ -31,6 +31,6 @@ python_library(
   name = 'fake_scheduler_proxy',
   sources = ['fake_scheduler_proxy.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/client/api:scheduler_client'),
+    pants('src/main/python/apache/aurora/client/api:scheduler_client'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/BUILD b/src/test/python/apache/aurora/client/api/BUILD
index 2850ece..c532675 100644
--- a/src/test/python/apache/aurora/client/api/BUILD
+++ b/src/test/python/apache/aurora/client/api/BUILD
@@ -13,58 +13,58 @@ python_tests(
   name = 'disambiguator',
   sources = ['test_disambiguator.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
     pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('src/main/python/twitter/aurora/client/api:disambiguator'),
+    pants('src/main/python/apache/aurora/client/api:disambiguator'),
   ],
 )
 
 python_tests(name = 'job_monitor',
   sources = ['test_job_monitor.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
-    pants('src/main/python/twitter/aurora/client/api:api'),
-    pants('src/main/python/twitter/aurora/client/api:job_monitor'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
-    pants('src/test/python/twitter/aurora/client:fake_scheduler_proxy'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('src/main/python/apache/aurora/client/api:api'),
+    pants('src/main/python/apache/aurora/client/api:job_monitor'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
+    pants('src/test/python/apache/aurora/client:fake_scheduler_proxy'),
   ],
 )
 
 python_tests(name = 'restarter',
   sources = ['test_restarter.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
-    pants('src/main/python/twitter/aurora/client/api:restarter'),
-    pants('src/main/python/twitter/aurora/common:aurora_job_key'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
-    pants('src/test/python/twitter/aurora/client:fake_scheduler_proxy'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('src/main/python/apache/aurora/client/api:restarter'),
+    pants('src/main/python/apache/aurora/common:aurora_job_key'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
+    pants('src/test/python/apache/aurora/client:fake_scheduler_proxy'),
   ],
 )
 
 python_tests(name = 'scheduler_client',
   sources = ['test_scheduler_client.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
-    pants('src/main/python/twitter/aurora/client/api:scheduler_client'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('src/main/python/apache/aurora/client/api:scheduler_client'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )
 
 python_tests(name = 'instance_watcher',
   sources = ['test_instance_watcher.py', 'test_health_check.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
-    pants('src/main/python/twitter/aurora/client/api:instance_watcher'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('src/main/python/apache/aurora/client/api:instance_watcher'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )
 
 python_tests(name = 'updater',
   sources = ['test_updater.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
-    pants('src/main/python/twitter/aurora/client/api:updater'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
-    pants('src/test/python/twitter/aurora/client:fake_scheduler_proxy'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('src/main/python/apache/aurora/client/api:updater'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
+    pants('src/test/python/apache/aurora/client:fake_scheduler_proxy'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_disambiguator.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_disambiguator.py b/src/test/python/apache/aurora/client/api/test_disambiguator.py
index fc70519..a93a8ee 100644
--- a/src/test/python/apache/aurora/client/api/test_disambiguator.py
+++ b/src/test/python/apache/aurora/client/api/test_disambiguator.py
@@ -1,12 +1,12 @@
 import functools
 
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.client.api.disambiguator import LiveJobDisambiguator
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.aurora.common.cluster import Cluster
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.client.api.disambiguator import LiveJobDisambiguator
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.cluster import Cluster
 
-from gen.twitter.aurora.constants import ResponseCode
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.constants import ResponseCode
+from gen.apache.aurora.ttypes import (
    Response,
    Result,
    GetJobsResult,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_health_check.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_health_check.py b/src/test/python/apache/aurora/client/api/test_health_check.py
index fb577c6..a160462 100644
--- a/src/test/python/apache/aurora/client/api/test_health_check.py
+++ b/src/test/python/apache/aurora/client/api/test_health_check.py
@@ -1,7 +1,7 @@
 import unittest
 
-from twitter.aurora.common.http_signaler import HttpSignaler
-from twitter.aurora.client.api.health_check import (
+from apache.aurora.common.http_signaler import HttpSignaler
+from apache.aurora.client.api.health_check import (
   ChainedHealthCheck,
   HealthCheck,
   HealthStatus,
@@ -12,7 +12,7 @@ from twitter.aurora.client.api.health_check import (
   StatusHealthCheck
 )
 
-from gen.twitter.aurora.ttypes import *
+from gen.apache.aurora.ttypes import *
 
 import mox
 import pytest

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_instance_watcher.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_instance_watcher.py b/src/test/python/apache/aurora/client/api/test_instance_watcher.py
index 274d23b..1184d0b 100644
--- a/src/test/python/apache/aurora/client/api/test_instance_watcher.py
+++ b/src/test/python/apache/aurora/client/api/test_instance_watcher.py
@@ -1,11 +1,11 @@
 from math import ceil
 import unittest
 
-from twitter.aurora.client.api.health_check import HealthCheck
-from twitter.aurora.client.api.instance_watcher import InstanceWatcher
+from apache.aurora.client.api.health_check import HealthCheck
+from apache.aurora.client.api.instance_watcher import InstanceWatcher
 
-from gen.twitter.aurora.ttypes import *
-from gen.twitter.aurora.AuroraSchedulerManager import Client as scheduler_client
+from gen.apache.aurora.ttypes import *
+from gen.apache.aurora.AuroraSchedulerManager import Client as scheduler_client
 
 import mox
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_job_monitor.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_job_monitor.py b/src/test/python/apache/aurora/client/api/test_job_monitor.py
index 30fca95..9327b32 100644
--- a/src/test/python/apache/aurora/client/api/test_job_monitor.py
+++ b/src/test/python/apache/aurora/client/api/test_job_monitor.py
@@ -1,7 +1,7 @@
-from gen.twitter.aurora.AuroraSchedulerManager import Client
-from gen.twitter.aurora.ttypes import Response, ResponseCode, Result, ScheduleStatusResult, Identity, TaskQuery
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.client.api.job_monitor import JobMonitor
+from gen.apache.aurora.AuroraSchedulerManager import Client
+from gen.apache.aurora.ttypes import Response, ResponseCode, Result, ScheduleStatusResult, Identity, TaskQuery
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.client.api.job_monitor import JobMonitor
 
 from mox import MoxTestBase
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_restarter.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_restarter.py b/src/test/python/apache/aurora/client/api/test_restarter.py
index 0f74922..8d505eb 100644
--- a/src/test/python/apache/aurora/client/api/test_restarter.py
+++ b/src/test/python/apache/aurora/client/api/test_restarter.py
@@ -1,15 +1,15 @@
-from twitter.aurora.client.api.restarter import Restarter
-from twitter.aurora.client.api.instance_watcher import InstanceWatcher
-from twitter.aurora.client.api.updater_util import UpdaterConfig
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.client.api.restarter import Restarter
+from apache.aurora.client.api.instance_watcher import InstanceWatcher
+from apache.aurora.client.api.updater_util import UpdaterConfig
+from apache.aurora.common.aurora_job_key import AuroraJobKey
 
-from gen.twitter.aurora.AuroraSchedulerManager import Client as scheduler_client
-from gen.twitter.aurora.ttypes import *
+from gen.apache.aurora.AuroraSchedulerManager import Client as scheduler_client
+from gen.apache.aurora.ttypes import *
 
 from mox import IgnoreArg, MoxTestBase
 
 # test space
-from twitter.aurora.client.fake_scheduler_proxy import FakeSchedulerProxy
+from apache.aurora.client.fake_scheduler_proxy import FakeSchedulerProxy
 
 
 SESSION_KEY = 'test_session'

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_scheduler_client.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_scheduler_client.py b/src/test/python/apache/aurora/client/api/test_scheduler_client.py
index fe62cd2..339ad9f 100644
--- a/src/test/python/apache/aurora/client/api/test_scheduler_client.py
+++ b/src/test/python/apache/aurora/client/api/test_scheduler_client.py
@@ -1,12 +1,12 @@
 import inspect
 import unittest
 
-import twitter.aurora.client.api.scheduler_client as scheduler_client
+import apache.aurora.client.api.scheduler_client as scheduler_client
 
-import gen.twitter.aurora.AuroraAdmin as AuroraAdmin
-import gen.twitter.aurora.AuroraSchedulerManager as AuroraSchedulerManager
-from gen.twitter.aurora.constants import DEFAULT_ENVIRONMENT, CURRENT_API_VERSION
-from gen.twitter.aurora.ttypes import *
+import gen.apache.aurora.AuroraAdmin as AuroraAdmin
+import gen.apache.aurora.AuroraSchedulerManager as AuroraSchedulerManager
+from gen.apache.aurora.constants import DEFAULT_ENVIRONMENT, CURRENT_API_VERSION
+from gen.apache.aurora.ttypes import *
 
 from mox import IgnoreArg, IsA, Mox
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/api/test_updater.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_updater.py b/src/test/python/apache/aurora/client/api/test_updater.py
index ae4de2b..5843bb4 100644
--- a/src/test/python/apache/aurora/client/api/test_updater.py
+++ b/src/test/python/apache/aurora/client/api/test_updater.py
@@ -2,13 +2,13 @@ from copy import deepcopy
 from os import environ
 from unittest import TestCase
 
-from twitter.aurora.client.api.instance_watcher import InstanceWatcher
-from twitter.aurora.client.api.updater import Updater
-from twitter.aurora.client.fake_scheduler_proxy import FakeSchedulerProxy
+from apache.aurora.client.api.instance_watcher import InstanceWatcher
+from apache.aurora.client.api.updater import Updater
+from apache.aurora.client.fake_scheduler_proxy import FakeSchedulerProxy
 
-from gen.twitter.aurora.AuroraSchedulerManager import Client as scheduler_client
-from gen.twitter.aurora.constants import ACTIVE_STATES
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.AuroraSchedulerManager import Client as scheduler_client
+from gen.apache.aurora.constants import ACTIVE_STATES
+from gen.apache.aurora.ttypes import (
   AddInstancesConfig,
   AcquireLockResult,
   AssignedTask,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/cli/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/BUILD b/src/test/python/apache/aurora/client/cli/BUILD
index 89184b6..9528eed 100644
--- a/src/test/python/apache/aurora/client/cli/BUILD
+++ b/src/test/python/apache/aurora/client/cli/BUILD
@@ -7,8 +7,8 @@ python_library(
   name = 'util',
   sources = [ 'util.py' ],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
-    pants('src/main/python/twitter/aurora/client/cli'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
+    pants('src/main/python/apache/aurora/client/cli'),
   ]
 )
 
@@ -17,10 +17,10 @@ python_tests(
   sources = [ 'test_create.py', 'test_kill.py' ],
   dependencies = [
     pants(':util'),
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('src/main/python/twitter/aurora/client/cli'),
-    pants('src/main/python/twitter/aurora/client/cli'),
-    pants('src/test/python/twitter/aurora/client/commands:util')
+    pants('src/main/python/apache/aurora/client/cli'),
+    pants('src/main/python/apache/aurora/client/cli'),
+    pants('src/test/python/apache/aurora/client/commands:util')
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/cli/test_create.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_create.py b/src/test/python/apache/aurora/client/cli/test_create.py
index da2828f..df2386d 100644
--- a/src/test/python/apache/aurora/client/cli/test_create.py
+++ b/src/test/python/apache/aurora/client/cli/test_create.py
@@ -1,16 +1,16 @@
 import contextlib
 
-from twitter.aurora.client.cli import (
+from apache.aurora.client.cli import (
     AuroraCommandLine,
     EXIT_INVALID_CONFIGURATION,
     EXIT_NETWORK_ERROR
 )
-from twitter.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.config import AuroraConfig
+from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.config import AuroraConfig
 from twitter.common.contextutil import temporary_file
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     AssignedTask,
     Identity,
     ScheduledTask,
@@ -104,7 +104,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
     # We'll patch out create_context, which will give us a fake context
     # object, and everything can be stubbed through that.
     mock_context = FakeAuroraCommandContext()
-    with patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
+    with patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
       # After making the client, create sets up a job monitor.
       # The monitor uses TaskQuery to get the tasks. It's called at least twice:once before
       # the job is created, and once after. So we need to set up mocks for the query results.
@@ -136,7 +136,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
     mock_context = FakeAuroraCommandContext()
     with contextlib.nested(
         patch('time.sleep'),
-        patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context)):
+        patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context)):
       mock_query = self.create_mock_query()
       for result in [ScheduleStatus.INIT, ScheduleStatus.PENDING, ScheduleStatus.PENDING,
           ScheduleStatus.RUNNING, ScheduleStatus.FINISHED]:
@@ -159,7 +159,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
     this time, make the monitor check status several times before successful completion.
     """
     mock_context = FakeAuroraCommandContext()
-    with patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
+    with patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
       mock_context.add_expected_status_query_result(
           self.create_mock_status_query_result(ScheduleStatus.INIT))
       api = mock_context.get_api('west')
@@ -184,7 +184,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
     """Run a test of the "create" command against a mocked-out API, with a configuration
     containing a syntax error"""
     mock_context = FakeAuroraCommandContext()
-    with patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
+    with patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context):
       with temporary_file() as fp:
         fp.write(self.get_invalid_config('invalid_clause=oops'))
         fp.flush()

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/cli/test_kill.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_kill.py b/src/test/python/apache/aurora/client/cli/test_kill.py
index 8f8095c..75fb6b6 100644
--- a/src/test/python/apache/aurora/client/cli/test_kill.py
+++ b/src/test/python/apache/aurora/client/cli/test_kill.py
@@ -1,14 +1,14 @@
 import contextlib
 import unittest
 
-from twitter.aurora.client.cli import AuroraCommandLine
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.client.cli import AuroraCommandLine
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.aurora_job_key import AuroraJobKey
 from twitter.common.contextutil import temporary_file
-from twitter.aurora.client.cli.jobs import parse_instances
-from twitter.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
+from apache.aurora.client.cli.jobs import parse_instances
+from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCommandContext
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     Identity,
     TaskQuery,
 )
@@ -55,8 +55,8 @@ class TestClientKillCommand(AuroraClientCommandTest):
     mock_context = FakeAuroraCommandContext()
     mock_scheduler = Mock()
     with contextlib.nested(
-        patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
+        patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
 
       api = mock_context.get_api('west')
       api.kill_job.return_value = self.get_kill_job_response()
@@ -75,8 +75,8 @@ class TestClientKillCommand(AuroraClientCommandTest):
     """Test kill client-side API logic."""
     mock_context = FakeAuroraCommandContext()
     with contextlib.nested(
-        patch('twitter.aurora.client.cli.jobs.Job.create_context', return_value=mock_context),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
+        patch('apache.aurora.client.cli.jobs.Job.create_context', return_value=mock_context),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
       api = mock_context.get_api('west')
       api.kill_job.return_value = self.get_kill_job_response()
       with temporary_file() as fp:
@@ -96,8 +96,8 @@ class TestClientKillCommand(AuroraClientCommandTest):
     mock_context = FakeAuroraCommandContext()
     (mock_api, mock_scheduler) = self.setup_mock_api()
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)):
       mock_scheduler.killTasks.return_value = self.get_kill_job_response()
       with temporary_file() as fp:
         fp.write(self.get_valid_config())

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/cli/util.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/util.py b/src/test/python/apache/aurora/client/cli/util.py
index 46883ec..c6d3830 100644
--- a/src/test/python/apache/aurora/client/cli/util.py
+++ b/src/test/python/apache/aurora/client/cli/util.py
@@ -1,11 +1,11 @@
 import unittest
 
-from twitter.aurora.client.cli.context import AuroraCommandContext
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
+from apache.aurora.client.cli.context import AuroraCommandContext
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     Response,
     ResponseCode,
     Result,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/BUILD b/src/test/python/apache/aurora/client/commands/BUILD
index 6d1f9b0..3c3de5f 100644
--- a/src/test/python/apache/aurora/client/commands/BUILD
+++ b/src/test/python/apache/aurora/client/commands/BUILD
@@ -16,11 +16,11 @@ python_tests(
     'test_update.py'
   ],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
     pants(':util'),
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('src/main/python/twitter/aurora/client/commands:core'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+    pants('src/main/python/apache/aurora/client/commands:core'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ])
 
 python_tests(
@@ -29,11 +29,11 @@ python_tests(
     'test_ssh.py',
   ],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
     pants(':util'),
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('src/main/python/twitter/aurora/client/commands:ssh'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+    pants('src/main/python/apache/aurora/client/commands:ssh'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ])
 
 python_tests(
@@ -42,19 +42,19 @@ python_tests(
     'test_run.py',
   ],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
     pants(':util'),
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('src/main/python/twitter/aurora/client/commands:run'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+    pants('src/main/python/apache/aurora/client/commands:run'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ])
 
 python_library(
   name='util',
   sources = [ 'util.py' ],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
-    pants('src/main/python/twitter/aurora/client/commands:core'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
+    pants('src/main/python/apache/aurora/client/commands:core'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_cancel_update.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_cancel_update.py b/src/test/python/apache/aurora/client/commands/test_cancel_update.py
index 52aacab..b1d63cc 100644
--- a/src/test/python/apache/aurora/client/commands/test_cancel_update.py
+++ b/src/test/python/apache/aurora/client/commands/test_cancel_update.py
@@ -1,15 +1,15 @@
 import contextlib
 import unittest
 
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.client.commands.core import cancel_update
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.client.commands.core import cancel_update
+from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.aurora_job_key import AuroraJobKey
 from twitter.common.contextutil import temporary_file
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     Identity,
     JobKey,
     ScheduleStatus,
@@ -81,10 +81,10 @@ class TestClientCancelUpdateCommand(AuroraClientCommandTest):
     mock_config = Mock()
     mock_api_factory = self.setup_mock_api_factory()
     with contextlib.nested(
-        patch('twitter.aurora.client.commands.core.make_client_factory',
+        patch('apache.aurora.client.commands.core.make_client_factory',
             return_value=mock_api_factory),
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
+        patch('apache.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
             mock_make_client_factory, options, mock_get_job_config):
       mock_api = mock_api_factory.return_value
 
@@ -127,10 +127,10 @@ class TestClientCancelUpdateCommand(AuroraClientCommandTest):
     (mock_api, mock_scheduler) = self.setup_mock_api()
     mock_scheduler.releaseLock.return_value = self.get_release_lock_response()
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
+        patch('apache.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
             mock_scheduler_proxy_class, mock_clusters, options, mock_get_job_config):
       with temporary_file() as fp:
         fp.write(self.get_valid_config())

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_create.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_create.py b/src/test/python/apache/aurora/client/commands/test_create.py
index bd8c6f7..57a6dc8 100644
--- a/src/test/python/apache/aurora/client/commands/test_create.py
+++ b/src/test/python/apache/aurora/client/commands/test_create.py
@@ -2,14 +2,14 @@ import contextlib
 import unittest
 
 
-from twitter.aurora.client.commands.core import create
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.config import AuroraConfig
+from apache.aurora.client.commands.core import create
+from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.config import AuroraConfig
 from twitter.common import app
 from twitter.common.contextutil import temporary_file
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     AssignedTask,
     Identity,
     Response,
@@ -111,7 +111,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
     # Next, create gets an API object via make_client. We need to replace that with a mock API.
     (mock_api, mock_scheduler) = self.setup_mock_api()
     with contextlib.nested(
-        patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+        patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
         patch('twitter.common.app.get_options', return_value=mock_options)) as (make_client,
         options):
 
@@ -154,7 +154,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
     (mock_api, mock_scheduler) = self.setup_mock_api()
     with contextlib.nested(
         patch('time.sleep'),
-        patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+        patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
         patch('twitter.common.app.get_options', return_value=mock_options)) as (sleep, make_client,
         options):
       mock_query = self.create_mock_query()
@@ -187,7 +187,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
     mock_options = self.setup_mock_options()
     (mock_api, mock_scheduler) = self.setup_mock_api()
     with contextlib.nested(
-        patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+        patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
         patch('twitter.common.app.get_options', return_value=mock_options)) as (make_client,
         options):
       mock_query = self.create_mock_query()
@@ -222,7 +222,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
     (mock_api, mock_scheduler) = self.setup_mock_api()
     with contextlib.nested(
         patch('time.sleep'),
-        patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+        patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
         patch('twitter.common.app.get_options', return_value=mock_options)) as (sleep, make_client,
         options):
       mock_query = self.create_mock_query()
@@ -253,7 +253,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
     mock_options = self.setup_mock_options()
     (mock_api, mock_scheduler) = self.setup_mock_api()
     with contextlib.nested(
-        patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+        patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
         patch('twitter.common.app.get_options', return_value=mock_options)) as (make_client,
         options):
       with temporary_file() as fp:
@@ -279,7 +279,7 @@ class TestClientCreateCommand(AuroraClientCommandTest):
     mock_options = self.setup_mock_options()
     (mock_api, mock_scheduler) = self.setup_mock_api()
     with contextlib.nested(
-        patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+        patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
         patch('twitter.common.app.get_options', return_value=mock_options)) as (make_client,
         options):
       with temporary_file() as fp:

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_diff.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_diff.py b/src/test/python/apache/aurora/client/commands/test_diff.py
index 74a30cf..82c3cc6 100644
--- a/src/test/python/apache/aurora/client/commands/test_diff.py
+++ b/src/test/python/apache/aurora/client/commands/test_diff.py
@@ -1,10 +1,10 @@
 import contextlib
 
-from twitter.aurora.client.commands.core import diff
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.commands.core import diff
+from apache.aurora.client.commands.util import AuroraClientCommandTest
 from twitter.common.contextutil import temporary_file
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     AssignedTask,
     ExecutorConfig,
     Identity,
@@ -94,8 +94,8 @@ class TestDiffCommand(AuroraClientCommandTest):
     mock_scheduler.getTasksStatus.return_value = self.create_status_response()
     self.setup_populate_job_config(mock_scheduler)
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options),
         patch('subprocess.call', return_value=0),
         patch('json.loads', return_value=Mock())) as (
@@ -131,8 +131,8 @@ class TestDiffCommand(AuroraClientCommandTest):
     mock_scheduler.getTasksStatus.return_value = self.create_status_response()
     self.setup_populate_job_config(mock_scheduler)
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options),
         patch('subprocess.call', return_value=0),
         patch('json.loads', return_value=Mock())) as (
@@ -157,8 +157,8 @@ class TestDiffCommand(AuroraClientCommandTest):
     mock_scheduler.getTasksStatus.return_value = self.create_failed_status_response()
     self.setup_populate_job_config(mock_scheduler)
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options),
         patch('subprocess.call', return_value=0),
         patch('json.loads', return_value=Mock())) as (

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_kill.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_kill.py b/src/test/python/apache/aurora/client/commands/test_kill.py
index a0cc716..edca5dc 100644
--- a/src/test/python/apache/aurora/client/commands/test_kill.py
+++ b/src/test/python/apache/aurora/client/commands/test_kill.py
@@ -1,15 +1,15 @@
 import contextlib
 import unittest
 
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.client.commands.core import kill
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.client.commands.core import kill
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.aurora_job_key import AuroraJobKey
 from twitter.common.contextutil import temporary_file
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.commands.util import AuroraClientCommandTest
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     Identity,
     ScheduleStatus,
     ScheduleStatusResult,
@@ -77,10 +77,10 @@ class TestClientKillCommand(AuroraClientCommandTest):
     mock_config = Mock()
     mock_api_factory = self.setup_mock_api_factory()
     with contextlib.nested(
-        patch('twitter.aurora.client.commands.core.make_client_factory',
+        patch('apache.aurora.client.commands.core.make_client_factory',
             return_value=mock_api_factory),
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
+        patch('apache.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
             mock_make_client_factory,
             options, mock_get_job_config):
       mock_api = mock_api_factory.return_value
@@ -129,11 +129,11 @@ class TestClientKillCommand(AuroraClientCommandTest):
     mock_api_factory = Mock(return_value=mock_api)
     mock_scheduler.killTasks.return_value = self.get_kill_job_response()
     with contextlib.nested(
-        patch('twitter.aurora.client.factory.make_client_factory', return_value=mock_api_factory),
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.factory.make_client_factory', return_value=mock_api_factory),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
+        patch('apache.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
             mock_api_factory_patch,
             mock_scheduler_proxy_class,
             mock_clusters,
@@ -159,11 +159,11 @@ class TestClientKillCommand(AuroraClientCommandTest):
     mock_api_factory = Mock(return_value=mock_api)
     mock_scheduler.killTasks.return_value = self.get_kill_job_response()
     with contextlib.nested(
-        patch('twitter.aurora.client.factory.make_client_factory', return_value=mock_api_factory),
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.factory.make_client_factory', return_value=mock_api_factory),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
+        patch('apache.aurora.client.commands.core.get_job_config', return_value=mock_config)) as (
             mock_api_factory_patch,
             mock_scheduler_proxy_class,
             mock_clusters,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_listjobs.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_listjobs.py b/src/test/python/apache/aurora/client/commands/test_listjobs.py
index 845ab54..16973d4 100644
--- a/src/test/python/apache/aurora/client/commands/test_listjobs.py
+++ b/src/test/python/apache/aurora/client/commands/test_listjobs.py
@@ -1,12 +1,12 @@
 import contextlib
 import unittest
 
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.client.commands.core import list_jobs
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.client.commands.core import list_jobs
+from apache.aurora.client.commands.util import AuroraClientCommandTest
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     GetJobsResult,
     JobKey,
 )
@@ -46,8 +46,8 @@ class TestListJobs(AuroraClientCommandTest):
     (mock_api, mock_scheduler) = self.create_mock_api()
     mock_scheduler.getJobs.return_value = self.create_listjobs_response()
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options)) as (
             mock_scheduler_proxy_class,
             mock_clusters,
@@ -62,8 +62,8 @@ class TestListJobs(AuroraClientCommandTest):
     (mock_api, mock_scheduler) = self.create_mock_api()
     mock_scheduler.getJobs.return_value = self.create_listjobs_response()
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options)) as (
             mock_scheduler_proxy_class,
             mock_clusters,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_restart.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_restart.py b/src/test/python/apache/aurora/client/commands/test_restart.py
index 7b4c5ae..77a24e8 100644
--- a/src/test/python/apache/aurora/client/commands/test_restart.py
+++ b/src/test/python/apache/aurora/client/commands/test_restart.py
@@ -1,12 +1,12 @@
 import contextlib
 import functools
 
-from twitter.aurora.client.commands.core import restart
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
-from twitter.aurora.client.api.health_check import InstanceWatcherHealthCheck, Retriable
+from apache.aurora.client.commands.core import restart
+from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.api.health_check import InstanceWatcherHealthCheck, Retriable
 from twitter.common.contextutil import temporary_file
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     AssignedTask,
     JobKey,
     PopulateJobResult,
@@ -90,9 +90,9 @@ class TestRestartCommand(AuroraClientCommandTest):
     self.setup_mock_scheduler_for_simple_restart(mock_api)
     with contextlib.nested(
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
-        patch('twitter.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
             return_value=mock_health_check),
         patch('time.time', side_effect=functools.partial(self.fake_time, self)),
         patch('time.sleep', return_value=None)
@@ -124,9 +124,9 @@ class TestRestartCommand(AuroraClientCommandTest):
     mock_scheduler.getTasksStatus.return_value = self.create_error_response()
     with contextlib.nested(
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
-        patch('twitter.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
             return_value=mock_health_check),
         patch('time.time', side_effect=functools.partial(self.fake_time, self)),
         patch('time.sleep', return_value=None)
@@ -150,9 +150,9 @@ class TestRestartCommand(AuroraClientCommandTest):
     mock_scheduler.restartShards.return_value = self.create_error_response()
     with contextlib.nested(
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
-        patch('twitter.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
             return_value=mock_health_check),
         patch('time.time', side_effect=functools.partial(self.fake_time, self)),
         patch('time.sleep', return_value=None)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_run.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_run.py b/src/test/python/apache/aurora/client/commands/test_run.py
index fd47b47..0a6aaf8 100644
--- a/src/test/python/apache/aurora/client/commands/test_run.py
+++ b/src/test/python/apache/aurora/client/commands/test_run.py
@@ -1,9 +1,9 @@
 import contextlib
 
-from twitter.aurora.client.commands.run import run
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.commands.run import run
+from apache.aurora.client.commands.util import AuroraClientCommandTest
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     AssignedTask,
     Identity,
     JobKey,
@@ -86,11 +86,11 @@ class TestRunCommand(AuroraClientCommandTest):
     mock_scheduler.getTasksStatus.return_value = self.create_status_response()
     sandbox_args = {'slave_root': '/slaveroot', 'slave_run_directory': 'slaverun'}
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
-        patch('twitter.aurora.client.commands.run.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.commands.run.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.api.command_runner.DistributedCommandRunner.sandbox_args',
+        patch('apache.aurora.client.api.command_runner.DistributedCommandRunner.sandbox_args',
             return_value=sandbox_args),
         patch('subprocess.Popen', return_value=self.create_mock_process())) as (
             mock_scheduler_proxy_class,


Mime
View raw message