Revert "Arnej/refactor requestor api 4"

10 files changed, 28 insertions, 41 deletions

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 7ce840c13f8..1ded447993c 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,12 +114,8 @@ 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
-        public void allocatePorts(int start, PortAllocBridge from) {
-            from.allocatePort("http");
-        }
     }
 
     private static int counter = 0;
@@ -142,16 +138,12 @@ public class HostPortsTest {
         public int getPortCount() { return portCount; }
 
         @Override
-        public void allocatePorts(int start, PortAllocBridge from) {
+        public String[] getPortSuffixes() {
+            String[] suffixes = new String[portCount];
             for (int i = 0; i < portCount; i++) {
-                String suffix = "generic." + i;
-                if (start == 0) {
-                    from.allocatePort(suffix);
-                } else {
-                    from.requirePort(start++, suffix);
-                }
+                suffixes[i] = "generic." + i;
             }
+            return suffixes;
         }
-
     }
 }
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 0624c2cd23a..02b77bdb375 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,16 +122,12 @@ public class HostResourceTest {
         public int getPortCount() { return portCount; }
 
         @Override
-        public void allocatePorts(int start, PortAllocBridge from) {
+        public String[] getPortSuffixes() {
+            String[] suffixes = new String[portCount];
             for (int i = 0; i < portCount; i++) {
-                String suffix = "generic." + i;
-                if (start == 0) {
-                    from.allocatePort(suffix);
-                } else {
-                    from.requirePort(start++, suffix);
-                }
+                suffixes[i] = "generic." + i;
             }
+            return suffixes;
         }
-
     }
 }
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 ef56a42cf1a..5d3bcd58f3d 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,6 +62,7 @@ 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"));
@@ -77,6 +78,8 @@ 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());
     }
@@ -90,6 +93,8 @@ 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 bb209e58e24..9318130bb4f 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
@@ -12,7 +12,6 @@ import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.Host;
 import com.yahoo.vespa.model.HostResource;
-import com.yahoo.vespa.model.PortAllocBridge;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
 import com.yahoo.config.application.api.ValidationOverrides;
@@ -248,7 +247,8 @@ public class ConfigValueChangeValidatorTest {
             return 0;
         }
 
-        @Override public void allocatePorts(int start, PortAllocBridge from) { }
+        @Override
+        public String[] getPortSuffixes() { return null; }
     }
 
     private static class SimpleConfigProducer extends AbstractConfigProducer<AbstractConfigProducer<?>>
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 c0b5ddd5d58..2b04b026ee7 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
@@ -8,7 +8,6 @@ import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.Host;
 import com.yahoo.vespa.model.HostResource;
-import com.yahoo.vespa.model.PortAllocBridge;
 import com.yahoo.vespa.model.application.validation.change.StartupCommandChangeValidator;
 import org.junit.Test;
 
@@ -77,6 +76,7 @@ public class StartupCommandChangeValidatorTest {
             return 0;
         }
 
-        @Override public void allocatePorts(int start, PortAllocBridge from) { }
+        @Override
+        public String[] getPortSuffixes() { return null; }
     }
 }
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 e9726903e49..6f06eb3e482 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
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.test;
 
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.AbstractService;
-import com.yahoo.vespa.model.PortAllocBridge;
 
 /**
  * This is a service for testing the plugin exchange mechanism in the
@@ -37,5 +36,6 @@ public class ApiService extends AbstractService implements com.yahoo.test.Standa
 
     public int getPortCount() { return 0; }
 
-    @Override public void allocatePorts(int start, PortAllocBridge from) { }
+    @Override
+    public String[] getPortSuffixes() { return null; }
 }
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 7ef89ded733..a8e946bcea1 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
@@ -13,7 +13,6 @@ import com.yahoo.config.model.builder.xml.ConfigModelId;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.HostResource;
-import com.yahoo.vespa.model.PortAllocBridge;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.ContainerModel;
@@ -128,7 +127,8 @@ public class ModelAmendingTestCase {
             return 0;
         }
 
-        @Override public void allocatePorts(int start, PortAllocBridge from) { }
+        @Override
+        public String[] getPortSuffixes() { return null; }
     }
 
     public static class AdminModelAmender extends ConfigModel {
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 96b5f98db86..b7887262ed5 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
@@ -4,7 +4,6 @@ package com.yahoo.vespa.model.test;
 import com.yahoo.test.StandardConfig.Builder;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.AbstractService;
-import com.yahoo.vespa.model.PortAllocBridge;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -58,5 +57,6 @@ public class ParentService extends AbstractService implements com.yahoo.test.Sta
     
     public int getPortCount() { return 0; }
 
-    @Override public void allocatePorts(int start, PortAllocBridge from) { }
+    @Override
+    public String[] getPortSuffixes() { return null; }
 }
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 553e0813038..8a5bbe36a73 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
@@ -4,7 +4,6 @@ package com.yahoo.vespa.model.test;
 import com.yahoo.test.StandardConfig.Builder;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.AbstractService;
-import com.yahoo.vespa.model.PortAllocBridge;
 
 import java.util.HashMap;
 
@@ -40,13 +39,8 @@ public class SimpleService extends AbstractService implements com.yahoo.test.Sta
     public int getPortCount() { return 5; }
 
     @Override
-    public void allocatePorts(int start, PortAllocBridge from) {
-        if (start == 0) start = getWantedPort();
-        from.wantPort(start++, "a");
-        from.wantPort(start++, "b");
-        from.wantPort(start++, "c");
-        from.wantPort(start++, "d");
-        from.wantPort(start++, "e");
+    public String[] getPortSuffixes() {
+        return new String[]{ "a", "b", "c", "d", "e" };
     }
 
     // Make sure this service is listed in the sentinel config
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 80b29120744..79646dacaa9 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
@@ -9,7 +9,6 @@ import com.yahoo.config.model.producer.UserConfigRepo;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.vespa.config.*;
 import com.yahoo.vespa.model.AbstractService;
-import com.yahoo.vespa.model.PortAllocBridge;
 import com.yahoo.vespa.model.SimpleConfigProducer;
 import org.junit.Before;
 import org.junit.Test;
@@ -174,6 +173,7 @@ public class FileSenderTest {
             return 0;
         }
 
-        @Override public void allocatePorts(int start, PortAllocBridge from) { }
+        @Override
+        public String[] getPortSuffixes() { return null; }
     }
 }