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, 7 insertions, 2 deletions

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 eca8fd40e69..cdc3fd4c4d4 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
@@ -3,6 +3,7 @@ package com.yahoo.vespa.model.admin;
 
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.AbstractService;
+import com.yahoo.vespa.model.PortAllocBridge;
 
 /**
  * Represents the Logserver. There is exactly one logserver in a Vespa
@@ -68,8 +69,12 @@ public class Logserver extends AbstractService {
     }
 
     @Override
-    public String[] getPortSuffixes() {
-        return new String[]{ "rpc", "unused/1", "unused/2", "unused/3" };
+    public void allocatePorts(int start, PortAllocBridge from) {
+        int port = (start == 0) ? getWantedPort() : start;
+        from.requirePort(port++, "rpc");
+        from.requirePort(port++, "unused/1");
+        from.requirePort(port++, "unused/2");
+        from.requirePort(port++, "unused/3");
     }
 
 }