PCEP add-lsp RPC: propagate TLVs from input to initiate message.

Change-Id: Iaf9d010f178feec90f349e389c5b8f39bc2cba19
Signed-off-by: Milos Fabian <milfabia@cisco.com>
(cherry picked from commit 6b884d7bdc4427036f37ce01721458ee87c0168c)

diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
index 6a53143282e128a7c4c10852a0f616f8eed4910f..c8fc1385642cbbaf401e19f3c341de1f33e55b1f 100644 (file)
--- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
+++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
@@ -251,12 +251,14 @@ final class Stateful07TopologySessionListener extends AbstractTopologySessionLis
 
                 rb.fieldsFrom(input.getArguments());
 
-                final TlvsBuilder tlvsBuilder = new TlvsBuilder();
-                tlvsBuilder.setSymbolicPathName(
-                    new SymbolicPathNameBuilder().setPathName(new SymbolicPathName(input.getName().getBytes(Charsets.UTF_8))).build());
+                final TlvsBuilder tlvsBuilder;
                 if (inputLsp.getTlvs() != null) {
-                    tlvsBuilder.setVsTlv(inputLsp.getTlvs().getVsTlv());
+                    tlvsBuilder = new TlvsBuilder(inputLsp.getTlvs());
+                } else {
+                    tlvsBuilder = new TlvsBuilder();
                 }
+                tlvsBuilder.setSymbolicPathName(
+                    new SymbolicPathNameBuilder().setPathName(new SymbolicPathName(input.getName().getBytes(Charsets.UTF_8))).build());
 
                 final SrpBuilder srpBuilder = new SrpBuilder();
                 srpBuilder.setOperationId(nextRequest());