</extension>
<extension>
<type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
- <name>pcep-parser-ietf-stateful07</name>
+ <name>pcep-parser-ietf-stateful</name>
</extension>
<extension>
<type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
- <name>pcep-parser-ietf-initiated00</name>
+ <name>pcep-parser-ietf-initiated</name>
</extension>
<extension>
<type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
- *pcep-parser-base* - will register parsers and serializers
implemented in pcep-impl module
-- *pcep-parser-ietf-stateful07* - will register parsers and serializers
+- *pcep-parser-ietf-stateful* - will register parsers and serializers
of draft-ietf-pce-stateful-pce-07 implementation
-- *pcep-parser-ietf-initiated00* - will register parser and serializer
+- *pcep-parser-ietf-initiated* - will register parser and serializer
of draft-ietf-pce-pce-initiated-lsp-00 implementation
- *pcep-parser-sync-optimizations* - will register parser and
serializers of draft-ietf-pce-stateful-sync-optimizations-03
implementation
-Stateful07 module is a good example of a PCEP parser extension.
+Stateful module is a good example of a PCEP parser extension.
Configuration of PCEP parsers specifies one implementation of *Extension
provider* that will take care of registering mentioned parser
PCEP IETF stateful
~~~~~~~~~~~~~~~~~~
-This section summarizes module pcep-ietf-stateful07. The term *stateful*
+This section summarizes module pcep-ietf-stateful. The term *stateful*
refers to
`draft-ietf-pce-stateful-pce <http://tools.ietf.org/html/draft-ietf-pce-stateful-pce>`__
and
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
+ <artifactId>odl-bgpcep-pcep-stateful</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
+ <artifactId>odl-bgpcep-pcep-stateful</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
+ <artifactId>odl-bgpcep-pcep-stateful</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
+ <artifactId>odl-bgpcep-pcep-stateful</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<relativePath>../../../single-feature-parent</relativePath>
</parent>
- <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
+ <artifactId>odl-bgpcep-pcep-stateful</artifactId>
<packaging>feature</packaging>
- <name>OpenDaylight :: PCEP :: Stateful 07</name>
+ <name>OpenDaylight :: PCEP :: Stateful</name>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
+ <artifactId>odl-bgpcep-pcep-stateful</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
+ <artifactId>odl-bgpcep-pcep-stateful</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
+ <artifactId>odl-bgpcep-pcep-stateful</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<module>odl-bgpcep-programming-impl</module>
<module>odl-bgpcep-pcep-server</module>
<module>odl-bgpcep-pcep-topology</module>
- <module>odl-bgpcep-pcep-stateful07</module>
+ <module>odl-bgpcep-pcep-stateful</module>
<module>odl-bgpcep-pcep-server-provider</module>
<module>odl-bgpcep-pcep-topology-provider</module>
<module>odl-bgpcep-pcep-tunnel-provider</module>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
import com.google.common.collect.Iterables;
import io.netty.buffer.ByteBuf;
import java.util.List;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07PCReportMessageParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulPCReportMessageParser;
import org.opendaylight.protocol.pcep.spi.ObjectRegistry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.auto.bandwidth.rev181109.Bandwidth1;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.auto.bandwidth.rev181109.Bandwidth1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.bandwidth.object.Bandwidth;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.bandwidth.object.BandwidthBuilder;
-public class PcRptMessageCodec extends Stateful07PCReportMessageParser {
+public class PcRptMessageCodec extends StatefulPCReportMessageParser {
public PcRptMessageCodec(final ObjectRegistry registry) {
super(registry);
import pcep-types { prefix pcep; revision-date 2018-11-09; }
import network-topology { prefix nt; revision-date 2013-10-21; }
import network-topology-pcep { prefix topo; revision-date 2020-01-20; }
- import odl-pcep-ietf-stateful07 { prefix stateful; revision-date 2018-11-09; }
+ import odl-pcep-ietf-stateful { prefix stateful; revision-date 2018-11-09; }
import network-concepts { prefix netc; revision-date 2013-11-25; }
organization "Cisco Systems, Inc.";
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator;
import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
import org.opendaylight.protocol.pcep.spi.pojo.SimplePCEPExtensionProviderContext;
<relativePath>../../binding-parent</relativePath>
</parent>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
<description>PCE IETF Stateful model plugin</description>
<packaging>bundle</packaging>
<name>${project.artifactId}</name>
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.initiated00;
+package org.opendaylight.protocol.pcep.ietf.initiated;
import java.util.ArrayList;
import java.util.List;
import org.opendaylight.protocol.pcep.spi.TlvRegistry;
import org.opendaylight.protocol.pcep.spi.VendorInformationTlvRegistry;
import org.opendaylight.protocol.pcep.spi.pojo.AbstractPCEPExtensionProviderActivator;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Pcinitiate;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Pcinitiate;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.Lsp;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.Srp;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.stateful.capability.tlv.Stateful;
import org.opendaylight.yangtools.concepts.Registration;
-public final class CrabbeInitiatedActivator extends AbstractPCEPExtensionProviderActivator {
+public final class InitiatedActivator extends AbstractPCEPExtensionProviderActivator {
@Override
protected List<Registration> startImpl(final PCEPExtensionProviderContext context) {
final List<Registration> regs = new ArrayList<>();
- regs.add(context.registerMessageParser(CInitiated00PCInitiateMessageParser.TYPE,
- new CInitiated00PCInitiateMessageParser(context.getObjectHandlerRegistry())));
+ regs.add(context.registerMessageParser(InitiatedPCInitiateMessageParser.TYPE,
+ new InitiatedPCInitiateMessageParser(context.getObjectHandlerRegistry())));
regs.add(context.registerMessageSerializer(Pcinitiate.class,
- new CInitiated00PCInitiateMessageParser(context.getObjectHandlerRegistry())));
+ new InitiatedPCInitiateMessageParser(context.getObjectHandlerRegistry())));
final TlvRegistry tlvReg = context.getTlvHandlerRegistry();
final VendorInformationTlvRegistry viTlvReg = context.getVendorInformationTlvRegistry();
- regs.add(context.registerObjectParser(new CInitiated00LspObjectParser(tlvReg, viTlvReg)));
- regs.add(context.registerObjectSerializer(Lsp.class, new CInitiated00LspObjectParser(tlvReg, viTlvReg)));
- regs.add(context.registerObjectParser(new CInitiated00SrpObjectParser(tlvReg, viTlvReg)));
- regs.add(context.registerObjectSerializer(Srp.class, new CInitiated00SrpObjectParser(tlvReg, viTlvReg)));
+ regs.add(context.registerObjectParser(new InitiatedLspObjectParser(tlvReg, viTlvReg)));
+ regs.add(context.registerObjectSerializer(Lsp.class, new InitiatedLspObjectParser(tlvReg, viTlvReg)));
+ regs.add(context.registerObjectParser(new InitiatedSrpObjectParser(tlvReg, viTlvReg)));
+ regs.add(context.registerObjectSerializer(Srp.class, new InitiatedSrpObjectParser(tlvReg, viTlvReg)));
- regs.add(context.registerTlvParser(CInitiated00StatefulCapabilityTlvParser.TYPE,
- new CInitiated00StatefulCapabilityTlvParser()));
- regs.add(context.registerTlvSerializer(Stateful.class, new CInitiated00StatefulCapabilityTlvParser()));
+ regs.add(context.registerTlvParser(InitiatedStatefulCapabilityTlvParser.TYPE,
+ new InitiatedStatefulCapabilityTlvParser()));
+ regs.add(context.registerTlvSerializer(Stateful.class, new InitiatedStatefulCapabilityTlvParser()));
return regs;
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.initiated00;
+package org.opendaylight.protocol.pcep.ietf.initiated;
import io.netty.buffer.ByteBuf;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LspObjectParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulLspObjectParser;
import org.opendaylight.protocol.pcep.spi.TlvRegistry;
import org.opendaylight.protocol.pcep.spi.VendorInformationTlvRegistry;
import org.opendaylight.protocol.util.BitArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Lsp1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Lsp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Lsp1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Lsp1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.OperationalStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.Lsp;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.LspBuilder;
/**
* Parser for {@link Lsp}.
*/
-public class CInitiated00LspObjectParser extends Stateful07LspObjectParser {
+public class InitiatedLspObjectParser extends StatefulLspObjectParser {
private static final int CREATE_FLAG_OFFSET = 4;
- public CInitiated00LspObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
+ public InitiatedLspObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
super(tlvReg, viTlvReg);
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.initiated00;
+package org.opendaylight.protocol.pcep.ietf.initiated;
import static com.google.common.base.Preconditions.checkArgument;
import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
import org.opendaylight.protocol.pcep.spi.MessageUtil;
import org.opendaylight.protocol.pcep.spi.ObjectRegistry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Pcinitiate;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.PcinitiateBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.PcinitiateMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Pcinitiate;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.PcinitiateBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.PcinitiateMessageBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.Lsp;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.Srp;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Message;
/**
* Parser for {@link Pcinitiate}.
*/
-public class CInitiated00PCInitiateMessageParser extends AbstractMessageParser {
+public class InitiatedPCInitiateMessageParser extends AbstractMessageParser {
public static final int TYPE = 12;
- public CInitiated00PCInitiateMessageParser(final ObjectRegistry registry) {
+ public InitiatedPCInitiateMessageParser(final ObjectRegistry registry) {
super(registry);
}
public void serializeMessage(final Message message, final ByteBuf out) {
checkArgument(message instanceof Pcinitiate,
"Wrong instance of Message. Passed instance of %s. Need PcinitiateMessage.", message.getClass());
- final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109
+ final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109
.pcinitiate.message.PcinitiateMessage init = ((Pcinitiate) message).getPcinitiateMessage();
final ByteBuf buffer = Unpooled.buffer();
for (final Requests req : init.getRequests()) {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.initiated00;
+package org.opendaylight.protocol.pcep.ietf.initiated;
import io.netty.buffer.ByteBuf;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07SrpObjectParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulSrpObjectParser;
import org.opendaylight.protocol.pcep.spi.TlvRegistry;
import org.opendaylight.protocol.pcep.spi.VendorInformationTlvRegistry;
import org.opendaylight.protocol.util.BitArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Srp1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Srp1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.Srp;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.SrpBuilder;
/**
* Parser for {@link Srp}.
*/
-public class CInitiated00SrpObjectParser extends Stateful07SrpObjectParser {
+public class InitiatedSrpObjectParser extends StatefulSrpObjectParser {
private static final int REMOVE_FLAG = 31;
- public CInitiated00SrpObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
+ public InitiatedSrpObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
super(tlvReg, viTlvReg);
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.initiated00;
+package org.opendaylight.protocol.pcep.ietf.initiated;
import io.netty.buffer.ByteBuf;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07StatefulCapabilityTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulStatefulCapabilityTlvParser;
import org.opendaylight.protocol.util.BitArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.stateful.capability.tlv.Stateful;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.stateful.capability.tlv.StatefulBuilder;
/**
* Parser for {@link Stateful}.
*/
-public class CInitiated00StatefulCapabilityTlvParser extends Stateful07StatefulCapabilityTlvParser {
+public class InitiatedStatefulCapabilityTlvParser extends StatefulStatefulCapabilityTlvParser {
protected static final int I_FLAG_OFFSET = 29;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import java.net.InetSocketAddress;
import org.opendaylight.protocol.pcep.PCEPCapability;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.ietf.stateful07.app.config.rev160707.PcepIetfStateful07Config;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.ietf.stateful.app.config.rev160707.PcepIetfStatefulConfig;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Tlvs1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.stateful.capability.tlv.StatefulBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder;
this.includeDbVersion = includeDbVersion || triggeredSync || deltaLspSync;
}
- public PCEPStatefulCapability(final PcepIetfStateful07Config config) {
+ public PCEPStatefulCapability(final PcepIetfStatefulConfig config) {
this(config.isStateful(), config.isActive(), config.isInitiated(), config.isTriggeredInitialSync(),
config.isTriggeredResync(), config.isDeltaLspSyncCapability(), config.isIncludeDbVersion());
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import java.util.ArrayList;
import java.util.List;
final List<Registration> regs = new ArrayList<>();
final ObjectRegistry objReg = context.getObjectHandlerRegistry();
- regs.add(context.registerMessageParser(Stateful07PCUpdateRequestMessageParser.TYPE,
- new Stateful07PCUpdateRequestMessageParser(objReg)));
- regs.add(context.registerMessageSerializer(Pcupd.class, new Stateful07PCUpdateRequestMessageParser(objReg)));
- regs.add(context.registerMessageParser(Stateful07PCReportMessageParser.TYPE,
- new Stateful07PCReportMessageParser(objReg)));
- regs.add(context.registerMessageSerializer(Pcrpt.class, new Stateful07PCReportMessageParser(objReg)));
- regs.add(context.registerMessageParser(Stateful07ErrorMessageParser.TYPE,
- new Stateful07ErrorMessageParser(objReg)));
- regs.add(context.registerMessageSerializer(Pcerr.class, new Stateful07ErrorMessageParser(objReg)));
+ regs.add(context.registerMessageParser(StatefulPCUpdateRequestMessageParser.TYPE,
+ new StatefulPCUpdateRequestMessageParser(objReg)));
+ regs.add(context.registerMessageSerializer(Pcupd.class, new StatefulPCUpdateRequestMessageParser(objReg)));
+ regs.add(context.registerMessageParser(StatefulPCReportMessageParser.TYPE,
+ new StatefulPCReportMessageParser(objReg)));
+ regs.add(context.registerMessageSerializer(Pcrpt.class, new StatefulPCReportMessageParser(objReg)));
+ regs.add(context.registerMessageParser(StatefulErrorMessageParser.TYPE,
+ new StatefulErrorMessageParser(objReg)));
+ regs.add(context.registerMessageSerializer(Pcerr.class, new StatefulErrorMessageParser(objReg)));
final TlvRegistry tlvReg = context.getTlvHandlerRegistry();
final VendorInformationTlvRegistry viTlvReg = context.getVendorInformationTlvRegistry();
- regs.add(context.registerObjectParser(new Stateful07LspObjectParser(tlvReg, viTlvReg)));
- regs.add(context.registerObjectSerializer(Lsp.class, new Stateful07LspObjectParser(tlvReg, viTlvReg)));
- regs.add(context.registerObjectParser(new Stateful07SrpObjectParser(tlvReg, viTlvReg)));
- regs.add(context.registerObjectSerializer(Srp.class, new Stateful07SrpObjectParser(tlvReg, viTlvReg)));
- regs.add(context.registerObjectParser(new Stateful07OpenObjectParser(tlvReg, viTlvReg)));
- regs.add(context.registerObjectSerializer(Open.class, new Stateful07OpenObjectParser(tlvReg, viTlvReg)));
+ regs.add(context.registerObjectParser(new StatefulLspObjectParser(tlvReg, viTlvReg)));
+ regs.add(context.registerObjectSerializer(Lsp.class, new StatefulLspObjectParser(tlvReg, viTlvReg)));
+ regs.add(context.registerObjectParser(new StatefulSrpObjectParser(tlvReg, viTlvReg)));
+ regs.add(context.registerObjectSerializer(Srp.class, new StatefulSrpObjectParser(tlvReg, viTlvReg)));
+ regs.add(context.registerObjectParser(new StatefulOpenObjectParser(tlvReg, viTlvReg)));
+ regs.add(context.registerObjectSerializer(Open.class, new StatefulOpenObjectParser(tlvReg, viTlvReg)));
- regs.add(context.registerTlvParser(Stateful07LSPIdentifierIpv4TlvParser.TYPE,
- new Stateful07LSPIdentifierIpv4TlvParser()));
- regs.add(context.registerTlvParser(Stateful07LSPIdentifierIpv6TlvParser.TYPE,
- new Stateful07LSPIdentifierIpv6TlvParser()));
- regs.add(context.registerTlvSerializer(LspIdentifiers.class, new Stateful07LSPIdentifierIpv4TlvParser()));
- regs.add(context.registerTlvParser(Stateful07LspUpdateErrorTlvParser.TYPE,
- new Stateful07LspUpdateErrorTlvParser()));
- regs.add(context.registerTlvSerializer(LspErrorCode.class, new Stateful07LspUpdateErrorTlvParser()));
- regs.add(context.registerTlvParser(Stateful07RSVPErrorSpecTlvParser.TYPE,
- new Stateful07RSVPErrorSpecTlvParser()));
- regs.add(context.registerTlvSerializer(RsvpErrorSpec.class, new Stateful07RSVPErrorSpecTlvParser()));
- regs.add(context.registerTlvParser(Stateful07StatefulCapabilityTlvParser.TYPE,
- new Stateful07StatefulCapabilityTlvParser()));
- regs.add(context.registerTlvSerializer(Stateful.class, new Stateful07StatefulCapabilityTlvParser()));
- regs.add(context.registerTlvParser(Stateful07LspSymbolicNameTlvParser.TYPE,
- new Stateful07LspSymbolicNameTlvParser()));
- regs.add(context.registerTlvSerializer(SymbolicPathName.class, new Stateful07LspSymbolicNameTlvParser()));
+ regs.add(context.registerTlvParser(StatefulLSPIdentifierIpv4TlvParser.TYPE,
+ new StatefulLSPIdentifierIpv4TlvParser()));
+ regs.add(context.registerTlvParser(StatefulLSPIdentifierIpv6TlvParser.TYPE,
+ new StatefulLSPIdentifierIpv6TlvParser()));
+ regs.add(context.registerTlvSerializer(LspIdentifiers.class, new StatefulLSPIdentifierIpv4TlvParser()));
+ regs.add(context.registerTlvParser(StatefulLspUpdateErrorTlvParser.TYPE,
+ new StatefulLspUpdateErrorTlvParser()));
+ regs.add(context.registerTlvSerializer(LspErrorCode.class, new StatefulLspUpdateErrorTlvParser()));
+ regs.add(context.registerTlvParser(StatefulRSVPErrorSpecTlvParser.TYPE,
+ new StatefulRSVPErrorSpecTlvParser()));
+ regs.add(context.registerTlvSerializer(RsvpErrorSpec.class, new StatefulRSVPErrorSpecTlvParser()));
+ regs.add(context.registerTlvParser(StatefulStatefulCapabilityTlvParser.TYPE,
+ new StatefulStatefulCapabilityTlvParser()));
+ regs.add(context.registerTlvSerializer(Stateful.class, new StatefulStatefulCapabilityTlvParser()));
+ regs.add(context.registerTlvParser(StatefulLspSymbolicNameTlvParser.TYPE,
+ new StatefulLspSymbolicNameTlvParser()));
+ regs.add(context.registerTlvSerializer(SymbolicPathName.class, new StatefulLspSymbolicNameTlvParser()));
regs.add(context.registerTlvParser(PathBindingTlvParser.TYPE, new PathBindingTlvParser()));
regs.add(context.registerTlvSerializer(PathBinding.class, new PathBindingTlvParser()));
return regs;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
/**
* Parser for {@link PcerrMessage}.
*/
-public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
+public final class StatefulErrorMessageParser extends PCEPErrorMessageParser {
- public Stateful07ErrorMessageParser(final ObjectRegistry registry) {
+ public StatefulErrorMessageParser(final ObjectRegistry registry) {
super(registry);
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
/**
* Parser for {@link LspIdentifiers}.
*/
-public final class Stateful07LSPIdentifierIpv4TlvParser implements TlvParser, TlvSerializer {
+public final class StatefulLSPIdentifierIpv4TlvParser implements TlvParser, TlvSerializer {
public static final int TYPE = 18;
private static final int V4_LENGTH = 16;
final AddressFamily afi = lsp.getAddressFamily();
final ByteBuf body = Unpooled.buffer();
if (afi.implementedInterface().equals(Ipv6Case.class)) {
- new Stateful07LSPIdentifierIpv6TlvParser().serializeTlv(tlv, buffer);
+ new StatefulLSPIdentifierIpv6TlvParser().serializeTlv(tlv, buffer);
}
final Ipv4 ipv4 = ((Ipv4Case) afi).getIpv4();
checkArgument(ipv4.getIpv4TunnelSenderAddress() != null, "Ipv4TunnelSenderAddress is mandatory.");
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
/**
* Parser for {@link LspIdentifiers}.
*/
-public final class Stateful07LSPIdentifierIpv6TlvParser implements TlvParser, TlvSerializer {
+public final class StatefulLSPIdentifierIpv6TlvParser implements TlvParser, TlvSerializer {
public static final int TYPE = 19;
private static final int V6_LENGTH = 52;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
/**
* Parser for {@link Lsp}.
*/
-public class Stateful07LspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
+public class StatefulLspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
private static final int CLASS = 32;
protected static final int FOUR_BITS_SHIFT = 4;
protected static final int FLAGS_SIZE = 12;
- public Stateful07LspObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
+ public StatefulLspObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
super(tlvReg, viTlvReg, CLASS, TYPE);
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
/**
* Parser for {@link SymbolicPathName}.
*/
-public final class Stateful07LspSymbolicNameTlvParser implements TlvParser, TlvSerializer {
+public final class StatefulLspSymbolicNameTlvParser implements TlvParser, TlvSerializer {
public static final int TYPE = 17;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
/**
* Parser for {@link LspErrorCode}.
*/
-public final class Stateful07LspUpdateErrorTlvParser implements TlvParser, TlvSerializer {
+public final class StatefulLspUpdateErrorTlvParser implements TlvParser, TlvSerializer {
public static final int TYPE = 20;
@Override
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import io.netty.buffer.ByteBuf;
import org.opendaylight.protocol.pcep.parser.object.PCEPLspaObjectParser;
/**
* Parser for Lspa object.
*/
-public class Stateful07LspaObjectParser extends PCEPLspaObjectParser {
+public class StatefulLspaObjectParser extends PCEPLspaObjectParser {
- public Stateful07LspaObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
+ public StatefulLspaObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
super(tlvReg, viTlvReg);
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import io.netty.buffer.ByteBuf;
import org.opendaylight.protocol.pcep.parser.object.PCEPOpenObjectParser;
/**
* Parser for Open object.
*/
-public class Stateful07OpenObjectParser extends PCEPOpenObjectParser {
+public class StatefulOpenObjectParser extends PCEPOpenObjectParser {
- public Stateful07OpenObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
+ public StatefulOpenObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
super(tlvReg, viTlvReg);
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
/**
* Parser for {@link Pcrpt}.
*/
-public class Stateful07PCReportMessageParser extends AbstractMessageParser {
+public class StatefulPCReportMessageParser extends AbstractMessageParser {
public static final int TYPE = 10;
- public Stateful07PCReportMessageParser(final ObjectRegistry registry) {
+ public StatefulPCReportMessageParser(final ObjectRegistry registry) {
super(registry);
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
/**
* Parser for {@link Pcupd}.
*/
-public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParser {
+public class StatefulPCUpdateRequestMessageParser extends AbstractMessageParser {
public static final int TYPE = 11;
- public Stateful07PCUpdateRequestMessageParser(final ObjectRegistry registry) {
+ public StatefulPCUpdateRequestMessageParser(final ObjectRegistry registry) {
super(registry);
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
/**
* Parser for {@link RsvpErrorSpec}.
*/
-public final class Stateful07RSVPErrorSpecTlvParser implements TlvParser, TlvSerializer {
+public final class StatefulRSVPErrorSpecTlvParser implements TlvParser, TlvSerializer {
public static final int TYPE = 21;
private static final int FLAGS_SIZE = 8;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import static com.google.common.base.Preconditions.checkArgument;
/**
* Parser for {@link Srp}.
*/
-public class Stateful07SrpObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
+public class StatefulSrpObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
private static final int CLASS = 33;
private static final int TYPE = 1;
protected static final int SRP_ID_SIZE = 4;
protected static final int MIN_SIZE = FLAGS_SIZE / Byte.SIZE + SRP_ID_SIZE;
- protected Stateful07SrpObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
+ protected StatefulSrpObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
super(tlvReg, viTlvReg, CLASS, TYPE);
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.protocol.pcep.ietf.stateful07;
+package org.opendaylight.protocol.pcep.ietf.stateful;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
/**
* Parser for {@link Stateful}.
*/
-public class Stateful07StatefulCapabilityTlvParser implements TlvParser, TlvSerializer {
+public class StatefulStatefulCapabilityTlvParser implements TlvParser, TlvSerializer {
public static final int TYPE = 16;
package org.opendaylight.protocol.pcep.sync.optimizations;
import io.netty.buffer.ByteBuf;
-import org.opendaylight.protocol.pcep.ietf.initiated00.CInitiated00StatefulCapabilityTlvParser;
+import org.opendaylight.protocol.pcep.ietf.initiated.InitiatedStatefulCapabilityTlvParser;
import org.opendaylight.protocol.util.BitArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.stateful.capability.tlv.Stateful;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.stateful.capability.tlv.StatefulBuilder;
-public class SyncOptimizationsCapabilityTlvParser extends CInitiated00StatefulCapabilityTlvParser {
+public class SyncOptimizationsCapabilityTlvParser extends InitiatedStatefulCapabilityTlvParser {
protected static final int S_FLAG_OFFSET = 30;
protected static final int T_FLAG_OFFSET = 28;
package org.opendaylight.protocol.pcep.sync.optimizations;
import io.netty.buffer.ByteBuf;
-import org.opendaylight.protocol.pcep.ietf.initiated00.CInitiated00LspObjectParser;
+import org.opendaylight.protocol.pcep.ietf.initiated.InitiatedLspObjectParser;
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.controller.pcep.sync.optimizations.rev181109.Tlvs1;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.lsp.TlvsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Tlv;
-public class SyncOptimizationsLspObjectParser extends CInitiated00LspObjectParser {
+public class SyncOptimizationsLspObjectParser extends InitiatedLspObjectParser {
public SyncOptimizationsLspObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
super(tlvReg, viTlvReg);
package org.opendaylight.protocol.pcep.sync.optimizations;
import io.netty.buffer.ByteBuf;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07OpenObjectParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulOpenObjectParser;
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.controller.pcep.sync.optimizations.rev181109.Tlvs3;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.Tlvs;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder;
-public class SyncOptimizationsOpenObjectParser extends Stateful07OpenObjectParser {
+public class SyncOptimizationsOpenObjectParser extends StatefulOpenObjectParser {
public SyncOptimizationsOpenObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
super(tlvReg, viTlvReg);
# under the terms of the Eclipse Public License v1.0 which
# accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability
\ No newline at end of file
+org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability
\ No newline at end of file
# terms of the Eclipse Public License v1.0 which accompanies this distribution,
# and is available at http://www.eclipse.org/legal/epl-v10.html
#
-org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator
-org.opendaylight.protocol.pcep.ietf.initiated00.CrabbeInitiatedActivator
+org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator
+org.opendaylight.protocol.pcep.ietf.initiated.InitiatedActivator
org.opendaylight.protocol.pcep.sync.optimizations.SyncOptimizationsActivator
<!-- Protocal extension providers -->
- <bean id="ietfStateful07Activator" class="org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator"/>
- <service ref="ietfStateful07Activator" interface="org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator"
- odl:type="org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator"/>
+ <bean id="ietfStatefulActivator" class="org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator"/>
+ <service ref="ietfStatefulActivator" interface="org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator"
+ odl:type="org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator"/>
- <bean id="ietfInitiated00Activator" class="org.opendaylight.protocol.pcep.ietf.initiated00.CrabbeInitiatedActivator"/>
- <service ref="ietfInitiated00Activator" interface="org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator"
- odl:type="org.opendaylight.protocol.pcep.ietf.initiated00.CrabbeInitiatedActivator"/>
+ <bean id="ietfInitiatedActivator" class="org.opendaylight.protocol.pcep.ietf.initiated.InitiatedActivator"/>
+ <service ref="ietfInitiatedActivator" interface="org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator"
+ odl:type="org.opendaylight.protocol.pcep.ietf.initiated.InitiatedActivator"/>
<bean id="syncOptimizationsActivator" class="org.opendaylight.protocol.pcep.sync.optimizations.SyncOptimizationsActivator"/>
<service ref="syncOptimizationsActivator" interface="org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator"
<!-- Capabilities -->
<odl:clustered-app-config id="statefulCapabilityConfig"
- binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.ietf.stateful07.app.config.rev160707.PcepIetfStateful07Config"/>
+ binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.ietf.stateful.app.config.rev160707.PcepIetfStatefulConfig"/>
- <bean id="statefulCapability" class="org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability">
+ <bean id="statefulCapability" class="org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability">
<argument ref="statefulCapabilityConfig"/>
</bean>
<service ref="statefulCapability" interface="org.opendaylight.protocol.pcep.PCEPCapability"
- odl:type="org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability"/>
+ odl:type="org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability"/>
-</blueprint>
\ No newline at end of file
+</blueprint>
-module odl-pcep-ietf-initiated00 {
+module odl-pcep-ietf-initiated {
yang-version 1;
- namespace "urn:opendaylight:params:xml:ns:yang:pcep:crabbe:initiated";
- prefix "crabbe";
+ namespace "urn:opendaylight:params:xml:ns:yang:pcep:ietf:initiated";
+ prefix "initiated";
import pcep-types { prefix pcep; revision-date 2018-11-09; }
import pcep-message { prefix msg; revision-date 2018-11-09; }
import network-topology { prefix nt; revision-date 2013-10-21; }
import network-topology-pcep { prefix topo; revision-date 2020-01-20; }
- import odl-pcep-ietf-stateful07 { prefix stateful; revision-date 2018-11-09; }
+ import odl-pcep-ietf-stateful { prefix stateful; revision-date 2018-11-09; }
organization "Cisco Systems, Inc.";
contact "Robert Varga <rovarga@cisco.com>";
-module pcep-ietf-stateful07-app-config {
+module pcep-ietf-stateful-app-config {
yang-version 1;
- namespace "urn:opendaylight:params:xml:ns:yang:controller:pcep:ietf-stateful07-app-config";
- prefix "pcep-ietf-stateful07-app-config";
+ namespace "urn:opendaylight:params:xml:ns:yang:controller:pcep:ietf-stateful-app-config";
+ prefix "pcep-ietf-stateful-app-config";
description
- "Configuration for the PCEP IETF stateful07 extension.";
+ "Configuration for the PCEP IETF stateful extension.";
revision "2016-07-07" {
description
}
}
- container pcep-ietf-stateful07-config {
+ container pcep-ietf-stateful-config {
uses stateful-capabilities;
}
}
\ No newline at end of file
-module odl-pcep-ietf-stateful07 {
+module odl-pcep-ietf-stateful {
yang-version 1;
namespace "urn:opendaylight:params:xml:ns:yang:pcep:ietf:stateful";
prefix "stateful";
import pcep-message { prefix msg; revision-date 2018-11-09; }
import network-topology { prefix nt; revision-date 2013-10-21; }
import network-topology-pcep { prefix topo; revision-date 2020-01-20; }
- import odl-pcep-ietf-stateful07 { prefix stateful; revision-date 2018-11-09; }
+ import odl-pcep-ietf-stateful { prefix stateful; revision-date 2018-11-09; }
organization "Pantheon Technologies";
contact "Iveta Halanova <iveta.halanova@pantheon.sk>";
import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import org.opendaylight.protocol.pcep.ietf.initiated00.CInitiated00SrpObjectParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LspObjectParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LspaObjectParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
+import org.opendaylight.protocol.pcep.ietf.initiated.InitiatedSrpObjectParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulLspObjectParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulLspaObjectParser;
import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
import org.opendaylight.protocol.pcep.spi.ObjectHeaderImpl;
import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersion;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.speaker.entity.id.tlv.SpeakerEntityIdBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Lsp1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Lsp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Srp1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.OperationalStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SrpIdNumber;
}
@Test
- public void testStateful07LspObjectWithTlv() throws IOException, PCEPDeserializerException {
- final Stateful07LspObjectParser parser = new Stateful07LspObjectParser(this.tlvRegistry, this.viTlvRegistry);
+ public void testStatefulLspObjectWithTlv() throws IOException, PCEPDeserializerException {
+ final StatefulLspObjectParser parser = new StatefulLspObjectParser(this.tlvRegistry, this.viTlvRegistry);
final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes(
"src/test/resources/PCEPLspObject2WithTLV.bin"));
@Test
public void testLspaObject() throws IOException, PCEPDeserializerException {
- final Stateful07LspaObjectParser parser = new Stateful07LspaObjectParser(this.tlvRegistry, this.viTlvRegistry);
+ final StatefulLspaObjectParser parser = new StatefulLspaObjectParser(this.tlvRegistry, this.viTlvRegistry);
final LspaBuilder builder = new LspaBuilder();
final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes(
"src/test/resources/PCEPLspaObject3RandVals.bin"));
@Test
public void testSrpObject() throws PCEPDeserializerException {
- final CInitiated00SrpObjectParser parser = new CInitiated00SrpObjectParser(this.tlvRegistry,
+ final InitiatedSrpObjectParser parser = new InitiatedSrpObjectParser(this.tlvRegistry,
this.viTlvRegistry);
final ByteBuf result = Unpooled.wrappedBuffer(new byte[] {
(byte) 0x21, (byte) 0x10, (byte) 0x00, (byte) 0x0c, 0, 0, 0, (byte) 0x01, 0, 0, 0, (byte) 0x01
0x0, 0x01,
/* pst-tlv */
0x0, 0x1C, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 };
- final CInitiated00SrpObjectParser parser = new CInitiated00SrpObjectParser(this.tlvRegistry,
+ final InitiatedSrpObjectParser parser = new InitiatedSrpObjectParser(this.tlvRegistry,
this.viTlvRegistry);
final SrpBuilder builder = new SrpBuilder()
.setProcessingRule(false)
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1Builder;
+import org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Tlvs1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.stateful.capability.tlv.StatefulBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.Tlvs;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import org.junit.Test;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PathBindingTlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LSPIdentifierIpv4TlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LSPIdentifierIpv6TlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LspSymbolicNameTlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07LspUpdateErrorTlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07RSVPErrorSpecTlvParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07StatefulCapabilityTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.PathBindingTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulLSPIdentifierIpv4TlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulLSPIdentifierIpv6TlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulLspSymbolicNameTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulLspUpdateErrorTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulRSVPErrorSpecTlvParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulStatefulCapabilityTlvParser;
import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
import org.opendaylight.protocol.pcep.sync.optimizations.SyncOptimizationsCapabilityTlvParser;
import org.opendaylight.protocol.util.ByteArray;
@Test
public void testStatefulTlv() throws PCEPDeserializerException {
- final Stateful07StatefulCapabilityTlvParser parser = new Stateful07StatefulCapabilityTlvParser();
+ final StatefulStatefulCapabilityTlvParser parser = new StatefulStatefulCapabilityTlvParser();
final Stateful tlv = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE).build();
assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(STATEFUL_BYTES, 4))));
final ByteBuf buff = Unpooled.buffer();
@Test
public void testSymbolicNameTlv() throws PCEPDeserializerException {
- final Stateful07LspSymbolicNameTlvParser parser = new Stateful07LspSymbolicNameTlvParser();
+ final StatefulLspSymbolicNameTlvParser parser = new StatefulLspSymbolicNameTlvParser();
final SymbolicPathName tlv = new SymbolicPathNameBuilder().setPathName(
new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109
.SymbolicPathName("Med test of symbolic nameeee".getBytes())).build();
@Test
public void testLspErrorCodeTlv() throws PCEPDeserializerException {
- final Stateful07LspUpdateErrorTlvParser parser = new Stateful07LspUpdateErrorTlvParser();
+ final StatefulLspUpdateErrorTlvParser parser = new StatefulLspUpdateErrorTlvParser();
final LspErrorCode tlv = new LspErrorCodeBuilder().setErrorCode(Uint32.valueOf(627610883)).build();
assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(LSP_UPDATE_ERROR_BYTES, 4))));
final ByteBuf buff = Unpooled.buffer();
@Test
public void testLspIdentifiers4Tlv() throws PCEPDeserializerException {
- final Stateful07LSPIdentifierIpv4TlvParser parser = new Stateful07LSPIdentifierIpv4TlvParser();
+ final StatefulLSPIdentifierIpv4TlvParser parser = new StatefulLSPIdentifierIpv4TlvParser();
final Ipv4Builder afi = new Ipv4Builder();
afi.setIpv4TunnelSenderAddress(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(
new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
@Test
public void testLspIdentifiers6Tlv() throws PCEPDeserializerException {
- final Stateful07LSPIdentifierIpv6TlvParser parser = new Stateful07LSPIdentifierIpv6TlvParser();
+ final StatefulLSPIdentifierIpv6TlvParser parser = new StatefulLSPIdentifierIpv6TlvParser();
final Ipv6Builder afi = new Ipv6Builder();
afi.setIpv6TunnelSenderAddress(Ipv6Util.addressForByteBuf(Unpooled.wrappedBuffer(
new byte[] {
@Test
public void testRSVPError4SpecTlv() throws PCEPDeserializerException {
- final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
+ final StatefulRSVPErrorSpecTlvParser parser = new StatefulRSVPErrorSpecTlvParser();
final RsvpErrorBuilder builder = new RsvpErrorBuilder()
.setNode(new IpAddressNoZone(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(
new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))))
@Test
public void testRSVPError6SpecTlv() throws PCEPDeserializerException {
- final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
+ final StatefulRSVPErrorSpecTlvParser parser = new StatefulRSVPErrorSpecTlvParser();
final RsvpErrorBuilder builder = new RsvpErrorBuilder()
.setNode(new IpAddressNoZone(Ipv6Util.addressForByteBuf(Unpooled.wrappedBuffer(new byte[] {
(byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
@Test
public void testUserErrorSpecTlv() throws PCEPDeserializerException {
- final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
+ final StatefulRSVPErrorSpecTlvParser parser = new StatefulRSVPErrorSpecTlvParser();
final UserErrorBuilder builder = new UserErrorBuilder()
.setEnterprise(new EnterpriseNumber(Uint32.valueOf(12345)))
.setSubOrg(Uint8.valueOf(5))
import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.opendaylight.protocol.pcep.ietf.initiated00.CInitiated00PCInitiateMessageParser;
-import org.opendaylight.protocol.pcep.ietf.initiated00.CrabbeInitiatedActivator;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07ErrorMessageParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07PCReportMessageParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.Stateful07PCUpdateRequestMessageParser;
-import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
+import org.opendaylight.protocol.pcep.ietf.initiated.InitiatedActivator;
+import org.opendaylight.protocol.pcep.ietf.initiated.InitiatedPCInitiateMessageParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulErrorMessageParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulPCReportMessageParser;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulPCUpdateRequestMessageParser;
import org.opendaylight.protocol.pcep.parser.BaseParserExtensionActivator;
import org.opendaylight.protocol.pcep.parser.message.PCEPOpenMessageParser;
import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ieee754.rev130819.Float32;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.Bandwidth;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Lsp1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.PcinitiateBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.PcinitiateMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Lsp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.PcinitiateBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Srp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.PcinitiateMessageBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.OperationalStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcrptBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcupdBuilder;
@Test
public void testUpdMsg() throws IOException, PCEPDeserializerException {
- try (CrabbeInitiatedActivator a = new CrabbeInitiatedActivator()) {
+ try (InitiatedActivator a = new InitiatedActivator()) {
a.start(this.ctx);
- final Stateful07PCUpdateRequestMessageParser parser = new Stateful07PCUpdateRequestMessageParser(
+ final StatefulPCUpdateRequestMessageParser parser = new StatefulPCUpdateRequestMessageParser(
this.ctx.getObjectHandlerRegistry());
final PcupdMessageBuilder builder = new PcupdMessageBuilder();
@Test
public void testRptMsg() throws IOException, PCEPDeserializerException {
- try (CrabbeInitiatedActivator a = new CrabbeInitiatedActivator();
+ try (InitiatedActivator a = new InitiatedActivator();
StatefulActivator b = new StatefulActivator()) {
a.start(this.ctx);
b.start(this.ctx);
ByteBuf result = Unpooled.wrappedBuffer(PCRT1);
- final Stateful07PCReportMessageParser parser = new Stateful07PCReportMessageParser(
+ final StatefulPCReportMessageParser parser = new StatefulPCReportMessageParser(
this.ctx.getObjectHandlerRegistry());
final PcrptMessageBuilder builder = new PcrptMessageBuilder();
@Test
public void testPcinitMsg() throws IOException, PCEPDeserializerException {
- try (CrabbeInitiatedActivator a = new CrabbeInitiatedActivator()) {
+ try (InitiatedActivator a = new InitiatedActivator()) {
a.start(this.ctx);
final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/Pcinit.bin"));
- final CInitiated00PCInitiateMessageParser parser = new CInitiated00PCInitiateMessageParser(
+ final InitiatedPCInitiateMessageParser parser = new InitiatedPCInitiateMessageParser(
this.ctx.getObjectHandlerRegistry());
final PcinitiateMessageBuilder builder = new PcinitiateMessageBuilder();
public void testErrorMsg() throws IOException, PCEPDeserializerException {
try (StatefulActivator a = new StatefulActivator()) {
a.start(this.ctx);
- final Stateful07ErrorMessageParser parser = new Stateful07ErrorMessageParser(
+ final StatefulErrorMessageParser parser = new StatefulErrorMessageParser(
this.ctx.getObjectHandlerRegistry());
ErrorObject error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false)
(byte) 0xFF, (byte) 0xFF, (byte) 0x16, (byte) 0x00
};
- try (CrabbeInitiatedActivator a = new CrabbeInitiatedActivator();
+ try (InitiatedActivator a = new InitiatedActivator();
StatefulActivator b = new StatefulActivator()) {
a.start(this.ctx);
b.start(this.ctx);
- final Stateful07PCReportMessageParser parser = new Stateful07PCReportMessageParser(
+ final StatefulPCReportMessageParser parser = new StatefulPCReportMessageParser(
this.ctx.getObjectHandlerRegistry());
final PcerrMessageBuilder errMsgBuilder = new PcerrMessageBuilder();
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00
};
- try (CrabbeInitiatedActivator a = new CrabbeInitiatedActivator()) {
+ try (InitiatedActivator a = new InitiatedActivator()) {
a.start(this.ctx);
- final Stateful07PCUpdateRequestMessageParser parser = new Stateful07PCUpdateRequestMessageParser(
+ final StatefulPCUpdateRequestMessageParser parser = new StatefulPCUpdateRequestMessageParser(
this.ctx.getObjectHandlerRegistry());
final PcerrMessageBuilder errMsgBuilder = new PcerrMessageBuilder();
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
import java.util.List;
import java.util.Optional;
import org.opendaylight.protocol.pcep.PCEPCapability;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability;
+import org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability;
import org.opendaylight.protocol.util.InetSocketAddressUtil;
import org.opendaylight.yangtools.yang.common.Uint64;
import org.slf4j.Logger;
import org.opendaylight.protocol.pcep.pcc.mock.api.PCCTunnelManager;
import org.opendaylight.protocol.pcep.pcc.mock.spi.MsgBuilderUtil;
import org.opendaylight.protocol.pcep.spi.PCEPErrors;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Lsp1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Lsp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Srp1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Srp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.OperationalStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcrpt;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId;
import org.opendaylight.protocol.concepts.KeyMapping;
import org.opendaylight.protocol.pcep.PCEPCapability;
import org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactory;
-import org.opendaylight.protocol.pcep.ietf.initiated00.CrabbeInitiatedActivator;
-import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
+import org.opendaylight.protocol.pcep.ietf.initiated.InitiatedActivator;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator;
import org.opendaylight.protocol.pcep.impl.BasePCEPSessionProposalFactory;
import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
import org.opendaylight.protocol.pcep.impl.PCEPSessionImpl;
final PCCActivator pccActivator = new PCCActivator();
final StatefulActivator stateful = new StatefulActivator();
final SyncOptimizationsActivator optimizationsActivator = new SyncOptimizationsActivator();
- final CrabbeInitiatedActivator activator = new CrabbeInitiatedActivator();
+ final InitiatedActivator activator = new InitiatedActivator();
final PCEPExtensionProviderContext ctx = ServiceLoaderPCEPExtensionProviderContext.getSingletonInstance();
pccActivator.start(ctx);
stateful.start(ctx);
package org.opendaylight.protocol.pcep.pcc.mock.api;
import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcupd.message.pcupd.message.Updates;
public interface PCCTunnelManager {
import org.opendaylight.protocol.pcep.pcc.mock.api.PCCTunnelManager;
import org.opendaylight.protocol.pcep.pcc.mock.spi.MsgBuilderUtil;
import org.opendaylight.protocol.pcep.spi.PCEPErrors;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Pcinitiate;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Pcinitiate;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcrpt;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcupd;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcupd.message.pcupd.message.Updates;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.OperationalStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcrpt;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcrptBuilder;
import java.util.Optional;
import org.junit.Test;
import org.opendaylight.protocol.pcep.PCEPCapability;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability;
+import org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability;
import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCServerPeerProposal;
import org.opendaylight.protocol.util.InetSocketAddressUtil;
import org.opendaylight.yangtools.yang.common.Uint64;
import org.opendaylight.protocol.pcep.PCEPSessionListenerFactory;
import org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactory;
import org.opendaylight.protocol.pcep.SpeakerIdMapping;
-import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator;
import org.opendaylight.protocol.pcep.impl.BasePCEPSessionProposalFactory;
import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
import org.opendaylight.protocol.pcep.impl.PCEPDispatcherImpl;
import org.opendaylight.protocol.pcep.sync.optimizations.SyncOptimizationsActivator;
import org.opendaylight.protocol.util.InetSocketAddressUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs3;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcrpt;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Tlvs1;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.Lsp;
import org.opendaylight.protocol.pcep.spi.PCEPErrors;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.PcinitiateBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.PcinitiateMessage;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.PcinitiateMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.PcinitiateBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.PcinitiateMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Srp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.PcinitiateMessageBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.OperationalStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcupd;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcupdBuilder;
import org.junit.Test;
import org.opendaylight.protocol.pcep.PCEPCapability;
import org.opendaylight.protocol.pcep.PCEPSession;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability;
+import org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability;
import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCPeerProposal;
import org.opendaylight.yangtools.yang.common.Uint64;
import org.junit.Test;
import org.opendaylight.protocol.pcep.PCEPCapability;
import org.opendaylight.protocol.pcep.PCEPSession;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability;
+import org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability;
import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCPeerProposal;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcupdBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId;
import org.junit.Test;
import org.opendaylight.protocol.pcep.PCEPCapability;
import org.opendaylight.protocol.pcep.PCEPSession;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability;
+import org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability;
import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCPeerProposal;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcupdBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId;
import org.junit.Test;
import org.opendaylight.protocol.pcep.PCEPCapability;
import org.opendaylight.protocol.pcep.PCEPSession;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability;
+import org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability;
import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCPeerProposal;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcupdBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId;
import org.opendaylight.protocol.pcep.spi.PCEPErrors;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Srp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcrpt;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SrpIdNumber;
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
+ <artifactId>odl-bgpcep-pcep-stateful</artifactId>
<classifier>features</classifier>
<type>xml</type>
<version>${project.version}</version>
<module>impl</module>
<module>spi</module>
<module>base-parser</module>
- <module>ietf-stateful07</module>
+ <module>ietf-stateful</module>
<module>ietf-p2mp-te-lsp</module>
<module>testtool</module>
<module>server</module>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
import pcep-types { prefix pcep; revision-date 2018-11-09; }
import pcep-message { prefix msg; revision-date 2018-11-09; }
- import odl-pcep-ietf-stateful07 { prefix stateful; revision-date 2018-11-09; }
- import odl-pcep-ietf-initiated00 { prefix crabbe; revision-date 2018-11-09; }
+ import odl-pcep-ietf-stateful { prefix stateful; revision-date 2018-11-09; }
+ import odl-pcep-ietf-initiated { prefix initiated; revision-date 2018-11-09; }
import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
import network-topology { prefix nt; revision-date 2013-10-21; }
import network-topology-pcep { prefix pn; revision-date 2020-01-20; }
}
}
- //stateful07
- augment "/crabbe:pcinitiate/crabbe:pcinitiate-message/crabbe:requests/crabbe:ero/crabbe:subobject/crabbe:subobject-type" {
+ //stateful
+ augment "/initiated:pcinitiate/initiated:pcinitiate-message/initiated:requests/initiated:ero/initiated:subobject/initiated:subobject-type" {
case sr-ero-type {
uses sr-ero-subobject;
}
}
}
- //stateful07
- augment "/crabbe:pcinitiate/crabbe:pcinitiate-message/crabbe:requests/crabbe:rro/crabbe:subobject/crabbe:subobject-type" {
+ //stateful
+ augment "/initiated:pcinitiate/initiated:pcinitiate-message/initiated:requests/initiated:rro/initiated:subobject/initiated:subobject-type" {
case sr-rro-type {
uses sr-rro-subobject;
}
import org.junit.Test;
import org.opendaylight.bgpcep.pcep.topology.provider.AbstractPCEPSessionTest;
import org.opendaylight.bgpcep.pcep.topology.provider.AbstractTopologySessionListener;
-import org.opendaylight.bgpcep.pcep.topology.provider.Stateful07TopologySessionListenerFactory;
+import org.opendaylight.bgpcep.pcep.topology.provider.PCEPTopologySessionListenerFactory;
import org.opendaylight.protocol.pcep.PCEPSession;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.common.Uint8;
-public class TopologyProviderTest extends AbstractPCEPSessionTest<Stateful07TopologySessionListenerFactory> {
+public class TopologyProviderTest extends AbstractPCEPSessionTest<PCEPTopologySessionListenerFactory> {
private AbstractTopologySessionListener<SrpIdNumber, PlspId> listener;
private PCEPSession session;
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
</dependency>
<dependency>
import java.util.concurrent.ExecutionException;
import org.opendaylight.protocol.pcep.PCEPCapability;
import org.opendaylight.protocol.pcep.PCEPSessionProposalFactory;
-import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPStatefulCapability;
-import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
+import org.opendaylight.protocol.pcep.ietf.stateful.PCEPStatefulCapability;
+import org.opendaylight.protocol.pcep.ietf.stateful.StatefulActivator;
import org.opendaylight.protocol.pcep.impl.BasePCEPSessionProposalFactory;
import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
import org.opendaylight.protocol.pcep.impl.PCEPDispatcherImpl;
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
import org.opendaylight.protocol.pcep.spi.PSTUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.PathComputationClient1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersion;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Lsp1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.PcinitiateBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.PcinitiateMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Lsp1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.PcinitiateBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Srp1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Srp1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.PcinitiateMessageBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Arguments1;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Arguments2;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Arguments3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class Stateful07TopologySessionListener extends AbstractTopologySessionListener<SrpIdNumber, PlspId> {
- private static final Logger LOG = LoggerFactory.getLogger(Stateful07TopologySessionListener.class);
+class PCEPTopologySessionListener extends AbstractTopologySessionListener<SrpIdNumber, PlspId> {
+ private static final Logger LOG = LoggerFactory.getLogger(PCEPTopologySessionListener.class);
private static final PlspId PLSPID_ZERO = new PlspId(Uint32.ZERO);
private final AtomicLong requestId = new AtomicLong(1L);
/**
* Creates a new stateful topology session listener for given server session manager.
*/
- Stateful07TopologySessionListener(final ServerSessionManager serverSessionManager) {
+ PCEPTopologySessionListener(final ServerSessionManager serverSessionManager) {
super(serverSessionManager);
this.pceServerProvider = serverSessionManager.getPCEPTopologyProviderDependencies().getPceServerProvider();
}
if (!staleLsp.getPath().isEmpty()) {
final Path1 path1 = staleLsp.getPath().values().iterator().next().augmentation(Path1.class);
if (path1 != null) {
- Stateful07TopologySessionListener.this.staleLsps.add(path1.getLsp().getPlspId());
+ PCEPTopologySessionListener.this.staleLsps.add(path1.getLsp().getPlspId());
}
}
updatePccState(PccSyncState.PcepTriggeredResync);
this.lsp);
return OperationResults.createUnsent(PCEPErrors.USED_SYMBOLIC_PATH_NAME).future();
}
- if (!Stateful07TopologySessionListener.this.initiationCapability.get()) {
+ if (!PCEPTopologySessionListener.this.initiationCapability.get()) {
return OperationResults.createUnsent(PCEPErrors.CAPABILITY_NOT_SUPPORTED).future();
}
*/
package org.opendaylight.bgpcep.pcep.topology.provider;
-public final class Stateful07TopologySessionListenerFactory implements TopologySessionListenerFactory {
+public final class PCEPTopologySessionListenerFactory implements TopologySessionListenerFactory {
@Override
public TopologySessionListener createTopologySessionListener(final ServerSessionManager manager) {
- return new Stateful07TopologySessionListener(manager);
+ return new PCEPTopologySessionListener(manager);
}
}
import org.opendaylight.protocol.util.StatisticsUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs3;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.speaker.entity.id.tlv.SpeakerEntityId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Pcinitiate;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Pcinitiate;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcupd;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stateful.stats.rev181109.PcepEntityIdStatsAugBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stateful.stats.rev181109.StatefulCapabilitiesStatsAug;
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
- <bean id="Stateful07TopologySessionListenerFactory"
- class="org.opendaylight.bgpcep.pcep.topology.provider.Stateful07TopologySessionListenerFactory"/>
- <service ref="Stateful07TopologySessionListenerFactory"
+ <bean id="PCEPTopologySessionListenerFactory"
+ class="org.opendaylight.bgpcep.pcep.topology.provider.PCEPTopologySessionListenerFactory"/>
+ <service ref="PCEPTopologySessionListenerFactory"
interface="org.opendaylight.bgpcep.pcep.topology.provider.TopologySessionListenerFactory"/>
<reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"
<argument ref="dataBroker"/>
<argument ref="pcepDispatcher"/>
<argument ref="rpcProviderService"/>
- <argument ref="Stateful07TopologySessionListenerFactory"/>
+ <argument ref="PCEPTopologySessionListenerFactory"/>
<argument ref="topologySessionStatsRegistry"/>
<argument ref="pceServerProvider"/>
</bean>
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs3Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersion;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.OperationalStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcrpt;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId;
import org.opendaylight.yangtools.yang.common.Uint64;
public class IncrementalSynchronizationProcedureTest
- extends AbstractPCEPSessionTest<Stateful07TopologySessionListenerFactory> {
+ extends AbstractPCEPSessionTest<PCEPTopologySessionListenerFactory> {
- private Stateful07TopologySessionListener listener;
+ private PCEPTopologySessionListener listener;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
- this.listener = (Stateful07TopologySessionListener) getSessionListener();
+ this.listener = (PCEPTopologySessionListener) getSessionListener();
}
@Test
});
this.listener.onSessionDown(session, new IllegalArgumentException());
- this.listener = (Stateful07TopologySessionListener) getSessionListener();
+ this.listener = (PCEPTopologySessionListener) getSessionListener();
//session up - expect sync (LSP-DBs do not match)
final LspDbVersion localDbVersion = new LspDbVersionBuilder()
import org.opendaylight.protocol.util.CheckTestUtil;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.topology.rev140113.NetworkTopologyRef;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Pcinitiate;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Pcinitiate;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Arguments1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Arguments2Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Arguments3Builder;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.Uint32;
-public class Stateful07TopologySessionListenerTest
- extends AbstractPCEPSessionTest<Stateful07TopologySessionListenerFactory> {
+public class PCEPTopologySessionListenerTest
+ extends AbstractPCEPSessionTest<PCEPTopologySessionListenerFactory> {
private final String tunnelName = "pcc_" + this.testAddress + "_tunnel_0";
- private Stateful07TopologySessionListener listener;
+ private PCEPTopologySessionListener listener;
private PCEPSessionImpl session;
@Before
public void setUp() throws Exception {
super.setUp();
- this.listener = (Stateful07TopologySessionListener) getSessionListener();
+ this.listener = (PCEPTopologySessionListener) getSessionListener();
this.session = getPCEPSession(getLocalPref(), getRemotePref());
}
@Test
- public void testStateful07TopologySessionListener() throws Exception {
+ public void testPCEPTopologySessionListener() throws Exception {
this.listener.onSessionUp(this.session);
final PcepSessionState listenerState = this.listener.listenerState;
assertEquals(this.testAddress, listenerState.getPeerPref().getIpAddress());
public void testConflictingListeners() {
this.listener.onSessionUp(this.session);
assertFalse(this.session.isClosed());
- Stateful07TopologySessionListener conflictingListener =
- (Stateful07TopologySessionListener) getSessionListener();
+ PCEPTopologySessionListener conflictingListener =
+ (PCEPTopologySessionListener) getSessionListener();
conflictingListener.onSessionUp(this.session);
assertTrue(this.session.isClosed());
}
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs3Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersion;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.OperationalStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcrpt;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId;
import org.opendaylight.yangtools.yang.common.Uint64;
public class PCEPTriggeredReSynchronizationProcedureTest
- extends AbstractPCEPSessionTest<Stateful07TopologySessionListenerFactory> {
- private Stateful07TopologySessionListener listener;
+ extends AbstractPCEPSessionTest<PCEPTopologySessionListenerFactory> {
+ private PCEPTopologySessionListener listener;
private PCEPSession session;
private final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(Uint64.ONE).build();
@Before
public void setUp() throws Exception {
super.setUp();
- this.listener = (Stateful07TopologySessionListener) getSessionListener();
+ this.listener = (PCEPTopologySessionListener) getSessionListener();
}
@Test
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs3Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersion;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.OperationalStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcrpt;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId;
import org.opendaylight.yangtools.yang.common.Uint64;
public class PCETriggeredInitialSyncProcedureTest
- extends AbstractPCEPSessionTest<Stateful07TopologySessionListenerFactory> {
- private Stateful07TopologySessionListener listener;
+ extends AbstractPCEPSessionTest<PCEPTopologySessionListenerFactory> {
+ private PCEPTopologySessionListener listener;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
- this.listener = (Stateful07TopologySessionListener) getSessionListener();
+ this.listener = (PCEPTopologySessionListener) getSessionListener();
}
/**
**/
@Test
public void testPcepTriggeredInitialSyncPerformed() throws Exception {
- this.listener = (Stateful07TopologySessionListener) getSessionListener();
+ this.listener = (PCEPTopologySessionListener) getSessionListener();
//session up - expect triggered sync (LSP-DBs do not match)
final LspDbVersion localDbVersion = new LspDbVersionBuilder()
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs3Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersion;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Stateful1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.initiated.rev181109.Stateful1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.OperationalStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Pcrpt;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId;
import org.opendaylight.yangtools.yang.common.Uint64;
public class StateSynchronizationAvoidanceProcedureTest extends
- AbstractPCEPSessionTest<Stateful07TopologySessionListenerFactory> {
+ AbstractPCEPSessionTest<PCEPTopologySessionListenerFactory> {
- private Stateful07TopologySessionListener listener;
+ private PCEPTopologySessionListener listener;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
- this.listener = (Stateful07TopologySessionListener) getSessionListener();
+ this.listener = (PCEPTopologySessionListener) getSessionListener();
}
@Test
});
this.listener.onSessionDown(session, new IllegalArgumentException("Simulate Exception"));
- this.listener = (Stateful07TopologySessionListener) getSessionListener();
+ this.listener = (PCEPTopologySessionListener) getSessionListener();
//session up - expect sync (LSP-DBs do not match)
final LspDbVersion localDbVersion = new LspDbVersionBuilder()
public class TopologyProgrammingTest extends AbstractPCEPSessionTest<MockedTopologySessionListenerFactory> {
private static final String NAME = "test-tunnel";
- private static Stateful07TopologySessionListener listener;
+ private static PCEPTopologySessionListener listener;
@Mock
private InstructionScheduler scheduler;
protected static final class MockedTopologySessionListenerFactory implements TopologySessionListenerFactory {
@Override
public TopologySessionListener createTopologySessionListener(final ServerSessionManager manager) {
- listener = Mockito.spy(new Stateful07TopologySessionListener(manager));
+ listener = Mockito.spy(new PCEPTopologySessionListener(manager));
return listener;
}
}
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>pcep-ietf-stateful07</artifactId>
+ <artifactId>pcep-ietf-stateful</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Code Review / bgpcep.git / commitdiff