mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-24 13:51:27 +02:00
Code Issues Projects Releases Wiki Activity

Add unit tests for constraint object serializations

Browse Source 
Duration is additionally registered because LatencyConstraint has it

Change-Id: Ibbf31761b789fa71fb6cb1a1155f5ea0680853ce
This commit is contained in:
Sho SHIMIZU 2014-11-13 08:40:50 -08:00 committed by Gerrit Code Review
parent 3266abfeb9
commit 977cb60b98
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoNamespaces.java
View File

@ -16,6 +16,7 @@
package org.onlab.onos.store.serializers; package org.onlab.onos.store.serializers;
import java.net.URI; import java.net.URI;
import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
@ -123,7 +124,8 @@ public final class KryoNamespaces {
HashMap.class, HashMap.class,
HashSet.class, HashSet.class,
LinkedList.class, LinkedList.class,
byte[].class byte[].class,
Duration.class
) )
.build(); .build();

42
core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java
View File

@ -52,6 +52,13 @@ import org.onlab.onos.net.resource.Lambda;
import org.onlab.onos.net.resource.LambdaResourceAllocation; import org.onlab.onos.net.resource.LambdaResourceAllocation;
import org.onlab.onos.net.resource.LinkResourceRequest; import org.onlab.onos.net.resource.LinkResourceRequest;
import org.onlab.onos.net.resource.ResourceAllocation; import org.onlab.onos.net.resource.ResourceAllocation;
import org.onlab.onos.net.intent.constraint.AnnotationConstraint;
import org.onlab.onos.net.intent.constraint.BandwidthConstraint;
import org.onlab.onos.net.intent.constraint.LambdaConstraint;
import org.onlab.onos.net.intent.constraint.LatencyConstraint;
import org.onlab.onos.net.intent.constraint.LinkTypeConstraint;
import org.onlab.onos.net.intent.constraint.ObstacleConstraint;
import org.onlab.onos.net.intent.constraint.WaypointConstraint;
import org.onlab.packet.ChassisId; import org.onlab.packet.ChassisId;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
import org.onlab.packet.Ip4Address; import org.onlab.packet.Ip4Address;
@ -66,6 +73,7 @@ import java.nio.ByteBuffer;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.time.Duration;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -287,6 +295,40 @@ public class KryoSerializerTest {
testSerializable(new DefaultLinkResourceAllocations(request, allocations)); testSerializable(new DefaultLinkResourceAllocations(request, allocations));
} }
@Test
public void testLambdaConstraint() {
testSerializable(new LambdaConstraint(Lambda.valueOf(1)));
}
@Test
public void testBandwidthConstraint() {
testSerializable(new BandwidthConstraint(Bandwidth.valueOf(1000.0)));
}
@Test
public void testLinkTypeConstraint() {
testSerializable(new LinkTypeConstraint(true, Link.Type.DIRECT));
}
@Test
public void testLatencyConstraint() {
testSerializable(new LatencyConstraint(Duration.ofSeconds(10)));
}
@Test
public void testWaypointConstraint() {
testSerializable(new WaypointConstraint(deviceId("of:1"), deviceId("of:2")));
}
@Test
public void testObstacleConstraint() {
testSerializable(new ObstacleConstraint(deviceId("of:1"), deviceId("of:2")));
}
@Test
public void testAnnotationConstraint() {
testSerializable(new AnnotationConstraint("distance", 100.0));
}
@Test @Test
public void testAnnotations() { public void testAnnotations() {