diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2022-05-09 09:28:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-09 09:28:25 +0200 |
commit | 623c97dddb66baa91d305dcfa81e37395747684d (patch) | |
tree | ee3dd2da70f5021a118ca1d50fdfb64e59a6864e /controller-server/src/test | |
parent | ba1ec40ccfe7f10ce757263871dd149b0709b8bf (diff) |
Revert "Revert "Maintain archive access for controller" MERGEOK"
Diffstat (limited to 'controller-server/src/test')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java index df2b462914e..e73d66b0329 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java @@ -17,6 +17,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.Stream; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -48,10 +49,11 @@ public class ArchiveAccessMaintainerTest { assertEquals(Set.of(tenant1role), archiveService.authorizedIamRolesForKey.get(testBucket.keyArn())); var expected = Map.of("archive.bucketCount", - tester.controller().zoneRegistry().zones().all().ids().stream() - .collect(Collectors.toMap( - zone -> Map.of("zone", zone.value()), - zone -> zone.equals(testZone) ? 1d : 0d))); + Stream.concat(Stream.of(tester.controller().zoneRegistry().systemZone().getVirtualId()), + tester.controller().zoneRegistry().zones().all().ids().stream()) + .collect(Collectors.toMap( + zone -> Map.of("zone", zone.value()), + zone -> zone.equals(testZone) ? 1d : 0d))); assertEquals(expected, metric.metrics()); } |