diff options
Diffstat (limited to 'config-model/src/main/java/com')
15 files changed, 0 insertions, 100 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"); |