Fixed update tunnel hanging.

Change-Id: Ia94bce78d4de8ca31a2c363c364bae39f6c71e5b
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/pcep/ietf-stateful02/src/main/yang/odl-pcep-ietf-stateful02.yang b/pcep/ietf-stateful02/src/main/yang/odl-pcep-ietf-stateful02.yang
index b455e0ca338d2aecb6dad0e7b6e000d6717224c8..956307e205e51bf93ca3d37d1f9d8bb4471d3a2c 100644 (file)
--- a/pcep/ietf-stateful02/src/main/yang/odl-pcep-ietf-stateful02.yang
+++ b/pcep/ietf-stateful02/src/main/yang/odl-pcep-ietf-stateful02.yang
@@ -252,6 +252,12 @@ module odl-pcep-ietf-stateful02 {
                }
        }
 
+       augment "/topo:update-lsp/topo:input/topo:arguments" {
+               leaf operational {
+                       type boolean;
+               }
+       }
+
        typedef administrative-status {
                type enumeration {
                        enum active;

diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful02TopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful02TopologySessionListener.java
index adf70035e4dbffbad6ff5cd60eeb7c0b3db87fe6..74a4ec72083147f2cd90182ec66e41c8fe1a2640 100644 (file)
--- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful02TopologySessionListener.java
+++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful02TopologySessionListener.java
@@ -19,6 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.cra
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated._00.rev140113.pcinitiate.message.PcinitiateMessageBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated._00.rev140113.pcinitiate.message.pcinitiate.message.RequestsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.stateful._02.rev140110.Arguments1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.stateful._02.rev140110.Arguments2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.stateful._02.rev140110.PcrptMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.stateful._02.rev140110.PcupdBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.stateful._02.rev140110.PlspId;
@@ -215,7 +216,7 @@ public class Stateful02TopologySessionListener extends AbstractTopologySessionLi
 
                // Build the PCUpd request and send it
                final UpdatesBuilder rb = new UpdatesBuilder();
-               rb.setLsp(new LspBuilder().setPlspId(ra.getLsp().getPlspId()).setDelegate(Boolean.TRUE).build());
+               rb.setLsp(new LspBuilder().setPlspId(ra.getLsp().getPlspId()).setDelegate(Boolean.TRUE).setOperational(input.getArguments().getAugmentation(Arguments2.class).isOperational()).build());
                final PathBuilder pb = new PathBuilder();
                rb.setPath(pb.setEro(input.getArguments().getEro()).build());