retry: refactor requestor api

* add and switch to API for explicitly allocating network ports
* remove now-unused getPortSuffixes
* remove now-unused requiresConsecutivePorts
* remove now-unused reservePortPrepended

1 files changed, 3 insertions, 14 deletions

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 96870ee30d8..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
@@ -26,6 +26,9 @@ public interface NetworkPortRequestor {
      */
     default int getWantedPort() { return 0; }
 
+    /** allocate the ports you need */
+    void allocatePorts(int start, PortAllocBridge from);
+
     /**
      * Returns the number of ports needed by this service.
      * User-defined ports for container http servers should not be counted, as those
@@ -41,18 +44,4 @@ public interface NetworkPortRequestor {
      * @return true if this Service requires the wanted base port.
      */
     default boolean requiresWantedPort() { return false; }
-
-    /**
-     * Override if the services does not require consecutive port numbers. I.e. if any ports
-     * in addition to the baseport should be allocated from Vespa's default port range.
-     *
-     * @return true by default
-     */
-    default boolean requiresConsecutivePorts() { return true; }
-
-    /**
-     * Return names for each port requested.
-     * The size of the returned array must be equal to getPortCount().
-     */
-    String[] getPortSuffixes();
 }