From 9c40c9c560a5417c59fa67f6e7aafda7281af4db Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Wed, 7 Sep 2016 11:55:04 +0200 Subject: [PATCH] BUG-6647 Increase code coverage and clean up II Remove unused methods, parameters. Change-Id: I14fdf71afc08a5c85fd86ea4a40c9b15993157e1 Signed-off-by: Claudio D. Gasparini (cherry picked from commit f0f2090ce6b2d7c204737352b784275a908d300f) --- .../bmp/impl/app/BmpRouterPeerImpl.java | 5 --- .../protocol/bmp/impl/app/TableContext.java | 4 -- .../protocol/bmp/impl/spi/BmpRouterPeer.java | 7 ---- .../bmp/impl/app/BmpMonitorImplTest.java | 6 +-- .../protocol/bmp/mock/BmpMockUtil.java | 2 +- .../protocol/bmp/mock/BmpMockUtilTest.java | 3 +- .../protocol/bmp/parser/message/TestUtil.java | 4 -- .../bgp/flowspec/handlers/FlowspecParser.java | 15 ------- .../flowspec/handlers/FlowspecSerializer.java | 15 ------- .../SimpleFlowspecIpv4NlriParserTest.java | 7 ++-- .../MultiProtocolCapabilityHandlerTest.java | 1 - .../spi/BGPExtensionConsumerActivator.java | 14 ------- .../SimpleBGPExtensionProviderContext.java | 13 ------ .../protocol/bgp/rib/impl/BGPPeer.java | 9 ---- .../protocol/bgp/rib/impl/BGPSessionImpl.java | 10 ----- .../bgp/rib/impl/spi/BGPServerDispatcher.java | 37 ---------------- .../bgp/rib/impl/spi/BGPSessionProposal.java | 20 --------- .../rib/impl/stats/peer/BGPPeerStatsImpl.java | 7 ---- .../peer/route/PerTableTypeRouteCounter.java | 12 ------ .../impl/BGPApplicationPeerModuleTest.java | 1 - .../yang/bgp/rib/impl/BGPPeerModuleTest.java | 7 ---- .../bgp/rib/impl/AbstractRIBTestSetup.java | 4 +- .../bgp/rib/impl/SimpleSessionListener.java | 5 --- .../protocol/bgp/rib/mock/BGPMock.java | 36 ---------------- .../bgp/rib/spi/BGPSessionListener.java | 7 ---- .../spi/RIBExtensionConsumerActivator.java | 14 ------- .../bgp/testtool/TestingListener.java | 5 --- .../protocol/concepts/KeyMapping.java | 22 ---------- .../pcep/PCEPSessionProposalFactory.java | 11 ----- .../PCEPMonitoringRequestMessageParser.java | 2 +- .../message/PCEPRequestMessageParser.java | 4 +- .../tlv/AbstractVendorSpecificTlvParser.java | 2 - .../protocol/pcep/ietf/PCEPValidatorTest.java | 2 - .../impl/BasePCEPSessionProposalFactory.java | 13 ------ .../protocol/pcep/impl/MockPCE.java | 22 ---------- .../pcep/impl/PCEPDispatcherImplTest.java | 9 +--- .../protocol/pcep/impl/ServerSessionMock.java | 42 ------------------- .../pcep/pcc/mock/PCCSyncOptimization.java | 7 ---- .../pcep/pcc/mock/PCCDispatcherImplTest.java | 3 -- .../spi/PCEPExtensionConsumerActivator.java | 14 ------- .../AbstractTopologySessionListener.java | 4 -- .../topology/provider/TopologyNodeState.java | 4 -- .../PCEPTopologyProviderModuleTest.java | 1 - .../PCEPTunnelTopologyProviderModuleTest.java | 1 - .../SimpleRSVPExtensionProviderContext.java | 13 ------ .../protocol/util/ByteBufWriteUtil.java | 4 -- 46 files changed, 15 insertions(+), 435 deletions(-) delete mode 100644 bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/FlowspecParser.java delete mode 100644 bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/FlowspecSerializer.java delete mode 100644 bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionConsumerActivator.java delete mode 100644 bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPServerDispatcher.java delete mode 100644 bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPSessionProposal.java delete mode 100644 bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerActivator.java delete mode 100644 pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/ServerSessionMock.java delete mode 100644 pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerActivator.java diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java index ef52e1e22b..89f30d943b 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java @@ -202,11 +202,6 @@ public final class BmpRouterPeerImpl implements BmpRouterPeer { close(); } - @Override - public PeerId getPeerId() { - return this.peerId; - } - @Override public void close() { Preconditions.checkState(this.up, "Already closed."); diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java index aed1e9b27b..2c7a80c923 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java @@ -104,10 +104,6 @@ final class TableContext { new NodeIdentifier(TablesUtil.BMP_ROUTES_QNAME)).build()).build()); } - void removeTable(final DOMDataWriteTransaction tx) { - tx.delete(LogicalDatastoreType.OPERATIONAL, this.tableId); - } - void writeRoutes(final DOMDataWriteTransaction tx, final MpReachNlri nlri, final Attributes attributes) { final ContainerNode domNlri = serializeReachNlri(nlri); final ContainerNode routeAttributes = serializeAttributes(attributes); diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/spi/BmpRouterPeer.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/spi/BmpRouterPeer.java index cff9917e42..ab8b0a53ae 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/spi/BmpRouterPeer.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/spi/BmpRouterPeer.java @@ -8,7 +8,6 @@ package org.opendaylight.protocol.bmp.impl.spi; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerId; import org.opendaylight.yangtools.yang.binding.Notification; /** @@ -17,12 +16,6 @@ import org.opendaylight.yangtools.yang.binding.Notification; */ public interface BmpRouterPeer extends AutoCloseable { - /** - * Peer is identified by it's BGP-ID. - * @return PeerId peer identifier. - */ - PeerId getPeerId(); - /** * Process peer-peer message that is related to this peer. * @param message BMP Per-peer message. diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java index 6aeeb3efa4..fa6f752b68 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java +++ b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java @@ -43,7 +43,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.config.yang.bmp.impl.MonitoredRouter; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest; @@ -131,7 +130,6 @@ public class BmpMonitorImplTest extends AbstractDataBrokerTest { private BmpDispatcher dispatcher; private BmpMonitoringStation bmpApp; private BmpMessageRegistry msgRegistry; - private List mrs; private ModuleInfoBackedContext moduleInfoBackedContext; @@ -169,7 +167,7 @@ public class BmpMonitorImplTest extends AbstractDataBrokerTest { this.bmpApp = BmpMonitoringStationImpl.createBmpMonitorInstance(ribExtension, this.dispatcher, getDomBroker(), MONITOR_ID, new InetSocketAddress(InetAddresses.forString(MONITOR_LOCAL_ADDRESS), MONITOR_LOCAL_PORT), Optional.of(keys), - this.mappingService.getCodecFactory(), this.moduleInfoBackedContext.getSchemaContext(), this.mrs); + this.mappingService.getCodecFactory(), this.moduleInfoBackedContext.getSchemaContext(), null); readData(InstanceIdentifier.create(BmpMonitor.class), monitor -> { Assert.assertEquals(1, monitor.getMonitor().size()); @@ -419,7 +417,7 @@ public class BmpMonitorImplTest extends AbstractDataBrokerTest { public void deploySecondInstance() throws Exception { final BmpMonitoringStation monitoringStation2 = BmpMonitoringStationImpl.createBmpMonitorInstance(new SimpleRIBExtensionProviderContext(), this.dispatcher, getDomBroker(), new MonitorId("monitor2"), new InetSocketAddress(InetAddresses.forString(MONITOR_LOCAL_ADDRESS_2), MONITOR_LOCAL_PORT), Optional.of(KeyMapping.getKeyMapping()), - this.mappingService.getCodecFactory(), this.moduleInfoBackedContext.getSchemaContext(), this.mrs); + this.mappingService.getCodecFactory(), this.moduleInfoBackedContext.getSchemaContext(), null); readData(InstanceIdentifier.create(BmpMonitor.class), monitor -> { Assert.assertEquals(2, monitor.getMonitor().size()); diff --git a/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockUtil.java b/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockUtil.java index 254b91a998..6ee8c512ed 100755 --- a/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockUtil.java +++ b/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockUtil.java @@ -94,7 +94,7 @@ final class BmpMockUtil { private static PeerHeader createPeerHeader(final Ipv4Address bgpId, final AdjRibInType ribType) { return new PeerHeaderBuilder() .setAddress(new IpAddress(bgpId)) - .setAdjRibInType(AdjRibInType.PrePolicy) + .setAdjRibInType(ribType) .setAs(new AsNumber(ASN)) .setBgpId(bgpId) .setIpv4(true) diff --git a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockUtilTest.java b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockUtilTest.java index bd7b9156b0..1f00469edc 100644 --- a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockUtilTest.java +++ b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockUtilTest.java @@ -77,7 +77,7 @@ public class BmpMockUtilTest { @Test public void testCreateRouteMonitoringPostPolicy() { final RouteMonitoringMessage routeMonitoring = BmpMockUtil.createRouteMonitoring(PEER_IP, AdjRibInType.PostPolicy, PREFIX); - assertEquals(AdjRibInType.PrePolicy, routeMonitoring.getPeerHeader().getAdjRibInType()); + assertEquals(AdjRibInType.PostPolicy, routeMonitoring.getPeerHeader().getAdjRibInType()); } @Test(expected=UnsupportedOperationException.class) @@ -90,5 +90,4 @@ public class BmpMockUtilTest { throw e.getCause(); } } - } diff --git a/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java index e8616865d1..fbb056eecf 100644 --- a/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java +++ b/bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java @@ -274,10 +274,6 @@ public final class TestUtil { return routeMirrorMsgBuilder.build(); } - public static RouteMirroringMessage createRouteMirrorMsg() { - return createRouteMirrorMsg(IPV4_ADDRESS_10); - } - private static Update createUpdate(final boolean withNormalizedIpv4Prefixes) { final UpdateBuilder updateBuilder = new UpdateBuilder() .setAttributes(createAttributes()) diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/FlowspecParser.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/FlowspecParser.java deleted file mode 100644 index 7296bb2c4e..0000000000 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/FlowspecParser.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.protocol.bgp.flowspec.handlers; - -import io.netty.buffer.ByteBuf; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.flowspec.destination.Flowspec; - -public interface FlowspecParser { - Flowspec parseFlowspec(ByteBuf buffer); -} diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/FlowspecSerializer.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/FlowspecSerializer.java deleted file mode 100644 index 962e6c8088..0000000000 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/FlowspecSerializer.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.protocol.bgp.flowspec.handlers; - -import io.netty.buffer.ByteBuf; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.flowspec.destination.Flowspec; - -public interface FlowspecSerializer { - void serializeFlowspec(Flowspec value, ByteBuf output); -} diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java index 5c8e0e8134..2f04afcbc0 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java @@ -207,7 +207,7 @@ public class SimpleFlowspecIpv4NlriParserTest { final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecCase) (result.getAdvertizedRoutes().getDestinationType())) .getDestinationFlowspec() .getFlowspec(); - testFlows(flows, destinationPrefix, sourcePrefix, prots, prots, ps, dps, sps); + testFlows(flows, destinationPrefix, sourcePrefix, prots, ps, dps, sps); final ByteBuf buffer = Unpooled.buffer(); parser.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv4AddressFamily.class).build()).build()).build(), buffer); @@ -216,7 +216,8 @@ public class SimpleFlowspecIpv4NlriParserTest { assertEquals("all packets to 10.0.1.0/32 AND from 1.2.3.4/32 AND where IP protocol equals to 6 AND where port is greater than or equals to 137 and is less than or equals to 139 or equals to 8080 AND where destination port is greater than 4089 or equals to 179 AND where source port equals to 8080 ", FS_PARSER.stringNlri(flows)); } - private void testFlows(final List flows, final DestinationPrefixCase destinationPrefix, final SourcePrefixCase sourcePrefix, final FlowspecType prots, final FlowspecType flowspecType, final PortCase ps, final FlowspecType dps, final FlowspecType sps) { + private void testFlows(final List flows, final DestinationPrefixCase destinationPrefix, final SourcePrefixCase sourcePrefix, + final FlowspecType prots, final PortCase ps, final FlowspecType dps, final FlowspecType sps) { assertEquals(6, flows.size()); assertEquals(destinationPrefix, flows.get(0).getFlowspecType()); assertEquals(sourcePrefix, flows.get(1).getFlowspecType()); @@ -292,7 +293,7 @@ public class SimpleFlowspecIpv4NlriParserTest { final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecCase) (result.getAdvertizedRoutes().getDestinationType())) .getDestinationFlowspec() .getFlowspec(); - testFlows(flows, destinationPrefix, sourcePrefix, prots, prots, ps, dps, sps); + testFlows(flows, destinationPrefix, sourcePrefix, prots, ps, dps, sps); final ByteBuf buffer = Unpooled.buffer(); parser.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv4AddressFamily.class).build()).build()).build(), buffer); diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java index a4b753263b..c17a60384b 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java @@ -38,7 +38,6 @@ public class MultiProtocolCapabilityHandlerTest { private final static Class safi = UnicastSubsequentAddressFamily.class; @Mock private SubsequentAddressFamilyRegistry safir; @Mock private SubsequentAddressFamilyRegistry safirException; - private final ByteBuf serializedBytes = Unpooled.copiedBuffer(new byte[] {1, 4, 1, 4, 0, 4}); @Before public void setUp() { diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionConsumerActivator.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionConsumerActivator.java deleted file mode 100644 index f01bbd378e..0000000000 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionConsumerActivator.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.protocol.bgp.parser.spi; - -public interface BGPExtensionConsumerActivator { - void start(BGPExtensionConsumerContext context); - - void stop(); -} \ No newline at end of file diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContext.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContext.java index eaf3ee8b46..363a932a2e 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContext.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContext.java @@ -7,7 +7,6 @@ */ package org.opendaylight.protocol.bgp.parser.spi.pojo; -import com.google.common.base.Preconditions; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import java.util.concurrent.atomic.AtomicReference; @@ -147,18 +146,6 @@ public class SimpleBGPExtensionProviderContext extends SimpleBGPExtensionConsume return this.referenceCache; } - public final synchronized int getMaximumCachedObjects() { - return this.maximumCachedObjects; - } - - public final synchronized void setMaximumCachedObjects(final int maximumCachedObjects) { - Preconditions.checkArgument(maximumCachedObjects >= 0); - - final Cache newCache = CacheBuilder.newBuilder().maximumSize(maximumCachedObjects).build(); - newCache.putAll(this.cacheRef.get().asMap()); - this.cacheRef.set(newCache); - } - @Override public AutoCloseable registerExtendedCommunitySerializer(final Class extendedCommunityClass, final ExtendedCommunitySerializer serializer) { 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 272ce08200..da0c276682 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 @@ -417,11 +417,6 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer } } - @Override - public boolean isSessionActive() { - return this.session != null; - } - @Override public synchronized byte[] getRawIdentifier() { return Arrays.copyOf(this.rawIdentifier, this.rawIdentifier.length); @@ -439,10 +434,6 @@ public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeer } } - public synchronized void registerRootRuntimeBean(final BGPPeerRuntimeRegistrator registrator) { - this.registrator = registrator; - } - @Override public BgpSessionState getBgpSessionState() { if (this.session instanceof BGPSessionStats) { 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 9f3277539f..2dad1f7475 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 @@ -452,16 +452,6 @@ public class BGPSessionImpl extends SimpleChannelInboundHandler im return this.channel != null && this.channel.isWritable(); } - void schedule(final Runnable task) { - Preconditions.checkState(this.channel != null); - this.channel.eventLoop().submit(task); - } - - @VisibleForTesting - protected synchronized void setLastMessageSentAt(final long lastMessageSentAt) { - this.lastMessageSentAt = lastMessageSentAt; - } - @Override public synchronized BgpSessionState getBgpSessionState() { return this.sessionStats.getBgpSessionState(); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPServerDispatcher.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPServerDispatcher.java deleted file mode 100644 index 7325d6d73f..0000000000 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPServerDispatcher.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.protocol.bgp.rib.impl.spi; - -import io.netty.channel.ChannelFuture; -import java.net.InetSocketAddress; -import org.opendaylight.protocol.concepts.KeyMapping; - -/** - * Dispatcher class for creating BGP server. - */ -public interface BGPServerDispatcher { - - /** - * Create new BGP server to accept incoming bgp connections (bound to provided socket address). - * - * @param peerRegistry BGP peer registry - * @param address server address - * @return ChannelFuture promising a server session - */ - ChannelFuture createServer(BGPPeerRegistry peerRegistry, InetSocketAddress address); - - /** - * Create new BGP server to accept incoming bgp connections (bound to provided socket address). - * - * @param peerRegistry BGP peer registry - * @param address server address - * @param keys KeyMapping - * @return ChannelFuture promising a server session - */ - ChannelFuture createServer(BGPPeerRegistry peerRegistry, InetSocketAddress address, KeyMapping keys); -} diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPSessionProposal.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPSessionProposal.java deleted file mode 100644 index 23b8fae274..0000000000 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPSessionProposal.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.protocol.bgp.rib.impl.spi; - -/** - * Interface that provides the initial acceptable session characteristics with which the session should be started. - */ -public interface BGPSessionProposal { - /** - * Returns BGPSessionPreferences for this IP address. - * - * @return BGPSessionPreferences with acceptable session characteristics - */ - BGPSessionPreferences getProposal(); -} diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPPeerStatsImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPPeerStatsImpl.java index 665bd09fdd..537a578e2c 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPPeerStatsImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPPeerStatsImpl.java @@ -20,15 +20,8 @@ import org.opendaylight.protocol.bgp.rib.impl.stats.peer.route.PerTableTypeRoute import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey; import org.opendaylight.yangtools.yang.binding.util.BindingReflections; import org.opendaylight.yangtools.yang.common.QName; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -/** - * @author Kevin Wang - */ public final class BGPPeerStatsImpl implements BGPPeerStats { - private static final Logger LOG = LoggerFactory.getLogger(BGPPeerStatsImpl.class); - private final Set tablesKeySet; private final PerTableTypeRouteCounter adjRibInRouteCounters; private final PerTableTypeRouteCounter adjRibOutRouteCounters; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java index acaf2674a2..07bdf06f8e 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java @@ -17,9 +17,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib. import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author Kevin Wang - */ public final class PerTableTypeRouteCounter { private static final Logger LOG = LoggerFactory.getLogger(PerTableTypeRouteCounter.class); @@ -63,15 +60,6 @@ public final class PerTableTypeRouteCounter { return this.counters.getOrDefault(Preconditions.checkNotNull(tablesKey), createCounter(tablesKey)); } - /** - * Get the counter with given tablesKey - * @param tablesKey - * @return - */ - public final UnsignedInt32Counter getCounter(@Nonnull final TablesKey tablesKey) { - return this.counters.get(Preconditions.checkNotNull(tablesKey)); - } - /** * Get the counter with given tablesKey. Create an empty counter if it doesn't exist * This method will put the created empty counter back to map diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModuleTest.java index 4bdf2a6cff..4b282a3894 100755 --- a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModuleTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModuleTest.java @@ -24,7 +24,6 @@ public class BGPApplicationPeerModuleTest extends AbstractRIBImplModuleTest { private static final int EXP_INSTANCES = 8; private static final String INSTANCE_NAME = "application-peer-instance"; - private static final String INSTANCE_NAME2 = "application-peer-instance-2"; private static final String FACTORY_NAME = BGPApplicationPeerModuleFactory.NAME; private static final ApplicationRibId APP_RIB_ID = new ApplicationRibId("application-peer-test"); private static final ApplicationRibId NEW_APP_RIB_ID = new ApplicationRibId("new-application-peer-name"); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java index 2b5f9b997f..0b82eb12e5 100755 --- a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java @@ -173,13 +173,6 @@ public class BGPPeerModuleTest extends AbstractRIBImplModuleTest { return transaction.createModule(StrictBgpPeerRegistryModuleFactory.NAME, "peer-registry"); } - private static BGPDispatcherImplModuleMXBean getBgpDispatcherImplModuleMXBean(final ConfigTransactionJMXClient transaction, - final BGPPeerModuleMXBean mxBean) { - final RIBImplModuleMXBean ribProxy = transaction.newMXBeanProxy(mxBean.getRib(), RIBImplModuleMXBean.class); - final ObjectName dispatcherON = ribProxy.getBgpDispatcher(); - return transaction.newMXBeanProxy(dispatcherON, BGPDispatcherImplModuleMXBean.class); - } - private CommitStatus createBgpPeerInstance() throws Exception { return createBgpPeerInstance(false); } diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java index c11e21dcd8..f8090b4aa3 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java @@ -224,7 +224,7 @@ public class AbstractRIBTestSetup { b.addChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(PREFIX_QNAME)).withValue(p).build()); final DataTreeCandidateNode child = Mockito.mock(DataTreeCandidateNode.class); - Mockito.doReturn(createIdentifier(target, p)).when(child).getIdentifier(); + Mockito.doReturn(createIdentifier(p)).when(child).getIdentifier(); Mockito.doReturn(Optional.of(b.build())).when(child).getDataAfter(); Mockito.doReturn(type).when(child).getModificationType(); children.add(child); @@ -234,7 +234,7 @@ public class AbstractRIBTestSetup { return col; } - public PathArgument createIdentifier(final YangInstanceIdentifier base, final Ipv4Prefix prefix) { + public PathArgument createIdentifier(final Ipv4Prefix prefix) { final NodeIdentifierWithPredicates routekey = new NodeIdentifierWithPredicates(Ipv4Route.QNAME, PREFIX_QNAME, prefix); return YangInstanceIdentifier.of(PREFIX_QNAME).node(routekey).getLastPathArgument(); } diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java index e173a38820..6e8f867adf 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java @@ -38,11 +38,6 @@ public final class SimpleSessionListener implements BGPSessionListener { return this.listMsg; } - @Override - public boolean isSessionActive() { - return getSession().isWritable(); - } - @Override public void markUptodate(final TablesKey tablesKey) { LOG.debug("Table marked as up-to-date {}", tablesKey); diff --git a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java index 11c82e26c5..e500065874 100644 --- a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java +++ b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java @@ -13,8 +13,6 @@ import com.google.common.eventbus.EventBus; import io.netty.buffer.Unpooled; import java.io.Closeable; -import java.util.Arrays; -import java.util.Iterator; import java.util.List; import javax.annotation.concurrent.GuardedBy; @@ -71,22 +69,6 @@ public final class BGPMock implements Closeable { return messages; } - public synchronized void insertConnectionLostEvent() { - this.insertMessage(CONNECTION_LOST_MAGIC_MSG); - } - - public synchronized void insertMessages(final List messages) { - for (final Notification message : messages) { - this.insertMessage(message); - } - } - - @GuardedBy("this") - private void insertMessage(final Notification message) { - this.allPreviousBGPMessages.add(message); - this.eventBus.post(message); - } - @Override public synchronized void close() { // unregister all EventBusRegistration instances @@ -96,24 +78,6 @@ public final class BGPMock implements Closeable { this.openRegistrations.clear(); } - public boolean isMessageListSame(final List newMessages) { - if (this.allPreviousBGPMessages.size() != newMessages.size()) { - return false; - } - final Iterator i1 = this.allPreviousByteMessages.iterator(); - final Iterator i2 = newMessages.iterator(); - for (int i = 0; i < this.allPreviousBGPMessages.size(); i++) { - if (!Arrays.equals(i1.next(), i2.next())) { - return false; - } - } - return true; - } - - public EventBus getEventBus() { - return this.eventBus; - } - public ListenerRegistration registerUpdateListener(final BGPSessionListener listener) { return EventBusRegistration.createAndRegister(this.eventBus, listener, this.allPreviousBGPMessages); } diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java index 0dfdef3961..be65fb4e24 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java @@ -17,13 +17,6 @@ import org.opendaylight.yangtools.yang.binding.Notification; */ public interface BGPSessionListener extends EventListener { - /** - * Returns state of BGP session associated with this listener. - * - * @return false if session associated with this listener is null, true if its non-null - */ - boolean isSessionActive(); - /** * Marks synchronization finished for given Table key * diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerActivator.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerActivator.java deleted file mode 100644 index 691737cce0..0000000000 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerActivator.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.protocol.bgp.rib.spi; - -public interface RIBExtensionConsumerActivator { - void startRIBExtensionConsumer(RIBExtensionConsumerContext context); - - void stopRIBExtensionConsumer(RIBExtensionConsumerContext context); -} \ No newline at end of file diff --git a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/TestingListener.java b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/TestingListener.java index f882a78e95..2297de7525 100644 --- a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/TestingListener.java +++ b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/TestingListener.java @@ -34,11 +34,6 @@ final class TestingListener implements BGPSessionListener { this.multiPathSupport = multiPathSupport; } - @Override - public boolean isSessionActive() { - return true; - } - @Override public void markUptodate(final TablesKey tablesKey) { LOG.debug("Table marked as up-to-date {}", tablesKey); diff --git a/concepts/src/main/java/org/opendaylight/protocol/concepts/KeyMapping.java b/concepts/src/main/java/org/opendaylight/protocol/concepts/KeyMapping.java index b6a6c668e9..f2db5a5b54 100644 --- a/concepts/src/main/java/org/opendaylight/protocol/concepts/KeyMapping.java +++ b/concepts/src/main/java/org/opendaylight/protocol/concepts/KeyMapping.java @@ -9,14 +9,11 @@ package org.opendaylight.protocol.concepts; import static com.google.common.base.Strings.isNullOrEmpty; -import com.google.common.base.Optional; import java.net.InetAddress; import java.nio.charset.StandardCharsets; import java.util.HashMap; -import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.rfc2385.cfg.rev160324.Rfc2385Key; public final class KeyMapping extends HashMap { private static final long serialVersionUID = 1L; @@ -25,18 +22,6 @@ public final class KeyMapping extends HashMap { super(); } - private KeyMapping(final int initialCapacity, final float loadFactor) { - super(initialCapacity, loadFactor); - } - - private KeyMapping(final int initialCapacity) { - super(initialCapacity); - } - - private KeyMapping(final Map m) { - super(m); - } - public static KeyMapping getKeyMapping(@Nonnull final InetAddress inetAddress, @Nullable final String password){ if (!isNullOrEmpty(password)) { final KeyMapping keyMapping = new KeyMapping(); @@ -50,11 +35,4 @@ public final class KeyMapping extends HashMap { final KeyMapping keyMapping = new KeyMapping(); return keyMapping; } - - public static KeyMapping getKeyMapping(@Nonnull final InetAddress inetAddress, final Optional password){ - if (password.isPresent()) { - return getKeyMapping(inetAddress, password.get().getValue()); - } - return null; - } } diff --git a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionProposalFactory.java b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionProposalFactory.java index d84db39758..dbc6b7b03e 100644 --- a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionProposalFactory.java +++ b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionProposalFactory.java @@ -15,17 +15,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ * Factory for generating PCEP Session proposals. Used by a server. */ public interface PCEPSessionProposalFactory { - - /** - * Returns one session proposal that is registered to this factory - * - * @param address serves as constraint, so that factory is able to return different proposals for different - * addresses - * @param sessionId is used for creation of PCEPOpenObject - * @return specific session proposal - */ - Open getSessionProposal(InetSocketAddress address, int sessionId); - /** * * @param address serves as constraint, so that factory is able to return different proposals for different diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringRequestMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringRequestMessageParser.java index 5ab85a13b6..dc11799a8c 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringRequestMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringRequestMessageParser.java @@ -68,7 +68,7 @@ public class PCEPMonitoringRequestMessageParser extends PCEPRequestMessageParser } final PcreqMessageBuilder mBuilder = new PcreqMessageBuilder(); mBuilder.setMonitoringRequest(monReq); - final List svecs = getSvecs(objects, errors); + final List svecs = getSvecs(objects); if (!svecs.isEmpty()) { mBuilder.setSvec(svecs); } diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java index 259829168d..3f93e7e1e9 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java @@ -160,7 +160,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser { } final PcreqMessageBuilder mBuilder = new PcreqMessageBuilder(); mBuilder.setMonitoringRequest(getMonitoring(objects)); - final List svecs = getSvecs(objects, errors); + final List svecs = getSvecs(objects); if (!svecs.isEmpty()) { mBuilder.setSvec(svecs); } @@ -176,7 +176,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser { return new PcreqBuilder().setPcreqMessage(mBuilder.build()).build(); } - protected List getSvecs(final List objects, final List errors) { + protected List getSvecs(final List objects) { final List svecList = new ArrayList<>(); while (!objects.isEmpty()) { final SvecBuilder sBuilder = new SvecBuilder(); diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/AbstractVendorSpecificTlvParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/AbstractVendorSpecificTlvParser.java index 2ca7739113..80476ff521 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/AbstractVendorSpecificTlvParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/AbstractVendorSpecificTlvParser.java @@ -32,8 +32,6 @@ public abstract class AbstractVendorSpecificTlvParser implements TlvParser, TlvS public static final int TYPE = 27; - protected static final int ENTERPRISE_NUM_LENGTH = 4; - @Override public void serializeTlv(final Tlv tlv, final ByteBuf buffer) { Preconditions.checkArgument(tlv instanceof VsTlv, "Vendor Specific Tlv is mandatory."); diff --git a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java index 3ebc0130d5..b76e3f89c2 100644 --- a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java +++ b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java @@ -12,12 +12,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import com.google.common.collect.Lists; -import com.google.common.primitives.Bytes; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import org.junit.Before; diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java index 22d76524fd..fcad92b22a 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java @@ -45,11 +45,6 @@ public final class BasePCEPSessionProposalFactory implements PCEPSessionProposal } } - @Override - public Open getSessionProposal(final InetSocketAddress address, final int sessionId) { - return getSessionProposal(address, sessionId, null); - } - @Override public Open getSessionProposal(final InetSocketAddress address, final int sessionId, final PCEPPeerProposal peerProposal) { @@ -71,14 +66,6 @@ public final class BasePCEPSessionProposalFactory implements PCEPSessionProposal return oBuilder.setTlvs(builder.build()).build(); } - public int getKeepAlive() { - return this.keepAlive; - } - - public int getDeadTimer() { - return this.deadTimer; - } - @Override public List getCapabilities() { return this.capabilities; diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/MockPCE.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/MockPCE.java index 1031d87b7e..7c9ee85a23 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/MockPCE.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/MockPCE.java @@ -12,10 +12,7 @@ import java.util.List; import org.opendaylight.protocol.pcep.PCEPSession; import org.opendaylight.protocol.pcep.PCEPSessionListener; import org.opendaylight.protocol.pcep.PCEPTerminationReason; -import org.opendaylight.protocol.pcep.impl.spi.Util; -import org.opendaylight.protocol.pcep.spi.PCEPErrors; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.Open; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,25 +28,6 @@ public class MockPCE implements PCEPSessionListener { public boolean down = false; - public MockPCE() { - } - - public void sendMessage(final Message msg) { - this.session.handleMessage(msg); - } - - public void sendErrorMessage(final PCEPErrors value, final Open open) { - this.sendMessage(Util.createErrorMessage(value, open)); - } - - public List getListMsg() { - return this.listMsg; - } - - public void addSession(final PCEPSessionImpl l) { - this.session = l; - } - @Override public void onMessage(final PCEPSession session, final Message message) { this.listMsg.add(message); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java index 7eb1a68d61..69c40aa8a9 100755 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java @@ -19,7 +19,6 @@ import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.util.concurrent.DefaultPromise; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GlobalEventExecutor; @@ -80,8 +79,7 @@ public class PCEPDispatcherImplTest { this.disp2Spy = Mockito.spy(dispatcher2); this.pccMock = new PCCMock(new DefaultPCEPSessionNegotiatorFactory(sessionProposal, 0), - new PCEPHandlerFactory(msgReg), new DefaultPromise( - GlobalEventExecutor.INSTANCE)); + new PCEPHandlerFactory(msgReg)); } @Test @@ -188,11 +186,8 @@ public class PCEPDispatcherImplTest { private final PCEPHandlerFactory factory; private final EventExecutor executor; private final EventLoopGroup workerGroup; - private final EventLoopGroup bossGroup; - public PCCMock(final PCEPSessionNegotiatorFactory negotiatorFactory, final PCEPHandlerFactory factory, - final DefaultPromise defaultPromise) { - this.bossGroup = Preconditions.checkNotNull(new NioEventLoopGroup()); + public PCCMock(final PCEPSessionNegotiatorFactory negotiatorFactory, final PCEPHandlerFactory factory) { this.workerGroup = Preconditions.checkNotNull(new NioEventLoopGroup()); this.negotiatorFactory = Preconditions.checkNotNull(negotiatorFactory); this.factory = Preconditions.checkNotNull(factory); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/ServerSessionMock.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/ServerSessionMock.java deleted file mode 100644 index 7f7a6455b3..0000000000 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/ServerSessionMock.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.protocol.pcep.impl; - -import static org.mockito.Mockito.mock; -import io.netty.channel.Channel; -import io.netty.util.concurrent.Future; -import io.netty.util.concurrent.GlobalEventExecutor; - -import org.opendaylight.protocol.pcep.PCEPCloseTermination; -import org.opendaylight.protocol.pcep.PCEPSessionListener; -import org.opendaylight.protocol.pcep.TerminationReason; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.OpenBuilder; - -public class ServerSessionMock extends PCEPSessionImpl { - - private final MockPCE client; - - public ServerSessionMock(final PCEPSessionListener listener, final PCEPSessionListener client) { - super(listener, 5, mock(Channel.class), new OpenBuilder().setKeepalive((short) 4).setDeadTimer((short) 9).setSessionId( - (short) 2).build(), new OpenBuilder().setKeepalive((short) 4).setDeadTimer((short) 9).setSessionId((short) 2).build()); - this.client = (MockPCE) client; - } - - @Override - public Future sendMessage(final Message msg) { - this.lastMessageSentAt = System.nanoTime(); - this.client.onMessage(this, msg); - return GlobalEventExecutor.INSTANCE.newSucceededFuture(null); - } - - @Override - public void close() { - this.client.onSessionTerminated(this, new PCEPCloseTermination(TerminationReason.UNKNOWN)); - } -} diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java index 0705b4aa55..5d4ce11e81 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java @@ -78,13 +78,6 @@ final class PCCSyncOptimization { return this.remoteLspDbVersion.getLspDbVersionValue(); } - public boolean isRemoteLspDbVersionNull() { - if (this.remoteLspDbVersion == null) { - return true; - } - return false; - } - private static LspDbVersion getLspDbVersion(final Tlvs openTlvs) { if (openTlvs != null) { final Tlvs3 tlvs3 = openTlvs.getAugmentation(Tlvs3.class); diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCDispatcherImplTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCDispatcherImplTest.java index 1539456fb8..98c765d474 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCDispatcherImplTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCDispatcherImplTest.java @@ -18,15 +18,12 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.util.concurrent.Future; import java.net.InetSocketAddress; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import org.opendaylight.protocol.pcep.PCEPCapability; import org.opendaylight.protocol.pcep.PCEPDispatcher; import org.opendaylight.protocol.pcep.PCEPSession; diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerActivator.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerActivator.java deleted file mode 100644 index 2e8e800c44..0000000000 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerActivator.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.protocol.pcep.spi; - -public interface PCEPExtensionConsumerActivator { - void start(PCEPExtensionConsumerContext context); - - void stop(); -} \ No newline at end of file diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java index 3380dc7f3b..6cda92f8cb 100755 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java @@ -498,10 +498,6 @@ public abstract class AbstractTopologySessionListener implements PCEPSessi return this.pccIdentifier.child(ReportedLsp.class, new ReportedLspKey(name)); } - protected final InstanceIdentifier getPccIdentifier() { - return this.pccIdentifier; - } - /** * Remove LSP from the database. * diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java index 9104abda11..1f0e3488c2 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java @@ -72,10 +72,6 @@ final class TopologyNodeState implements AutoCloseable, TransactionChainListener } } - public synchronized void removeLspMetadata(final String name) { - metadata.remove(name); - } - public synchronized void cleanupExcept(final Collection values) { final Iterator it = metadata.keySet().iterator(); while (it.hasNext()) { diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java index 86f165cd99..c18ccfa28b 100644 --- a/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java +++ b/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import io.netty.channel.nio.NioEventLoopGroup; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Random; import javax.management.ObjectName; diff --git a/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java b/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java index 3d21ff947c..b316753f73 100644 --- a/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java +++ b/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import io.netty.channel.nio.NioEventLoopGroup; import java.util.Arrays; -import java.util.Collections; import java.util.List; import javax.management.ObjectName; import org.junit.Before; diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContext.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContext.java index 69a8a86474..6a2eb86b49 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContext.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContext.java @@ -8,7 +8,6 @@ package org.opendaylight.protocol.rsvp.parser.spi.pojo; -import com.google.common.base.Preconditions; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import java.util.concurrent.atomic.AtomicReference; @@ -61,18 +60,6 @@ public class SimpleRSVPExtensionProviderContext extends SimpleRSVPExtensionConsu this.cacheRef = new AtomicReference>(cache); } - public final synchronized int getMaximumCachedObjects() { - return this.maximumCachedObjects; - } - - public final synchronized void setMaximumCachedObjects(final int maximumCachedObjects) { - Preconditions.checkArgument(maximumCachedObjects >= 0); - - final Cache newCache = CacheBuilder.newBuilder().maximumSize(maximumCachedObjects).build(); - newCache.putAll(this.cacheRef.get().asMap()); - this.cacheRef.set(newCache); - } - @Override public ReferenceCache getReferenceCache() { return this.referenceCache; diff --git a/util/src/main/java/org/opendaylight/protocol/util/ByteBufWriteUtil.java b/util/src/main/java/org/opendaylight/protocol/util/ByteBufWriteUtil.java index 5e5422db77..d7337091e2 100644 --- a/util/src/main/java/org/opendaylight/protocol/util/ByteBufWriteUtil.java +++ b/util/src/main/java/org/opendaylight/protocol/util/ByteBufWriteUtil.java @@ -40,10 +40,6 @@ public final class ByteBufWriteUtil { public static final int IPV6_PREFIX_BYTE_LENGTH = Ipv6Util.IPV6_LENGTH + 1; - public static final int AFI_BYTES_LENGTH = 2; - - public static final int SAFI_BYTES_LENGTH = 1; - private ByteBufWriteUtil() { throw new UnsupportedOperationException(); } -- 2.36.6