fixing the it-tests

Change-Id: Ie017cdd4525173dec0fc1b68d8da57c32c72bc74
Signed-off-by: David Goldberg <david.goldberg@contextream.com>

diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml
index 73e33cddca7d31fc8c1189226df7d20b2a709f8a..9d6297e24488f65855eeb91e42d34172a6efb914 100644 (file)
--- a/mappingservice/config/pom.xml
+++ b/mappingservice/config/pom.xml
@@ -119,6 +119,14 @@
                </plugins>
        </build>
        <dependencies>
+       <dependency>
+                       <groupId>org.opendaylight.yangtools.model</groupId>
+                       <artifactId>ietf-inet-types</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.yangtools.model</groupId>
+                       <artifactId>ietf-yang-types</artifactId>
+               </dependency>
        <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>

diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 89a4d5135fb2a2aa2f83427648eb6aa0730f855a..8b1c05587dc6799b7e05c73b871b7a0d62a0f9ee 100644 (file)
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -111,6 +111,14 @@
                </plugins>
        </build>
        <dependencies>
+       <dependency>
+                       <groupId>org.opendaylight.yangtools.model</groupId>
+                       <artifactId>ietf-inet-types</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.yangtools.model</groupId>
+                       <artifactId>ietf-yang-types</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>sal-binding-api</artifactId>

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 c88e24c9a90e5479a9c9e4161dfd1676b5ae96de..44d6d92ac5193b5b420c4a656ff3714b422b4839 100644 (file)
--- 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;
     }