From 37ce355370e8483c05bd9a7ce9f4f248e19ad4fb Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon@oath.com>
Date: Wed, 25 Oct 2017 17:36:20 +0200
Subject: Provide more info in host Orchestrator REST API

---
 .../com/yahoo/vespa/service/monitor/ConfigServerApplication.java  | 6 ++++++
 .../main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java | 8 ++++++++
 2 files changed, 14 insertions(+)

(limited to 'service-monitor')

diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java
index 1a48ba870fb..7a76c072076 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ConfigServerApplication.java
@@ -48,6 +48,12 @@ public class ConfigServerApplication {
                 APPLICATION_INSTANCE_ID,
                 serviceClusters);
 
+        // Fill back-references
+        serviceCluster.setApplicationInstance(applicationInstance);
+        for (ServiceInstance serviceInstance : serviceCluster.serviceInstances()) {
+            serviceInstance.setServiceCluster(serviceCluster);
+        }
+
         return applicationInstance;
     }
 }
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java
index d9f019ade63..9716846dea4 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ModelGenerator.java
@@ -101,6 +101,14 @@ public class ModelGenerator {
                 toApplicationInstanceId(applicationInfo, zone),
                 serviceClusters);
 
+        // Fill back-references
+        for (ServiceCluster serviceCluster : applicationInstance.serviceClusters()) {
+            serviceCluster.setApplicationInstance(applicationInstance);
+            for (ServiceInstance serviceInstance : serviceCluster.serviceInstances()) {
+                serviceInstance.setServiceCluster(serviceCluster);
+            }
+        }
+
         return applicationInstance;
     }
 
-- 
cgit v1.2.3