diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-07-14 15:10:12 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-07-14 15:10:12 +0200 |
commit | d2b309fbb5f7f82a16bbc70dfbb48a3ce0ed4bf0 (patch) | |
tree | fb6d42da9c84b1d4c3a30982f4ce85d1965cce7d /controller-server/src/test | |
parent | 2aa5abc426c58dbb56791a045ec1b53735cc0551 (diff) |
Remove support for legacy format
Diffstat (limited to 'controller-server/src/test')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java index 7ca964e06dd..d67e9c3e432 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java @@ -6,7 +6,6 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.zone.ZoneId; -import com.yahoo.slime.SlimeUtils; import com.yahoo.vespa.hosted.controller.application.EndpointId; import com.yahoo.vespa.hosted.controller.routing.GlobalRouting; import com.yahoo.vespa.hosted.controller.routing.RoutingPolicy; @@ -16,7 +15,6 @@ import org.junit.Test; import java.time.Instant; import java.util.Iterator; -import java.util.Map; import java.util.Optional; import java.util.Set; @@ -63,16 +61,4 @@ public class RoutingPolicySerializerTest { } } - // TODO(mpolden): Remove after January 2020 - @Test - public void legacy_serialization() { - var json = "{\"routingPolicies\":[{\"cluster\":\"default\",\"zone\":\"prod.us-north-1\",\"canonicalName\":\"lb-host\",\"dnsZone\":\"dnsZoneId\",\"rotations\":[\"default\"],\"active\":true}]}"; - var owner = ApplicationId.defaultId(); - var serialized = serializer.fromSlime(owner, SlimeUtils.jsonToSlime(json)); - var id = new RoutingPolicyId(owner, ClusterSpec.Id.from("default"), ZoneId.from("prod", "us-north-1")); - var expected = Map.of(id, new RoutingPolicy(id, HostName.from("lb-host"), Optional.of("dnsZoneId"), - Set.of(EndpointId.defaultId()), new Status(true, GlobalRouting.DEFAULT_STATUS))); - assertEquals(expected, serialized); - } - } |