Merge pull request #5328 from vespa-engine/mpolden/zone-registry-cleanup

Zone registry cleanup

1 files changed, 10 insertions, 14 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
index 81283ce802f..25b286bf94c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
@@ -19,35 +19,31 @@ import java.util.Optional;
  */
 public interface ZoneRegistry {
 
-    /** Returns whether the system of this registry contains the given zone. */
+    /** Returns whether the system of this registry contains the given zone */
     boolean hasZone(ZoneId zoneId);
 
-    /** Returns a list containing the id of all zones in this registry. */
+    /** Returns a list containing the id of all zones in this registry */
     ZoneFilter zones();
 
-    /** Returns the default region for the given environment, if one is configured. */
+    /** Returns the default region for the given environment, if one is configured */
     Optional<RegionName> getDefaultRegion(Environment environment);
 
-    // TODO Rename to getConfigServerUris once port 4080 is removed from configservers
-    /** Returns a list with all known config servers in the given zone, with a secure connection URL. */
-    List<URI> getConfigServerSecureUris(ZoneId zoneId);
+    /** Returns a list with all known config servers in the given zone, with a secure connection URL */
+    List<URI> getConfigServerUris(ZoneId zoneId);
 
-    /** Returns a URL with the logs for the given deployment, if logging is configured for its zone. */
+    /** Returns a URL with the logs for the given deployment, if logging is configured for its zone */
     Optional<URI> getLogServerUri(DeploymentId deploymentId);
 
-    /** Returns the time to live for deployments in the given zone, or empty if this is infinite. */
+    /** Returns the time to live for deployments in the given zone, or empty if this is infinite */
     Optional<Duration> getDeploymentTimeToLive(ZoneId zoneId);
 
-    /** Returns a URL pointing at monitoring resources for the given deployment. */
+    /** Returns the monitoring system URL for the given deployment */
     URI getMonitoringSystemUri(DeploymentId deploymentId);
 
-    /** Returns the URL of the dashboard for the system of this registry. */
-    URI getDashboardUri();
-
-    /** Returns the system of this registry. */
+    /** Returns the system of this registry */
     SystemName system();
 
     /** Return the configserver's Athenz service identity */
-    AthenzService getConfigserverAthenzService(ZoneId zoneId);
+    AthenzService getConfigServerAthenzService(ZoneId zoneId);
 
 }