Move SuperModel to config-model-api

This avoids duplication of datastructures in service monitor

1 files changed, 8 insertions, 3 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java
index 42437b20b83..4c7f15143ec 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java
@@ -1,13 +1,18 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
-import java.util.List;
+import com.yahoo.config.provision.Zone;
 
 public interface SuperModelProvider {
+    SuperModel getSuperModel();
+
     /**
-     * Returns all applications in the SuperModel. All changes to the SuperModel
+     * Returns the current SuperModel. All changes to the SuperModel
      * following that snapshot will be published to the listener. Warning: The listener
      * methods may have been invoked before (or concurrently with) this method returning.
      */
-    List<ApplicationInfo> snapshot(SuperModelListener listener);
+    SuperModel snapshot(SuperModelListener listener);
+
+    // TODO: Remove - clients of SuperModel should get zone from elsewhere.
+    Zone getZone();
 }