aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-05-02 11:35:24 +0200
committerMartin Polden <mpolden@mpolden.no>2019-05-02 12:45:11 +0200
commitdc8f7668907fdd198b3c8af4cf0b3fb6d3371a05 (patch)
treedbc20f972adbcbc24776f1d7ae9632f321491c7b /controller-server/src/test/java
parent05fb9663a0e78ee98f50e8ec57229654b5a4bb3c (diff)
Fix serialization TODO
Diffstat (limited to 'controller-server/src/test/java')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java27
1 files changed, 0 insertions, 27 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 4a4fd39ccb7..1aefe3f62bd 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
@@ -7,7 +7,6 @@ import com.yahoo.config.provision.ClusterSpec;
import com.yahoo.config.provision.HostName;
import com.yahoo.config.provision.RotationName;
import com.yahoo.config.provision.zone.ZoneId;
-import com.yahoo.vespa.config.SlimeUtils;
import com.yahoo.vespa.hosted.controller.application.RoutingPolicy;
import org.junit.Test;
@@ -43,30 +42,4 @@ public class RoutingPolicySerializerTest {
assertEquals(loadBalancers, serialized);
}
- @Test
- public void test_legacy_serialization() { // TODO: Remove after 7.43 has been released
- String json = "{\n" +
- " \"routingPolicies\": [\n" +
- " {\n" +
- " \"alias\": \"my-pretty-alias\",\n" +
- " \"zone\": \"prod.us-north-1\",\n" +
- " \"canonicalName\": \"long-and-ugly-name\",\n" +
- " \"dnsZone\": \"zone1\",\n" +
- " \"rotations\": [\n" +
- " \"r1\",\n" +
- " \"r2\"\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- "}";
- ApplicationId owner = ApplicationId.defaultId();
- Set<RoutingPolicy> expected = Set.of(new RoutingPolicy(owner,
- ClusterSpec.Id.from("default"),
- ZoneId.from("prod", "us-north-1"),
- HostName.from("long-and-ugly-name"),
- Optional.of("zone1"),
- Set.of(RotationName.from("r1"), RotationName.from("r2"))));
- assertEquals(expected, serializer.fromSlime(owner, SlimeUtils.jsonToSlime(json)));
- }
-
}