From 75290b4f109cad1dbed0996557501ede3f09be25 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 18 Oct 2019 16:42:31 +0200 Subject: [PATCH] Update to work on Sodium SR1 This updates pointers to Sodium SR1 versions, adding porting changes. We disable the odl-l2switch-ui feature, as we do not have dlux available. It should be pretty easy to add back. Change-Id: I170395794b26ead35a2d26f457ecae776de2cb4e Signed-off-by: Robert Varga --- addresstracker/implementation/pom.xml | 5 + .../AddressObservationWriter.java | 9 +- .../AddressObserverUsingArp.java | 4 +- .../AddressObserverUsingIpv4.java | 5 +- .../AddressObserverUsingIpv6.java | 4 +- .../AddressTrackerProvider.java | 2 +- .../AddressObservationWriterTest.java | 6 +- .../AddressObserverUsingArpTest.java | 9 +- .../AddressObserverUsingIpv4Test.java | 14 +- .../AddressObserverUsingIpv6Test.java | 11 +- addresstracker/model/pom.xml | 4 +- .../arphandler/core/PacketDispatcher.java | 13 +- .../core/ProactiveFloodFlowWriter.java | 6 +- .../arphandler/flow/InitialFlowWriter.java | 9 +- .../arphandler/inventory/InventoryReader.java | 22 +-- .../arphandler/core/ArpPacketHandlerTest.java | 40 +++-- .../arphandler/core/PacketDispatcherTest.java | 4 +- .../core/ProactiveFloodFlowWriterTest.java | 13 +- .../flow/InitialFlowWriterTest.java | 3 +- .../inventory/InventoryReaderTest.java | 11 +- artifacts/pom.xml | 2 +- distribution/karaf/pom.xml | 5 +- features/features-l2switch/pom.xml | 4 +- features/odl-l2switch-addresstracker/pom.xml | 2 +- features/odl-l2switch-all/pom.xml | 2 +- features/odl-l2switch-arphandler/pom.xml | 2 +- features/odl-l2switch-hosttracker/pom.xml | 2 +- features/odl-l2switch-loopremover/pom.xml | 6 +- features/odl-l2switch-packethandler/pom.xml | 4 +- features/odl-l2switch-switch-rest/pom.xml | 4 +- features/odl-l2switch-switch-ui/pom.xml | 4 +- features/odl-l2switch-switch/pom.xml | 2 +- features/pom.xml | 4 +- hosttracker/implementation/pom.xml | 5 + .../ConcurrentClusterAwareHostHashMap.java | 14 +- .../ConcurrentClusterAwareLinkHashMap.java | 9 +- .../plugin/internal/HostTrackerImpl.java | 20 +-- .../plugin/internal/HostTrackerOperation.java | 2 +- .../plugin/internal/OperationProcessor.java | 4 +- .../internal/SimpleAddressObserver.java | 4 +- .../hosttracker/plugin/inventory/Host.java | 8 +- .../hosttracker/plugin/util/Compare.java | 2 +- .../hosttracker/plugin/util/Utilities.java | 8 +- .../l2switch/flow/FlowWriterServiceImpl.java | 3 +- .../l2switch/flow/InitialFlowWriter.java | 5 +- .../l2switch/inventory/InventoryReader.java | 10 +- .../flow/FlowWriterServiceImplTest.java | 3 +- .../l2switch/flow/InitialFlowWriterTest.java | 3 +- .../l2switch/flow/InventoryReaderTest.java | 19 +-- .../l2switch/flow/ReactiveFlowWriterTest.java | 10 +- .../util/InstanceIdentifierUtilsTest.java | 6 +- .../loopremover/flow/InitialFlowWriter.java | 7 +- .../topology/NetworkGraphImpl.java | 2 +- .../TopologyLinkDataChangeHandler.java | 2 +- .../util/InstanceIdentifierUtils.java | 6 +- .../flow/InitialFlowWriterTest.java | 6 +- .../TopologyLinkDataChangeHandlerTest.java | 7 +- .../util/InstanceIdentifierUtilsTest.java | 15 +- loopremover/model/pom.xml | 4 +- packethandler/implementation/pom.xml | 5 + .../packethandler/decoders/ArpDecoder.java | 2 +- .../packethandler/decoders/IcmpDecoder.java | 2 +- .../packethandler/decoders/Ipv4Decoder.java | 2 +- .../packethandler/decoders/Ipv6Decoder.java | 2 +- .../decoders/utils/NetUtils.java | 11 +- .../decoders/EthernetDecoderTest.java | 2 +- .../decoders/IcmpDecoderTest.java | 2 +- packethandler/model/pom.xml | 4 +- parent/pom.xml | 143 +----------------- pom.xml | 4 +- 70 files changed, 235 insertions(+), 365 deletions(-) diff --git a/addresstracker/implementation/pom.xml b/addresstracker/implementation/pom.xml index 12c381cc..c94c28ec 100644 --- a/addresstracker/implementation/pom.xml +++ b/addresstracker/implementation/pom.xml @@ -39,6 +39,11 @@ org.opendaylight.l2switch.addresstracker addresstracker-model + + + com.google.code.findbugs + jsr305 + true junit diff --git a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObservationWriter.java b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObservationWriter.java index e1ea5e76..739658cf 100644 --- a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObservationWriter.java +++ b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObservationWriter.java @@ -123,8 +123,7 @@ public class AddressObservationWriter { if (nc == null) { return; } - AddressCapableNodeConnector acnc = nc - .getAugmentation(AddressCapableNodeConnector.class); + AddressCapableNodeConnector acnc = nc.augmentation(AddressCapableNodeConnector.class); // Address observations exist if (acnc != null && acnc.getAddresses() != null) { @@ -135,7 +134,7 @@ public class AddressObservationWriter { if (addresses.get(i).getIp().equals(ipAddress) && addresses.get(i).getMac().equals(macAddress)) { if (now - addresses.get(i).getLastSeen() > timestampUpdateInterval) { addressBuilder.setFirstSeen(addresses.get(i).getFirstSeen()) - .setKey(addresses.get(i).getKey()); + .withKey(addresses.get(i).key()); addresses.remove(i); break; } else { @@ -149,8 +148,8 @@ public class AddressObservationWriter { addresses = new ArrayList<>(); } - if (addressBuilder.getKey() == null) { - addressBuilder.setKey(new AddressesKey(BigInteger.valueOf(addressKey.getAndIncrement()))); + if (addressBuilder.key() == null) { + addressBuilder.withKey(new AddressesKey(BigInteger.valueOf(addressKey.getAndIncrement()))); } // Add as an augmentation diff --git a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArp.java b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArp.java index 44a536bf..ad9916a9 100644 --- a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArp.java +++ b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArp.java @@ -7,7 +7,7 @@ */ package org.opendaylight.l2switch.addresstracker.addressobserver; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.ArpPacketListener; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.ArpPacketReceived; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.arp.packet.received.packet.chain.packet.ArpPacket; @@ -57,6 +57,6 @@ public class AddressObserverUsingArp implements ArpPacketListener { } addressObservationWriter.addAddress(ethernetPacket.getSourceMac(), - new IpAddress(arpPacket.getSourceProtocolAddress().toCharArray()), rawPacket.getIngress()); + IpAddressBuilder.getDefaultInstance(arpPacket.getSourceProtocolAddress()), rawPacket.getIngress()); } } diff --git a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4.java b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4.java index 748f5232..1e091e45 100644 --- a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4.java +++ b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4.java @@ -7,7 +7,7 @@ */ package org.opendaylight.l2switch.addresstracker.addressobserver; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.PacketChain; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.packet.chain.packet.RawPacket; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ethernet.rev140528.ethernet.packet.received.packet.chain.packet.EthernetPacket; @@ -15,6 +15,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv4.rev140528.Ipv4P import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv4.rev140528.Ipv4PacketReceived; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ipv4.rev140528.ipv4.packet.received.packet.chain.packet.Ipv4Packet; + /** * AddressObserver listens to IPv4 packets to find addresses (mac, ip) and store * these address observations for each node-connector. These packets are @@ -59,7 +60,7 @@ public class AddressObserverUsingIpv4 implements Ipv4PacketListener { if (!IPV4_IP_TO_IGNORE.equals(ipv4Packet.getSourceIpv4().getValue())) { addressObservationWriter.addAddress(ethernetPacket.getSourceMac(), - new IpAddress(ipv4Packet.getSourceIpv4().getValue().toCharArray()), rawPacket.getIngress()); + IpAddressBuilder.getDefaultInstance(ipv4Packet.getSourceIpv4().getValue()), rawPacket.getIngress()); } } } diff --git a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6.java b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6.java index 92d95f3b..bf07dcf1 100644 --- a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6.java +++ b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6.java @@ -7,7 +7,7 @@ */ package org.opendaylight.l2switch.addresstracker.addressobserver; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.PacketChain; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.basepacket.rev140528.packet.chain.grp.packet.chain.packet.RawPacket; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ethernet.rev140528.ethernet.packet.received.packet.chain.packet.EthernetPacket; @@ -59,7 +59,7 @@ public class AddressObserverUsingIpv6 implements Ipv6PacketListener { if (!IPV6_IP_TO_IGNORE.equals(ipv6Packet.getSourceIpv6().getValue())) { addressObservationWriter.addAddress(ethernetPacket.getSourceMac(), - new IpAddress(ipv6Packet.getSourceIpv6().getValue().toCharArray()), rawPacket.getIngress()); + IpAddressBuilder.getDefaultInstance(ipv6Packet.getSourceIpv6().getValue()), rawPacket.getIngress()); } } } diff --git a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressTrackerProvider.java b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressTrackerProvider.java index 3b387f3c..5ea5cc9d 100644 --- a/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressTrackerProvider.java +++ b/addresstracker/implementation/src/main/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressTrackerProvider.java @@ -74,7 +74,7 @@ public class AddressTrackerProvider { public void close() { listenerRegistrations.forEach(reg -> reg.close()); - LOG.info("AddressTracker torn down.", this); + LOG.info("AddressTracker torn down."); } @Nonnull diff --git a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObservationWriterTest.java b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObservationWriterTest.java index fc82993e..2ff876de 100644 --- a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObservationWriterTest.java +++ b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObservationWriterTest.java @@ -7,7 +7,7 @@ */ package org.opendaylight.l2switch.addresstracker.addressobserver; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -70,7 +70,7 @@ public class AddressObservationWriterTest { when(dataObjectOptional.get()).thenReturn(nodeConnector); addrCapableNc = mock(AddressCapableNodeConnector.class); - when(nodeConnector.getAugmentation(AddressCapableNodeConnector.class)).thenReturn(addrCapableNc); + when(nodeConnector.augmentation(AddressCapableNodeConnector.class)).thenReturn(addrCapableNc); address = mock(Addresses.class); List listAddr = new ArrayList(); @@ -82,7 +82,7 @@ public class AddressObservationWriterTest { when(address.getLastSeen()).thenReturn(1410350400L); when(address.getFirstSeen()).thenReturn(1410350400L); addrKey = mock(AddressesKey.class); - when(address.getKey()).thenReturn(addrKey); + when(address.key()).thenReturn(addrKey); writeTransaction = mock(WriteTransaction.class); when(dataService.newWriteOnlyTransaction()).thenReturn(writeTransaction); diff --git a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArpTest.java b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArpTest.java index a0be192a..e6cf6b3f 100644 --- a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArpTest.java +++ b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingArpTest.java @@ -7,7 +7,7 @@ */ package org.opendaylight.l2switch.addresstracker.addressobserver; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -37,7 +37,7 @@ public class AddressObserverUsingArpTest { @Test public void onArpPacketReceivedTest() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder() .setPacket(new EthernetPacketBuilder().setSourceMac(new MacAddress("aa:bb:cc:dd:ee:ff")).build()) @@ -49,8 +49,7 @@ public class AddressObserverUsingArpTest { AddressObserverUsingArp addressOberserverArp = new AddressObserverUsingArp(addressObservationWriterMock); addressOberserverArp.onArpPacketReceived(arpReceived); - verify(addressObservationWriterMock, times(1)).addAddress(any(MacAddress.class), any(IpAddress.class), - any(NodeConnectorRef.class)); + verify(addressObservationWriterMock, times(1)).addAddress(any(MacAddress.class), any(IpAddress.class), any()); } @Test @@ -67,7 +66,7 @@ public class AddressObserverUsingArpTest { @Test public void onArpPacketReceivedNullInputTest2() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder() .setPacket(new EthernetPacketBuilder().setSourceMac(new MacAddress("aa:bb:cc:dd:ee:ff")).build()) diff --git a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4Test.java b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4Test.java index 85046f45..81cbf706 100644 --- a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4Test.java +++ b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv4Test.java @@ -7,7 +7,7 @@ */ package org.opendaylight.l2switch.addresstracker.addressobserver; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -38,7 +38,7 @@ public class AddressObserverUsingIpv4Test { @Test public void onIpv4PacketReceivedTest() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder() .setPacket(new EthernetPacketBuilder().setSourceMac(new MacAddress("aa:bb:cc:dd:ee:ff")).build()) @@ -50,8 +50,7 @@ public class AddressObserverUsingIpv4Test { AddressObserverUsingIpv4 addressObserverIpv4 = new AddressObserverUsingIpv4(addressObservationWriterMock); addressObserverIpv4.onIpv4PacketReceived(ipv4PktReceived); - verify(addressObservationWriterMock, times(1)).addAddress(any(MacAddress.class), any(IpAddress.class), - any(NodeConnectorRef.class)); + verify(addressObservationWriterMock, times(1)).addAddress(any(MacAddress.class), any(IpAddress.class), any()); } @Test @@ -63,13 +62,12 @@ public class AddressObserverUsingIpv4Test { verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class), any(NodeConnectorRef.class)); - } @Test public void onIpv4PacketReceivedNullInputTest2() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder() .setPacket(new EthernetPacketBuilder().setSourceMac(new MacAddress("aa:bb:cc:dd:ee:ff")).build()) @@ -81,13 +79,12 @@ public class AddressObserverUsingIpv4Test { verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class), any(NodeConnectorRef.class)); - } @Test public void onIpv4PacketReceivedNullInputTest3() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder() .setPacket(new EthernetPacketBuilder().setSourceMac(new MacAddress("aa:bb:cc:dd:ee:ff")).build()) @@ -101,6 +98,5 @@ public class AddressObserverUsingIpv4Test { verify(addressObservationWriterMock, times(0)).addAddress(any(MacAddress.class), any(IpAddress.class), any(NodeConnectorRef.class)); - } } diff --git a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6Test.java b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6Test.java index 89ec315b..380443bf 100644 --- a/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6Test.java +++ b/addresstracker/implementation/src/test/java/org/opendaylight/l2switch/addresstracker/addressobserver/AddressObserverUsingIpv6Test.java @@ -7,7 +7,7 @@ */ package org.opendaylight.l2switch.addresstracker.addressobserver; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -38,7 +38,7 @@ public class AddressObserverUsingIpv6Test { @Test public void onIpv6PacketReceivedTest() { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder() .setPacket(new EthernetPacketBuilder().setSourceMac(new MacAddress("aa:bb:cc:dd:ee:ff")).build()) @@ -53,8 +53,7 @@ public class AddressObserverUsingIpv6Test { AddressObserverUsingIpv6 addressObserverIpv6 = new AddressObserverUsingIpv6(addressObservationWriterMock); addressObserverIpv6.onIpv6PacketReceived(ipv6PktReceived); - verify(addressObservationWriterMock, times(1)).addAddress(any(MacAddress.class), any(IpAddress.class), - any(NodeConnectorRef.class)); + verify(addressObservationWriterMock, times(1)).addAddress(any(MacAddress.class), any(IpAddress.class), any()); } @Test @@ -71,7 +70,7 @@ public class AddressObserverUsingIpv6Test { @Test public void onIpv6PacketReceivedNullInputTest2() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder() .setPacket(new EthernetPacketBuilder().setSourceMac(new MacAddress("aa:bb:cc:dd:ee:ff")).build()) @@ -88,7 +87,7 @@ public class AddressObserverUsingIpv6Test { @Test public void onIpv6PacketReceivedNullInputTest3() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder() .setPacket(new EthernetPacketBuilder().setSourceMac(new MacAddress("aa:bb:cc:dd:ee:ff")).build()) diff --git a/addresstracker/model/pom.xml b/addresstracker/model/pom.xml index 32950541..f50ec266 100644 --- a/addresstracker/model/pom.xml +++ b/addresstracker/model/pom.xml @@ -21,8 +21,8 @@ yang-common - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types org.opendaylight.l2switch.packethandler diff --git a/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcher.java b/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcher.java index 014a9276..12a63d14 100644 --- a/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcher.java +++ b/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcher.java @@ -18,9 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types. import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInputBuilder; @@ -61,8 +59,7 @@ public class PacketDispatcher { public void dispatchPacket(byte[] payload, NodeConnectorRef ingress, MacAddress srcMac, MacAddress destMac) { inventoryReader.readInventory(); - String nodeId = ingress.getValue().firstIdentifierOf(Node.class).firstKeyOf(Node.class, NodeKey.class).getId() - .getValue(); + String nodeId = ingress.getValue().firstIdentifierOf(Node.class).firstKeyOf(Node.class).getId().getValue(); NodeConnectorRef srcConnectorRef = inventoryReader.getControllerSwitchConnectors().get(nodeId); if (srcConnectorRef == null) { @@ -108,10 +105,10 @@ public class PacketDispatcher { } for (NodeConnectorRef ncRef : nodeConnectors) { String ncId = ncRef.getValue().firstIdentifierOf(NodeConnector.class) - .firstKeyOf(NodeConnector.class, NodeConnectorKey.class).getId().getValue(); + .firstKeyOf(NodeConnector.class).getId().getValue(); // Don't flood on discarding node connectors & origIngress if (!ncId.equals(origIngress.getValue().firstIdentifierOf(NodeConnector.class) - .firstKeyOf(NodeConnector.class, NodeConnectorKey.class).getId().getValue())) { + .firstKeyOf(NodeConnector.class).getId().getValue())) { sendPacketOut(payload, origIngress, ncRef); } } @@ -140,9 +137,9 @@ public class PacketDispatcher { .build(); Futures.addCallback(JdkFutureAdapters.listenInPoolThread(packetProcessingService.transmitPacket(input)), - new FutureCallback>() { + new FutureCallback>() { @Override - public void onSuccess(RpcResult result) { + public void onSuccess(RpcResult result) { LOG.debug("transmitPacket was successful"); } diff --git a/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriter.java b/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriter.java index 6a1778c4..789d61d7 100644 --- a/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriter.java +++ b/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriter.java @@ -246,7 +246,7 @@ public class ProactiveFloodFlowWriter implements DataTreeChangeListener { for (InstanceIdentifier nodeId : nodeIds) { if (Node.class.isAssignableFrom(nodeId.getTargetType())) { InstanceIdentifier invNodeId = (InstanceIdentifier)nodeId; - if (invNodeId.firstKeyOf(Node.class,NodeKey.class).getId().getValue().contains("openflow:")) { + if (invNodeId.firstKeyOf(Node.class).getId().getValue().contains("openflow:")) { addInitialFlows(invNodeId); } } @@ -258,7 +257,7 @@ public class InitialFlowWriter implements DataTreeChangeListener { private Action getSendToControllerAction() { Action sendToController = new ActionBuilder() .setOrder(0) - .setKey(new ActionKey(0)) + .withKey(new ActionKey(0)) .setAction(new OutputActionCaseBuilder() .setOutputAction(new OutputActionBuilder() .setMaxLength(0xffff) @@ -272,7 +271,7 @@ public class InitialFlowWriter implements DataTreeChangeListener { private Action getNormalAction() { Action normal = new ActionBuilder() .setOrder(0) - .setKey(new ActionKey(0)) + .withKey(new ActionKey(0)) .setAction(new OutputActionCaseBuilder() .setOutputAction(new OutputActionBuilder() .setMaxLength(0xffff) @@ -287,7 +286,7 @@ public class InitialFlowWriter implements DataTreeChangeListener { InstanceIdentifier tableInstanceId, InstanceIdentifier flowPath, Flow flow) { - LOG.trace("Adding flow to node {}",nodeInstanceId.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + LOG.trace("Adding flow to node {}",nodeInstanceId.firstKeyOf(Node.class).getId().getValue()); final AddFlowInputBuilder builder = new AddFlowInputBuilder(flow); builder.setNode(new NodeRef(nodeInstanceId)); builder.setFlowRef(new FlowRef(flowPath)); diff --git a/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReader.java b/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReader.java index 69ae008d..c6d2f17e 100755 --- a/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReader.java +++ b/arphandler/src/main/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReader.java @@ -163,16 +163,16 @@ public class InventoryReader implements DataTreeChangeListener { for (NodeConnector nodeConnector : nodeConnectors) { // Read STP status for this NodeConnector StpStatusAwareNodeConnector saNodeConnector = nodeConnector - .getAugmentation(StpStatusAwareNodeConnector.class); + .augmentation(StpStatusAwareNodeConnector.class); if (saNodeConnector != null && StpStatus.Discarding.equals(saNodeConnector.getStatus())) { continue; } - if (nodeConnector.getKey().toString().contains("LOCAL")) { + if (nodeConnector.key().toString().contains("LOCAL")) { continue; } NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class) - .child(Node.class, node.getKey()) - .child(NodeConnector.class, nodeConnector.getKey()) + .child(Node.class, node.key()) + .child(NodeConnector.class, nodeConnector.key()) .build()); nodeConnectorRefs.add(ncRef); } @@ -180,11 +180,11 @@ public class InventoryReader implements DataTreeChangeListener { switchNodeConnectors.put(node.getId().getValue(), nodeConnectorRefs); NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class) - .child(Node.class, node.getKey()) + .child(Node.class, node.key()) .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId(node.getId().getValue() + ":LOCAL"))) .build()); - LOG.debug("Local port for node {} is {}", node.getKey(), ncRef); + LOG.debug("Local port for node {} is {}", node.key(), ncRef); controllerSwitchConnectors.put(node.getId().getValue(), ncRef); } } @@ -226,21 +226,21 @@ public class InventoryReader implements DataTreeChangeListener { for (NodeConnector nc : node.getNodeConnector()) { // Don't look for mac in discarding node connectors StpStatusAwareNodeConnector saNodeConnector = nc - .getAugmentation(StpStatusAwareNodeConnector.class); + .augmentation(StpStatusAwareNodeConnector.class); if (saNodeConnector != null && StpStatus.Discarding.equals(saNodeConnector.getStatus())) { continue; } - LOG.debug("Looking address{} in nodeconnector : {}", macAddress, nc.getKey()); - AddressCapableNodeConnector acnc = nc.getAugmentation(AddressCapableNodeConnector.class); + LOG.debug("Looking address{} in nodeconnector : {}", macAddress, nc.key()); + AddressCapableNodeConnector acnc = nc.augmentation(AddressCapableNodeConnector.class); if (acnc != null) { List addressesList = acnc.getAddresses(); for (Addresses add : addressesList) { if (macAddress.equals(add.getMac())) { if (add.getLastSeen() > latest) { destNodeConnector = new NodeConnectorRef( - nodeInsId.child(NodeConnector.class, nc.getKey())); + nodeInsId.child(NodeConnector.class, nc.key())); latest = add.getLastSeen(); - LOG.debug("Found address{} in nodeconnector : {}", macAddress, nc.getKey()); + LOG.debug("Found address{} in nodeconnector : {}", macAddress, nc.key()); break; } } diff --git a/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/ArpPacketHandlerTest.java b/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/ArpPacketHandlerTest.java index 1a558809..0bc578ce 100644 --- a/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/ArpPacketHandlerTest.java +++ b/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/ArpPacketHandlerTest.java @@ -7,16 +7,15 @@ */ package org.opendaylight.l2switch.arphandler.core; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; import java.util.ArrayList; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.ArpPacketReceived; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.ArpPacketReceivedBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.arp.rev140528.arp.packet.received.packet.chain.packet.ArpPacketBuilder; @@ -27,7 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.ethernet.rev140528.e public class ArpPacketHandlerTest { - @MockitoAnnotations.Mock + @Mock private PacketDispatcher packetDispatcher; private ArpPacketHandler arpPacketHandler; @@ -39,74 +38,69 @@ public class ArpPacketHandlerTest { @Test public void onArpPacketReceivedTest() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder().setPacket(new EthernetPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder().setPacket(new ArpPacketBuilder().build()).build()); ArpPacketReceived arpReceived = new ArpPacketReceivedBuilder().setPacketChain(packetChainList).build(); arpPacketHandler.onArpPacketReceived(arpReceived); - verify(packetDispatcher, times(1)).dispatchPacket(any(byte[].class), any(NodeConnectorRef.class), - any(MacAddress.class), any(MacAddress.class)); + verify(packetDispatcher, times(1)).dispatchPacket(null, null, null, null); } @Test public void onArpPacketReceivedTest_NullInput() throws Exception { arpPacketHandler.onArpPacketReceived(null); - verify(packetDispatcher, times(0)).dispatchPacket(any(byte[].class), any(NodeConnectorRef.class), - any(MacAddress.class), any(MacAddress.class)); + verifyZeroInteractions(packetDispatcher); } @Test public void onArpPacketReceivedTest_NullPacketChain() throws Exception { ArpPacketReceived arpReceived = new ArpPacketReceivedBuilder().build(); arpPacketHandler.onArpPacketReceived(arpReceived); - verify(packetDispatcher, times(0)).dispatchPacket(any(byte[].class), any(NodeConnectorRef.class), - any(MacAddress.class), any(MacAddress.class)); + + verifyZeroInteractions(packetDispatcher); } @Test public void onArpPacketReceivedTest_EmptyPacketChain() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); ArpPacketReceived arpReceived = new ArpPacketReceivedBuilder().setPacketChain(packetChainList).build(); arpPacketHandler.onArpPacketReceived(arpReceived); - verify(packetDispatcher, times(0)).dispatchPacket(any(byte[].class), any(NodeConnectorRef.class), - any(MacAddress.class), any(MacAddress.class)); + + verifyZeroInteractions(packetDispatcher); } @Test public void onArpPacketReceivedTest_NoRawPacket() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new EthernetPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder().setPacket(new ArpPacketBuilder().build()).build()); ArpPacketReceived arpReceived = new ArpPacketReceivedBuilder().setPacketChain(packetChainList).build(); arpPacketHandler.onArpPacketReceived(arpReceived); - verify(packetDispatcher, times(0)).dispatchPacket(any(byte[].class), any(NodeConnectorRef.class), - any(MacAddress.class), any(MacAddress.class)); + verifyZeroInteractions(packetDispatcher); } @Test public void onArpPacketReceivedTest_NoEthernetPacket() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder().setPacket(new ArpPacketBuilder().build()).build()); ArpPacketReceived arpReceived = new ArpPacketReceivedBuilder().setPacketChain(packetChainList).build(); arpPacketHandler.onArpPacketReceived(arpReceived); - verify(packetDispatcher, times(0)).dispatchPacket(any(byte[].class), any(NodeConnectorRef.class), - any(MacAddress.class), any(MacAddress.class)); + verifyZeroInteractions(packetDispatcher); } @Test public void onArpPacketReceivedTest_NoArpPacket() throws Exception { - ArrayList packetChainList = new ArrayList(); + ArrayList packetChainList = new ArrayList<>(); packetChainList.add(new PacketChainBuilder().setPacket(new RawPacketBuilder().build()).build()); packetChainList.add(new PacketChainBuilder().setPacket(new EthernetPacketBuilder().build()).build()); ArpPacketReceived arpReceived = new ArpPacketReceivedBuilder().setPacketChain(packetChainList).build(); arpPacketHandler.onArpPacketReceived(arpReceived); - verify(packetDispatcher, times(0)).dispatchPacket(any(byte[].class), any(NodeConnectorRef.class), - any(MacAddress.class), any(MacAddress.class)); + verifyZeroInteractions(packetDispatcher); } } diff --git a/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcherTest.java b/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcherTest.java index 6692e09f..b74d81a5 100644 --- a/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcherTest.java +++ b/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcherTest.java @@ -7,7 +7,7 @@ */ package org.opendaylight.l2switch.arphandler.core; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -133,7 +133,7 @@ public class PacketDispatcherTest { HashMap controllerSwitchConnectors = Mockito.mock(HashMap.class); when(controllerSwitchConnectors.get(any(String.class))).thenReturn(ncRef1); when(inventoryReader.getControllerSwitchConnectors()).thenReturn(controllerSwitchConnectors); - when(inventoryReader.getNodeConnector(any(InstanceIdentifier.class), any(MacAddress.class))).thenReturn(ncRef1); + when(inventoryReader.getNodeConnector(any(InstanceIdentifier.class), any())).thenReturn(ncRef1); packetDispatcher.dispatchPacket(null, new NodeConnectorRef(ncInsId1), null, null); verify(inventoryReader, times(1)).readInventory(); diff --git a/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriterTest.java b/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriterTest.java index 5a159156..03ddd6bd 100644 --- a/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriterTest.java +++ b/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriterTest.java @@ -19,6 +19,7 @@ import java.util.Collections; import java.util.List; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -45,9 +46,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class ProactiveFloodFlowWriterTest { - @MockitoAnnotations.Mock + @Mock private DataBroker dataBroker; - @MockitoAnnotations.Mock + @Mock private SalFlowService salFlowService; private ProactiveFloodFlowWriter proactiveFloodFlowWriter; @@ -101,11 +102,11 @@ public class ProactiveFloodFlowWriterTest { StpStatusAwareNodeConnector stpStatusAwareNodeConnector = new StpStatusAwareNodeConnectorBuilder() .setStatus(StpStatus.Discarding).build(); - NodeConnector nc1 = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("1"))).build(); - NodeConnector nc2 = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("2"))).build(); - NodeConnector nc3 = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("3"))) + NodeConnector nc1 = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("1"))).build(); + NodeConnector nc2 = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("2"))).build(); + NodeConnector nc3 = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("3"))) .addAugmentation(StpStatusAwareNodeConnector.class, stpStatusAwareNodeConnector).build(); - NodeConnector ncLocal = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("LOCAL"))) + NodeConnector ncLocal = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("LOCAL"))) .addAugmentation(StpStatusAwareNodeConnector.class, stpStatusAwareNodeConnector).build(); List nodeConnectors = new ArrayList<>(); diff --git a/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/flow/InitialFlowWriterTest.java b/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/flow/InitialFlowWriterTest.java index b49bbe45..10e4818f 100644 --- a/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/flow/InitialFlowWriterTest.java +++ b/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/flow/InitialFlowWriterTest.java @@ -15,6 +15,7 @@ import static org.mockito.Mockito.when; import java.util.Collections; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; @@ -32,7 +33,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class InitialFlowWriterTest { - @MockitoAnnotations.Mock private SalFlowService salFlowService; + @Mock private SalFlowService salFlowService; private InitialFlowWriter initialFlowWriter; @Before diff --git a/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReaderTest.java b/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReaderTest.java index a7599b9a..4020c8a4 100644 --- a/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReaderTest.java +++ b/arphandler/src/test/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReaderTest.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -48,7 +49,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class InventoryReaderTest { - @MockitoAnnotations.Mock + @Mock private DataBroker dataBroker; private InventoryReader inventoryReader; @@ -124,11 +125,11 @@ public class InventoryReaderTest { public void testReadInventory_Refresh() throws Exception { StpStatusAwareNodeConnector stpStatusAwareNodeConnector = new StpStatusAwareNodeConnectorBuilder() .setStatus(StpStatus.Discarding).build(); - NodeConnector nc1 = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("1"))).build(); - NodeConnector nc2 = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("2"))).build(); - NodeConnector nc3 = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("3"))) + NodeConnector nc1 = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("1"))).build(); + NodeConnector nc2 = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("2"))).build(); + NodeConnector nc3 = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("3"))) .addAugmentation(StpStatusAwareNodeConnector.class, stpStatusAwareNodeConnector).build(); - NodeConnector ncLocal = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("LOCAL"))) + NodeConnector ncLocal = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("LOCAL"))) .addAugmentation(StpStatusAwareNodeConnector.class, stpStatusAwareNodeConnector).build(); List nodeConnectors = new ArrayList(); diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 9451d316..a8358b4b 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.0 + 5.0.2 diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml index db21e2af..b7c4bd6b 100644 --- a/distribution/karaf/pom.xml +++ b/distribution/karaf/pom.xml @@ -4,16 +4,13 @@ org.opendaylight.odlparent karaf4-parent - 3.1.0 + 5.0.2 distribution-karaf org.opendaylight.l2switch 0.8.0-SNAPSHOT pom - - 3.0 - odl-l2switch-switch-ui diff --git a/features/features-l2switch/pom.xml b/features/features-l2switch/pom.xml index a981fc31..8d38b570 100644 --- a/features/features-l2switch/pom.xml +++ b/features/features-l2switch/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 3.1.0 + 5.0.2 @@ -43,6 +43,7 @@ xml features + ${project.groupId} odl-l2switch-hosttracker diff --git a/features/odl-l2switch-addresstracker/pom.xml b/features/odl-l2switch-addresstracker/pom.xml index d458c7a3..f9d7496a 100644 --- a/features/odl-l2switch-addresstracker/pom.xml +++ b/features/odl-l2switch-addresstracker/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.0 + 5.0.2 diff --git a/features/odl-l2switch-all/pom.xml b/features/odl-l2switch-all/pom.xml index a9b2a901..ba35c411 100644 --- a/features/odl-l2switch-all/pom.xml +++ b/features/odl-l2switch-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.0 + 5.0.2 diff --git a/features/odl-l2switch-arphandler/pom.xml b/features/odl-l2switch-arphandler/pom.xml index 19ad9e0a..c660ec02 100644 --- a/features/odl-l2switch-arphandler/pom.xml +++ b/features/odl-l2switch-arphandler/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.0 + 5.0.2 diff --git a/features/odl-l2switch-hosttracker/pom.xml b/features/odl-l2switch-hosttracker/pom.xml index ae15d8a9..4637800d 100644 --- a/features/odl-l2switch-hosttracker/pom.xml +++ b/features/odl-l2switch-hosttracker/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.0 + 5.0.2 diff --git a/features/odl-l2switch-loopremover/pom.xml b/features/odl-l2switch-loopremover/pom.xml index 6e839628..e6dc45ca 100644 --- a/features/odl-l2switch-loopremover/pom.xml +++ b/features/odl-l2switch-loopremover/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.0 + 5.0.2 @@ -27,14 +27,14 @@ org.opendaylight.openflowplugin odl-openflowplugin-flow-services - 0.7.0-SNAPSHOT + 0.9.1 xml features org.opendaylight.odlparent odl-jung-2.1 - 3.1.0 + 5.0.2 xml features diff --git a/features/odl-l2switch-packethandler/pom.xml b/features/odl-l2switch-packethandler/pom.xml index 77489255..7e722e3c 100644 --- a/features/odl-l2switch-packethandler/pom.xml +++ b/features/odl-l2switch-packethandler/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.0 + 5.0.2 @@ -27,7 +27,7 @@ org.opendaylight.openflowplugin odl-openflowplugin-southbound - 0.7.0-SNAPSHOT + 0.9.1 xml features diff --git a/features/odl-l2switch-switch-rest/pom.xml b/features/odl-l2switch-switch-rest/pom.xml index d4908615..e66e2874 100644 --- a/features/odl-l2switch-switch-rest/pom.xml +++ b/features/odl-l2switch-switch-rest/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.0 + 5.0.2 @@ -34,7 +34,7 @@ org.opendaylight.netconf odl-restconf - 1.8.0-SNAPSHOT + 1.10.1 xml features diff --git a/features/odl-l2switch-switch-ui/pom.xml b/features/odl-l2switch-switch-ui/pom.xml index a3f82555..b3acb57e 100644 --- a/features/odl-l2switch-switch-ui/pom.xml +++ b/features/odl-l2switch-switch-ui/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.0 + 5.0.2 @@ -34,7 +34,7 @@ org.opendaylight.netconf odl-mdsal-apidocs - 1.8.0-SNAPSHOT + 1.10.1 xml features diff --git a/features/odl-l2switch-switch/pom.xml b/features/odl-l2switch-switch/pom.xml index 521927c7..0b8d2c73 100644 --- a/features/odl-l2switch-switch/pom.xml +++ b/features/odl-l2switch-switch/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.0 + 5.0.2 diff --git a/features/pom.xml b/features/pom.xml index fce3dd28..078e2888 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.0 + 5.0.2 @@ -26,7 +26,9 @@ odl-l2switch-all odl-l2switch-switch odl-l2switch-switch-rest + odl-l2switch-hosttracker odl-l2switch-addresstracker odl-l2switch-arphandler diff --git a/hosttracker/implementation/pom.xml b/hosttracker/implementation/pom.xml index cca45b3a..2837dc6e 100644 --- a/hosttracker/implementation/pom.xml +++ b/hosttracker/implementation/pom.xml @@ -55,6 +55,11 @@ org.opendaylight.mdsal yang-binding + + com.google.code.findbugs + jsr305 + true + org.opendaylight.controller.model model-inventory diff --git a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/ConcurrentClusterAwareHostHashMap.java b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/ConcurrentClusterAwareHostHashMap.java index e1aeec27..8b463d50 100644 --- a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/ConcurrentClusterAwareHostHashMap.java +++ b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/ConcurrentClusterAwareHostHashMap.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014 André Martins and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -91,8 +91,8 @@ public class ConcurrentClusterAwareHostHashMap { * the value's (Host's) InstanceIdentifier<Node> * @param value * the Host to store locally. - * @return the previous value associated with key, or null - * if there was no mapping for key + * @return the previous value associated with {@code key}, or {@code null} + * if there was no mapping for {@code key} */ public synchronized Host putLocally(InstanceIdentifier ii, Host value) { Host host = value; @@ -129,7 +129,7 @@ public class ConcurrentClusterAwareHostHashMap { public synchronized void submit(HostId hostid) { Host host = this.hostHashMap.get(hostid); final Node hostNode = host.getHostNode(); - final InstanceIdentifier buildNodeIID = Utilities.buildNodeIID(hostNode.getKey(), topologyId); + final InstanceIdentifier buildNodeIID = Utilities.buildNodeIID(hostNode.key(), topologyId); this.opProcessor.enqueueOperation(tx -> tx.merge(LogicalDatastoreType.OPERATIONAL, buildNodeIID, hostNode, true)); putLocally(buildNodeIID, host); @@ -147,7 +147,7 @@ public class ConcurrentClusterAwareHostHashMap { public synchronized void putAll(List hosts) { for (Host h : hosts) { final Node hostNode = h.getHostNode(); - final InstanceIdentifier buildNodeIID = Utilities.buildNodeIID(hostNode.getKey(), topologyId); + final InstanceIdentifier buildNodeIID = Utilities.buildNodeIID(hostNode.key(), topologyId); this.opProcessor.enqueueOperation(tx -> tx.merge(LogicalDatastoreType.OPERATIONAL, buildNodeIID, hostNode, true)); putLocally(buildNodeIID, h); @@ -167,7 +167,7 @@ public class ConcurrentClusterAwareHostHashMap { */ public synchronized Host put(HostId hostId, Host host) { final Node hostNode = host.getHostNode(); - final InstanceIdentifier buildNodeIID = Utilities.buildNodeIID(hostNode.getKey(), topologyId); + final InstanceIdentifier buildNodeIID = Utilities.buildNodeIID(hostNode.key(), topologyId); this.opProcessor.enqueueOperation(tx -> tx.merge(LogicalDatastoreType.OPERATIONAL, buildNodeIID, hostNode, true)); LOG.trace("Putting MD-SAL {}", hostNode.getNodeId()); @@ -186,7 +186,7 @@ public class ConcurrentClusterAwareHostHashMap { Host removedValue = this.hostHashMap.remove(hostId); if (removedValue != null) { Node hostNode = removedValue.getHostNode(); - final InstanceIdentifier hnIID = Utilities.buildNodeIID(hostNode.getKey(), topologyId); + final InstanceIdentifier hnIID = Utilities.buildNodeIID(hostNode.key(), topologyId); this.opProcessor.enqueueOperation(tx -> tx.delete(LogicalDatastoreType.OPERATIONAL, hnIID)); this.instanceIDs.remove(hnIID); } diff --git a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/ConcurrentClusterAwareLinkHashMap.java b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/ConcurrentClusterAwareLinkHashMap.java index 4a526b9b..499fc5bc 100644 --- a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/ConcurrentClusterAwareLinkHashMap.java +++ b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/ConcurrentClusterAwareLinkHashMap.java @@ -1,11 +1,10 @@ -/** +/* * Copyright (c) 2016 Brocade Communications 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.l2switch.hosttracker.plugin.internal; import java.util.Collection; @@ -52,8 +51,8 @@ public class ConcurrentClusterAwareLinkHashMap { * * @param ii the value's (Link's) InstanceIdentifier<Link> * @param link the Link to store locally. - * @return the previous value associated with key, or - * null if there was no mapping for key + * @return the previous value associated with {@code key}, or + * {@code null} if there was no mapping for {@code key} */ public synchronized Link putLocally(InstanceIdentifier ii, Link link) { LOG.trace("Putting locally {}", link.getLinkId()); @@ -69,7 +68,7 @@ public class ConcurrentClusterAwareLinkHashMap { */ public synchronized void removeAll(List links) { for (final Map.Entry, LinkId> e : this.instanceIDs.entrySet()) { - LOG.debug("Links to remove from local & MD-SAL database", links.toString()); + LOG.debug("Links to remove from local & MD-SAL database: {}", links); for (Link l : links) { if (e.getValue().equals(l.getLinkId())) { this.opProcessor.enqueueOperation(tx -> tx.delete(LogicalDatastoreType.OPERATIONAL, e.getKey())); diff --git a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/HostTrackerImpl.java b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/HostTrackerImpl.java index 2fd37c33..a8629ba7 100644 --- a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/HostTrackerImpl.java +++ b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/HostTrackerImpl.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014 André Martins, Colin Dixon, Evan Zeller and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -197,7 +197,7 @@ public class HostTrackerImpl implements DataTreeChangeListener { if (iid.getTargetType().equals(Node.class)) { Node node = (Node) rootNode.getDataBefore(); InstanceIdentifier iiN = (InstanceIdentifier) iid; - HostNode hostNode = node.getAugmentation(HostNode.class); + HostNode hostNode = node.augmentation(HostNode.class); if (hostNode != null) { hosts.removeLocally(iiN); } @@ -228,8 +228,8 @@ public class HostTrackerImpl implements DataTreeChangeListener { try { opNodeConnector = futureNodeConnector.get(); opNode = futureNode.get(); - } catch (ExecutionException | InterruptedException ex) { - LOG.warn(ex.getLocalizedMessage()); + } catch (ExecutionException | InterruptedException e) { + LOG.warn("Failed to get node connector {}", iinc, e); } if (opNode != null && opNode.isPresent() && opNodeConnector != null && opNodeConnector.isPresent()) { @@ -283,7 +283,7 @@ public class HostTrackerImpl implements DataTreeChangeListener { * if it was not found a network topology or it was not found a host connected to this nodeConnetor. */ private boolean isNodeConnectorInternal(NodeConnector nodeConnector) { - TpId tpId = new TpId(nodeConnector.getKey().getId().getValue()); + TpId tpId = new TpId(nodeConnector.key().getId().getValue()); InstanceIdentifier ntII = InstanceIdentifier.builder(NetworkTopology.class).build(); ListenableFuture> lfONT; @@ -293,8 +293,8 @@ public class HostTrackerImpl implements DataTreeChangeListener { Optional optionalNT; try { optionalNT = lfONT.get(); - } catch (InterruptedException | ExecutionException ex) { - LOG.warn(ex.getLocalizedMessage()); + } catch (InterruptedException | ExecutionException e) { + LOG.warn("Failed to get network topology {}", ntII, e); return false; } if (optionalNT.isPresent()) { @@ -353,14 +353,14 @@ public class HostTrackerImpl implements DataTreeChangeListener { private void writeDataToDataStore(List linksToAdd, List linksToRemove) { if (linksToAdd != null) { for (final Link l : linksToAdd) { - final InstanceIdentifier lIID = Utilities.buildLinkIID(l.getKey(), topologyId); + final InstanceIdentifier lIID = Utilities.buildLinkIID(l.key(), topologyId); LOG.trace("Writing link from MD_SAL: {}", lIID.toString()); opProcessor.enqueueOperation(tx -> tx.merge(LogicalDatastoreType.OPERATIONAL, lIID, l, true)); } } if (linksToRemove != null) { for (Link l : linksToRemove) { - final InstanceIdentifier lIID = Utilities.buildLinkIID(l.getKey(), topologyId); + final InstanceIdentifier lIID = Utilities.buildLinkIID(l.key(), topologyId); LOG.trace("Removing link from MD_SAL: {}", lIID.toString()); opProcessor.enqueueOperation(tx -> tx.delete(LogicalDatastoreType.OPERATIONAL, lIID)); } @@ -380,7 +380,7 @@ public class HostTrackerImpl implements DataTreeChangeListener { final long nowInSeconds = TimeUnit.MILLISECONDS.toSeconds(nowInMillis); // iterate through all hosts in the local cache for (Host h : hosts.values()) { - final HostNode hn = h.getHostNode().getAugmentation(HostNode.class); + final HostNode hn = h.getHostNode().augmentation(HostNode.class); if (hn == null) { LOG.warn("Encountered non-host node {} in hosts during purge", h); } else if (hn.getAddresses() != null) { diff --git a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/HostTrackerOperation.java b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/HostTrackerOperation.java index 37f44142..23bb354a 100644 --- a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/HostTrackerOperation.java +++ b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/HostTrackerOperation.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2015 Evan Zeller and others. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/OperationProcessor.java b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/OperationProcessor.java index 69746d8c..bde2bb15 100644 --- a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/OperationProcessor.java +++ b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/OperationProcessor.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2015 Evan Zeller and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -95,7 +95,7 @@ public class OperationProcessor implements AutoCloseable, Runnable, TransactionC } clearQueue(); } catch (IllegalStateException e) { - LOG.warn(e.getLocalizedMessage()); + LOG.warn("Failed to close chain", e); } } diff --git a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/SimpleAddressObserver.java b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/SimpleAddressObserver.java index 9a10b407..150375f2 100644 --- a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/SimpleAddressObserver.java +++ b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/internal/SimpleAddressObserver.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014 André Martins, Colin Dixon, Evan Zeller and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -187,7 +187,7 @@ public class SimpleAddressObserver implements ArpPacketListener, Ipv4PacketListe BigInteger id = BigInteger.valueOf(ketype.getIntValue()).abs() .add(BigInteger.valueOf(srcMacAddr.hashCode()).abs().shiftLeft(16)); addrs.setId(id); - addrs.setKey(new AddressesKey(addrs.getId())); + addrs.withKey(new AddressesKey(addrs.getId())); addrs.setVlan(vlanId); addrs.setIp(srcIpAddr); addrs.setMac(srcMacAddr); diff --git a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/inventory/Host.java b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/inventory/Host.java index dfe32091..df941daa 100644 --- a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/inventory/Host.java +++ b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/inventory/Host.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014 André Martins, Colin Dixon, Evan Zeller and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -44,7 +44,7 @@ public class Host { private final NodeBuilder nodeBuilder; public static Host createHost(Node node) { - HostNode hostNode = node.getAugmentation(HostNode.class); + HostNode hostNode = node.augmentation(HostNode.class); return new Host(hostNode.getId(), hostNode.getAddresses(), hostNode.getAttachmentPoints()); } @@ -105,7 +105,7 @@ public class Host { } NodeBuilder node = new NodeBuilder().setNodeId(createNodeId(hostNode)) .setTerminationPoint(tps); - node.setKey(new NodeKey(node.getNodeId())); + node.withKey(new NodeKey(node.getNodeId())); return node; } @@ -226,7 +226,7 @@ public class Host { public synchronized void removeAttachmentPoints(AttachmentPointsBuilder apb) { LOG.debug("Setting attachment points {} to inactive state", apb); for (AttachmentPointsBuilder apbi : attachmentPointsBuilders) { - if (apbi.getKey().equals(apb.getKey())) { + if (apbi.key().equals(apb.key())) { apbi.setActive(Boolean.FALSE); } } diff --git a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Compare.java b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Compare.java index 55e11107..aa3c241f 100644 --- a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Compare.java +++ b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Compare.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014 André Martins, Colin Dixon, Evan Zeller and others. All rights reserved. * * This program and the accompanying materials are made available under the diff --git a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Utilities.java b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Utilities.java index 1cbfb1e8..8aa307e4 100644 --- a/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Utilities.java +++ b/hosttracker/implementation/src/main/java/org/opendaylight/l2switch/hosttracker/plugin/util/Utilities.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014 André Martins, Colin Dixon, Evan Zeller and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -41,7 +41,7 @@ public final class Utilities { .setDestination(new DestinationBuilder()// .setDestNode(dstNId).setDestTp(dstTpId).build())// .setLinkId(new LinkId(srcTpId.getValue() + "/" + dstTpId.getValue())); - srcdst.setKey(new LinkKey(srcdst.getLinkId())); + srcdst.withKey(new LinkKey(srcdst.getLinkId())); LinkBuilder dstsrc = new LinkBuilder()// .setSource(new SourceBuilder()// .setSourceNode(dstNId)// @@ -49,7 +49,7 @@ public final class Utilities { .setDestination(new DestinationBuilder()// .setDestNode(srcNId).setDestTp(srcTpId).build())// .setLinkId(new LinkId(dstTpId.getValue() + "/" + srcTpId.getValue())); - dstsrc.setKey(new LinkKey(dstsrc.getLinkId())); + dstsrc.withKey(new LinkKey(dstsrc.getLinkId())); links.add(dstsrc.build()); links.add(srcdst.build()); return links; @@ -77,7 +77,7 @@ public final class Utilities { public static AttachmentPointsBuilder createAPsfromTP(TpId tpId) { AttachmentPointsBuilder at = new AttachmentPointsBuilder()// .setTpId(tpId)// - .setKey(new AttachmentPointsKey(tpId)); + .withKey(new AttachmentPointsKey(tpId)); return at; } } diff --git a/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/FlowWriterServiceImpl.java b/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/FlowWriterServiceImpl.java index 2df79af7..8728878d 100644 --- a/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/FlowWriterServiceImpl.java +++ b/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/FlowWriterServiceImpl.java @@ -44,7 +44,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.ethernet.match.fields.EthernetDestinationBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.ethernet.match.fields.EthernetSourceBuilder; @@ -185,7 +184,7 @@ public class FlowWriterServiceImpl implements FlowWriterService { EthernetMatch ethernetMatch = ethernetMatchBuilder.build(); Match match = new MatchBuilder().setEthernetMatch(ethernetMatch).build(); - Uri destPortUri = destPort.getValue().firstKeyOf(NodeConnector.class, NodeConnectorKey.class).getId(); + Uri destPortUri = destPort.getValue().firstKeyOf(NodeConnector.class).getId(); Action outputToControllerAction = new ActionBuilder() // .setOrder(0) diff --git a/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/InitialFlowWriter.java b/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/InitialFlowWriter.java index 3784d2a6..a265f025 100644 --- a/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/InitialFlowWriter.java +++ b/l2switch-main/src/main/java/org/opendaylight/l2switch/flow/InitialFlowWriter.java @@ -52,7 +52,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -147,7 +146,7 @@ public class InitialFlowWriter implements DataTreeChangeListener { for (InstanceIdentifier nodeId : nodeIds) { if (Node.class.isAssignableFrom(nodeId.getTargetType())) { InstanceIdentifier invNodeId = (InstanceIdentifier) nodeId; - if (invNodeId.firstKeyOf(Node.class, NodeKey.class).getId().getValue().contains("openflow:")) { + if (invNodeId.firstKeyOf(Node.class).getId().getValue().contains("openflow:")) { addInitialFlows(invNodeId); } } @@ -236,7 +235,7 @@ public class InitialFlowWriter implements DataTreeChangeListener { InstanceIdentifier
tableInstanceId, InstanceIdentifier flowPath, Flow flow) { - LOG.trace("Adding flow to node {}",nodeInstanceId.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + LOG.trace("Adding flow to node {}",nodeInstanceId.firstKeyOf(Node.class).getId().getValue()); final AddFlowInputBuilder builder = new AddFlowInputBuilder(flow); builder.setNode(new NodeRef(nodeInstanceId)); builder.setFlowRef(new FlowRef(flowPath)); diff --git a/l2switch-main/src/main/java/org/opendaylight/l2switch/inventory/InventoryReader.java b/l2switch-main/src/main/java/org/opendaylight/l2switch/inventory/InventoryReader.java index d777154e..326dd150 100644 --- a/l2switch-main/src/main/java/org/opendaylight/l2switch/inventory/InventoryReader.java +++ b/l2switch-main/src/main/java/org/opendaylight/l2switch/inventory/InventoryReader.java @@ -70,21 +70,21 @@ public class InventoryReader { LOG.debug("Looking address{} in node : {}", macAddress, nodeInsId); for (NodeConnector nc : node.getNodeConnector()) { // Don't look for mac in discarding node connectors - StpStatusAwareNodeConnector saNodeConnector = nc.getAugmentation(StpStatusAwareNodeConnector.class); + StpStatusAwareNodeConnector saNodeConnector = nc.augmentation(StpStatusAwareNodeConnector.class); if (saNodeConnector != null && StpStatus.Discarding.equals(saNodeConnector.getStatus())) { continue; } - LOG.debug("Looking address{} in nodeconnector : {}", macAddress, nc.getKey()); - AddressCapableNodeConnector acnc = nc.getAugmentation(AddressCapableNodeConnector.class); + LOG.debug("Looking address{} in nodeconnector : {}", macAddress, nc.key()); + AddressCapableNodeConnector acnc = nc.augmentation(AddressCapableNodeConnector.class); if (acnc != null) { List addressesList = acnc.getAddresses(); for (Addresses add : addressesList) { if (macAddress.equals(add.getMac())) { if (add.getLastSeen() > latest) { destNodeConnector = new NodeConnectorRef( - nodeInsId.child(NodeConnector.class, nc.getKey())); + nodeInsId.child(NodeConnector.class, nc.key())); latest = add.getLastSeen(); - LOG.debug("Found address{} in nodeconnector : {}", macAddress, nc.getKey()); + LOG.debug("Found address{} in nodeconnector : {}", macAddress, nc.key()); break; } } diff --git a/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/FlowWriterServiceImplTest.java b/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/FlowWriterServiceImplTest.java index c44a1bfa..55de3fc9 100644 --- a/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/FlowWriterServiceImplTest.java +++ b/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/FlowWriterServiceImplTest.java @@ -14,6 +14,7 @@ import static org.mockito.Mockito.verify; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInput; @@ -30,7 +31,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class FlowWriterServiceImplTest { - @MockitoAnnotations.Mock + @Mock private SalFlowService salFlowService; private FlowWriterServiceImpl flowWriterService; private InstanceIdentifier nodeConnectorInstanceIdentifier; diff --git a/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/InitialFlowWriterTest.java b/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/InitialFlowWriterTest.java index 43139d69..a69a1312 100644 --- a/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/InitialFlowWriterTest.java +++ b/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/InitialFlowWriterTest.java @@ -15,6 +15,7 @@ import static org.mockito.Mockito.when; import java.util.Collections; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; @@ -32,7 +33,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class InitialFlowWriterTest { - @MockitoAnnotations.Mock private SalFlowService salFlowService; + @Mock private SalFlowService salFlowService; private InitialFlowWriter initialFlowWriter; @Before diff --git a/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/InventoryReaderTest.java b/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/InventoryReaderTest.java index 4ba05aab..39708217 100644 --- a/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/InventoryReaderTest.java +++ b/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/InventoryReaderTest.java @@ -18,6 +18,7 @@ import java.util.Date; import java.util.List; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; @@ -46,15 +47,15 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class InventoryReaderTest { - @MockitoAnnotations.Mock + @Mock private DataBroker dataService; - @MockitoAnnotations.Mock + @Mock private ReadOnlyTransaction readOnlyTransaction; - @MockitoAnnotations.Mock + @Mock private Optional dataObjectOptional; - @MockitoAnnotations.Mock + @Mock private CheckedFuture checkedFuture; - @MockitoAnnotations.Mock + @Mock private Node node; private InventoryReader inventoryReader; @@ -98,13 +99,13 @@ public class InventoryReaderTest { StpStatusAwareNodeConnector stpStatusAwareNodeConnector = new StpStatusAwareNodeConnectorBuilder() .setStatus(StpStatus.Discarding).build(); - NodeConnector nc1 = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("1"))).build(); - NodeConnector nc2 = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("2"))) + NodeConnector nc1 = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("1"))).build(); + NodeConnector nc2 = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("2"))) .addAugmentation(AddressCapableNodeConnector.class, addressCapableNodeConnector).build(); - NodeConnector nc3 = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("3"))) + NodeConnector nc3 = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("3"))) .addAugmentation(StpStatusAwareNodeConnector.class, stpStatusAwareNodeConnector) .addAugmentation(AddressCapableNodeConnector.class, addressCapableNodeConnector).build(); - NodeConnector ncLocal = new NodeConnectorBuilder().setKey(new NodeConnectorKey(new NodeConnectorId("LOCAL"))) + NodeConnector ncLocal = new NodeConnectorBuilder().withKey(new NodeConnectorKey(new NodeConnectorId("LOCAL"))) .addAugmentation(StpStatusAwareNodeConnector.class, stpStatusAwareNodeConnector) .addAugmentation(AddressCapableNodeConnector.class, addressCapableNodeConnector).build(); diff --git a/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java b/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java index 79458389..022c0864 100644 --- a/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java +++ b/l2switch-main/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java @@ -16,6 +16,7 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opendaylight.l2switch.inventory.InventoryReader; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; @@ -33,9 +34,12 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class ReactiveFlowWriterTest { - @MockitoAnnotations.Mock private InventoryReader inventoryReader; - @MockitoAnnotations.Mock private FlowWriterService flowWriterService; - @MockitoAnnotations.Mock private NodeConnectorRef destNodeConnectorRef; + @Mock + private InventoryReader inventoryReader; + @Mock + private FlowWriterService flowWriterService; + @Mock + private NodeConnectorRef destNodeConnectorRef; private ReactiveFlowWriter reactiveFlowWriter; private InstanceIdentifier nodeInstanceIdentifier; private NodeConnectorRef nodeConnectorRef; diff --git a/l2switch-main/src/test/java/org/opendaylight/l2switch/util/InstanceIdentifierUtilsTest.java b/l2switch-main/src/test/java/org/opendaylight/l2switch/util/InstanceIdentifierUtilsTest.java index e31bc6ee..34008589 100644 --- a/l2switch-main/src/test/java/org/opendaylight/l2switch/util/InstanceIdentifierUtilsTest.java +++ b/l2switch-main/src/test/java/org/opendaylight/l2switch/util/InstanceIdentifierUtilsTest.java @@ -45,7 +45,7 @@ public class InstanceIdentifierUtilsTest { InstanceIdentifier
tableInsId = InstanceIdentifierUtils.generateFlowTableInstanceIdentifier(ncRef, new TableKey(NUM_ID_1)); assertNotNull(tableInsId); - assertEquals(NUM_ID_1, tableInsId.firstKeyOf(Table.class, TableKey.class).getId()); + assertEquals(NUM_ID_1, tableInsId.firstKeyOf(Table.class).getId()); } @Test @@ -56,7 +56,7 @@ public class InstanceIdentifierUtilsTest { InstanceIdentifier flowInsId = InstanceIdentifierUtils.generateFlowInstanceIdentifier(ncRef, new TableKey(NUM_ID_1), new FlowKey(new FlowId(STR_ID_1))); assertNotNull(flowInsId); - assertEquals(NUM_ID_1, flowInsId.firstKeyOf(Table.class, TableKey.class).getId()); - assertEquals(STR_ID_1, flowInsId.firstKeyOf(Flow.class, FlowKey.class).getId().getValue()); + assertEquals(NUM_ID_1, flowInsId.firstKeyOf(Table.class).getId()); + assertEquals(STR_ID_1, flowInsId.firstKeyOf(Flow.class).getId().getValue()); } } diff --git a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriter.java b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriter.java index d4859a19..904872f4 100644 --- a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriter.java +++ b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriter.java @@ -55,7 +55,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.EtherType; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.ethernet.match.fields.EthernetTypeBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.EthernetMatchBuilder; @@ -157,7 +156,7 @@ public class InitialFlowWriter implements DataTreeChangeListener { for (InstanceIdentifier nodeId : nodeIds) { if (Node.class.isAssignableFrom(nodeId.getTargetType())) { InstanceIdentifier topoNodeId = (InstanceIdentifier)nodeId; - if (topoNodeId.firstKeyOf(Node.class,NodeKey.class).getId().getValue().contains("openflow:")) { + if (topoNodeId.firstKeyOf(Node.class).getId().getValue().contains("openflow:")) { addInitialFlows(topoNodeId); } } @@ -245,7 +244,7 @@ public class InitialFlowWriter implements DataTreeChangeListener { private Action getSendToControllerAction() { Action sendToController = new ActionBuilder() .setOrder(0) - .setKey(new ActionKey(0)) + .withKey(new ActionKey(0)) .setAction(new OutputActionCaseBuilder() .setOutputAction(new OutputActionBuilder() .setMaxLength(0xffff) @@ -261,7 +260,7 @@ public class InitialFlowWriter implements DataTreeChangeListener { InstanceIdentifier
tableInstanceId, InstanceIdentifier flowPath, Flow flow) { - LOG.trace("Adding flow to node {}",nodeInstanceId.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + LOG.trace("Adding flow to node {}",nodeInstanceId.firstKeyOf(Node.class).getId().getValue()); final AddFlowInputBuilder builder = new AddFlowInputBuilder(flow); builder.setNode(new NodeRef(nodeInstanceId)); builder.setFlowRef(new FlowRef(flowPath)); diff --git a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/NetworkGraphImpl.java b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/NetworkGraphImpl.java index c102545d..064bebbe 100644 --- a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/NetworkGraphImpl.java +++ b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/NetworkGraphImpl.java @@ -18,7 +18,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.annotation.concurrent.GuardedBy; +import org.checkerframework.checker.lock.qual.GuardedBy; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Link; import org.slf4j.Logger; diff --git a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java index 6b5dbf4c..fa631fcb 100644 --- a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java +++ b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java @@ -280,7 +280,7 @@ public class TopologyLinkDataChangeHandler implements DataTreeChangeListener tablePath) { - return tablePath.firstKeyOf(Table.class, TableKey.class).getId(); + return tablePath.firstKeyOf(Table.class).getId(); } /** * Extracts NodeConnectorKey from node connector path. */ public static NodeConnectorKey getNodeConnectorKey(final InstanceIdentifier nodeConnectorPath) { - return nodeConnectorPath.firstKeyOf(NodeConnector.class, NodeConnectorKey.class); + return nodeConnectorPath.firstKeyOf(NodeConnector.class); } /** * Extracts NodeKey from node path. */ public static NodeKey getNodeKey(final InstanceIdentifier nodePath) { - return nodePath.firstKeyOf(Node.class, NodeKey.class); + return nodePath.firstKeyOf(Node.class); } public static InstanceIdentifier createNodeConnectorIdentifier(final String nodeIdValue, diff --git a/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriterTest.java b/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriterTest.java index 6fbb820b..a621c473 100644 --- a/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriterTest.java +++ b/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriterTest.java @@ -7,7 +7,7 @@ */ package org.opendaylight.l2switch.loopremover.flow; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -15,6 +15,7 @@ import static org.mockito.Mockito.when; import java.util.Collections; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; @@ -32,7 +33,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class InitialFlowWriterTest { - @MockitoAnnotations.Mock private SalFlowService salFlowService; + @Mock + private SalFlowService salFlowService; private InitialFlowWriter initialFlowWriter; @Before diff --git a/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandlerTest.java b/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandlerTest.java index 4e51a9da..21fbe47b 100644 --- a/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandlerTest.java +++ b/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandlerTest.java @@ -7,7 +7,7 @@ */ package org.opendaylight.l2switch.loopremover.topology; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -19,6 +19,7 @@ import java.util.Collections; import java.util.List; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -47,9 +48,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class TopologyLinkDataChangeHandlerTest { - @MockitoAnnotations.Mock + @Mock private DataBroker dataBroker; - @MockitoAnnotations.Mock + @Mock private NetworkGraphService networkGraphService; private TopologyLinkDataChangeHandler topologyLinkDataChangeHandler; diff --git a/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/util/InstanceIdentifierUtilsTest.java b/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/util/InstanceIdentifierUtilsTest.java index 795747ed..3b990fe7 100644 --- a/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/util/InstanceIdentifierUtilsTest.java +++ b/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/util/InstanceIdentifierUtilsTest.java @@ -18,11 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeCon import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class InstanceIdentifierUtilsTest { @@ -36,7 +33,7 @@ public class InstanceIdentifierUtilsTest { InstanceIdentifier insId = InstanceIdentifierUtils.createNodePath(new NodeId(STR_ID_1)); assertNotNull(insId); assertNotNull(insId.firstIdentifierOf(Nodes.class)); - assertEquals(STR_ID_1, insId.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + assertEquals(STR_ID_1, insId.firstKeyOf(Node.class).getId().getValue()); } @Test @@ -51,7 +48,7 @@ public class InstanceIdentifierUtilsTest { InstanceIdentifier
tableInsId = InstanceIdentifierUtils.createTablePath( InstanceIdentifier.builder(Nodes.class).child(Node.class).build(), new TableKey(NUM_ID_1)); assertNotNull(tableInsId); - assertEquals(NUM_ID_1.shortValue(), tableInsId.firstKeyOf(Table.class, TableKey.class).getId().shortValue()); + assertEquals(NUM_ID_1.shortValue(), tableInsId.firstKeyOf(Table.class).getId().shortValue()); assertNotNull(tableInsId.firstIdentifierOf(FlowCapableNode.class)); } @@ -60,8 +57,8 @@ public class InstanceIdentifierUtilsTest { InstanceIdentifier ncInsId = InstanceIdentifierUtils.createNodeConnectorIdentifier(STR_ID_1, STR_ID_2); assertNotNull(ncInsId); - assertEquals(STR_ID_1, ncInsId.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); - assertEquals(STR_ID_2, ncInsId.firstKeyOf(NodeConnector.class, NodeConnectorKey.class).getId().getValue()); + assertEquals(STR_ID_1, ncInsId.firstKeyOf(Node.class).getId().getValue()); + assertEquals(STR_ID_2, ncInsId.firstKeyOf(NodeConnector.class).getId().getValue()); } @Test @@ -78,7 +75,7 @@ public class InstanceIdentifierUtilsTest { InstanceIdentifier
tableInsId = InstanceIdentifierUtils.generateFlowTableInstanceIdentifier(ncRef, new TableKey(NUM_ID_1)); assertNotNull(tableInsId); - assertEquals(NUM_ID_1, tableInsId.firstKeyOf(Table.class, TableKey.class).getId()); + assertEquals(NUM_ID_1, tableInsId.firstKeyOf(Table.class).getId()); } @Test @@ -86,6 +83,6 @@ public class InstanceIdentifierUtilsTest { InstanceIdentifier topologyInsId = InstanceIdentifierUtils .generateTopologyInstanceIdentifier(STR_ID_1); assertNotNull(topologyInsId); - assertEquals(STR_ID_1, topologyInsId.firstKeyOf(Topology.class, TopologyKey.class).getTopologyId().getValue()); + assertEquals(STR_ID_1, topologyInsId.firstKeyOf(Topology.class).getTopologyId().getValue()); } } diff --git a/loopremover/model/pom.xml b/loopremover/model/pom.xml index 4901e121..509ccb4d 100644 --- a/loopremover/model/pom.xml +++ b/loopremover/model/pom.xml @@ -21,8 +21,8 @@ yang-common - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types diff --git a/packethandler/implementation/pom.xml b/packethandler/implementation/pom.xml index af23d12e..c84c97e2 100644 --- a/packethandler/implementation/pom.xml +++ b/packethandler/implementation/pom.xml @@ -35,6 +35,11 @@ org.opendaylight.openflowplugin.model model-flow-service + + com.google.code.findbugs + jsr305 + true + diff --git a/packethandler/implementation/src/main/java/org/opendaylight/l2switch/packethandler/decoders/ArpDecoder.java b/packethandler/implementation/src/main/java/org/opendaylight/l2switch/packethandler/decoders/ArpDecoder.java index daebb905..93f917bc 100644 --- a/packethandler/implementation/src/main/java/org/opendaylight/l2switch/packethandler/decoders/ArpDecoder.java +++ b/packethandler/implementation/src/main/java/org/opendaylight/l2switch/packethandler/decoders/ArpDecoder.java @@ -100,7 +100,7 @@ public class ArpDecoder extends AbstractPacketDecodermodel-flow-service - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types diff --git a/parent/pom.xml b/parent/pom.xml index 5afc0fb9..fb209bd3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 0.13.0-SNAPSHOT + 4.0.6 org.opendaylight.l2switch @@ -13,24 +13,19 @@ 0.8.0-SNAPSHOT pom - - 2.1.1 - 0.7.0-SNAPSHOT - - org.opendaylight.controller mdsal-artifacts - 1.8.0-SNAPSHOT + 1.10.1 import pom org.opendaylight.openflowplugin openflowplugin-artifacts - ${openflow.plugin.version} + 0.9.1 import pom @@ -41,22 +36,6 @@ import pom - - - net.sf.jung - jung-api - ${jung2.version} - - - net.sf.jung - jung-algorithms - ${jung2.version} - - - net.sf.jung - jung-graph-impl - ${jung2.version} - @@ -78,119 +57,7 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compile.plugin.version} - - ${java.version.source} - ${java.version.target} - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - properties-maven-plugin - [0.0,) - - set-system-properties - - - - - - - - - org.jacoco - jacoco-maven-plugin - [0.0,) - - prepare-agent - pre-test - post-test - - - - - - - - - org.ops4j.pax.exam - maven-paxexam-plugin - [1.2.4,) - - generate-depends-file - - - - - false - - - - - - org.opendaylight.yangtools - yang-maven-plugin - [0.5,) - - generate-sources - - - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - execute - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${enforcer.version} - - enforce - - - - - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - org.apache.maven.plugins maven-checkstyle-plugin @@ -199,8 +66,8 @@ - org.codehaus.mojo - findbugs-maven-plugin + com.github.spotbugs + spotbugs-maven-plugin true diff --git a/pom.xml b/pom.xml index 6e5a42bd..e979710e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,9 +6,7 @@ 0.8.0-SNAPSHOT pom l2switch - - 3.0 - + parent packethandler -- 2.36.6