diff options
author | Martin Polden <martin.polden@gmail.com> | 2017-06-09 11:15:55 +0200 |
---|---|---|
committer | Martin Polden <martin.polden@gmail.com> | 2017-06-09 11:15:55 +0200 |
commit | f2e64369ceb8ced2949eb45d14911823d6cff3b3 (patch) | |
tree | 82ddc2a89364d77ad66fb7a4da3c43881b17b038 /orchestrator | |
parent | f5d7c6546b8676f32fa94e0767ad2951335eeb62 (diff) |
Remove hostname references in orchestrator module
Diffstat (limited to 'orchestrator')
-rw-r--r-- | orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java | 18 | ||||
-rw-r--r-- | orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java index 8fc6f27d3d9..135aa61af5c 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java @@ -29,9 +29,9 @@ import java.util.stream.Collectors; */ public class DummyInstanceLookupService implements InstanceLookupService { - public static final HostName TEST1_HOST_NAME = new HostName("test1.prod.utpoia-1.vespahosted.ut1.yahoo.com"); - public static final HostName TEST3_HOST_NAME = new HostName("test3.prod.utpoia-1.vespahosted.ut1.yahoo.com"); - public static final HostName TEST6_HOST_NAME = new HostName("test6.prod.us-east-1.vespahosted.ne1.yahoo.com"); + public static final HostName TEST1_HOST_NAME = new HostName("test1.hostname.tld"); + public static final HostName TEST3_HOST_NAME = new HostName("test3.hostname.tld"); + public static final HostName TEST6_HOST_NAME = new HostName("test6.hostname.tld"); private static final Set<ApplicationInstance<ServiceMonitorStatus>> apps = new HashSet<>(); @@ -50,7 +50,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { ServiceMonitorStatus.UP), new ServiceInstance<>( new ConfigId("storage/storage/2"), - new HostName("test2.prod.utopoia-1.vespahosted.ut1.yahoo.com"), + new HostName("test2.hostname.tld"), ServiceMonitorStatus.UP))), new ServiceCluster<>( new ClusterId("clustercontroller"), @@ -58,7 +58,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { TestUtil.makeServiceInstanceSet( new ServiceInstance<>( new ConfigId("clustercontroller-1"), - new HostName("myclustercontroller.prod.utopia-1.vespahosted.ut1.yahoo.com"), + new HostName("myclustercontroller.hostname.tld"), ServiceMonitorStatus.UP))) ) @@ -78,7 +78,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { ServiceMonitorStatus.UP), new ServiceInstance<>( new ConfigId("storage/storage/4"), - new HostName("test4.prod.utpoia-1.vespahosted.ut1.yahoo.com"), + new HostName("test4.hostname.tld"), ServiceMonitorStatus.UP))), new ServiceCluster<>( new ClusterId("clustercontroller"), @@ -86,7 +86,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { TestUtil.makeServiceInstanceSet( new ServiceInstance<>( new ConfigId("clustercontroller-1"), - new HostName("myclustercontroller2.prod.utopia-1.vespahosted.ut1.yahoo.com"), + new HostName("myclustercontroller2.hostname.tld"), ServiceMonitorStatus.UP))) ) ) @@ -106,7 +106,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { ServiceMonitorStatus.UP), new ServiceInstance<>( new ConfigId("storage/storage/4"), - new HostName("test4.prod.utpoia-1.vespahosted.ut1.yahoo.com"), + new HostName("test4.hostname.tld"), ServiceMonitorStatus.UP))), new ServiceCluster<>( new ClusterId("clustercontroller"), @@ -114,7 +114,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { TestUtil.makeServiceInstanceSet( new ServiceInstance<>( new ConfigId("clustercontroller-1"), - new HostName("myclustercontroller3.prod.utopia-1.vespahosted.ut1.yahoo.com"), + new HostName("myclustercontroller3.hostname.tld"), ServiceMonitorStatus.UP))) ) )); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java index ccee70630af..d5fe4581dea 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java @@ -247,11 +247,11 @@ public class OrchestratorImplTest { assertEquals(e.getSuppressed().length, 1); assertEquals("Failed to suspend NodeGroup{application=tenant-id-3:application-instance-3:prod:utopia-1:default, " + - "hostNames=[test6.prod.us-east-1.vespahosted.ne1.yahoo.com]} with parent host parentHostname: " + - "Changing the state of test6.prod.us-east-1.vespahosted.ne1.yahoo.com would violate " + + "hostNames=[test6.hostname.tld]} with parent host parentHostname: " + + "Changing the state of test6.hostname.tld would violate " + "some-constraint: error message; With suppressed throwable " + "com.yahoo.vespa.orchestrator.policy.HostStateChangeDeniedException: " + - "Changing the state of test1.prod.utpoia-1.vespahosted.ut1.yahoo.com " + + "Changing the state of test1.hostname.tld " + "would violate foo1-constraint: foo1-message", e.getMessage()); } |