Revert "Arnej/refactor requestor api 4"

1 files changed, 11 insertions, 11 deletions

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 43f02f8b6d4..2c4fa83d02b 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
@@ -4,7 +4,6 @@ package com.yahoo.vespa.model.admin;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.config.core.StateserverConfig;
 import com.yahoo.vespa.model.AbstractService;
-import com.yahoo.vespa.model.PortAllocBridge;
 
 /**
  * Represents a Slobrok service.
@@ -14,8 +13,6 @@ import com.yahoo.vespa.model.PortAllocBridge;
 public class Slobrok extends AbstractService implements StateserverConfig.Producer {
     private static final long serialVersionUID = 1L;
 
-    public final static int BASEPORT = 19099;
-
     @Override
     public void getConfig(StateserverConfig.Builder builder) {
         builder.httpport(getHealthPort());
@@ -35,9 +32,14 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc
     }
 
     @Override
+    public boolean requiresConsecutivePorts() {
+        return false;
+    }
+
+    @Override
     public int getWantedPort() {
         if (getId() == 1) {
-            return BASEPORT;
+            return 19099;
         } else {
             return 0;
         }
@@ -47,13 +49,6 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc
         return "exec $ROOT/sbin/vespa-slobrok -p " + getRpcPort() + " -c " + getConfigId();
     }
 
-    @Override
-    public void allocatePorts(int start, PortAllocBridge from) {
-        if (start == 0) start = BASEPORT;
-        from.wantPort(start, "rpc");
-        from.allocatePort("http");
-    }
-
     /**
      * @return The number of ports needed by the slobrok.
      */
@@ -61,6 +56,11 @@ 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
      */