[ONOS-4163] Provider side changes to support stateful PCE and PCECC
Change-Id: I0a57ed1d1e505a2e94921fd5f5d92426a105ad12
diff --git a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProviderTest.java b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProviderTest.java
index d357d46..2922537 100644
--- a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProviderTest.java
+++ b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProviderTest.java
@@ -15,7 +15,12 @@
*/
package org.onosproject.provider.pcep.tunnel.impl;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.core.IsNot.not;
import static org.onosproject.net.DefaultAnnotations.EMPTY;
+import static org.onosproject.provider.pcep.tunnel.impl.LspType.WITH_SIGNALLING;
+import static org.onosproject.provider.pcep.tunnel.impl.PcepAnnotationKeys.LSP_SIG_TYPE;
import java.io.IOException;
import java.util.ArrayList;
@@ -30,7 +35,9 @@
import org.onosproject.incubator.net.tunnel.Tunnel;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.incubator.net.tunnel.TunnelName;
+import org.onosproject.net.Annotations;
import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.DefaultLink;
import org.onosproject.net.DefaultPath;
import org.onosproject.net.IpElementId;
@@ -62,7 +69,7 @@
Tunnel tunnel;
Path path;
ProviderId pid = new ProviderId("pcep", PROVIDER_ID);
- List<Link> links = new ArrayList<Link>();
+ List<Link> links = new ArrayList<>();
IpAddress srcIp = IpAddress.valueOf(0xC010101);
IpElementId srcElementId = IpElementId.ipElement(srcIp);
@@ -85,11 +92,17 @@
path = new DefaultPath(pid, links, 10, EMPTY);
+ Annotations annotations = DefaultAnnotations.builder()
+ .set(LSP_SIG_TYPE, WITH_SIGNALLING.name())
+ .build();
+
tunnel = new DefaultTunnel(pid, ipTunnelEndPointSrc, ipTunnelEndPointDst, Tunnel.Type.MPLS,
new DefaultGroupId(0), TunnelId.valueOf("1"), TunnelName.tunnelName("T123"),
- path, EMPTY);
+ path, annotations);
tunnelProvider.setupTunnel(tunnel, path);
+
+ assertThat(tunnelProvider.pcepTunnelApiMapper, not(nullValue()));
}
@After
@@ -99,4 +112,4 @@
tunnelProvider.pcepClientController = null;
tunnelProvider.tunnelProviderRegistry = null;
}
-}
+}
\ No newline at end of file