Merge pull request #2684 from yahoo/mpolden/remove-hostname-references

Remove hostname references

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 448ae78a21a..aea310932d1 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
@@ -256,11 +256,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());
         }