From: Dana Kutenicsova Date: Sun, 29 Sep 2013 18:42:54 +0000 (+0200) Subject: moved BGP Table type from concepts to parser-api. X-Git-Tag: jenkins-bgpcep-bulk-release-prepare-only-1~237^2~239 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=76537cd41927cce01291825af086ba821e5f2240;p=bgpcep.git moved BGP Table type from concepts to parser-api. Change-Id: I10a610d7bb1288310de1a198abd4433d25e00415 Signed-off-by: Dana Kutenicsova --- diff --git a/bgp/concepts/src/test/java/org/opendaylight/protocol/bgp/concepts/ClusterIdentifierTest.java b/bgp/concepts/src/test/java/org/opendaylight/protocol/bgp/concepts/ClusterIdentifierTest.java index ec6d9d8535..ad82accf23 100644 --- a/bgp/concepts/src/test/java/org/opendaylight/protocol/bgp/concepts/ClusterIdentifierTest.java +++ b/bgp/concepts/src/test/java/org/opendaylight/protocol/bgp/concepts/ClusterIdentifierTest.java @@ -8,8 +8,11 @@ package org.opendaylight.protocol.bgp.concepts; import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import org.junit.Test; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpOrigin; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.ClusterIdentifier; public class ClusterIdentifierTest { @@ -32,4 +35,25 @@ public class ClusterIdentifierTest { assertArrayEquals(id1.getValue(), new byte[] { 13, 14, 15, 16 }); } + + @Test + public void testOrigin() { + final BgpOrigin or = BgpOrigin.Egp; + assertEquals(or.name(), "Egp"); + } + + @Test + public void testBaseBGPObjectState() { + final BaseBGPObjectState state = new BaseBGPObjectState(BgpOrigin.Incomplete, null); + final BaseBGPObjectState state1 = new BaseBGPObjectState(BgpOrigin.Incomplete, null); + assertNull(state.getAggregator()); + assertEquals(BgpOrigin.Incomplete, state.getOrigin()); + assertEquals(state.toString(), state1.toString()); + + final BaseBGPObjectState s = new BaseBGPObjectState(state); + assertEquals(state, s); + assertEquals(state.hashCode(), s.hashCode()); + + assertEquals(s, s.newInstance()); + } } diff --git a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPSession.java b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPSession.java index fcfd73c808..dd3269df05 100644 --- a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPSession.java +++ b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPSession.java @@ -9,7 +9,6 @@ package org.opendaylight.protocol.bgp.parser; import java.util.Set; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.framework.ProtocolSession; import org.opendaylight.yangtools.yang.binding.Notification; diff --git a/bgp/concepts/src/main/java/org/opendaylight/protocol/bgp/concepts/BGPTableType.java b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPTableType.java similarity index 97% rename from bgp/concepts/src/main/java/org/opendaylight/protocol/bgp/concepts/BGPTableType.java rename to bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPTableType.java index dc9aee8c88..5c223aee22 100644 --- a/bgp/concepts/src/main/java/org/opendaylight/protocol/bgp/concepts/BGPTableType.java +++ b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPTableType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bgp.concepts; +package org.opendaylight.protocol.bgp.parser; import org.opendaylight.protocol.concepts.Identifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.AddressFamily; diff --git a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPUpdateSynchronized.java b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPUpdateSynchronized.java index a5adc6e745..2cd2277c03 100644 --- a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPUpdateSynchronized.java +++ b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPUpdateSynchronized.java @@ -7,7 +7,6 @@ */ package org.opendaylight.protocol.bgp.parser; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; /** * Update event indicating that a RIB has reached initial synchronization. An instance of this interface is generated diff --git a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/parameter/GracefulCapability.java b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/parameter/GracefulCapability.java index 3e2027641c..fbc10baf9e 100644 --- a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/parameter/GracefulCapability.java +++ b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/parameter/GracefulCapability.java @@ -9,7 +9,7 @@ package org.opendaylight.protocol.bgp.parser.parameter; import java.util.Map; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; +import org.opendaylight.protocol.bgp.parser.BGPTableType; /** diff --git a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/parameter/MultiprotocolCapability.java b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/parameter/MultiprotocolCapability.java index 0342499bb5..effecf0b5e 100644 --- a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/parameter/MultiprotocolCapability.java +++ b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/parameter/MultiprotocolCapability.java @@ -7,7 +7,7 @@ */ package org.opendaylight.protocol.bgp.parser.parameter; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.AddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.SubsequentAddressFamily; diff --git a/bgp/parser-api/src/main/yang/bgp-multiprotocol.yang b/bgp/parser-api/src/main/yang/bgp-multiprotocol.yang index 9aa6c55674..e071296f01 100644 --- a/bgp/parser-api/src/main/yang/bgp-multiprotocol.yang +++ b/bgp/parser-api/src/main/yang/bgp-multiprotocol.yang @@ -66,9 +66,7 @@ module bgp-multiprotocol { list capabilities { container multiprotocol-capability { reference "http://tools.ietf.org/html/rfc4760#section-8"; - container table-type { - uses bgp-table-type; - } + uses bgp-table-type; } } } diff --git a/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java b/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java index 5a706d8259..af6abf2526 100644 --- a/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java +++ b/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java @@ -19,7 +19,6 @@ import java.util.Collections; import java.util.Map; import org.junit.Test; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.concepts.BaseBGPObjectState; import org.opendaylight.protocol.bgp.linkstate.ISISAreaIdentifier; import org.opendaylight.protocol.bgp.linkstate.LinkProtectionType; diff --git a/bgp/concepts/src/test/java/org/opendaylight/protocol/bgp/concepts/TableTypeTest.java b/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/TableTypeTest.java similarity index 71% rename from bgp/concepts/src/test/java/org/opendaylight/protocol/bgp/concepts/TableTypeTest.java rename to bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/TableTypeTest.java index eb2cf98e4a..cf9e3a8d2a 100644 --- a/bgp/concepts/src/test/java/org/opendaylight/protocol/bgp/concepts/TableTypeTest.java +++ b/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/TableTypeTest.java @@ -5,16 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.protocol.bgp.concepts; +package org.opendaylight.protocol.bgp.parser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; import org.junit.Test; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpOrigin; 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.Ipv6AddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.MplsLabeledVpnSubsequentAddressFamily; @@ -48,25 +46,4 @@ public class TableTypeTest { assertNotSame(tt1.getAddressFamily(), tt2.getAddressFamily()); assertEquals(tt1.getSubsequentAddressFamily(), tt2.getSubsequentAddressFamily()); } - - @Test - public void testOrigin() { - final BgpOrigin or = BgpOrigin.Egp; - assertEquals(or.name(), "Egp"); - } - - @Test - public void testBaseBGPObjectState() { - final BaseBGPObjectState state = new BaseBGPObjectState(BgpOrigin.Incomplete, null); - final BaseBGPObjectState state1 = new BaseBGPObjectState(BgpOrigin.Incomplete, null); - assertNull(state.getAggregator()); - assertEquals(BgpOrigin.Incomplete, state.getOrigin()); - assertEquals(state.toString(), state1.toString()); - - final BaseBGPObjectState s = new BaseBGPObjectState(state); - assertEquals(state, s); - assertEquals(state.hashCode(), s.hashCode()); - - assertEquals(s, s.newInstance()); - } } diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java index 6a113f99b2..a1d76cbaa2 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java @@ -13,10 +13,10 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPDocumentedException; import org.opendaylight.protocol.bgp.parser.BGPError; import org.opendaylight.protocol.bgp.parser.BGPParsingException; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPUpdateEvent; import org.opendaylight.protocol.bgp.parser.BGPUpdateSynchronized; import org.opendaylight.protocol.bgp.parser.impl.BGPMessageFactoryImpl; diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java index 4b2d95fced..6818660673 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java @@ -10,8 +10,8 @@ package org.opendaylight.protocol.bgp.parser.impl.message.open; import java.util.Arrays; import java.util.Map.Entry; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPParsingException; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.impl.ParserUtil; import org.opendaylight.protocol.bgp.parser.parameter.AS4BytesCapability; import org.opendaylight.protocol.bgp.parser.parameter.CapabilityParameter; diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java index 3faef75621..c26b103099 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java @@ -24,7 +24,6 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.protocol.bgp.concepts.BGPObject; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.concepts.BaseBGPObjectState; import org.opendaylight.protocol.bgp.linkstate.AreaIdentifier; import org.opendaylight.protocol.bgp.linkstate.DomainIdentifier; @@ -48,6 +47,7 @@ import org.opendaylight.protocol.bgp.parser.BGPLink; import org.opendaylight.protocol.bgp.parser.BGPNode; import org.opendaylight.protocol.bgp.parser.BGPParameter; import org.opendaylight.protocol.bgp.parser.BGPRoute; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPUpdateEvent; import org.opendaylight.protocol.bgp.parser.BGPUpdateMessage; import org.opendaylight.protocol.bgp.parser.BGPUpdateSynchronized; 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 148d62290b..c9fcbe13b9 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 @@ -26,12 +26,12 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; import org.opendaylight.protocol.bgp.concepts.BGPObject; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.concepts.BaseBGPObjectState; import org.opendaylight.protocol.bgp.linkstate.NetworkObjectState; import org.opendaylight.protocol.bgp.linkstate.NetworkRouteState; import org.opendaylight.protocol.bgp.parser.BGPParameter; import org.opendaylight.protocol.bgp.parser.BGPRoute; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPUpdateMessage; import org.opendaylight.protocol.bgp.parser.impl.BGPUpdateMessageImpl; import org.opendaylight.protocol.bgp.parser.message.BGPOpenMessage; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java index 16e4e71f2c..ed9a811615 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java @@ -9,9 +9,9 @@ package org.opendaylight.protocol.bgp.rib.impl; import java.util.Set; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPSession; import org.opendaylight.protocol.bgp.parser.BGPSessionListener; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPTerminationReason; import org.opendaylight.protocol.bgp.parser.BGPUpdateMessage; import org.opendaylight.yangtools.yang.binding.Notification; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java index 35255c7bd9..c537fdfe64 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java @@ -19,11 +19,11 @@ import java.util.concurrent.TimeUnit; import javax.annotation.concurrent.GuardedBy; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPError; import org.opendaylight.protocol.bgp.parser.BGPParameter; import org.opendaylight.protocol.bgp.parser.BGPSession; import org.opendaylight.protocol.bgp.parser.BGPSessionListener; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPTerminationReason; import org.opendaylight.protocol.bgp.parser.message.BGPNotificationMessage; import org.opendaylight.protocol.bgp.parser.message.BGPOpenMessage; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionProposalImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionProposalImpl.java index 78f0e65fed..199b453631 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionProposalImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionProposalImpl.java @@ -9,8 +9,8 @@ package org.opendaylight.protocol.bgp.rib.impl; import java.util.List; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPParameter; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.parameter.AS4BytesCapability; import org.opendaylight.protocol.bgp.parser.parameter.MultiprotocolCapability; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSynchronization.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSynchronization.java index 28ea097592..c505fa6613 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSynchronization.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSynchronization.java @@ -12,13 +12,13 @@ import java.util.Map.Entry; import java.util.Set; import org.opendaylight.protocol.bgp.concepts.BGPObject; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPLink; import org.opendaylight.protocol.bgp.parser.BGPNode; import org.opendaylight.protocol.bgp.parser.BGPPrefix; import org.opendaylight.protocol.bgp.parser.BGPRoute; import org.opendaylight.protocol.bgp.parser.BGPSession; import org.opendaylight.protocol.bgp.parser.BGPSessionListener; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPUpdateMessage; import org.opendaylight.protocol.bgp.parser.BGPUpdateSynchronized; import org.opendaylight.protocol.bgp.util.BGPIPv4RouteImpl; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPUpdateSynchronizedImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPUpdateSynchronizedImpl.java index 6b2d84878f..695d849ecc 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPUpdateSynchronizedImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPUpdateSynchronizedImpl.java @@ -7,7 +7,7 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPUpdateSynchronized; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java index ee4b1c861d..b223911905 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java @@ -14,7 +14,6 @@ import java.util.Set; import javax.annotation.concurrent.ThreadSafe; import org.opendaylight.protocol.bgp.concepts.BGPObject; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.linkstate.LinkIdentifier; import org.opendaylight.protocol.bgp.linkstate.NodeIdentifier; import org.opendaylight.protocol.bgp.linkstate.PrefixIdentifier; @@ -26,6 +25,7 @@ import org.opendaylight.protocol.bgp.parser.BGPPrefix; import org.opendaylight.protocol.bgp.parser.BGPPrefixState; import org.opendaylight.protocol.bgp.parser.BGPRoute; import org.opendaylight.protocol.bgp.parser.BGPRouteState; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.concepts.Prefix; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev130918.LinkstateAddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily; diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ApiTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ApiTest.java index e26ceb05e8..98ff7baa57 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ApiTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ApiTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import org.junit.Test; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPUpdateSynchronized; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber; diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java index bbdd334dfb..55a82b5825 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java @@ -32,9 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPError; import org.opendaylight.protocol.bgp.parser.BGPParameter; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.message.BGPNotificationMessage; import org.opendaylight.protocol.bgp.parser.message.BGPOpenMessage; import org.opendaylight.protocol.bgp.parser.parameter.MultiprotocolCapability; diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserTest.java index f6d403c0f9..a1f87bad1b 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserTest.java @@ -21,10 +21,10 @@ import java.util.List; import java.util.Map; import org.junit.Test; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPDocumentedException; import org.opendaylight.protocol.bgp.parser.BGPError; import org.opendaylight.protocol.bgp.parser.BGPParameter; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.impl.BGPMessageFactoryImpl; import org.opendaylight.protocol.bgp.parser.message.BGPNotificationMessage; import org.opendaylight.protocol.bgp.parser.message.BGPOpenMessage; diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionListener.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionListener.java index 92f3d6138e..19b8caab9e 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionListener.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionListener.java @@ -10,9 +10,9 @@ package org.opendaylight.protocol.bgp.rib.impl; import java.util.List; import java.util.Set; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPSession; import org.opendaylight.protocol.bgp.parser.BGPSessionListener; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPTerminationReason; import org.opendaylight.yangtools.yang.binding.Notification; import org.slf4j.Logger; diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationTest.java index 77a405ee48..7337dc4bae 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationTest.java @@ -16,10 +16,10 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; import org.opendaylight.protocol.bgp.concepts.BGPObject; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.concepts.BaseBGPObjectState; import org.opendaylight.protocol.bgp.parser.BGPLink; import org.opendaylight.protocol.bgp.parser.BGPSession; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPUpdateMessage; import org.opendaylight.protocol.bgp.parser.impl.BGPUpdateMessageImpl; import org.opendaylight.protocol.bgp.util.BGPIPv4RouteImpl; diff --git a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java index f30a814ea3..5bdbaf0399 100644 --- a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java +++ b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/EventBusRegistration.java @@ -12,10 +12,10 @@ import java.util.Set; import javax.annotation.concurrent.GuardedBy; -import org.opendaylight.protocol.bgp.concepts.BGPTableType; import org.opendaylight.protocol.bgp.parser.BGPParameter; import org.opendaylight.protocol.bgp.parser.BGPSession; import org.opendaylight.protocol.bgp.parser.BGPSessionListener; +import org.opendaylight.protocol.bgp.parser.BGPTableType; import org.opendaylight.protocol.bgp.parser.message.BGPOpenMessage; import org.opendaylight.protocol.bgp.parser.parameter.MultiprotocolCapability; import org.opendaylight.protocol.concepts.ListenerRegistration;