From: Claudio D. Gasparini Date: Wed, 27 Apr 2016 14:22:31 +0000 (+0200) Subject: Code clean up X-Git-Tag: release/boron~177 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=68d89408be4243f3e11b854b6864d6e78a10d1d4;p=bgpcep.git Code clean up Remove deprecated leafs on extended-community and obsolete choice c-segment Change-Id: If62d0fede00d15b0c3bfa7da139009eecc8beaff Signed-off-by: Claudio D. Gasparini --- diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/test/TestUtil.java b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/test/TestUtil.java index 9f05d15191..fa57c4fe44 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/test/TestUtil.java +++ b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/test/TestUtil.java @@ -56,10 +56,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.ClusterIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.AListCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.a.list._case.AListBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.a.list._case.a.list.AsSequence; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.a.list._case.a.list.AsSequenceBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.AdjRibInType; @@ -296,20 +292,10 @@ public final class TestUtil { } private static Attributes createAttributes() { - final AsSequenceBuilder asSeqBuilder = new AsSequenceBuilder(); - asSeqBuilder.setAs(new AsNumber(72L)); - asSeqBuilder.build(); - final AsSequenceBuilder asSeqBuilder2 = new AsSequenceBuilder(); - asSeqBuilder.setAs(new AsNumber(82L)); - asSeqBuilder.build(); - final AsSequenceBuilder asSeqBuilder3 = new AsSequenceBuilder(); - asSeqBuilder.setAs(new AsNumber(92L)); - asSeqBuilder.build(); - - final List asSequences = Lists.newArrayList(asSeqBuilder.build(), asSeqBuilder2.build(), asSeqBuilder3.build()); + final List asSequences = Lists.newArrayList(new AsNumber(72L), new AsNumber(82L), new AsNumber(92L)); final List segments = Lists.newArrayList(); final SegmentsBuilder segmentsBuild = new SegmentsBuilder(); - segmentsBuild.setCSegment(new AListCaseBuilder().setAList(new AListBuilder().setAsSequence(asSequences).build()).build()); + segmentsBuild.setAsSequence(asSequences).build(); final AttributesBuilder attribBuilder = new AttributesBuilder() .setAggregator(new AggregatorBuilder().setAsNumber(new AsNumber(72L)).setNetworkAddress(new Ipv4Address(IPV4_ADDRESS_20)).build()) diff --git a/bgp/concepts/src/main/yang/bgp-types.yang b/bgp/concepts/src/main/yang/bgp-types.yang index 97c0291d0c..bda5035505 100644 --- a/bgp/concepts/src/main/yang/bgp-types.yang +++ b/bgp/concepts/src/main/yang/bgp-types.yang @@ -165,24 +165,12 @@ module bgp-types { } grouping extended-community { - leaf comm-type { - status deprecated; - type uint8; - } - leaf comm-sub-type { - status deprecated; - type uint8; - } leaf transitive { type boolean; } choice extended-community { case as-specific-extended-community-case { container as-specific-extended-community { - leaf transitive { - status deprecated; - type boolean; - } leaf global-administrator { type short-as-number; } @@ -195,10 +183,6 @@ module bgp-types { } case inet4-specific-extended-community-case { container inet4-specific-extended-community { - leaf transitive { - status deprecated; - type boolean; - } leaf global-administrator { type inet:ipv4-address; } @@ -211,10 +195,6 @@ module bgp-types { } case opaque-extended-community-case { container opaque-extended-community { - leaf transitive { - status deprecated; - type boolean; - } leaf value { type binary { length "6"; @@ -292,26 +272,6 @@ module bgp-types { grouping as-path-segment { reference "http://tools.ietf.org/html/rfc4271#section-5.1.2"; - choice c-segment { - description "This model is obsolete and please use just leaf-lists as-sequence and as-set nested directly under as-path-segment."; - status obsolete; - case a-set-case { - container a-set { - leaf-list as-set { - type inet:as-number; - } - } - } - case a-list-case { - container a-list { - list as-sequence { - leaf as { - type inet:as-number; - } - } - } - } - } leaf-list as-sequence { type inet:as-number; ordered-by user; diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandler.java index 08a5332697..75eb3de6d1 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandler.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandler.java @@ -29,7 +29,7 @@ public final class Ipv4SpecificEcHandler extends AbstractIpv4ExtendedCommunity { @Override public ExtendedCommunity parseExtendedCommunity(final ByteBuf buffer) throws BGPDocumentedException, BGPParsingException { return new Inet4SpecificExtendedCommunityCaseBuilder().setInet4SpecificExtendedCommunity( - new Inet4SpecificExtendedCommunityBuilder().setTransitive(true).setGlobalAdministrator( + new Inet4SpecificExtendedCommunityBuilder().setGlobalAdministrator( Ipv4Util.addressForByteBuf(buffer)).setLocalAdministrator( ByteArray.readBytes(buffer, INET_LOCAL_ADMIN_LENGTH)).build()).build(); } diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandlerTest.java index 3e2315d99e..1c80c83618 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandlerTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandlerTest.java @@ -30,7 +30,7 @@ public class Ipv4SpecificEcHandlerTest { public void testHandler() throws BGPDocumentedException, BGPParsingException { final Ipv4SpecificEcHandler handler = new Ipv4SpecificEcHandler(); final Inet4SpecificExtendedCommunityCase expected = new Inet4SpecificExtendedCommunityCaseBuilder().setInet4SpecificExtendedCommunity( - new Inet4SpecificExtendedCommunityBuilder().setTransitive(true).setGlobalAdministrator(new Ipv4Address("12.51.2.5")).setLocalAdministrator( + new Inet4SpecificExtendedCommunityBuilder().setGlobalAdministrator(new Ipv4Address("12.51.2.5")).setLocalAdministrator( new byte[] { 21, 45 }).build()).build(); final ExtendedCommunity exComm = handler.parseExtendedCommunity(Unpooled.copiedBuffer(INPUT)); diff --git a/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java b/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java index 6ff58ec088..87f40b27e6 100644 --- a/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java +++ b/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java @@ -62,10 +62,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv6AddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.MplsLabeledVpnSubsequentAddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.AListCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.a.list._case.AListBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.a.list._case.a.list.AsSequence; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.a.list._case.a.list.AsSequenceBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.CNextHop; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv6NextHopCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHopBuilder; @@ -151,10 +147,8 @@ public class BGPMessageParserMockTest { final UpdateBuilder builder = new UpdateBuilder(); - final List asnums = Lists.newArrayList(new AsSequenceBuilder().setAs(new AsNumber(asn)).build()); final List asPath = Lists.newArrayList(); - asPath.add(new SegmentsBuilder().setCSegment( - new AListCaseBuilder().setAList(new AListBuilder().setAsSequence(asnums).build()).build()).build()); + asPath.add(new SegmentsBuilder().setAsSequence(Lists.newArrayList(new AsNumber(asn))).build()); final CNextHop nextHop = new Ipv6NextHopCaseBuilder().setIpv6NextHop( new Ipv6NextHopBuilder().setGlobal(new Ipv6Address("2001:db8::1")).setLinkLocal(new Ipv6Address("fe80::c001:bff:fe7e:0")).build()).build();