diff options
| author | jonmv <venstad@gmail.com> | 2023-09-28 17:17:09 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-09-28 17:17:09 +0200 |
| commit | 1b0cfae1d7c756c2caeef468d5d2725f81493fdc (patch) | |
| tree | 7f5c9e89198ee71f8e3d2b4faa94659026d3ae2b /controller-server/src/test/java/com/yahoo | |
| parent | a1bd65e6be24f8073c6a5cc826d291a3571ee676 (diff) | |
Group fingerprints by token id
Diffstat (limited to 'controller-server/src/test/java/com/yahoo')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java index 4a1ad86b5a4..0e5308fcef5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java @@ -42,6 +42,8 @@ import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeFilter import com.yahoo.vespa.hosted.controller.api.integration.configserver.ProxyResponse; import com.yahoo.vespa.hosted.controller.api.integration.configserver.QuotaUsage; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ServiceConvergence; +import com.yahoo.vespa.hosted.controller.api.integration.dataplanetoken.FingerPrint; +import com.yahoo.vespa.hosted.controller.api.integration.dataplanetoken.TokenId; import com.yahoo.vespa.hosted.controller.api.integration.deployment.TestReport; import com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud; import com.yahoo.vespa.hosted.controller.api.integration.dns.NameService; @@ -103,7 +105,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer private final Map<DeploymentId, TestReport> testReport = new HashMap<>(); private final Map<DeploymentId, CloudAccount> cloudAccounts = new HashMap<>(); private final Map<DeploymentId, List<X509Certificate>> additionalCertificates = new HashMap<>(); - private final Map<String, List<String>> activeTokenFingerprints = new HashMap<>(); + private final Map<HostName, Map<TokenId, List<FingerPrint>>> activeTokenFingerprints = new HashMap<>(); private List<SearchNodeMetrics> searchNodeMetrics; private Version lastPrepareVersion = null; @@ -320,8 +322,8 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer return additionalCertificates.getOrDefault(deployment, List.of()); } - public void setActiveTokenFingerprints(String hostname, List<String> fingerprints) { - activeTokenFingerprints.put(hostname, List.copyOf(fingerprints)); + public void setActiveTokenFingerprints(HostName hostname, Map<TokenId, List<FingerPrint>> tokens) { + activeTokenFingerprints.put(hostname, tokens); } @Override @@ -591,8 +593,8 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer } @Override - public Map<String, List<String>> activeTokenFingerprints(DeploymentId deploymentId) { - return Map.copyOf(activeTokenFingerprints); + public Map<HostName, Map<TokenId, List<FingerPrint>>> activeTokenFingerprints(DeploymentId deploymentId) { + return activeTokenFingerprints; } public static class Application { |