Cleanup deprecation warnings in pcep 98/90798/1
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 29 Jun 2020 05:20:47 +0000 (07:20 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Mon, 29 Jun 2020 05:20:47 +0000 (07:20 +0200)
Eliminate some leftovers from codegen change.

Change-Id: Ieecc76abeb58bd910893f5935c0ca99756d9177a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
35 files changed:
pcep/auto-bandwidth-extension/src/main/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodec.java
pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java
pcep/ietf-p2mp-te-lsp/src/main/java/org/opendaylight/protocol/pcep/p2mp/te/lsp/P2MPTeLspCapability.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00LspObjectParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00SrpObjectParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00StatefulCapabilityTlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPStatefulCapability.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspaObjectParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07OpenObjectParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/sync/optimizations/SyncOptimizationsCapabilityTlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/sync/optimizations/SyncOptimizationsLspObjectParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/sync/optimizations/SyncOptimizationsOpenObjectParser.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPStatefulCapabilityTest.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImpl.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCPeerProposal.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCServerPeerProposal.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/spi/MsgBuilderUtil.java
pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSessionListenerTest.java
pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java
pcep/topology/cli/src/test/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtilsTest.java
pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java
pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/session/stats/SessionStateImpl.java
pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java
pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java
pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java
pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java
pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java
pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimizationTest.java
pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgrammingTest.java

index daed39f37c01b07e9bc718c525702aee87e3215e..6cea75cca502c8fee75c932c48c430c767530447 100644 (file)
@@ -74,9 +74,9 @@ public class PcRptMessageCodec extends Stateful07PCReportMessageParser {
         } else {
             bandwidthBuilder = new BandwidthBuilder();
         }
-        bandwidthBuilder.addAugmentation(Bandwidth1.class, new Bandwidth1Builder()
-                .setBwSample(bwUsage.getBwSample()).build()).build();
-        return bandwidthBuilder.build();
+        return bandwidthBuilder
+                .addAugmentation(new Bandwidth1Builder().setBwSample(bwUsage.getBwSample()).build())
+                .build();
     }
 
 }
index c97d0f7595d314a6cf4b22efddcb8b4ed9ff5369..1334dcc8cfe1dc7e8dd6cb0878e0cd6d918db8f6 100644 (file)
@@ -19,7 +19,6 @@ import java.util.Collections;
 import java.util.List;
 import javax.xml.bind.DatatypeConverter;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
@@ -120,11 +119,11 @@ public class PcRptMessageCodecTest {
     @Test
     public void testserializeObject() {
         final PcRptMessageCodec codec = new PcRptMessageCodec(this.ctx.getObjectHandlerRegistry());
-        final BandwidthBuilder bwBuilder = new BandwidthBuilder();
-        bwBuilder.addAugmentation(Bandwidth1.class, new Bandwidth1Builder().setBwSample(BW).build());
         final ByteBuf buffer = Unpooled.buffer();
-        codec.serializeObject(bwBuilder.build(), buffer);
-        Assert.assertTrue(buffer.readableBytes() > 0);
+        codec.serializeObject(new BandwidthBuilder()
+            .addAugmentation(new Bandwidth1Builder().setBwSample(BW).build())
+            .build(), buffer);
+        assertTrue(buffer.readableBytes() > 0);
     }
 
     @Test
@@ -136,7 +135,7 @@ public class PcRptMessageCodecTest {
                         + "0d42020030801010000000001080a00070620000308010100000000");
         final Pcrpt msg = (Pcrpt) this.ctx.getMessageHandlerRegistry().parseMessage(10,
                 Unpooled.wrappedBuffer(parseHexBinary), Collections.emptyList());
-        Assert.assertNotNull(msg.getPcrptMessage().getReports().get(0).getPath()
+        assertNotNull(msg.getPcrptMessage().getReports().get(0).getPath()
                 .getBandwidth().augmentation(Bandwidth1.class));
     }
 
index 9218250f2522f689c2e1caa5f062d6c5edbff430..17b5e993474b5052fdf93dd99b9aaeb072b846c0 100644 (file)
@@ -15,7 +15,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.p2m
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder;
 
 public final class P2MPTeLspCapability implements PCEPCapability {
-    private static TlvsP2mpCapabilityAug PATH_COMPUTATION_CAP_AUG = new TlvsP2mpCapabilityAugBuilder()
+    private static final TlvsP2mpCapabilityAug PATH_COMPUTATION_CAP_AUG = new TlvsP2mpCapabilityAugBuilder()
         .setP2mpPceCapability(new P2mpPceCapabilityBuilder().build()).build();
     private final boolean supportsPathComputation;
 
@@ -26,7 +26,7 @@ public final class P2MPTeLspCapability implements PCEPCapability {
     @Override
     public void setCapabilityProposal(final InetSocketAddress address, final TlvsBuilder builder) {
         if (this.supportsPathComputation) {
-            builder.addAugmentation(TlvsP2mpCapabilityAug.class, PATH_COMPUTATION_CAP_AUG);
+            builder.addAugmentation(PATH_COMPUTATION_CAP_AUG);
         }
     }
 
index c6f080d2518fc860bd0450b65038eeb9abcfd509..e6f66500e223999cfb8013e6733c2965a99fb611 100644 (file)
@@ -36,7 +36,7 @@ public class CInitiated00LspObjectParser extends Stateful07LspObjectParser {
         builder.setSync(flags.get(SYNC));
         builder.setRemove(flags.get(REMOVE));
         builder.setAdministrative(flags.get(ADMINISTRATIVE));
-        builder.addAugmentation(Lsp1.class, new Lsp1Builder().setCreate(flags.get(CREATE_FLAG_OFFSET)).build());
+        builder.addAugmentation(new Lsp1Builder().setCreate(flags.get(CREATE_FLAG_OFFSET)).build());
         short oper = 0;
         oper |= flags.get(OPERATIONAL + 2) ? 1 : 0;
         oper |= (flags.get(OPERATIONAL + 1) ? 1 : 0) << 1;
index d33fad6006c279ed987d3673b6b8b6e56a3d94b7..e9496d7fd13610292674bac715a95830b691b2a0 100644 (file)
@@ -31,7 +31,7 @@ public class CInitiated00SrpObjectParser extends Stateful07SrpObjectParser {
     @Override
     protected void parseFlags(final SrpBuilder builder, final ByteBuf bytes) {
         final BitArray flags = BitArray.valueOf(bytes, FLAGS_SIZE);
-        builder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(flags.get(REMOVE_FLAG)).build());
+        builder.addAugmentation(new Srp1Builder().setRemove(flags.get(REMOVE_FLAG)).build());
     }
 
     @Override
index 69d6f94b92be74b9deeece8ecb1d25a29906335a..4d6a9906c2fb0a65a7dbc08dd222a68a96a7d56e 100644 (file)
@@ -27,7 +27,7 @@ public class CInitiated00StatefulCapabilityTlvParser extends Stateful07StatefulC
         final BitArray flags = BitArray.valueOf(buffer, FLAGS_F_LENGTH);
         sb.setLspUpdateCapability(flags.get(U_FLAG_OFFSET));
         if (flags.get(I_FLAG_OFFSET)) {
-            sb.addAugmentation(Stateful1.class, new Stateful1Builder().setInitiation(Boolean.TRUE).build());
+            sb.addAugmentation(new Stateful1Builder().setInitiation(Boolean.TRUE).build());
         }
     }
 
index dc1e962f3a566bfbc3d4cbb25212d557cc04880c..16f2eb2b3df0baafed526ca1bad33949b64ce9fd 100644 (file)
@@ -10,9 +10,7 @@ package org.opendaylight.protocol.pcep.ietf.stateful07;
 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.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.stateful.rev181109.Tlvs1;
 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;
@@ -39,7 +37,7 @@ public class PCEPStatefulCapability implements PCEPCapability {
         this.includeDbVersion = includeDbVersion || triggeredSync || deltaLspSync;
     }
 
-    public PCEPStatefulCapability(PcepIetfStateful07Config config) {
+    public PCEPStatefulCapability(final PcepIetfStateful07Config config) {
         this(config.isStateful(), config.isActive(), config.isInitiated(), config.isTriggeredInitialSync(),
                 config.isTriggeredResync(), config.isDeltaLspSyncCapability(), config.isIncludeDbVersion());
     }
@@ -47,18 +45,16 @@ public class PCEPStatefulCapability implements PCEPCapability {
     @Override
     public void setCapabilityProposal(final InetSocketAddress address, final TlvsBuilder builder) {
         if (this.stateful) {
-            builder.addAugmentation(Tlvs1.class, new Tlvs1Builder()
+            builder.addAugmentation(new Tlvs1Builder()
                     .setStateful(new StatefulBuilder().setLspUpdateCapability(this.active)
-                        .addAugmentation(Stateful1.class, new Stateful1Builder().setInitiation(this.instant).build())
-                        .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
-                                .pcep.sync.optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1.urn
-                                    .opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109
-                                    .Stateful1Builder()
-                                    .setTriggeredInitialSync(this.triggeredSync)
-                                    .setTriggeredResync(this.triggeredResync)
-                                    .setDeltaLspSyncCapability(this.deltaLspSync)
-                                    .setIncludeDbVersion(this.includeDbVersion)
-                                    .build())
+                        .addAugmentation(new Stateful1Builder().setInitiation(this.instant).build())
+                        .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
+                            .pcep.sync.optimizations.rev181109.Stateful1Builder()
+                                .setTriggeredInitialSync(this.triggeredSync)
+                                .setTriggeredResync(this.triggeredResync)
+                                .setDeltaLspSyncCapability(this.deltaLspSync)
+                                .setIncludeDbVersion(this.includeDbVersion)
+                                .build())
                         .build())
                     .build());
         }
index 6dd19aad7d85340ea755be7101be196f2ae09f27..ffef693d85db71d67dd7375dc31eb6a78c92c1ac 100644 (file)
@@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
  */
 public class Stateful07LspaObjectParser extends PCEPLspaObjectParser {
 
-    public Stateful07LspaObjectParser(TlvRegistry tlvReg, VendorInformationTlvRegistry viTlvReg) {
+    public Stateful07LspaObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
         super(tlvReg, viTlvReg);
     }
 
@@ -40,7 +40,7 @@ public class Stateful07LspaObjectParser extends PCEPLspaObjectParser {
         if (tlv instanceof SymbolicPathName) {
             nameBuilder.setSymbolicPathName((SymbolicPathName) tlv);
         }
-        tbuilder.addAugmentation(Tlvs2.class, nameBuilder.build());
+        tbuilder.addAugmentation(nameBuilder.build());
     }
 
     @Override
index c62d6db4bd265f5314dcd3753a6b5f1dad222b2b..21f9118e61682bbc7abe39994e3b1c9ed11e7c29 100644 (file)
@@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
  */
 public class Stateful07OpenObjectParser extends PCEPOpenObjectParser {
 
-    public Stateful07OpenObjectParser(TlvRegistry tlvReg, VendorInformationTlvRegistry viTlvReg) {
+    public Stateful07OpenObjectParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
         super(tlvReg, viTlvReg);
     }
 
@@ -40,7 +40,7 @@ public class Stateful07OpenObjectParser extends PCEPOpenObjectParser {
         if (tlv instanceof Stateful) {
             statefulBuilder.setStateful((Stateful) tlv);
         }
-        tbuilder.addAugmentation(Tlvs1.class, statefulBuilder.build());
+        tbuilder.addAugmentation(statefulBuilder.build());
     }
 
     @Override
index 26cc0ae9eebbed36716aec6c5e48f8b3051e23dd..401d3ae185da7a7dc72a75ba213299d35cbd3474 100644 (file)
@@ -27,7 +27,7 @@ public class SyncOptimizationsCapabilityTlvParser extends CInitiated00StatefulCa
         final BitArray flags = BitArray.valueOf(buffer, FLAGS_F_LENGTH);
         sb.setLspUpdateCapability(flags.get(U_FLAG_OFFSET));
         if (flags.get(I_FLAG_OFFSET)) {
-            sb.addAugmentation(Stateful1.class, new Stateful1Builder().setInitiation(Boolean.TRUE).build());
+            sb.addAugmentation(new Stateful1Builder().setInitiation(Boolean.TRUE).build());
         }
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations
             .rev181109.Stateful1Builder syncOptBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns
@@ -44,8 +44,7 @@ public class SyncOptimizationsCapabilityTlvParser extends CInitiated00StatefulCa
         if (flags.get(F_FLAG_OFFSET)) {
             syncOptBuilder.setTriggeredInitialSync(Boolean.TRUE);
         }
-        sb.addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
-            .optimizations.rev181109.Stateful1.class, syncOptBuilder.build());
+        sb.addAugmentation(syncOptBuilder.build());
     }
 
     @Override
index dfffa2f97c8ee0ab3f8984dfa98dbece3f7b6b07..ddd05e2646b7bfd789a1fc44454bd5a42adc5882 100644 (file)
@@ -51,6 +51,6 @@ public class SyncOptimizationsLspObjectParser extends CInitiated00LspObjectParse
         if (tlv instanceof LspDbVersion) {
             syncOptTlvsBuilder.setLspDbVersion((LspDbVersion) tlv);
         }
-        tbuilder.addAugmentation(Tlvs1.class, syncOptTlvsBuilder.build());
+        tbuilder.addAugmentation(syncOptTlvsBuilder.build());
     }
 }
index cf704ff1cec5c810953b97ecbefd5d61ca7b2f2e..2b44472170852363fe70154a9196523cb18b32c8 100644 (file)
@@ -45,7 +45,7 @@ public class SyncOptimizationsOpenObjectParser extends Stateful07OpenObjectParse
         if (tlv instanceof SpeakerEntityId) {
             syncOptTlvsBuilder.setSpeakerEntityId((SpeakerEntityId) tlv);
         }
-        tbuilder.addAugmentation(Tlvs3.class, syncOptTlvsBuilder.build());
+        tbuilder.addAugmentation(syncOptTlvsBuilder.build());
     }
 
     @Override
index 87d859419b02e21cae7e3710fbb63d5d1d2bcec7..d7ef84a72759d2e74db776dd68c6aaaf1b21521b 100644 (file)
@@ -32,21 +32,16 @@ import org.opendaylight.protocol.pcep.sync.optimizations.SyncOptimizationsOpenOb
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder;
-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.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.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.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.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.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;
-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.Tlvs1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Tlvs2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Tlvs2Builder;
@@ -122,7 +117,7 @@ public class PCEPObjectParserTest {
                     .setSessionId(Uint8.ONE);
 
             final Stateful tlv1 = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE)
-                    .addAugmentation(Stateful1.class, new Stateful1Builder().build()).build();
+                    .addAugmentation(new Stateful1Builder().build()).build();
 
             final Tlvs1Builder statBuilder = new Tlvs1Builder();
             statBuilder.setStateful(tlv1);
@@ -133,8 +128,8 @@ public class PCEPObjectParserTest {
 
             builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
                 .open.object.open.TlvsBuilder()
-                .addAugmentation(Tlvs1.class, statBuilder.build())
-                .addAugmentation(Tlvs3.class, syncOptBuilder.build())
+                .addAugmentation(statBuilder.build())
+                .addAugmentation(syncOptBuilder.build())
                 .build());
 
             assertEquals(builder.build(), parser.parseObject(
@@ -164,7 +159,7 @@ public class PCEPObjectParserTest {
                     .setDelegate(false)
                     .setRemove(true)
                     .setSync(false)
-                    .addAugmentation(Lsp1.class, new Lsp1Builder().setCreate(false).build())
+                    .addAugmentation(new Lsp1Builder().setCreate(false).build())
                     .setOperational(OperationalStatus.GoingDown)
                     .setPlspId(new PlspId(Uint32.valueOf(0x12345)));
 
@@ -175,10 +170,8 @@ public class PCEPObjectParserTest {
             final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(DB_VERSION).build();
             builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful
                 .rev181109.lsp.object.lsp.TlvsBuilder().setLspErrorCode(tlv1).setSymbolicPathName(tlv2)
-                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep
-                        .sync.optimizations.rev181109.Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight
-                            .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1Builder()
-                            .setLspDbVersion(lspDbVersion).build())
+                    .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
+                        .pcep.sync.optimizations.rev181109.Tlvs1Builder().setLspDbVersion(lspDbVersion).build())
                     .build());
 
             assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true),
@@ -268,8 +261,8 @@ public class PCEPObjectParserTest {
             .setSetupPriority(Uint8.valueOf(0x03))
             .setLocalProtectionDesired(true)
             .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.lspa
-                .object.lspa.TlvsBuilder().addAugmentation(Tlvs2.class,
-                    new Tlvs2Builder().setSymbolicPathName(tlv).build()).build());
+                .object.lspa.TlvsBuilder().addAugmentation(new Tlvs2Builder().setSymbolicPathName(tlv).build())
+                .build());
 
         // Tlvs container does not contain toString
         final Object o = parser.parseObject(new ObjectHeaderImpl(true, true),
@@ -294,7 +287,7 @@ public class PCEPObjectParserTest {
                 .setProcessingRule(false)
                 .setIgnore(false)
                 .setOperationId(new SrpIdNumber(Uint32.ONE))
-                .addAugmentation(Srp1.class, new Srp1Builder().setRemove(true).build())
+                .addAugmentation(new Srp1Builder().setRemove(true).build())
                 .setTlvs(new TlvsBuilder().build());
 
         assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false),
@@ -316,7 +309,7 @@ public class PCEPObjectParserTest {
                 .setProcessingRule(false)
                 .setIgnore(false)
                 .setOperationId(new SrpIdNumber(Uint32.ONE))
-                .addAugmentation(Srp1.class, new Srp1Builder().setRemove(true).build())
+                .addAugmentation(new Srp1Builder().setRemove(true).build())
                 .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful
                     .rev181109.srp.object.srp.TlvsBuilder()
                     .setPathSetupType(new PathSetupTypeBuilder().setPst(Uint8.ZERO).build()).build());
index a9894e78869fc6b1bfde6db56be9b5ab289a9c45..b9a7761a0c055154793d01baa89c7586a9ce23bd 100644 (file)
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.protocol.pcep.ietf;
 
-import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+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.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.stateful.rev181109.Tlvs1;
 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;
@@ -20,14 +21,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 
 public class PCEPStatefulCapabilityTest {
 
-    private static final Tlvs EXPECTED_TLVS =
-        new TlvsBuilder().addAugmentation(
-            Tlvs1.class, new Tlvs1Builder()
+    private static final Tlvs EXPECTED_TLVS = new TlvsBuilder()
+            .addAugmentation(new Tlvs1Builder()
                 .setStateful(new StatefulBuilder().setLspUpdateCapability(true)
-                    .addAugmentation(Stateful1.class, new Stateful1Builder().setInitiation(true).build())
-                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep
-                        .sync.optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight
-                            .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder()
+                    .addAugmentation(new Stateful1Builder().setInitiation(true).build())
+                    .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
+                        .pcep.sync.optimizations.rev181109.Stateful1Builder()
                             .setTriggeredInitialSync(true)
                             .setTriggeredResync(false)
                             .setDeltaLspSyncCapability(true)
@@ -35,20 +34,20 @@ public class PCEPStatefulCapabilityTest {
                             .build())
                     .build())
                 .build())
-        .build();
+            .build();
 
     @Test
     public void testPCEPStatefulCapability() {
         final PCEPStatefulCapability sspf = new PCEPStatefulCapability(true, true, true, true, false, true, false);
-        Assert.assertTrue(sspf.isActive());
-        Assert.assertTrue(sspf.isInstant());
-        Assert.assertTrue(sspf.isStateful());
-        Assert.assertFalse(sspf.isTriggeredResync());
-        Assert.assertTrue(sspf.isTriggeredSync());
-        Assert.assertTrue(sspf.isDeltaLspSync());
-        Assert.assertTrue(sspf.isIncludeDbVersion());
+        assertTrue(sspf.isActive());
+        assertTrue(sspf.isInstant());
+        assertTrue(sspf.isStateful());
+        assertFalse(sspf.isTriggeredResync());
+        assertTrue(sspf.isTriggeredSync());
+        assertTrue(sspf.isDeltaLspSync());
+        assertTrue(sspf.isIncludeDbVersion());
         final TlvsBuilder builder = new TlvsBuilder();
         sspf.setCapabilityProposal(null, builder);
-        Assert.assertEquals(EXPECTED_TLVS, builder.build());
+        assertEquals(EXPECTED_TLVS, builder.build());
     }
 }
index 95abe9f04ec414eef08386b254d454d847ac4f2f..c9845e2de8e3f70da9005fff93da0796aa2b12fc 100644 (file)
@@ -106,9 +106,8 @@ public class PCEPTlvParserTest {
     public void testStatefulTlvSyncOptimizationExtension() throws PCEPDeserializerException {
         final SyncOptimizationsCapabilityTlvParser parser = new SyncOptimizationsCapabilityTlvParser();
         final Stateful tlv = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE)
-            .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
-                .optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml
-                    .ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder()
+            .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
+                .optimizations.rev181109.Stateful1Builder()
                     .setTriggeredInitialSync(Boolean.TRUE)
                     .setDeltaLspSyncCapability(Boolean.TRUE)
                     .setIncludeDbVersion(Boolean.TRUE)
index f995cbcabcf2086bc4b8aa53e64eb23d96010e4c..69e8601ae28cf8290a723d6b1e7145b935f82b09 100644 (file)
@@ -35,10 +35,8 @@ import org.opendaylight.protocol.util.ByteArray;
 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.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.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.pcinitiate.message.PcinitiateMessageBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
@@ -48,7 +46,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SrpIdNumber;
-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.Tlvs1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.identifiers.tlv.LspIdentifiers;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.identifiers.tlv.LspIdentifiersBuilder;
@@ -266,7 +263,7 @@ public class PCEPValidatorTest {
                 .setIgnore(false)
                 .setProcessingRule(false)
                 .setOperationId(new SrpIdNumber(Uint32.ONE))
-                .addAugmentation(Srp1.class, new Srp1Builder().setRemove(false).build())
+                .addAugmentation(new Srp1Builder().setRemove(false).build())
                 .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful
                     .rev181109.srp.object.srp.TlvsBuilder().build())
                 .build();
@@ -281,7 +278,7 @@ public class PCEPValidatorTest {
                 .setSync(false)
                 .setRemove(false)
                 .setTlvs(new TlvsBuilder().build())
-                .addAugmentation(Lsp1.class, new Lsp1Builder().setCreate(false).build());
+                .addAugmentation(new Lsp1Builder().setCreate(false).build());
 
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp
             .identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4Builder builder =
@@ -340,9 +337,11 @@ public class PCEPValidatorTest {
                     .setDeadTimer(Uint8.valueOf(120))
                     .setSessionId(Uint8.ONE)
                     .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
-                        .open.object.open.TlvsBuilder().addAugmentation(Tlvs1.class,
-                            new Tlvs1Builder().setStateful(new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE)
-                                .build()).build()).build());
+                        .open.object.open.TlvsBuilder()
+                            .addAugmentation(new Tlvs1Builder()
+                                .setStateful(new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE).build())
+                                .build())
+                            .build());
             builder.setOpen(b.build());
 
             assertEquals(new OpenBuilder().setOpenMessage(builder.build()).build(), parser.parseMessage(result.slice(4,
index 4cffba7181a7153dc95bce84756b11f8320381ba..4c92034b71382a1190f8d376fe4485549d8cd390 100644 (file)
@@ -36,7 +36,6 @@ import org.opendaylight.protocol.pcep.pcc.mock.api.PCCSession;
 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.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.crabbe.initiated.rev181109.Srp1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Srp1Builder;
@@ -200,7 +199,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
         sendToAll(tunnel, plspId, request.getEro().getSubobject(),
                 createSrp(request.getSrp().getOperationId().getValue()), tunnel.getLspState(),
                 new LspBuilder(request.getLsp())
-                        .addAugmentation(Lsp1.class, new Lsp1Builder().setCreate(true).build()).build());
+                        .addAugmentation(new Lsp1Builder().setCreate(true).build()).build());
         this.tunnels.put(plspId, tunnel);
     }
 
@@ -214,7 +213,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
                     this.tunnels.remove(plspId);
                     sendToAll(tunnel, plspId, tunnel.getLspState().getEro().getSubobject(),
                         new SrpBuilder(request.getSrp())
-                                .addAugmentation(Srp1.class, new Srp1Builder().setRemove(true).build()).build(),
+                                .addAugmentation(new Srp1Builder().setRemove(true).build()).build(),
                         reqToRptPath(request), request.getLsp());
                 } else {
                     session.sendError(MsgBuilderUtil.createErrorMsg(PCEPErrors.UPDATE_REQ_FOR_NON_LSP, srpId));
@@ -407,8 +406,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
                     .setOperational(OperationalStatus.Up)
                     .setDelegate(isDelegated)
                     .setSync(true)
-                    .addAugmentation(Lsp1.class, new Lsp1Builder()
-                            .setCreate(tunnel.getType() == LspType.PCE_LSP).build())
+                    .addAugmentation(new Lsp1Builder().setCreate(tunnel.getType() == LspType.PCE_LSP).build())
                     .setTlvs(tlvs).build(),
                 Optional.ofNullable(srp), path);
             session.sendReport(pcRpt);
index cd669290cc7c721dc58e5c27b4d1b154ab073a98..6d8d363669fd53ce07cea7ab285f383ae1dbdf2d 100644 (file)
@@ -12,9 +12,7 @@ import static java.util.Objects.requireNonNull;
 import java.net.InetSocketAddress;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.protocol.pcep.PCEPPeerProposal;
-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.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.types.rev181109.open.object.open.TlvsBuilder;
 import org.opendaylight.yangtools.yang.common.Uint64;
@@ -33,7 +31,8 @@ public final class PCCPeerProposal implements PCEPPeerProposal {
     @Override
     public void setPeerSpecificProposal(final InetSocketAddress address, final TlvsBuilder openBuilder) {
         requireNonNull(address);
-        final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(this.dbVersion).build();
-        openBuilder.addAugmentation(Tlvs3.class, new Tlvs3Builder().setLspDbVersion(lspDbVersion).build());
+        openBuilder.addAugmentation(new Tlvs3Builder()
+            .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(this.dbVersion).build())
+            .build());
     }
 }
index da326d5486fb5baecaa3376ff62b4b1914c54070..f1d06ea10c62a0934af9ec59ab6602109c53c2f7 100644 (file)
@@ -12,7 +12,6 @@ import static java.util.Objects.requireNonNull;
 import java.net.InetSocketAddress;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.protocol.pcep.PCEPPeerProposal;
-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.Tlvs3Builder;
 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.types.rev181109.open.object.open.TlvsBuilder;
@@ -35,7 +34,6 @@ public class PCCServerPeerProposal implements PCEPPeerProposal {
         } else {
             this.isAfterReconnection = true;
         }
-        openBuilder.addAugmentation(Tlvs3.class, new Tlvs3Builder()
-                .setLspDbVersion(lspDbVersionBuilder.build()).build());
+        openBuilder.addAugmentation(new Tlvs3Builder().setLspDbVersion(lspDbVersionBuilder.build()).build());
     }
 }
\ No newline at end of file
index 24ac7aac67516e79e5fc5ed1a10b72f7f25b8ce4..3da71ffd54536e439220830567411ac3897e7678 100644 (file)
@@ -15,7 +15,6 @@ import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 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.Tlvs1;
 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;
@@ -62,30 +61,29 @@ public final class MsgBuilderUtil {
     }
 
     public static Pcrpt createPcRtpMessage(final Lsp lsp, final Optional<Srp> srp, final Path path) {
-        final PcrptBuilder rptBuilder = new PcrptBuilder();
-        final PcrptMessageBuilder msgBuilder = new PcrptMessageBuilder();
-        final ReportsBuilder reportBuilder = new ReportsBuilder();
-        reportBuilder.setLsp(lsp);
-        reportBuilder.setSrp(srp.orElse(null));
-        reportBuilder.setPath(path);
-        msgBuilder.setReports(Lists.newArrayList(reportBuilder.build()));
-        rptBuilder.setPcrptMessage(msgBuilder.build());
-        return rptBuilder.build();
+        return new PcrptBuilder()
+                .setPcrptMessage(new PcrptMessageBuilder()
+                    .setReports(Lists.newArrayList(new ReportsBuilder()
+                        .setLsp(lsp)
+                        .setSrp(srp.orElse(null))
+                        .setPath(path).build()))
+                    .build())
+                .build();
     }
 
     public static Lsp createLsp(final Uint32 plspId, final boolean sync, final Optional<Tlvs> tlvs,
             final boolean isDelegatedLsp, final boolean remove) {
-        final LspBuilder lspBuilder = new LspBuilder();
-        lspBuilder.setAdministrative(true);
-        lspBuilder.setDelegate(isDelegatedLsp);
-        lspBuilder.setIgnore(false);
-        lspBuilder.setOperational(OperationalStatus.Up);
-        lspBuilder.setPlspId(new PlspId(plspId));
-        lspBuilder.setProcessingRule(false);
-        lspBuilder.setRemove(remove);
-        lspBuilder.setSync(sync);
-        lspBuilder.setTlvs(tlvs.orElse(null));
-        return lspBuilder.build();
+        return new LspBuilder()
+                .setAdministrative(true)
+                .setDelegate(isDelegatedLsp)
+                .setIgnore(false)
+                .setOperational(OperationalStatus.Up)
+                .setPlspId(new PlspId(plspId))
+                .setProcessingRule(false)
+                .setRemove(remove)
+                .setSync(sync)
+                .setTlvs(tlvs.orElse(null))
+                .build();
     }
 
     public static Lsp createLsp(final Uint32 plspId, final boolean sync, final Optional<Tlvs> tlvs,
@@ -94,17 +92,17 @@ public final class MsgBuilderUtil {
     }
 
     public static Path createPath(final List<Subobject> subobjects) {
-        final PathBuilder pathBuilder = new PathBuilder();
-        pathBuilder.setEro(new EroBuilder().setSubobject(subobjects).build());
-        return pathBuilder.build();
+        return new PathBuilder()
+                .setEro(new EroBuilder().setSubobject(subobjects).build())
+                .build();
     }
 
     public static Srp createSrp(final Uint32 srpId) {
-        final SrpBuilder srpBuilder = new SrpBuilder();
-        srpBuilder.setProcessingRule(false);
-        srpBuilder.setIgnore(false);
-        srpBuilder.setOperationId(new SrpIdNumber(srpId));
-        return srpBuilder.build();
+        return new SrpBuilder()
+                .setProcessingRule(false)
+                .setIgnore(false)
+                .setOperationId(new SrpIdNumber(srpId))
+                .build();
     }
 
     public static Path updToRptPath(final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf
@@ -154,15 +152,15 @@ public final class MsgBuilderUtil {
         }
 
         if (lspDBVersion.isPresent()) {
-            tlvs.addAugmentation(Tlvs1.class, new Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder()
-                    .setLspDbVersionValue(lspDBVersion.get()).build()).build());
+            tlvs.addAugmentation(new Tlvs1Builder()
+                .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(lspDBVersion.get()).build()).build());
         }
         return tlvs.build();
     }
 
     public static Optional<Tlvs> createLspTlvsEndofSync(final @NonNull Uint64 dbVersion) {
-        final Tlvs tlvs = new TlvsBuilder().addAugmentation(Tlvs1.class, new Tlvs1Builder().setLspDbVersion(
-            new LspDbVersionBuilder().setLspDbVersionValue(dbVersion).build()).build()).build();
+        final Tlvs tlvs = new TlvsBuilder().addAugmentation(new Tlvs1Builder()
+            .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(dbVersion).build()).build()).build();
         return Optional.of(tlvs);
     }
 
index c02f051823f49fdd4c3a786f471adb20baf5ac0e..48ccfaebffde0df512d87ffd811868c9915037ac 100644 (file)
@@ -29,7 +29,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 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.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.PcinitiateMessageBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
@@ -163,7 +162,7 @@ public class PCCSessionListenerTest {
         final List<Requests> requests = new ArrayList<>();
         final RequestsBuilder reqBuilder = new RequestsBuilder()
             .setLsp(lspBuilder.build())
-            .setSrp(new SrpBuilder(MsgBuilderUtil.createSrp(Uint32.valueOf(123))).addAugmentation(Srp1.class,
+            .setSrp(new SrpBuilder(MsgBuilderUtil.createSrp(Uint32.valueOf(123))).addAugmentation(
                 new Srp1Builder().setRemove(remove).build()).build());
         if (endpoint) {
             reqBuilder.setEndpointsObj(new EndpointsObjBuilder().build());
index a89e57044d70415b4a4de4a34e08778604256810..c6ccc239acc9eb22eb5ffe2b2179a168ee22a7b4 100644 (file)
@@ -30,7 +30,6 @@ import org.opendaylight.protocol.pcep.pcc.mock.api.PCCTunnelManager;
 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.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.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.RequestsBuilder;
@@ -328,10 +327,11 @@ public class PCCTunnelManagerImplTest {
         reqBuilder.setLsp(lsp.build());
         final SrpBuilder srpBuilder = new SrpBuilder();
         if (remove.isPresent()) {
-            srpBuilder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(Boolean.TRUE).build());
+            srpBuilder.addAugmentation(new Srp1Builder().setRemove(Boolean.TRUE).build());
         }
-        reqBuilder.setSrp(srpBuilder.setOperationId(new SrpIdNumber(Uint32.ZERO)).build());
-        return reqBuilder.build();
+        return reqBuilder
+                .setSrp(srpBuilder.setOperationId(new SrpIdNumber(Uint32.ZERO)).build())
+                .build();
     }
 
     private static Requests createRequestsRemove(final long plspId) {
index d93c868e9529ebd2ff8d218ddabf6db269e1062f..c593072993668a25061e098bfdebb5c9e6adae87 100644 (file)
@@ -19,26 +19,18 @@ import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stateful.stats.rev181109.PcepEntityIdStatsAug;
 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;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stateful.stats.rev181109.StatefulCapabilitiesStatsAugBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stateful.stats.rev181109.StatefulMessagesStatsAug;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stateful.stats.rev181109.StatefulMessagesStatsAugBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.error.messages.grouping.ErrorMessages;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.error.messages.grouping.ErrorMessagesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.LocalPref;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.LocalPrefBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.Messages;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.MessagesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.PeerCapabilities;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.PeerCapabilitiesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.PeerPrefBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.grouping.PcepSessionState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.pcep.session.state.grouping.PcepSessionStateBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.reply.time.grouping.ReplyTime;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.reply.time.grouping.ReplyTimeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.stats.rev181109.PcepTopologyNodeStatsAug;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.stats.rev181109.PcepTopologyNodeStatsAugBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
@@ -82,9 +74,8 @@ public class PcepStateUtilsTest extends AbstractConcurrentDataBrokerTest {
         final WriteTransaction wt = getDataBroker().newWriteOnlyTransaction();
         final Node node = new NodeBuilder()
                 .setNodeId(new NodeId(NODE_ID))
-                .addAugmentation(PcepTopologyNodeStatsAug.class,
-                        new PcepTopologyNodeStatsAugBuilder().setPcepSessionState(createPcepSessionState())
-                                .build())
+                .addAugmentation(new PcepTopologyNodeStatsAugBuilder().setPcepSessionState(createPcepSessionState())
+                    .build())
                 .build();
 
         final InstanceIdentifier<Node> topology = InstanceIdentifier.builder(NetworkTopology.class)
@@ -100,44 +91,7 @@ public class PcepStateUtilsTest extends AbstractConcurrentDataBrokerTest {
                 .setDeadtimer(Uint8.valueOf(120))
                 .setIpAddress(IP_ADDRESS)
                 .setSessionId(Uint16.ZERO)
-                .addAugmentation(PcepEntityIdStatsAug.class, new PcepEntityIdStatsAugBuilder()
-                        .setSpeakerEntityIdValue(SPEAKER_ID).build())
-                .build();
-
-        final PeerCapabilities capa = new PeerCapabilitiesBuilder()
-                .addAugmentation(StatefulCapabilitiesStatsAug.class, new StatefulCapabilitiesStatsAugBuilder()
-                        .setStateful(Boolean.TRUE)
-                        .setInstantiation(Boolean.TRUE)
-                        .setActive(Boolean.TRUE)
-                        .build())
-                .build();
-
-        final ReplyTime reply = new ReplyTimeBuilder()
-                .setAverageTime(Uint32.ONE)
-                .setMaxTime(Uint32.valueOf(3))
-                .setMinTime(Uint32.TWO)
-                .build();
-
-        final ErrorMessages errorMsg = new ErrorMessagesBuilder()
-                .setReceivedErrorMsgCount(Uint32.ONE)
-                .setSentErrorMsgCount(Uint32.TWO)
-                .build();
-
-        final StatefulMessagesStatsAug statefulMsg = new StatefulMessagesStatsAugBuilder()
-                .setLastReceivedRptMsgTimestamp(Uint32.valueOf(1512043769L))
-                .setSentUpdMsgCount(Uint32.ONE)
-                .setReceivedRptMsgCount(Uint32.TWO)
-                .setSentInitMsgCount(Uint32.valueOf(3))
-                .build();
-
-        final Messages messages = new MessagesBuilder()
-                .setLastSentMsgTimestamp(Uint32.valueOf(1512043828L))
-                .setUnknownMsgReceived(Uint16.ONE)
-                .setSentMsgCount(Uint32.valueOf(5))
-                .setReceivedMsgCount(Uint32.valueOf(4))
-                .setReplyTime(reply)
-                .setErrorMessages(errorMsg)
-                .addAugmentation(StatefulMessagesStatsAug.class, statefulMsg)
+                .addAugmentation(new PcepEntityIdStatsAugBuilder().setSpeakerEntityIdValue(SPEAKER_ID).build())
                 .build();
 
         return new PcepSessionStateBuilder()
@@ -146,8 +100,34 @@ public class PcepStateUtilsTest extends AbstractConcurrentDataBrokerTest {
                 .setDelegatedLspsCount(Uint16.ONE)
                 .setLocalPref(pref)
                 .setPeerPref(new PeerPrefBuilder(pref).build())
-                .setPeerCapabilities(capa)
-                .setMessages(messages)
+                .setPeerCapabilities(new PeerCapabilitiesBuilder()
+                    .addAugmentation(new StatefulCapabilitiesStatsAugBuilder()
+                        .setStateful(Boolean.TRUE)
+                        .setInstantiation(Boolean.TRUE)
+                        .setActive(Boolean.TRUE)
+                        .build())
+                    .build())
+                .setMessages(new MessagesBuilder()
+                    .setLastSentMsgTimestamp(Uint32.valueOf(1512043828L))
+                    .setUnknownMsgReceived(Uint16.ONE)
+                    .setSentMsgCount(Uint32.valueOf(5))
+                    .setReceivedMsgCount(Uint32.valueOf(4))
+                    .setReplyTime(new ReplyTimeBuilder()
+                        .setAverageTime(Uint32.ONE)
+                        .setMaxTime(Uint32.valueOf(3))
+                        .setMinTime(Uint32.TWO)
+                        .build())
+                    .setErrorMessages(new ErrorMessagesBuilder()
+                        .setReceivedErrorMsgCount(Uint32.ONE)
+                        .setSentErrorMsgCount(Uint32.TWO)
+                        .build())
+                    .addAugmentation(new StatefulMessagesStatsAugBuilder()
+                        .setLastReceivedRptMsgTimestamp(Uint32.valueOf(1512043769L))
+                        .setSentUpdMsgCount(Uint32.ONE)
+                        .setReceivedRptMsgCount(Uint32.TWO)
+                        .setSentInitMsgCount(Uint32.valueOf(3))
+                        .build())
+                    .build())
                 .build();
     }
 }
index 33f51a14facdef588acb45516830c031960f665d..fbd70194939c8e4904065d09c3fd46a0f33899f7 100644 (file)
@@ -5,7 +5,6 @@
  * 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.bgpcep.pcep.topology.provider;
 
 import static java.util.Objects.requireNonNull;
@@ -18,7 +17,6 @@ import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.PathComputationClient1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1;
-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.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.speaker.entity.id.tlv.SpeakerEntityIdBuilder;
@@ -79,7 +77,7 @@ final class PCEPStatefulPeerProposal {
             if (speakerId != null) {
                 syncBuilder.setSpeakerEntityId(new SpeakerEntityIdBuilder().setSpeakerEntityIdValue(speakerId).build());
             }
-            openTlvsBuilder.addAugmentation(Tlvs3.class, syncBuilder.build()).build();
+            openTlvsBuilder.addAugmentation(syncBuilder.build()).build();
         }
     }
 
index dd96a7917bbc9f37bbd4af76e8d611f4e9b27291..e1e9ded5807542f04bb63b370b03a1418e4be870 100644 (file)
@@ -41,7 +41,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.OperationResult;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.RemoveLspArgs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.TearDownSessionInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.TopologyTypes1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.TopologyTypes1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.TriggerSyncArgs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.UpdateLspArgs;
@@ -106,8 +105,8 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology
         final WriteTransaction tx = this.dependenciesProvider.getDataBroker().newWriteOnlyTransaction();
         tx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, this.topology, new TopologyBuilder().withKey(key)
                 .setTopologyId(topologyId).setTopologyTypes(new TopologyTypesBuilder()
-                        .addAugmentation(TopologyTypes1.class, new TopologyTypes1Builder().setTopologyPcep(
-                                new TopologyPcepBuilder().build()).build()).build())
+                        .addAugmentation(new TopologyTypes1Builder().setTopologyPcep(new TopologyPcepBuilder().build())
+                            .build()).build())
                 .setNode(new ArrayList<>()).build());
         try {
             tx.commit().get();
index 8940f9e05a6eb40d7956137234e565bfa9996c10..b05190decc8d295ee6af6741d799bdf6a62d9989 100644 (file)
@@ -33,7 +33,6 @@ import org.opendaylight.bgpcep.pcep.server.PceServerProvider;
 import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.protocol.pcep.spi.PSTUtil;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.PathComputationClient1;
 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;
@@ -54,7 +53,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SrpIdNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.StatefulTlv1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.StatefulTlv1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SymbolicPathName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Tlvs1;
@@ -143,7 +141,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener<
             final Stateful stateful = tlvs.augmentation(Tlvs1.class).getStateful();
             if (stateful != null) {
                 setStatefulCapabilities(stateful);
-                pccBuilder.setReportedLsp(Collections.emptyList());
+                pccBuilder.setReportedLsp(Collections.emptyMap());
                 if (isSynchronized()) {
                     pccBuilder.setStateSync(PccSyncState.Synchronized);
                 } else if (isTriggeredInitialSynchro()) {
@@ -153,7 +151,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener<
                 } else {
                     pccBuilder.setStateSync(PccSyncState.InitialResync);
                 }
-                pccBuilder.setStatefulTlv(new StatefulTlvBuilder().addAugmentation(StatefulTlv1.class,
+                pccBuilder.setStatefulTlv(new StatefulTlvBuilder().addAugmentation(
                         new StatefulTlv1Builder(tlvs.augmentation(Tlvs1.class)).build()).build());
             } else {
                 LOG.debug("Peer {} does not advertise stateful TLV", peerAddress);
@@ -328,8 +326,8 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener<
         //get LspDB from LSP and write it to pcc's node
         final LspDbVersion lspDbVersion = geLspDbVersionTlv(lsp);
         if (lspDbVersion != null) {
-            updatePccNode(ctx, new PathComputationClientBuilder().addAugmentation(PathComputationClient1.class,
-                    new PathComputationClient1Builder().setLspDbVersion(lspDbVersion).build()).build());
+            updatePccNode(ctx, new PathComputationClientBuilder()
+                .addAugmentation(new PathComputationClient1Builder().setLspDbVersion(lspDbVersion).build()).build());
         }
         updateLsp(ctx, plspid, name, rlb, solicited, lsp.isRemove());
         unmarkStaleLsp(plspid);
@@ -357,7 +355,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener<
         } else {
             pst = null;
         }
-        pb.addAugmentation(Path1.class, p1Builder.build());
+        pb.addAugmentation(p1Builder.build());
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp
                 .object.lsp.Tlvs tlvs = report.getLsp().getTlvs();
         if (tlvs != null) {
@@ -458,7 +456,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener<
     private Requests buildRequest(final Optional<ReportedLsp> rep, final Lsp reportedLsp) {
         // Build the request and send it
         final RequestsBuilder rb = new RequestsBuilder();
-        final SrpBuilder srpBuilder = new SrpBuilder().addAugmentation(Srp1.class, new Srp1Builder()
+        final SrpBuilder srpBuilder = new SrpBuilder().addAugmentation(new Srp1Builder()
                 .setRemove(Boolean.TRUE).build()).setOperationId(nextRequest()).setProcessingRule(Boolean.TRUE);
         final Optional<PathSetupType> maybePST = getPST(rep);
         if (maybePST.isPresent()) {
index 021249c63bf507aabd3e565a2f2c41e477768e22..c3f6a3aa7b0b1d860c56c9b30a3af00175273392 100644 (file)
@@ -5,7 +5,6 @@
  * 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.bgpcep.pcep.topology.provider.session.stats;
 
 import static java.util.Objects.requireNonNull;
@@ -19,7 +18,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 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.stateful.rev181109.Pcupd;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stateful.stats.rev181109.PcepEntityIdStatsAug;
 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;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stateful.stats.rev181109.StatefulCapabilitiesStatsAugBuilder;
@@ -70,8 +68,7 @@ public final class SessionStateImpl implements PcepSessionState {
             final SpeakerEntityId entityId = localOpen.getTlvs().augmentation(Tlvs3.class).getSpeakerEntityId();
             if (entityId != null) {
                 this.localPref = new LocalPrefBuilder(session.getLocalPref())
-                        .addAugmentation(PcepEntityIdStatsAug.class,
-                                new PcepEntityIdStatsAugBuilder(entityId).build()).build();
+                        .addAugmentation(new PcepEntityIdStatsAugBuilder(entityId).build()).build();
             }
         } else {
             this.localPref = session.getLocalPref();
@@ -124,7 +121,7 @@ public final class SessionStateImpl implements PcepSessionState {
     @Override
     public synchronized PeerCapabilities getPeerCapabilities() {
         return new PeerCapabilitiesBuilder()
-                .addAugmentation(StatefulCapabilitiesStatsAug.class, createStatefulCapabilities())
+                .addAugmentation(createStatefulCapabilities())
                 .build();
     }
 
@@ -140,7 +137,7 @@ public final class SessionStateImpl implements PcepSessionState {
     public Messages getMessages() {
         return new MessagesBuilder(this.pcepSessionState.getMessages())
                 .setReplyTime(setReplyTime())
-                .addAugmentation(StatefulMessagesStatsAug.class, createStatefulMessages())
+                .addAugmentation(createStatefulMessages())
                 .build();
     }
 
index 87f03ee818552e9ed1c1471100c1333a8475feab..7c376d043707c95aab068734f91981c6d7736371 100644 (file)
@@ -136,11 +136,10 @@ public class IncrementalSynchronizationProcedureTest
                     .object.lsp.TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder()
                     .setLspId(new LspId(val)).build())
                 .setSymbolicPathName(new SymbolicPathNameBuilder().setPathName(new SymbolicPathName(
-                    pathname.getBytes())).build()).addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params
-                .xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1.class, new org.opendaylight.yang.gen.v1
-                    .urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1Builder()
-                .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(Uint64.valueOf(val)).build())
-                .build()).build()).setPlspId(new PlspId(val)
+                    pathname.getBytes())).build()).addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight
+                        .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1Builder()
+                        .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(Uint64.valueOf(val)).build())
+                        .build()).build()).setPlspId(new PlspId(val)
         ).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.empty(),
             createPath(Collections.emptyList()));
     }
@@ -148,11 +147,10 @@ public class IncrementalSynchronizationProcedureTest
     private static Pcrpt getSyncPcrt() {
         return MsgBuilderUtil.createPcRtpMessage(createLsp(Uint32.ZERO, false, Optional.of(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109
-                        .lsp.object.lsp.TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight
-                                .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1.class,
-                        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
-                                .optimizations.rev181109.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder()
-                                .setLspDbVersionValue(Uint64.valueOf(3L)).build()).build()).build()),
+                        .lsp.object.lsp.TlvsBuilder().addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight
+                            .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1Builder()
+                            .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(Uint64.valueOf(3L)).build())
+                            .build()).build()),
                 true, false), Optional.empty(),
                 createPath(Collections.emptyList()));
     }
index 256146b499c0356f421dedfa02e38e9acd9cfd89..7139311a3e3c29abc3839076534a1b18c079d7a3 100644 (file)
@@ -27,12 +27,10 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder;
 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.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.ietf.stateful.rev181109.Tlvs1;
 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;
@@ -65,11 +63,9 @@ public class PCEPStatefulPeerProposalTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        this.tlvsBuilder = new TlvsBuilder().addAugmentation(
-                Tlvs1.class,
-                new Tlvs1Builder().setStateful(
-                        new StatefulBuilder().addAugmentation(Stateful1.class, new Stateful1Builder().build()).build())
-                        .build());
+        this.tlvsBuilder = new TlvsBuilder().addAugmentation(new Tlvs1Builder()
+            .setStateful(new StatefulBuilder().addAugmentation(new Stateful1Builder().build()).build())
+            .build());
         doReturn(this.rt).when(this.dataBroker).newReadOnlyTransaction();
         doNothing().when(this.rt).close();
         doReturn(this.listenableFutureMock).when(this.rt)
index 43c19847e7c86213815c461450161082f5ed5582..e0cf468a86382100cf2c6ca29da6ef37a8d91d63 100644 (file)
@@ -22,18 +22,15 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.pcc.mock.spi.MsgBuilderUtil;
-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.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.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.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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SrpIdNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SymbolicPathName;
-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.Tlvs1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.identifiers.tlv.LspIdentifiersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.LspBuilder;
@@ -171,14 +168,15 @@ public class PCEPTriggeredReSynchronizationProcedureTest
     }
 
     private Open getOpen() {
-        return new OpenBuilder(super.getLocalPref()).setTlvs(new TlvsBuilder().addAugmentation(Tlvs1.class,
-            new Tlvs1Builder().setStateful(new StatefulBuilder().addAugmentation(Stateful1.class, new Stateful1Builder()
-                .setInitiation(Boolean.TRUE).build()).addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight
-                    .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1.class,
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations
-                    .rev181109.Stateful1Builder().setIncludeDbVersion(Boolean.TRUE).setTriggeredResync(Boolean.TRUE)
-                    .build()).build()).build()).addAugmentation(Tlvs3.class, new Tlvs3Builder()
-            .setLspDbVersion(this.lspDbVersion).build()).build()).build();
+        return new OpenBuilder(super.getLocalPref()).setTlvs(new TlvsBuilder().addAugmentation(new Tlvs1Builder()
+            .setStateful(new StatefulBuilder()
+                .addAugmentation(new Stateful1Builder().setInitiation(Boolean.TRUE).build())
+                .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep
+                    .sync.optimizations.rev181109.Stateful1Builder()
+                        .setIncludeDbVersion(Boolean.TRUE).setTriggeredResync(Boolean.TRUE)
+                        .build())
+                .build())
+            .build()).addAugmentation(new Tlvs3Builder().setLspDbVersion(this.lspDbVersion).build()).build()).build();
     }
 
     private static Pcrpt getSyncMsg() {
@@ -187,13 +185,11 @@ public class PCEPTriggeredReSynchronizationProcedureTest
         srpBuilder.setOperationId(new SrpIdNumber(Uint32.ONE));
         return MsgBuilderUtil.createPcRtpMessage(createLsp(Uint32.ZERO, false, Optional.of(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp
-                        .object.lsp.TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params
-                                .xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1.class,
-                    new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
-                            .optimizations.rev181109.Tlvs1Builder()
-                        .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(Uint64.valueOf(3L))
+                        .object.lsp.TlvsBuilder().addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight
+                            .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1Builder()
+                            .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(Uint64.valueOf(3L))
                                 .build()).build()).build()), true, false),
-                            Optional.of(srpBuilder.build()), createPath(Collections.emptyList()));
+            Optional.of(srpBuilder.build()), createPath(Collections.emptyList()));
     }
 
     private static Pcrpt getPcrt() {
@@ -202,10 +198,8 @@ public class PCEPTriggeredReSynchronizationProcedureTest
                         .object.lsp.TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder()
                         .setLspId(new LspId(Uint32.ONE)).build()).setSymbolicPathName(
                     new SymbolicPathNameBuilder().setPathName(new SymbolicPathName("test".getBytes())).build())
-                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep
-                                    .sync.optimizations.rev181109.Tlvs1.class,
-                        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
-                                .optimizations.rev181109.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder()
+                    .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
+                        .pcep.sync.optimizations.rev181109.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder()
                                 .setLspDbVersionValue(Uint64.ONE).build()).build()).build())
                 .setPlspId(new PlspId(Uint32.ONE)).setSync(true).setRemove(false)
                         .setOperational(OperationalStatus.Active).build(), Optional.empty(),
index 8511af7696caaca41daa1ed7e7989412059a223a..67cc52c8418aba140ec193725847e5fc86f285a1 100644 (file)
@@ -5,7 +5,6 @@
  * 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.bgpcep.pcep.topology.provider;
 
 import static org.junit.Assert.assertEquals;
@@ -21,17 +20,14 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.pcc.mock.spi.MsgBuilderUtil;
-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.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.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.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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SymbolicPathName;
-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.Tlvs1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.identifiers.tlv.LspIdentifiersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.LspBuilder;
@@ -101,43 +97,46 @@ public class PCETriggeredInitialSyncProcedureTest
     }
 
     private Open getOpen(final LspDbVersion dbVersion, final boolean incremental) {
-        return new OpenBuilder(super.getLocalPref()).setTlvs(new TlvsBuilder().addAugmentation(Tlvs1.class,
-                new Tlvs1Builder().setStateful(new StatefulBuilder()
-                        .addAugmentation(Stateful1.class, new Stateful1Builder().setInitiation(Boolean.TRUE).build())
-                        .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
-                                        .pcep.sync.optimizations.rev181109.Stateful1.class,
-                                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep
-                                        .sync.optimizations.rev181109.Stateful1Builder()
-                                        .setIncludeDbVersion(Boolean.TRUE)
-                                        .setTriggeredInitialSync(Boolean.TRUE)
-                                        .setDeltaLspSyncCapability(incremental).build()).build()).build())
-                .addAugmentation(Tlvs3.class, new Tlvs3Builder().setLspDbVersion(dbVersion).build())
-                .build()).build();
+        return new OpenBuilder(super.getLocalPref())
+                .setTlvs(new TlvsBuilder()
+                    .addAugmentation(new Tlvs1Builder()
+                        .setStateful(new StatefulBuilder()
+                            .addAugmentation(new Stateful1Builder().setInitiation(Boolean.TRUE).build())
+                            .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
+                                .controller.pcep.sync.optimizations.rev181109.Stateful1Builder()
+                                .setIncludeDbVersion(Boolean.TRUE)
+                                .setTriggeredInitialSync(Boolean.TRUE)
+                                .setDeltaLspSyncCapability(incremental).build()).build()).build())
+                    .addAugmentation(new Tlvs3Builder().setLspDbVersion(dbVersion).build())
+                    .build())
+                .build();
     }
 
     private static Pcrpt getsyncMsg() {
         return MsgBuilderUtil.createPcRtpMessage(createLsp(Uint32.ZERO, false, Optional.of(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp
-                    .object.lsp.TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params
-                        .xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1.class, new org.opendaylight
-                        .yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109
-                        .Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(Uint64
-                        .valueOf(2L)).build()).build()).build()), true, false), Optional.empty(),
-                        createPath(Collections.emptyList()));
+                    .object.lsp.TlvsBuilder().addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params
+                        .xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1Builder()
+                        .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(Uint64.TWO).build()).build())
+                    .build()), true, false), Optional.empty(), createPath(Collections.emptyList()));
     }
 
     private static Pcrpt getPcrpt() {
         return MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setPlspId(new PlspId(Uint32.ONE)).setTlvs(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp
-                        .object.lsp.TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder()
-                        .setLspId(new LspId(Uint32.ONE)).build()).setSymbolicPathName(new SymbolicPathNameBuilder()
-                        .setPathName(new SymbolicPathName("test".getBytes())).build()).addAugmentation(org.opendaylight
-                        .yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109
-                        .Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
-                        .pcep.sync.optimizations.rev181109.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder()
-                        .setLspDbVersionValue(Uint64.valueOf(3L)).build())
-                        .build()).build()).setPlspId(new PlspId(Uint32.ONE)).setSync(true).setRemove(false)
-                .setOperational(OperationalStatus.Active).build(), Optional.empty(),
-                createPath(Collections.emptyList()));
+                        .object.lsp.TlvsBuilder()
+                        .setLspIdentifiers(new LspIdentifiersBuilder().setLspId(new LspId(Uint32.ONE)).build())
+                        .setSymbolicPathName(new SymbolicPathNameBuilder()
+                                .setPathName(new SymbolicPathName("test".getBytes()))
+                                .build())
+                        .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
+                            .pcep.sync.optimizations.rev181109.Tlvs1Builder()
+                                .setLspDbVersion(new LspDbVersionBuilder()
+                                    .setLspDbVersionValue(Uint64.valueOf(3L))
+                                    .build())
+                                .build())
+                        .build())
+            .setPlspId(new PlspId(Uint32.ONE)).setSync(true).setRemove(false)
+            .setOperational(OperationalStatus.Active).build(), Optional.empty(), createPath(Collections.emptyList()));
     }
 }
index 9abc560b6d6897604b26942969aaeb05fae1065c..2e0067e175f5dc52f39bcc379fd18068785db844 100644 (file)
@@ -5,7 +5,6 @@
  * 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.bgpcep.pcep.topology.provider;
 
 import static org.junit.Assert.assertEquals;
@@ -23,17 +22,14 @@ import org.junit.Test;
 import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.pcc.mock.spi.MsgBuilderUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.PathComputationClient1;
-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.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.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.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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SymbolicPathName;
-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.Tlvs1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.identifiers.tlv.LspIdentifiersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.LspBuilder;
@@ -64,16 +60,16 @@ public class StateSynchronizationAvoidanceProcedureTest extends
         final PCEPSession session = getPCEPSession(getOpen(null), getOpen(null));
         this.listener.onSessionUp(session);
         //report LSP + LSP-DB version number
-        final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setTlvs(
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp
-                        .object.lsp.TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params
-                                .xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1.class,
-                        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
-                                .optimizations.rev181109.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder()
-                                .setLspDbVersionValue(Uint64.ONE).build()).build()).build())
-                        .setPlspId(new PlspId(Uint32.ONE)).setSync(false).setRemove(false)
-                        .setOperational(OperationalStatus.Active).build(),
-                Optional.of(MsgBuilderUtil.createSrp(Uint32.ONE)), null);
+        final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder()
+            .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109
+                .lsp.object.lsp.TlvsBuilder()
+                    .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
+                        .pcep.sync.optimizations.rev181109.Tlvs1Builder()
+                            .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(Uint64.ONE).build())
+                            .build())
+                    .build())
+            .setPlspId(new PlspId(Uint32.ONE)).setSync(false).setRemove(false).setOperational(OperationalStatus.Active)
+            .build(), Optional.of(MsgBuilderUtil.createSrp(Uint32.ONE)), null);
         this.listener.onMessage(session, pcRpt);
         //check topology
         readDataOperational(getDataBroker(), this.pathComputationClientIId.builder()
@@ -110,15 +106,18 @@ public class StateSynchronizationAvoidanceProcedureTest extends
         PCEPSession session = getPCEPSession(getOpen(null), getOpen(null));
         this.listener.onSessionUp(session);
         //report LSP + LSP-DB version number
-        final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setPlspId(new PlspId(Uint32.ONE))
-                .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful
-                        .rev181109.lsp.object.lsp.TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder()
-                        .setLspId(new LspId(Uint32.ONE)).build()).setSymbolicPathName(new SymbolicPathNameBuilder()
-                        .setPathName(new SymbolicPathName("test".getBytes())).build()).addAugmentation(org.opendaylight
-                        .yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109
-                        .Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
-                        .pcep.sync.optimizations.rev181109.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder()
-                        .setLspDbVersionValue(Uint64.ONE).build()).build()).build())
+        final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder()
+            .setPlspId(new PlspId(Uint32.ONE))
+            .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109
+                .lsp.object.lsp.TlvsBuilder()
+                    .setLspIdentifiers(new LspIdentifiersBuilder().setLspId(new LspId(Uint32.ONE)).build())
+                    .setSymbolicPathName(new SymbolicPathNameBuilder()
+                        .setPathName(new SymbolicPathName("test".getBytes())).build())
+                    .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
+                        .pcep.sync.optimizations.rev181109.Tlvs1Builder()
+                        .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(Uint64.ONE).build())
+                        .build())
+                    .build())
                 .setPlspId(new PlspId(Uint32.ONE)).setSync(true).setRemove(false)
                 .setOperational(OperationalStatus.Active)
                 .build(), Optional.empty(), createPath(Collections.emptyList()));
@@ -148,11 +147,10 @@ public class StateSynchronizationAvoidanceProcedureTest extends
         //sync rpt + LSP-DB
         final Pcrpt syncMsg = MsgBuilderUtil.createPcRtpMessage(createLsp(Uint32.ZERO, false, Optional.of(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109
-                        .lsp.object.lsp.TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight
-                                .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1.class,
-                        new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
-                                .optimizations.rev181109.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder()
-                                .setLspDbVersionValue(Uint64.TWO).build()).build()).build()),
+                        .lsp.object.lsp.TlvsBuilder().addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight
+                            .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1Builder()
+                            .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(Uint64.TWO).build())
+                            .build()).build()),
                 true, false), Optional.empty(),
                 createPath(Collections.emptyList()));
         this.listener.onMessage(session, syncMsg);
@@ -166,14 +164,12 @@ public class StateSynchronizationAvoidanceProcedureTest extends
     }
 
     private Open getOpen(final LspDbVersion dbVersion) {
-        return new OpenBuilder(super.getLocalPref()).setTlvs(new TlvsBuilder().addAugmentation(Tlvs1.class,
-            new Tlvs1Builder().setStateful(new StatefulBuilder()
-            .addAugmentation(Stateful1.class, new Stateful1Builder().setInitiation(Boolean.TRUE).build())
-            .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
-                    .optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params
-                    .xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder()
-                .setIncludeDbVersion(Boolean.TRUE).build()).build()).build()).addAugmentation(Tlvs3.class,
-            new Tlvs3Builder().setLspDbVersion(dbVersion).build()).build()).build();
+        return new OpenBuilder(super.getLocalPref()).setTlvs(new TlvsBuilder().addAugmentation(new Tlvs1Builder()
+            .setStateful(new StatefulBuilder()
+                .addAugmentation(new Stateful1Builder().setInitiation(Boolean.TRUE).build())
+                .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep
+                    .sync.optimizations.rev181109.Stateful1Builder()
+                    .setIncludeDbVersion(Boolean.TRUE).build()).build()).build())
+            .addAugmentation(new Tlvs3Builder().setLspDbVersion(dbVersion).build()).build()).build();
     }
-
 }
index ee0d4c04857bc9172a16c0db1de4ea9cfff7610b..15827aa130767135114450ec6ab495b8431811aa 100644 (file)
@@ -40,14 +40,10 @@ 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.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.crabbe.initiated.rev181109.pcinitiate.message.pcinitiate.message.Requests;
-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.Arguments1Builder;
-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.Arguments2Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Arguments3;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Arguments3Builder;
 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;
@@ -55,7 +51,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 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.PlspId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SymbolicPathName;
-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.Tlvs1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.identifiers.tlv.LspIdentifiersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.LspBuilder;
@@ -242,8 +237,7 @@ public class Stateful07TopologySessionListenerTest
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.ensure.lsp
                 .operational.args.ArgumentsBuilder ensureArgs = new org.opendaylight.yang.gen.v1.urn.opendaylight.params
                 .xml.ns.yang.topology.pcep.rev200120.ensure.lsp.operational.args.ArgumentsBuilder();
-        ensureArgs.addAugmentation(Arguments1.class, new Arguments1Builder().setOperational(OperationalStatus.Active)
-                .build());
+        ensureArgs.addAugmentation(new Arguments1Builder().setOperational(OperationalStatus.Active).build());
         final EnsureLspOperationalInput ensure = new EnsureLspOperationalInputBuilder().setArguments(ensureArgs.build())
                 .setName(this.tunnelName).setNetworkTopologyRef(new NetworkTopologyRef(TOPO_IID))
                 .setNode(this.nodeId).build();
@@ -512,7 +506,7 @@ public class Stateful07TopologySessionListenerTest
                 .ArgumentsBuilder updArgsBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
                 .topology.pcep.rev200120.update.lsp.args.ArgumentsBuilder();
         updArgsBuilder.setEro(createEroWithIpPrefixes(Lists.newArrayList(this.eroIpPrefix, this.dstIpPrefix)));
-        updArgsBuilder.addAugmentation(Arguments3.class, new Arguments3Builder().setLsp(new LspBuilder()
+        updArgsBuilder.addAugmentation(new Arguments3Builder().setLsp(new LspBuilder()
                 .setDelegate(TRUE).setAdministrative(TRUE).build()).build());
         final UpdateLspInput update = new UpdateLspInputBuilder().setArguments(updArgsBuilder.build())
                 .setName(this.tunnelName).setNetworkTopologyRef(new NetworkTopologyRef(TOPO_IID)).setNode(this.nodeId)
@@ -637,14 +631,12 @@ public class Stateful07TopologySessionListenerTest
 
     @Override
     protected Open getLocalPref() {
-        return new OpenBuilder(super.getLocalPref()).setTlvs(new TlvsBuilder().addAugmentation(Tlvs1.class,
-                new Tlvs1Builder().setStateful(new StatefulBuilder()
-                        .addAugmentation(Stateful1.class, new Stateful1Builder().setInitiation(TRUE).build())
-                        .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
-                                .pcep.sync.optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1
-                                .urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109
-                                .Stateful1Builder().setTriggeredInitialSync(TRUE).build())
-                        .build()).build()).build()).build();
+        return new OpenBuilder(super.getLocalPref()).setTlvs(new TlvsBuilder().addAugmentation(new Tlvs1Builder()
+            .setStateful(new StatefulBuilder()
+                .addAugmentation(new Stateful1Builder().setInitiation(TRUE).build())
+                .addAugmentation(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep
+                    .sync.optimizations.rev181109.Stateful1Builder().setTriggeredInitialSync(TRUE).build())
+                .build()).build()).build()).build();
     }
 
     @Override
@@ -659,7 +651,7 @@ public class Stateful07TopologySessionListenerTest
                 .setDestinationIpv4Address(new Ipv4AddressNoZone(this.testAddress)).build());
         argsBuilder.setEndpointsObj(new EndpointsObjBuilder().setAddressFamily(ipv4Builder.build()).build());
         argsBuilder.setEro(createEroWithIpPrefixes(Lists.newArrayList(this.eroIpPrefix)));
-        argsBuilder.addAugmentation(Arguments2.class, new Arguments2Builder().setLsp(new LspBuilder()
+        argsBuilder.addAugmentation(new Arguments2Builder().setLsp(new LspBuilder()
                 .setDelegate(TRUE).setAdministrative(TRUE).build()).build());
         return new AddLspInputBuilder().setName(this.tunnelName).setArguments(argsBuilder.build())
                 .setNetworkTopologyRef(new NetworkTopologyRef(TOPO_IID)).setNode(this.nodeId).build();
index 156f0811f441f6b1eb33ef11323f67a2887a32b8..ae1129ab4dd1ef36d584029709d96999232abfbd 100644 (file)
@@ -5,7 +5,6 @@
  * 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.bgpcep.pcep.topology.provider;
 
 import static org.junit.Assert.assertFalse;
@@ -17,12 +16,9 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.protocol.pcep.PCEPSession;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder;
-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.Tlvs3Builder;
 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.ietf.stateful.rev181109.Tlvs1;
 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;
@@ -118,10 +114,10 @@ public class SyncOptimizationTest {
     private static Tlvs createTlvs(final Long lspDbVersion, final boolean includeDbVresion,
             final boolean includeDeltaSync) {
         return new TlvsBuilder()
-            .addAugmentation(Tlvs1.class, new Tlvs1Builder().setStateful(new StatefulBuilder()
-                    .addAugmentation(Stateful1.class, new Stateful1Builder().setIncludeDbVersion(includeDbVresion)
+            .addAugmentation(new Tlvs1Builder().setStateful(new StatefulBuilder()
+                    .addAugmentation(new Stateful1Builder().setIncludeDbVersion(includeDbVresion)
                             .setDeltaLspSyncCapability(includeDeltaSync).build()).build()).build())
-            .addAugmentation(Tlvs3.class, new Tlvs3Builder().setLspDbVersion(
+            .addAugmentation(new Tlvs3Builder().setLspDbVersion(
                 new LspDbVersionBuilder().setLspDbVersionValue(lspDbVersion != null
                         ? Uint64.valueOf(lspDbVersion) : null).build()).build()).build();
     }
index f253c56f2b5110e28e46887f7ef29c151971f029..3b87ba932432e9c37e9f264f1e341397fb4e23fe 100644 (file)
@@ -23,7 +23,6 @@ import org.opendaylight.bgpcep.pcep.topology.provider.TopologyProgrammingTest.Mo
 import org.opendaylight.bgpcep.programming.spi.Instruction;
 import org.opendaylight.bgpcep.programming.spi.InstructionScheduler;
 import org.opendaylight.protocol.pcep.PCEPSession;
-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.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;
@@ -215,7 +214,7 @@ public class TopologyProgrammingTest extends AbstractPCEPSessionTest<MockedTopol
     @Override
     protected Open getLocalPref() {
         return new OpenBuilder(super.getLocalPref()).setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params
-                .xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder().addAugmentation(Tlvs1.class,
+                .xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder().addAugmentation(
                 new Tlvs1Builder().setStateful(new StatefulBuilder().build()).build()).build()).build();
     }
 }