From: David Goldberg Date: Fri, 29 Nov 2013 06:50:02 +0000 (+0200) Subject: fixing integration tests X-Git-Tag: jenkins-controller-bulk-release-prepare-only-1~16 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4919b0478b926d9f9094a97f2176567258697a95;p=lispflowmapping.git fixing integration tests Signed-off-by: David Goldberg Change-Id: I7de5ffe3b7af1256b57906869e63b8ea8e91050e Signed-off-by: David Goldberg --- diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispSegmentLCAFAddressSerializer.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispSegmentLCAFAddressSerializer.java index 11d845234..f336a9e2b 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispSegmentLCAFAddressSerializer.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/serializer/address/LispSegmentLCAFAddressSerializer.java @@ -2,6 +2,7 @@ package org.opendaylight.lispflowmapping.implementation.serializer.address; import java.nio.ByteBuffer; +import org.opendaylight.lispflowmapping.implementation.lisp.exception.LispSerializationException; import org.opendaylight.lispflowmapping.implementation.util.ByteUtil; import org.opendaylight.lispflowmapping.implementation.util.LispAFIConvertor; import org.opendaylight.lispflowmapping.type.AddressFamilyNumberEnum; @@ -14,6 +15,7 @@ import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispsimpleaddress. public class LispSegmentLCAFAddressSerializer extends LispLCAFAddressSerializer { + private static final int MAX_INSTANCE_ID = 16777216; private static final LispSegmentLCAFAddressSerializer INSTANCE = new LispSegmentLCAFAddressSerializer(); // Private constructor prevents instantiation from other classes @@ -38,10 +40,14 @@ public class LispSegmentLCAFAddressSerializer extends LispLCAFAddressSerializer @Override protected LcafSegmentAddress deserializeData(ByteBuffer buffer, byte res2, short length) { - int instanceId = buffer.getInt(); + long instanceId = (int) ByteUtil.asUnsignedInteger(buffer.getInt()); + + if (instanceId > MAX_INSTANCE_ID) { + throw new LispSerializationException("Instance ID is longer than 24 bits. got " + instanceId); + } LispAFIAddress address = LispAddressSerializer.getInstance().deserialize(buffer); LcafSegmentBuilder builder = new LcafSegmentBuilder(); - builder.setInstanceId(ByteUtil.asUnsignedInteger(instanceId) & 0xFFFFFF); + builder.setInstanceId(instanceId); builder.setAfi(AddressFamilyNumberEnum.LCAF.getIanaCode()).setLcafType((short) LispCanonicalAddressFormatEnum.SEGMENT.getLispCode()) .setAddress(new AddressBuilder().setPrimitiveAddress((PrimitiveAddress) LispAFIConvertor.toPrimitive(address)).build()); diff --git a/mappingservice/integrationtest/pom.xml b/mappingservice/integrationtest/pom.xml index 952df7043..6226b4d63 100644 --- a/mappingservice/integrationtest/pom.xml +++ b/mappingservice/integrationtest/pom.xml @@ -63,19 +63,19 @@ - - org.ops4j.pax.exam - maven-paxexam-plugin - 1.2.4 - - - generate-config - - generate-depends-file - - - - + + org.ops4j.pax.exam + maven-paxexam-plugin + 1.2.4 + + + generate-config + + generate-depends-file + + + + org.apache.maven.plugins maven-checkstyle-plugin @@ -146,6 +146,11 @@ sal-binding-api 1.0-SNAPSHOT + + org.opendaylight.controller + sal-binding-it + 1.0-SNAPSHOT + org.opendaylight.controller sal-common-api @@ -199,10 +204,10 @@ 0.5.0-SNAPSHOT - org.opendaylight.controller - netconf-impl - ${netconf.version} - + org.opendaylight.controller + netconf-impl + ${netconf.version} + org.opendaylight.controller containermanager.it.implementation @@ -471,14 +476,13 @@ test - org.ops4j.pax.exam - pax-exam - ${exam.version} - - compile - + org.ops4j.pax.exam + pax-exam + ${exam.version} + + compile + org.ops4j.pax.exam pax-exam-link-mvn @@ -597,11 +601,32 @@ xtend-lib-osgi 2.4.3 + + org.opendaylight.yangtools.model + opendaylight-l2-types + ${opendaylight-l2-types.version} + + + org.opendaylight.yangtools.model + yang-ext + ${yang-ext.version} + org.opendaylight.controller sal-binding-broker-impl 1.0-SNAPSHOT + + org.opendaylight.controller + config-netconf-connector + ${netconf.version} + test + + + org.opendaylight.controller.model + model-inventory + ${mdsal.version} + org.javassist javassist diff --git a/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java b/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java index a3ced2e25..f3849c70b 100644 --- a/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java +++ b/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java @@ -42,6 +42,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.opendaylight.controller.test.sal.binding.it.TestHelper; import org.opendaylight.lispflowmapping.implementation.dao.ClusterDAOService; import org.opendaylight.lispflowmapping.implementation.serializer.LispMessage; import org.opendaylight.lispflowmapping.implementation.serializer.MapNotifySerializer; @@ -338,6 +339,12 @@ public class MappingServiceIntegrationTest { mavenBundle("org.opendaylight.controller", "containermanager").versionAsInProject(), mavenBundle("org.opendaylight.controller", "containermanager.it.implementation").versionAsInProject(), + TestHelper.baseModelBundles(), + TestHelper.configMinumumBundles(), + TestHelper.bindingIndependentSalBundles(), + TestHelper.bindingAwareSalBundles(), + TestHelper.mdSalCoreBundles(), + // Specific bundles mavenBundle(ODL, "sal-binding-api").versionAsInProject(), // mavenBundle(ODL, "sal-binding-config").versionAsInProject(),