remove now-unused getPortSuffixes

25 files changed, 0 insertions, 147 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ConfigProxy.java b/config-model/src/main/java/com/yahoo/vespa/model/ConfigProxy.java
index 70df4cdedb9..adb49fff9df 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ConfigProxy.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ConfigProxy.java
@@ -53,9 +53,4 @@ public class ConfigProxy extends AbstractService {
      */
     public int getPortCount() { return 1; }
 
-    @Override
-    public String[] getPortSuffixes() {
-        return new String[]{"rpc"};
-    }
-
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java b/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java
index 655c081c72e..d15db6b4a55 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java
@@ -57,11 +57,6 @@ public class ConfigSentinel extends AbstractService implements SentinelConfig.Pr
     public int getPortCount() { return 2; }
 
     @Override
-    public String[] getPortSuffixes() {
-        return new String[]{ "rpc", "http" };
-    }
-
-    @Override
     public int getHealthPort() {return getRelativePort(1); }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Logd.java b/config-model/src/main/java/com/yahoo/vespa/model/Logd.java
index 5253b4b54ec..300f35b62d3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/Logd.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/Logd.java
@@ -39,11 +39,6 @@ public class Logd
      */
     public int getPortCount() { return 1; }
 
-    @Override
-    public String[] getPortSuffixes() {
-        return new String[]{"http"};
-    }
-
     /** Returns the desired base port for this service.  */
     public int getWantedPort() { return 19089; }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java b/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java
index 845b925aaf0..f8337219f54 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java
@@ -44,10 +44,4 @@ public interface NetworkPortRequestor {
      * @return true if this Service requires the wanted base port.
      */
     default boolean requiresWantedPort() { return false; }
-
-    /**
-     * Return names for each port requested.
-     * The size of the returned array must be equal to getPortCount().
-     */
-    String[] getPortSuffixes();
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
index bf0a9b00ded..7c31da19cf8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Configserver.java
@@ -67,11 +67,6 @@ public class Configserver extends AbstractService {
      */
     public int getPortCount() { return 2; }
 
-    @Override
-    public String[] getPortSuffixes() {
-        return new String[]{ "rpc", "http" };
-    }
-
     private int getConfigServerRpcPort() {
         return getRelativePort(0);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java
index 5e8e0e3acc2..f93a3b39ad6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java
@@ -62,11 +62,6 @@ public class LogForwarder extends AbstractService implements LogforwarderConfig.
      */
     public int getPortCount() { return 0; }
 
-    @Override
-    public String[] getPortSuffixes() {
-        return null;
-    }
-
     /**
      * @return The command used to start LogForwarder
      */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java
index 31ea1d3902b..c7216756843 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java
@@ -69,11 +69,6 @@ public class Logserver extends AbstractService {
     }
 
     @Override
-    public String[] getPortSuffixes() {
-        return new String[]{ "rpc", "unused/1", "unused/2", "unused/3" };
-    }
-
-    @Override
     public void allocatePorts(int start, PortAllocBridge from) {
         int port = (start == 0) ? getWantedPort() : start;
         from.requirePort(port++, "unused");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
index c4e76f5ccf1..43f02f8b6d4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
@@ -61,11 +61,6 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc
         return 2;
     }
 
-    @Override
-    public String[] getPortSuffixes() {
-        return new String[] { "rpc", "http" };
-    }
-
     /**
      * @return The port on which this slobrok should respond
      */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
index 3218389438d..01168c59442 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
@@ -110,13 +110,6 @@ public class MetricsProxyContainer extends Container implements
     }
 
     @Override
-    public String[] getPortSuffixes() {
-        var suffixes = super.getPortSuffixes();
-        suffixes[metricsRpcPortOffset()] = "rpc/metrics";
-        return suffixes;
-    }
-
-    @Override
     public void getConfig(RpcConnectorConfig.Builder builder) {
         builder.port(getRelativePort(metricsRpcPortOffset()));
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index 5919c0426fe..3bc68e4a879 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -234,33 +234,6 @@ public abstract class Container extends AbstractService implements
     }
 
     @Override
-    public String[] getPortSuffixes() {
-        // TODO clean up this mess
-        int n = getPortCount();
-        String[] suffixes = new String[n];
-        int off = 0;
-        int httpPorts = (getHttp() != null) ? 0 : numHttpServerPorts;
-        if (httpPorts > 0) {
-            suffixes[off++] = "http";
-        }
-        for (int i = 1; i < httpPorts; i++) {
-            suffixes[off++] = "http/" + i;
-        }
-        if (messageBusEnabled()) {
-            suffixes[off++] = "messaging";
-        }
-        if (rpcServerEnabled()) {
-            suffixes[off++] = "rpc/admin";
-        }
-        while (off < n) {
-            suffixes[off] = "unused/" + off;
-            ++off;
-        }
-        assert (off == n);
-        return suffixes;
-    }
-
-    @Override
     public void allocatePorts(int start, PortAllocBridge from) {
         if (start == 0) start = BASEPORT;
         int off = 2;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
index 17e85e47c4e..9a8a57f12ea 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
@@ -57,11 +57,6 @@ public abstract class ContentNode extends AbstractService
     public int getPortCount() { return 3; }
 
     @Override
-    public String[] getPortSuffixes() {
-        return new String[] { "messaging", "rpc", "http" };
-    }
-
-    @Override
     public void allocatePorts(int start, PortAllocBridge from) {
         if (start == 0) {
             from.allocatePort("messaging");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/generic/service/Service.java b/config-model/src/main/java/com/yahoo/vespa/model/generic/service/Service.java
index 4dfca39004a..325f511edf1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/generic/service/Service.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/generic/service/Service.java
@@ -25,11 +25,6 @@ public class Service extends AbstractService {
     }
 
     @Override
-    public String[] getPortSuffixes() {
-        return null;
-    }
-
-    @Override
     public void allocatePorts(int start, PortAllocBridge from) { }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
index 6073f338683..2e821a67cb2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java
@@ -244,9 +244,4 @@ public class Dispatch extends AbstractService implements SearchInterface,
      */
     public int getPortCount() { return 3; }
 
-    @Override
-    public String[] getPortSuffixes() {
-        return new String[]{ "rpc", "fs4", "health" };
-    }
-
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index 9fe016b95df..c4acf8b5b0b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -179,11 +179,6 @@ public class SearchNode extends AbstractService implements
         return 5;
     }
 
-    @Override
-    public String[] getPortSuffixes() {
-        return new String[] { "rpc", "fs4", "future/4", "unused/3", "health" };
-    }
-
     /**
      * Returns the RPC port used by this searchnode.
      *
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java b/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java
index 7f3391865ed..2c457940f24 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java
@@ -40,11 +40,6 @@ public class TransactionLogServer extends AbstractService  {
     }
 
     @Override
-    public String[] getPortSuffixes() {
-        return new String[]{"tls"};
-    }
-
-    @Override
     public void allocatePorts(int start, PortAllocBridge from) {
         // NB: ignore "start"
         from.allocatePort("tls");
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/HostPortsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/HostPortsTest.java
index 0c737bce2f3..7ce840c13f8 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/HostPortsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/HostPortsTest.java
@@ -114,7 +114,6 @@ public class HostPortsTest {
             super(parent, "slobrok."+number);
         }
         @Override public int getPortCount() { return 1; }
-        @Override public String[] getPortSuffixes() { return new String[]{"http"}; }
         @Override public String getServiceType() { return "slobrok"; }
 
         @Override
@@ -143,15 +142,6 @@ public class HostPortsTest {
         public int getPortCount() { return portCount; }
 
         @Override
-        public String[] getPortSuffixes() {
-            String[] suffixes = new String[portCount];
-            for (int i = 0; i < portCount; i++) {
-                suffixes[i] = "generic." + i;
-            }
-            return suffixes;
-        }
-
-        @Override
         public void allocatePorts(int start, PortAllocBridge from) {
             for (int i = 0; i < portCount; i++) {
                 String suffix = "generic." + i;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
index f582417815b..0624c2cd23a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
@@ -122,15 +122,6 @@ public class HostResourceTest {
         public int getPortCount() { return portCount; }
 
         @Override
-        public String[] getPortSuffixes() {
-            String[] suffixes = new String[portCount];
-            for (int i = 0; i < portCount; i++) {
-                suffixes[i] = "generic." + i;
-            }
-            return suffixes;
-        }
-
-        @Override
         public void allocatePorts(int start, PortAllocBridge from) {
             for (int i = 0; i < portCount; i++) {
                 String suffix = "generic." + i;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
index 5d3bcd58f3d..ef56a42cf1a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
@@ -62,7 +62,6 @@ public class MetricsProxyContainerTest {
         MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
         assertEquals(19092, container.getSearchPort());
         assertEquals(19092, container.getHealthPort());
-        assertEquals("http", container.getPortSuffixes()[0]);
 
         assertTrue(container.getPortsMeta().getTagsAt(0).contains("http"));
         assertTrue(container.getPortsMeta().getTagsAt(0).contains("state"));
@@ -78,8 +77,6 @@ public class MetricsProxyContainerTest {
         assertTrue(container.getPortsMeta().getTagsAt(offset).contains("rpc"));
         assertTrue(container.getPortsMeta().getTagsAt(offset).contains("metrics"));
 
-        assertEquals("rpc/metrics", container.getPortSuffixes()[offset]);
-
         RpcConnectorConfig config = getRpcConnectorConfig(model);
         assertEquals(19095, config.port());
     }
@@ -93,8 +90,6 @@ public class MetricsProxyContainerTest {
         assertEquals(2, container.getPortsMeta().getTagsAt(offset).size());
         assertTrue(container.getPortsMeta().getTagsAt(offset).contains("rpc"));
         assertTrue(container.getPortsMeta().getTagsAt(offset).contains("admin"));
-
-        assertEquals("rpc/admin", container.getPortSuffixes()[offset]);
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
index be2ac91391c..bb209e58e24 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
@@ -248,9 +248,6 @@ public class ConfigValueChangeValidatorTest {
             return 0;
         }
 
-        @Override
-        public String[] getPortSuffixes() { return null; }
-
         @Override public void allocatePorts(int start, PortAllocBridge from) { }
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java
index a42b04b8342..c0b5ddd5d58 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java
@@ -77,9 +77,6 @@ public class StartupCommandChangeValidatorTest {
             return 0;
         }
 
-        @Override
-        public String[] getPortSuffixes() { return null; }
-
         @Override public void allocatePorts(int start, PortAllocBridge from) { }
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/ApiService.java b/config-model/src/test/java/com/yahoo/vespa/model/test/ApiService.java
index 016c8b84347..e9726903e49 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/ApiService.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/ApiService.java
@@ -37,8 +37,5 @@ public class ApiService extends AbstractService implements com.yahoo.test.Standa
 
     public int getPortCount() { return 0; }
 
-    @Override
-    public String[] getPortSuffixes() { return null; }
-
     @Override public void allocatePorts(int start, PortAllocBridge from) { }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
index 42ce91c3c51..7ef89ded733 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
@@ -128,9 +128,6 @@ public class ModelAmendingTestCase {
             return 0;
         }
 
-        @Override
-        public String[] getPortSuffixes() { return null; }
-
         @Override public void allocatePorts(int start, PortAllocBridge from) { }
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/ParentService.java b/config-model/src/test/java/com/yahoo/vespa/model/test/ParentService.java
index 3c3c11a7773..96b5f98db86 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/ParentService.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/ParentService.java
@@ -58,8 +58,5 @@ public class ParentService extends AbstractService implements com.yahoo.test.Sta
     
     public int getPortCount() { return 0; }
 
-    @Override
-    public String[] getPortSuffixes() { return null; }
-
     @Override public void allocatePorts(int start, PortAllocBridge from) { }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/SimpleService.java b/config-model/src/test/java/com/yahoo/vespa/model/test/SimpleService.java
index 155fc4709ef..553e0813038 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/SimpleService.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/SimpleService.java
@@ -40,11 +40,6 @@ public class SimpleService extends AbstractService implements com.yahoo.test.Sta
     public int getPortCount() { return 5; }
 
     @Override
-    public String[] getPortSuffixes() {
-        return new String[]{ "a", "b", "c", "d", "e" };
-    }
-
-    @Override
     public void allocatePorts(int start, PortAllocBridge from) {
         if (start == 0) start = getWantedPort();
         from.wantPort(start++, "a");
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java
index 363baccf33f..80b29120744 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java
@@ -174,9 +174,6 @@ public class FileSenderTest {
             return 0;
         }
 
-        @Override
-        public String[] getPortSuffixes() { return null; }
-
         @Override public void allocatePorts(int start, PortAllocBridge from) { }
     }
 }