From 35799fa6ff3feb89ebb2ff9e0b8ad1e2ad699428 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 17 Jul 2018 08:57:41 +0200 Subject: Remove workarounds from ietf-routing-types related to MDSAL-269 Change-Id: Iadd17a3a44a20711e58c272934fb15dfe89bf2be Signed-off-by: Marek Gradzki --- .../src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java | 7 ++++--- .../src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java | 6 +++--- .../src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java | 3 ++- mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java | 8 +++++--- 4 files changed, 14 insertions(+), 10 deletions(-) (limited to 'mpls/impl/src/test/java/io') diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java index 12312af37..bcd888bef 100644 --- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java +++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/ImposeAndForwardTest.java @@ -54,6 +54,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170702.routing.Mpls; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev180313.Routing; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.types.rev171204.MplsLabel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.types.rev171204.MplsLabelGeneralUse; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class ImposeAndForwardTest extends WriterCustomizerTest implements ByteDataTranslator, MplsLabelTranslator { @@ -91,7 +92,7 @@ public class ImposeAndForwardTest extends WriterCustomizerTest implements ByteDa new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702._static.lsp.paths.out.segment.simple.path.simple.path.ConfigBuilder() .setNextHop(nextHop) .setOutgoingInterface(IF_NAME) - .setOutgoingLabel(new MplsLabel(label)) + .setOutgoingLabel(new MplsLabel(new MplsLabelGeneralUse(label))) .build()).build()) .build()) .build(); @@ -133,13 +134,13 @@ public class ImposeAndForwardTest extends WriterCustomizerTest implements ByteDa new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.path.outgoing.labels.outgoing.labels.OutgoingLabelsBuilder() .setIndex((short) 0) .setConfig(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.path.outgoing.labels.outgoing.labels.outgoing.labels.ConfigBuilder() - .setLabel(new MplsLabel(102L)) + .setLabel(new MplsLabel(new MplsLabelGeneralUse(102L))) .build()) .build(), new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.path.outgoing.labels.outgoing.labels.OutgoingLabelsBuilder() .setIndex((short) 1) .setConfig(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.path.outgoing.labels.outgoing.labels.outgoing.labels.ConfigBuilder() - .setLabel(new MplsLabel(104L)) + .setLabel(new MplsLabel(new MplsLabelGeneralUse(104L))) .build()) .build())) .build()) diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java index 627c3294f..8ee6f1b5d 100644 --- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java +++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndIpv4LookupTest.java @@ -43,6 +43,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170702.routing.Mpls; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev180313.Routing; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.types.rev171204.MplsLabel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.types.rev171204.MplsLabelGeneralUse; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.mpls.rev171120.LookupType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.mpls.rev171120.StaticLspVppLookupAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.mpls.rev171120.StaticLspVppLookupAugmentationBuilder; @@ -76,9 +77,8 @@ public class PopAndIpv4LookupTest extends WriterCustomizerTest implements ByteDa new InSegmentBuilder() .setConfig( new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.in.segment.in.segment.ConfigBuilder() - .setType(new MplsLabelBuilder() - .setIncomingLabel(new MplsLabel((long) LOCAL_LABEL)) - .build()) + .setType(new MplsLabelBuilder().setIncomingLabel( + new MplsLabel(new MplsLabelGeneralUse((long) LOCAL_LABEL))).build()) .build()) .build() diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java index ab069100b..1b347e263 100644 --- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java +++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/PopAndMplsLookupTest.java @@ -43,6 +43,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170702.routing.Mpls; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev180313.Routing; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.types.rev171204.MplsLabel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.types.rev171204.MplsLabelGeneralUse; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.mpls.rev171120.LookupType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.mpls.rev171120.StaticLspVppLookupAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.mpls.rev171120.StaticLspVppLookupAugmentationBuilder; @@ -76,7 +77,7 @@ public class PopAndMplsLookupTest extends WriterCustomizerTest implements ByteDa new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.in.segment.in.segment.ConfigBuilder() .setType( new MplsLabelBuilder() - .setIncomingLabel(new MplsLabel((long) LOCAL_LABEL)) + .setIncomingLabel(new MplsLabel(new MplsLabelGeneralUse((long) LOCAL_LABEL))) .build()) .build()) .build() diff --git a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java index 677bb0914..0ed07097e 100644 --- a/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java +++ b/mpls/impl/src/test/java/io/fd/hc2vpp/mpls/SwapAndForwardTest.java @@ -46,6 +46,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls.rev170702.routing.Mpls; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev180313.Routing; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.types.rev171204.MplsLabel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.types.rev171204.MplsLabelGeneralUse; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class SwapAndForwardTest extends WriterCustomizerTest implements ByteDataTranslator, MplsLabelTranslator { @@ -77,8 +78,9 @@ public class SwapAndForwardTest extends WriterCustomizerTest implements ByteData new InSegmentBuilder() .setConfig( new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.in.segment.in.segment.ConfigBuilder() - .setType(new MplsLabelBuilder().setIncomingLabel(new MplsLabel((long) LOCAL_LABEL)) - .build()) + .setType(new MplsLabelBuilder() + .setIncomingLabel(new MplsLabel(new MplsLabelGeneralUse((long) LOCAL_LABEL))) + .build()) .build()) .build() ) @@ -92,7 +94,7 @@ public class SwapAndForwardTest extends WriterCustomizerTest implements ByteData new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702._static.lsp.paths.out.segment.simple.path.simple.path.ConfigBuilder() .setNextHop(IpAddressBuilder.getDefaultInstance("10.10.24.4")) .setOutgoingInterface(IF_NAME) - .setOutgoingLabel(new MplsLabel((long) OUT_LABEL)) + .setOutgoingLabel(new MplsLabel(new MplsLabelGeneralUse((long) OUT_LABEL))) .build()) .build()) .build()) -- cgit 1.2.3-korg