commit f97e13d0a1240de055ab9a0175ddc9c010cda80d
author Priyanka B <priyanka.b@huawei.com> Thu Jul 28 10:57:15 2016 +0530
committer Priyankab-Huawei <priyanka.b@huawei.com> Fri Jul 29 05:00:11 2016 +0000
tree ad2da9643edd54e7f5cdaedd889bd96ff62ff7da
parent f8ba88154c0b6ce092692ff438d44bd1935bfed4

[ONOS] duplicate tunnelname not allowed in PCE REST and WEB

Change-Id: Id801fdccb8110759f55034fc8ee00ac5c40eca41
(cherry picked from commit edf1cd84129199451560428786d514592f2480e0)

apps/pce/pcerest/src/test/java/org/onosproject/pcerest/PcePathResourceTest.java

diff --git a/apps/pce/pcerest/src/test/java/org/onosproject/pcerest/PcePathResourceTest.java b/apps/pce/pcerest/src/test/java/org/onosproject/pcerest/PcePathResourceTest.java
index a61a294..862fb14 100644
--- a/apps/pce/pcerest/src/test/java/org/onosproject/pcerest/PcePathResourceTest.java
+++ b/apps/pce/pcerest/src/test/java/org/onosproject/pcerest/PcePathResourceTest.java
@@ -24,7 +24,6 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-
 import static org.onosproject.net.Link.Type.DIRECT;
 
 import com.eclipsesource.json.Json;
@@ -34,6 +33,7 @@
 import java.net.HttpURLConnection;
 import java.util.LinkedList;
 import java.util.List;
+
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
@@ -43,7 +43,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.onlab.osgi.ServiceDirectory;
 import org.onlab.osgi.TestServiceDirectory;
 import org.onlab.packet.IpAddress;
@@ -56,6 +55,7 @@
 import org.onosproject.incubator.net.tunnel.TunnelId;
 import org.onosproject.incubator.net.tunnel.TunnelEndPoint;
 import org.onosproject.incubator.net.tunnel.TunnelName;
+import org.onosproject.incubator.net.tunnel.TunnelService;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DefaultAnnotations;
 import org.onosproject.net.DefaultLink;
@@ -73,6 +73,7 @@
  */
 public class PcePathResourceTest extends PceResourceTest {
     private final PceService pceService = createMock(PceService.class);
+    private final TunnelService tunnelService = createMock(TunnelService.class);
     private final TunnelEndPoint src = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(23423));
     private final TunnelEndPoint dst = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(32421));
     private final DefaultGroupId groupId = new DefaultGroupId(92034);
@@ -100,6 +101,7 @@
        // Mock environment setup
        MockPceCodecContext context = new MockPceCodecContext();
        ServiceDirectory testDirectory = new TestServiceDirectory().add(PceService.class, pceService)
+                                                                  .add(TunnelService.class, tunnelService)
                                                                   .add(CodecService.class, context.codecManager());
        BaseResource.setServiceDirectory(testDirectory);