Expose GPU load in nodes API

5 files changed, 40 insertions, 12 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
index 225eb3e4e8d..89853896104 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
@@ -98,6 +98,8 @@ public class ApplicationSerializer {
         loadObject.setDouble("cpu", load.cpu());
         loadObject.setDouble("memory", load.memory());
         loadObject.setDouble("disk", load.disk());
+        loadObject.setDouble("gpu", load.gpu());
+        loadObject.setDouble("gpuMemory", load.gpuMemory());
     }
 
     private static void toSlime(Autoscaling.Metrics metrics, Cursor metricsObject) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
index 9080030f026..0b157e8635b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
@@ -502,6 +502,8 @@ public class NodesV2ApiHandler extends ThreadedHttpRequestHandler {
         object.setDouble("cpu", load.cpu());
         object.setDouble("memory", load.memory());
         object.setDouble("disk", load.disk());
+        object.setDouble("gpu", load.gpu());
+        object.setDouble("gpuMemory", load.gpuMemory());
     }
 
     /** Returns a copy of the given URI with the host and port from the given URI and the path set to the given path */
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json
index 28bde7bd966..7b2cf1dc8e4 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json
@@ -63,12 +63,16 @@
         "peak" : {
           "cpu" : 0.0,
           "memory" : 0.0,
-          "disk" : 0.0
+          "disk" : 0.0,
+          "gpu": 0.0,
+          "gpuMemory": 0.0
         },
         "ideal" : {
           "cpu" : 0.0,
           "memory" : 0.0,
-          "disk" : 0.0
+          "disk" : 0.0,
+          "gpu": 0.0,
+          "gpuMemory": 0.0
         },
         "metrics" : {
           "queryRate" : 0.0,
@@ -96,12 +100,16 @@
         "peak" : {
           "cpu" : 0.1,
           "memory" : 0.2,
-          "disk" : 0.3
+          "disk" : 0.3,
+          "gpu": 0.0,
+          "gpuMemory": 0.0
         },
         "ideal" : {
           "cpu" : 0.4,
           "memory" : 0.5,
-          "disk" : 0.6
+          "disk" : 0.6,
+          "gpu": 0.0,
+          "gpuMemory": 0.0
         },
         "metrics" : {
           "queryRate" : 0.7,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json
index 05a62ff944d..10173089f75 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json
@@ -50,12 +50,16 @@
         "peak" : {
           "cpu" : 0.0,
           "memory" : 0.0,
-          "disk" : 0.0
+          "disk" : 0.0,
+          "gpu": 0.0,
+          "gpuMemory": 0.0
         },
         "ideal" : {
           "cpu" : 0.0,
           "memory" : 0.0,
-          "disk" : 0.0
+          "disk" : 0.0,
+          "gpu": 0.0,
+          "gpuMemory": 0.0
         },
         "metrics" : {
           "queryRate" : 0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json
index 788eb6d359f..b031e0deba0 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json
@@ -4,12 +4,16 @@
   "load": {
     "cpu": 0.0,
     "memory": 0.0,
-    "disk": 0.0
+    "disk": 0.0,
+    "gpu": 0.0,
+    "gpuMemory": 0.0
   },
   "activeLoad": {
     "cpu": 0.0,
     "memory": 0.0,
-    "disk": 0.0
+    "disk": 0.0,
+    "gpu": 0.0,
+    "gpuMemory": 0.0
   },
   "applications": [
     {
@@ -17,7 +21,9 @@
       "load": {
         "cpu": 0.0,
         "memory": 0.0,
-        "disk": 0.0
+        "disk": 0.0,
+        "gpu": 0.0,
+        "gpuMemory": 0.0
       },
       "cost": 0.0,
       "unutilizedCost": 0.0
@@ -27,7 +33,9 @@
       "load": {
         "cpu": 0.0,
         "memory": 0.0,
-        "disk": 0.0
+        "disk": 0.0,
+        "gpu": 0.0,
+        "gpuMemory": 0.0
       },
       "cost": 0.0,
       "unutilizedCost": 0.0
@@ -37,7 +45,9 @@
       "load": {
         "cpu": 0.0,
         "memory": 0.0,
-        "disk": 0.0
+        "disk": 0.0,
+        "gpu": 0.0,
+        "gpuMemory": 0.0
       },
       "cost": 0.0,
       "unutilizedCost": 0.0
@@ -47,7 +57,9 @@
       "load": {
         "cpu": 0.0,
         "memory": 0.0,
-        "disk": 0.0
+        "disk": 0.0,
+        "gpu": 0.0,
+        "gpuMemory": 0.0
       },
       "cost": 0.0,
       "unutilizedCost": 0.0