Segment routing Open-Object parser should extend Stateful07 Open-Object parser.

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

diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr02/cfg/Sr02PCEPSessionProposalFactoryModule.java b/pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr02/cfg/Sr02PCEPSessionProposalFactoryModule.java
index 0fe43331bcda6d8d16752c659ba72869b1cc440d..b57d8af6be034a196106d3a7d573ca27e13aea6e 100644 (file)
--- a/pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr02/cfg/Sr02PCEPSessionProposalFactoryModule.java
+++ b/pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr02/cfg/Sr02PCEPSessionProposalFactoryModule.java
@@ -12,7 +12,6 @@ import com.google.common.base.Preconditions;
 import java.net.InetSocketAddress;
 import org.opendaylight.controller.config.api.JmxAttributeValidationException;
 import org.opendaylight.protocol.pcep.PCEPSessionProposalFactory;
-import org.opendaylight.protocol.pcep.ietf.initiated00.Stateful07SessionProposalFactory;
 import org.opendaylight.protocol.pcep.segment.routing02.SegmentRouting02SessionProposalFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.Open;
 import org.slf4j.Logger;
@@ -61,7 +60,7 @@ public class Sr02PCEPSessionProposalFactoryModule extends org.opendaylight.contr
     }
 
     private static final class PCEPSessionProposalFactoryCloseable implements PCEPSessionProposalFactory, AutoCloseable {
-        private final Stateful07SessionProposalFactory inner;
+        private final SegmentRouting02SessionProposalFactory inner;
 
         public PCEPSessionProposalFactoryCloseable(final SegmentRouting02SessionProposalFactory inner) {
             this.inner = Preconditions.checkNotNull(inner);

diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/PcepOpenObjectWithSpcTlvParser.java b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/PcepOpenObjectWithSpcTlvParser.java
index aed2af8b5f19c8bde583759ee2a9c2fdd9f24a80..56170f5e1a42324a87b6bf4bfa47da5a95d40e60 100644 (file)
--- a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/PcepOpenObjectWithSpcTlvParser.java
+++ b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/PcepOpenObjectWithSpcTlvParser.java
@@ -8,7 +8,7 @@
 package org.opendaylight.protocol.pcep.segment.routing02;
 
 import io.netty.buffer.ByteBuf;
-import org.opendaylight.protocol.pcep.impl.object.PCEPOpenObjectParser;
+import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07OpenObjectParser;
 import org.opendaylight.protocol.pcep.spi.TlvRegistry;
 import org.opendaylight.protocol.pcep.spi.VendorInformationTlvRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing._02.rev140506.Tlvs1;
@@ -18,7 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.open.Tlvs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.open.TlvsBuilder;
 
-public class PcepOpenObjectWithSpcTlvParser extends PCEPOpenObjectParser {
+public class PcepOpenObjectWithSpcTlvParser extends Stateful07OpenObjectParser {
 
     public PcepOpenObjectWithSpcTlvParser(TlvRegistry tlvReg, VendorInformationTlvRegistry viTlvReg) {
         super(tlvReg, viTlvReg);

diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing02/SrObjectParserTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing02/SrObjectParserTest.java
index fa1d1d481a79816c634a56bf9b41bd8db5790a13..15ec74d1f777666cc215e36d82e40137a8334461 100644 (file)
--- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing02/SrObjectParserTest.java
+++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing02/SrObjectParserTest.java
@@ -86,7 +86,7 @@ public class SrObjectParserTest {
 
         final Tlvs1 tlv = new Tlvs1Builder().setSrPceCapability(new SrPceCapabilityBuilder().setMsd((short) 1).build())
                 .build();
-        builder.setTlvs(new TlvsBuilder().addAugmentation(Tlvs1.class, tlv).build());
+        builder.setTlvs(new TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.Tlvs1Builder().build()).addAugmentation(Tlvs1.class, tlv).build());
 
         final ByteBuf result = Unpooled.wrappedBuffer(openObjectBytes);
         assertEquals(builder.build(),