From 21348324395d9b5e4916c01b3d661f1658d1ead7 Mon Sep 17 00:00:00 2001 From: David Goldberg Date: Wed, 18 Dec 2013 07:39:02 +0200 Subject: [PATCH] fixing the it-tests Change-Id: Ie017cdd4525173dec0fc1b68d8da57c32c72bc74 Signed-off-by: David Goldberg --- mappingservice/config/pom.xml | 8 ++++++++ mappingservice/implementation/pom.xml | 8 ++++++++ .../integrationtest/MappingServiceIntegrationTest.java | 8 ++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml index 73e33cddc..9d6297e24 100644 --- a/mappingservice/config/pom.xml +++ b/mappingservice/config/pom.xml @@ -119,6 +119,14 @@ + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.opendaylight.yangtools.model + ietf-yang-types + org.opendaylight.lispflowmapping mappingservice.api diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml index 89a4d5135..8b1c05587 100644 --- a/mappingservice/implementation/pom.xml +++ b/mappingservice/implementation/pom.xml @@ -111,6 +111,14 @@ + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.opendaylight.yangtools.model + ietf-yang-types + org.opendaylight.controller sal-binding-api 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 c88e24c9a..44d6d92ac 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 @@ -8,6 +8,7 @@ package org.opendaylight.lispflowmapping.integrationtest; import aQute.lib.osgi.Constants; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -28,7 +29,9 @@ import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; import java.util.concurrent.TimeUnit; + import javax.inject.Inject; + import org.apache.commons.codec.binary.Base64; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; @@ -114,6 +117,7 @@ import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -813,8 +817,8 @@ public class MappingServiceIntegrationTest { } private URL createGetMappingSourceDestURL(int afi, String srcAddress, int srcMask, String dstAddress, int dstMask) throws MalformedURLException { - String restUrl = String.format("http://localhost:8080/lispflowmapping/nb/v2/default/%s/0/%d/%s/%d/%s/%d", "mapping", afi, srcAddress, srcMask, - dstAddress, dstMask); + String restUrl = String.format("http://localhost:8080/lispflowmapping/nb/v2/default/%s/0/%d/%s/%d/%s/%d", "mapping", afi, srcAddress, + srcMask, dstAddress, dstMask); URL url = new URL(restUrl); return url; } -- 2.36.6