From 92599c56d62226a32e1e4df4321123c9691db73d Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@yahoo-inc.com>
Date: Wed, 6 Feb 2019 14:37:43 +0000
Subject: add list of network port allocations

* add port suffixes to identify individual ports for a service
* stash port reservations from current config model
---
 config-provisioning/abi-spec.json | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'config-provisioning/abi-spec.json')

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 5372e18e109..349d1d23e76 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -462,11 +462,13 @@
       "public void <init>(java.lang.String, java.util.List, com.yahoo.config.provision.ClusterMembership)",
       "public void <init>(java.lang.String, java.util.List, java.util.Optional, java.util.Optional)",
       "public void <init>(java.lang.String, java.util.List, java.util.Optional, java.util.Optional, java.util.Optional)",
+      "public void <init>(java.lang.String, java.util.List, java.util.Optional, java.util.Optional, java.util.Optional, java.util.Optional)",
       "public java.lang.String hostname()",
       "public java.util.List aliases()",
       "public java.util.Optional flavor()",
       "public java.util.Optional version()",
       "public java.util.Optional membership()",
+      "public java.util.Optional networkPorts()",
       "public java.lang.String toString()",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
@@ -497,6 +499,49 @@
     ],
     "fields": []
   },
+  "com.yahoo.config.provision.NetworkPorts$Allocation": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(int, java.lang.String, java.lang.String, java.lang.String)",
+      "public java.lang.String key()",
+      "public java.lang.String toString()"
+    ],
+    "fields": [
+      "public final int port",
+      "public final java.lang.String serviceType",
+      "public final java.lang.String configId",
+      "public final java.lang.String portSuffix"
+    ]
+  },
+  "com.yahoo.config.provision.NetworkPorts": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.util.Collection)",
+      "public java.util.Collection allocations()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.config.provision.NetworkPortsSerializer": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static void toSlime(com.yahoo.config.provision.NetworkPorts, com.yahoo.slime.Cursor)",
+      "public static java.util.Optional fromSlime(com.yahoo.slime.Inspector)"
+    ],
+    "fields": []
+  },
   "com.yahoo.config.provision.NodeFlavors": {
     "superClass": "java.lang.Object",
     "interfaces": [],
-- 
cgit v1.2.3


From 40596e59db99c1c6d488efeb7af9bedd05de8f60 Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@yahoo-inc.com>
Date: Thu, 21 Feb 2019 10:50:44 +0000
Subject: add size method for easier debugging

---
 config-provisioning/abi-spec.json                                      | 3 ++-
 .../src/main/java/com/yahoo/config/provision/NetworkPorts.java         | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'config-provisioning/abi-spec.json')

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 349d1d23e76..8640bd91de9 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -525,7 +525,8 @@
     ],
     "methods": [
       "public void <init>(java.util.Collection)",
-      "public java.util.Collection allocations()"
+      "public java.util.Collection allocations()",
+      "public int size()"
     ],
     "fields": []
   },
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NetworkPorts.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NetworkPorts.java
index ed62b24f5fa..90ac3651bb2 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NetworkPorts.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NetworkPorts.java
@@ -50,4 +50,6 @@ public class NetworkPorts {
     public Collection<Allocation> allocations() {
         return this.allocations;
     }
+
+    public int size() { return allocations.size(); }
 }
-- 
cgit v1.2.3