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

Change-Id: Iaf9d010f178feec90f349e389c5b8f39bc2cba19
Signed-off-by: Milos Fabian <milfabia@cisco.com>

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 f6a41aa5c4bc9fa05607ff1f33624afcbb62ff06..eac0732f9de17e66c25a19b0a938e643547f6cf5 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
@@ -235,12 +235,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());
 
                 rb.setSrp(new SrpBuilder().setOperationId(nextRequest()).setProcessingRule(Boolean.TRUE).build());
                 rb.setLsp(new LspBuilder().setAdministrative(inputLsp.isAdministrative()).setDelegate(inputLsp.isDelegate()).setPlspId(