From 1b50bf01cd8dab4b32ce696f58d722d6c81db1af Mon Sep 17 00:00:00 2001 From: Deepak Date: Mon, 18 Nov 2013 15:49:47 +0530 Subject: [PATCH] HostTracker hosts DB key scheme implementation Requirements :- i) IP only scheme for hosttracker hosts db key is by default supported. ii) IP + MAC scheme for hosttracker hosts db key addition. iii) Only one scheme at a time will be active. The configuration is controller by the setting hosttracker.keyscheme in config.ini. By default it has a value of zero which indicates IP only scheme. The value 1 can be set for choosing IP+MAC scheme. Changes done :- i) Marker interface named IHostId is used for the implementation. ii) IPHostId and IPMacHostId are the classes which implement the marker interface. iii) All the hostttracker apis have been aligned to the new key using the marker interface IHostId as the key. iv) Version of the hosttracker and it's dependent bundles like arphandler,loadbalancer,static routing etc.. have been bumped up. v) HostIdFactory has been provided to create the keys based on the scheme the user is using. Tests done :- i) pingall has worked. ii) NB APIs of hosttracker. Made distribution changes which were needed and other pom changes as well. Integration test for hosttracker has been fixed with the right version. Other module integration test failures and review comments have been taken care off. Host DB Key classes have been serialized. Change-Id: I328a1b6d3702d5268832f0e3ea6ee47122f20205 Signed-off-by: Deepak --- opendaylight/arphandler/pom.xml | 5 +- .../arphandler/internal/ArpHandler.java | 261 +++++++-------- opendaylight/commons/opendaylight/pom.xml | 4 + .../configuration/integrationtest/pom.xml | 2 +- .../distribution/opendaylight/pom.xml | 10 +- .../main/resources/configuration/config.ini | 3 + opendaylight/forwarding/staticrouting/pom.xml | 174 +++++----- .../internal/StaticRoutingImplementation.java | 106 +++--- .../forwardingrulesmanager/api/pom.xml | 2 +- .../implementation/pom.xml | 2 +- .../integrationtest/pom.xml | 4 +- opendaylight/hosttracker/api/pom.xml | 155 ++++----- .../controller/hosttracker/HostIdFactory.java | 48 +++ .../controller/hosttracker/IHostId.java | 19 ++ .../controller/hosttracker/IPHostId.java | 64 ++++ .../controller/hosttracker/IPMacHostId.java | 83 +++++ .../controller/hosttracker/IfIptoHost.java | 94 +++++- .../hosttracker/implementation/pom.xml | 4 +- .../hosttracker/internal/HostTracker.java | 306 ++++++++++++------ .../internal/HostTrackerCallable.java | 11 +- .../hosttracker/internal/HostTrackerTest.java | 14 +- .../hosttracker/integrationtest/pom.xml | 8 +- .../hosttracker/internal/HostTrackerIT.java | 12 +- opendaylight/northbound/hosttracker/pom.xml | 2 +- .../northbound/integrationtest/pom.xml | 8 +- opendaylight/northbound/staticrouting/pom.xml | 2 +- opendaylight/samples/loadbalancer/pom.xml | 4 +- .../internal/LoadBalancerService.java | 287 ++++++++-------- .../samples/northbound/loadbalancer/pom.xml | 4 +- .../statisticsmanager/integrationtest/pom.xml | 2 +- .../topologymanager/integrationtest/pom.xml | 2 +- opendaylight/web/devices/pom.xml | 2 +- 32 files changed, 1044 insertions(+), 660 deletions(-) create mode 100644 opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/HostIdFactory.java create mode 100644 opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostId.java create mode 100644 opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java create mode 100644 opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java diff --git a/opendaylight/arphandler/pom.xml b/opendaylight/arphandler/pom.xml index 8f1f4d5d2e..e3576e6ed8 100644 --- a/opendaylight/arphandler/pom.xml +++ b/opendaylight/arphandler/pom.xml @@ -14,7 +14,7 @@ HEAD arphandler - 0.4.1-SNAPSHOT + 0.5.1-SNAPSHOT bundle @@ -27,6 +27,7 @@ + org.opendaylight.controller.sal.packet.address, org.opendaylight.controller.connectionmanager, org.opendaylight.controller.sal.connection, org.opendaylight.controller.sal.core, @@ -72,7 +73,7 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java index abe104a406..8c91c71533 100644 --- a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java +++ b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java @@ -1,4 +1,3 @@ - /* * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. * @@ -37,6 +36,8 @@ import org.opendaylight.controller.clustering.services.ICacheUpdateAware; import org.opendaylight.controller.clustering.services.IClusterContainerServices; import org.opendaylight.controller.clustering.services.IClusterServices; import org.opendaylight.controller.connectionmanager.IConnectionManager; +import org.opendaylight.controller.hosttracker.HostIdFactory; +import org.opendaylight.controller.hosttracker.IHostId; import org.opendaylight.controller.hosttracker.IfHostListener; import org.opendaylight.controller.hosttracker.IfIptoHost; import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector; @@ -80,27 +81,29 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA private BlockingQueue ARPCacheEvents = new LinkedBlockingQueue(); private Thread cacheEventHandler; private boolean stopping = false; + /* * A cluster allocated cache. Used for synchronizing ARP request/reply - * events across all cluster controllers. To raise an event, we put() a specific - * event object (as key) and all nodes handle it in the entryUpdated callback. + * events across all cluster controllers. To raise an event, we put() a + * specific event object (as key) and all nodes handle it in the + * entryUpdated callback. * * In case of ARPReply, we put true value to send replies to any requestors * by calling generateAndSendReply */ private ConcurrentMap arpRequestReplyEvent; - void setConnectionManager(IConnectionManager cm){ + void setConnectionManager(IConnectionManager cm) { this.connectionManager = cm; } - void unsetConnectionManager(IConnectionManager cm){ - if (this.connectionManager == cm){ + void unsetConnectionManager(IConnectionManager cm) { + if (this.connectionManager == cm) { connectionManager = null; } } - void setClusterContainerService(IClusterContainerServices s){ + void setClusterContainerService(IClusterContainerServices s) { this.clusterContainerService = s; } @@ -164,11 +167,10 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } } - protected void sendARPReply(NodeConnector p, byte[] sMAC, InetAddress sIP, - byte[] tMAC, InetAddress tIP) { + protected void sendARPReply(NodeConnector p, byte[] sMAC, InetAddress sIP, byte[] tMAC, InetAddress tIP) { byte[] senderIP = sIP.getAddress(); byte[] targetIP = tIP.getAddress(); - ARP arp = createARP(ARP.REPLY,sMAC,senderIP,tMAC,targetIP); + ARP arp = createARP(ARP.REPLY, sMAC, senderIP, tMAC, targetIP); Ethernet ethernet = createEthernet(sMAC, tMAC, arp); @@ -214,8 +216,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA // Make sure that the host is a legitimate member of this subnet if (!subnet.hasNodeConnector(p)) { - log.debug("{} showing up on {} does not belong to {}", - new Object[] { sourceIP, p, subnet }); + log.debug("{} showing up on {} does not belong to {}", new Object[] { sourceIP, p, subnet }); return; } @@ -237,9 +238,9 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /* - * OpCode != request -> ARP Reply. If there are hosts (in - * arpRequestors) waiting for the ARP reply for this sourceIP, it's - * time to generate the reply and send it to these hosts. + * OpCode != request -> ARP Reply. If there are hosts (in arpRequestors) + * waiting for the ARP reply for this sourceIP, it's time to generate + * the reply and send it to these hosts. * * If sourceIP==targetIP, it is a Gratuitous ARP. If there are hosts (in * arpRequestors) waiting for the ARP reply for this sourceIP, it's time @@ -247,27 +248,29 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA */ if (pkt.getOpCode() != ARP.REQUEST || sourceIP.equals(targetIP)) { - // Raise a reply event so that any waiting requestors will be sent a reply - // the true value indicates we should generate replies to requestors across the cluster + // Raise a reply event so that any waiting requestors will be sent a + // reply + // the true value indicates we should generate replies to requestors + // across the cluster log.trace("Received ARP reply packet from {}, reply to all requestors.", sourceIP); arpRequestReplyEvent.put(new ARPReply(sourceIP, sourceMAC), true); return; } /* - * ARP Request Handling: - * If targetIP is the IP of the subnet, reply with ARP REPLY - * If targetIP is a known host, PROXY ARP (by sending ARP REPLY) on behalf of known target hosts. - * For unknown target hosts, generate and send an ARP request to ALL switches/ports using - * the IP address defined in the subnet as source address + * ARP Request Handling: If targetIP is the IP of the subnet, reply with + * ARP REPLY If targetIP is a known host, PROXY ARP (by sending ARP + * REPLY) on behalf of known target hosts. For unknown target hosts, + * generate and send an ARP request to ALL switches/ports using the IP + * address defined in the subnet as source address */ /* * If target IP is gateway IP, Send ARP reply */ if ((targetIP.equals(subnet.getNetworkAddress())) && (NetUtils.isBroadcastMACAddr(targetMAC) || Arrays.equals(targetMAC, getControllerMAC()))) { - if (connectionManager.getLocalityStatus(p.getNode()) == ConnectionLocality.LOCAL){ - if (log.isTraceEnabled()){ + if (connectionManager.getLocalityStatus(p.getNode()) == ConnectionLocality.LOCAL) { + if (log.isTraceEnabled()) { log.trace("Received local ARP req. for default gateway. Replying with controller MAC: {}", HexEncode.bytesToHexString(getControllerMAC())); } @@ -280,8 +283,9 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA return; } - - HostNodeConnector host = hostTracker.hostQuery(targetIP); + // Hosttracker hosts db key implementation + IHostId id = HostIdFactory.create(targetIP, null); + HostNodeConnector host = hostTracker.hostQuery(id); // unknown host, initiate ARP request if (host == null) { // add the requestor to the list so that we can replay the reply @@ -293,48 +297,40 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA arpRequestors.put(targetIP, requestorSet); } requestorSet.add(requestor); - countDownTimers.put(targetIP, (short) 2); // reset timeout to 2sec + countDownTimers.put(targetIP, (short) 2); // reset timeout to + // 2sec } - //Raise a bcast request event, all controllers need to send one + // Raise a bcast request event, all controllers need to send one log.trace("Sending a bcast ARP request for {}", targetIP); arpRequestReplyEvent.put(new ARPRequest(targetIP, subnet), false); } else { /* - * Target host known (across the cluster), send ARP REPLY make sure that targetMAC - * matches the host's MAC if it is not broadcastMAC + * Target host known (across the cluster), send ARP REPLY make sure + * that targetMAC matches the host's MAC if it is not broadcastMAC */ if (NetUtils.isBroadcastMACAddr(targetMAC) || Arrays.equals(host.getDataLayerAddressBytes(), targetMAC)) { log.trace("Received ARP req. for known host {}, sending reply...", targetIP); if (connectionManager.getLocalityStatus(p.getNode()) == ConnectionLocality.LOCAL) { - sendARPReply(p, - host.getDataLayerAddressBytes(), - host.getNetworkAddress(), - pkt.getSenderHardwareAddress(), - sourceIP); + sendARPReply(p, host.getDataLayerAddressBytes(), host.getNetworkAddress(), + pkt.getSenderHardwareAddress(), sourceIP); } else { - arpRequestReplyEvent.put(new ARPReply( - p, - host.getNetworkAddress(), - host.getDataLayerAddressBytes(), - sourceIP, - pkt.getSenderHardwareAddress()), false); + arpRequestReplyEvent.put(new ARPReply(p, host.getNetworkAddress(), host.getDataLayerAddressBytes(), + sourceIP, pkt.getSenderHardwareAddress()), false); } } else { /* - * Target MAC has been changed. For now, discard it. - * TODO: We may need to send unicast ARP REQUEST on behalf of - * the target back to the sender to trigger the sender to update - * its table + * Target MAC has been changed. For now, discard it. TODO: We + * may need to send unicast ARP REQUEST on behalf of the target + * back to the sender to trigger the sender to update its table */ } } } /** - * Send a broadcast ARP Request to the switch/ ports using - * the networkAddress of the subnet as sender IP - * the controller's MAC as sender MAC - * the targetIP as the target Network Address + * Send a broadcast ARP Request to the switch/ ports using the + * networkAddress of the subnet as sender IP the controller's MAC as sender + * MAC the targetIP as the target Network Address */ protected void sendBcastARPRequest(InetAddress targetIP, Subnet subnet) { log.trace("sendBcatARPRequest targetIP:{} subnet:{}", targetIP, subnet); @@ -349,10 +345,11 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } byte[] targetHardwareAddress = new byte[] { (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0 }; - //TODO: should use IBroadcastHandler instead + // TODO: should use IBroadcastHandler instead for (NodeConnector p : nodeConnectors) { - //filter out any non-local or internal ports - if (!(connectionManager.getLocalityStatus(p.getNode()) == ConnectionLocality.LOCAL) || topologyManager.isInternal(p)) { + // filter out any non-local or internal ports + if (!(connectionManager.getLocalityStatus(p.getNode()) == ConnectionLocality.LOCAL) + || topologyManager.isInternal(p)) { continue; } log.trace("Sending toward nodeConnector:{}", p); @@ -374,8 +371,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA /** * Send a unicast ARP Request to the known host on a specific switch/port as - * defined in the host. - * The sender IP is the networkAddress of the subnet + * defined in the host. The sender IP is the networkAddress of the subnet * The sender MAC is the controller's MAC */ protected void sendUcastARPRequest(HostNodeConnector host, Subnet subnet) { @@ -425,15 +421,14 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA Subnet subnet = null; if (switchManager != null) { - subnet = switchManager.getSubnetByNetworkAddress(host - .getNetworkAddress()); + subnet = switchManager.getSubnetByNetworkAddress(host.getNetworkAddress()); } if (subnet == null) { log.debug("can't find subnet matching {}", host.getNetworkAddress()); return; } - if (connectionManager.getLocalityStatus(host.getnodeconnectorNode()) == ConnectionLocality.LOCAL){ + if (connectionManager.getLocalityStatus(host.getnodeconnectorNode()) == ConnectionLocality.LOCAL) { log.trace("Send a ucast ARP req. to: {}", host); sendUcastARPRequest(host, subnet); } else { @@ -443,9 +438,9 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /** - * An IP packet is punted to the controller, this means that the - * destination host is not known to the controller. - * Need to discover it by sending a Broadcast ARP Request + * An IP packet is punted to the controller, this means that the destination + * host is not known to the controller. Need to discover it by sending a + * Broadcast ARP Request * * @param pkt * @param p @@ -454,7 +449,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA InetAddress dIP = NetUtils.getInetAddress(pkt.getDestinationAddress()); if (dIP == null) { - return; + return; } // try to find a matching subnet @@ -468,20 +463,21 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } // see if we know about the host - HostNodeConnector host = hostTracker.hostFind(dIP); + // Hosttracker hosts db key implementation + IHostId id = HostIdFactory.create(dIP, null); + HostNodeConnector host = hostTracker.hostFind(id); if (host == null) { // if we don't, know about the host, try to find it - log.trace("Punted IP pkt to {}, sending bcast ARP event...", - dIP); + log.trace("Punted IP pkt to {}, sending bcast ARP event...", dIP); /* * unknown destination host, initiate bcast ARP request */ arpRequestReplyEvent.put(new ARPRequest(dIP, subnet), false); - } else if (routing == null || - routing.getRoute(p.getNode(), host.getnodeconnectorNode()) != null) { - /* if IRouting is available, make sure that this packet can get it's + } else if (routing == null || routing.getRoute(p.getNode(), host.getnodeconnectorNode()) != null) { + /* + * if IRouting is available, make sure that this packet can get it's * destination normally before teleporting it there. If it's not * available, then assume it's reachable. * @@ -490,9 +486,11 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA log.trace("forwarding punted IP pkt to {} received at {}", dIP, p); - /* if we know where the host is and there's a path from where this + /* + * if we know where the host is and there's a path from where this * packet was punted to where the host is, then deliver it to the - * host for now */ + * host for now + */ NodeConnector nc = host.getnodeConnector(); // re-encode the Ethernet packet (the parent of the IPv4 packet) @@ -500,8 +498,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA rp.setOutgoingNodeConnector(nc); this.dataPacketService.transmitDataPacket(rp); } else { - log.trace("ignoring punted IP pkt to {} because there is no route from {}", - dIP, p); + log.trace("ignoring punted IP pkt to {} because there is no route from {}", dIP, p); } } @@ -524,19 +521,20 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA allocateCaches(); retrieveCaches(); + } @SuppressWarnings({ "unchecked" }) private void retrieveCaches() { - ConcurrentMap map; + ConcurrentMap map; - if (this.clusterContainerService == null){ + if (this.clusterContainerService == null) { log.error("Cluster service unavailable, can't retieve ARPHandler caches!"); return; } map = clusterContainerService.getCache(ARP_EVENT_CACHE_NAME); - if (map != null){ + if (map != null) { this.arpRequestReplyEvent = (ConcurrentMap) map; } else { log.error("Cache allocation failed for {}", ARP_EVENT_CACHE_NAME); @@ -544,30 +542,31 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } private void allocateCaches() { - if (clusterContainerService == null){ + if (clusterContainerService == null) { nonClusterObjectCreate(); log.error("Clustering service unavailable. Allocated non-cluster caches for ARPHandler."); return; } - try{ + try { clusterContainerService.createCache(ARP_EVENT_CACHE_NAME, EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); - } catch (CacheConfigException e){ + } catch (CacheConfigException e) { log.error("ARPHandler cache configuration invalid!"); - } catch (CacheExistException e){ + } catch (CacheExistException e) { log.debug("ARPHandler cache exists, skipped allocation."); } } - private void nonClusterObjectCreate(){ + private void nonClusterObjectCreate() { arpRequestReplyEvent = new ConcurrentHashMap(); } + /** - * Function called by the dependency manager when at least one - * dependency become unsatisfied or when the component is shutting - * down because for example bundle is being stopped. + * Function called by the dependency manager when at least one dependency + * become unsatisfied or when the component is shutting down because for + * example bundle is being stopped. * */ void destroy() { @@ -575,9 +574,8 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /** - * Function called by dependency manager after "init ()" is called - * and after the services provided by the class are registered in - * the service registry + * Function called by dependency manager after "init ()" is called and after + * the services provided by the class are registered in the service registry * */ void start() { @@ -587,12 +585,12 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /** - * Function called by the dependency manager before the services - * exported by the component are unregistered, this will be - * followed by a "destroy ()" calls + * Function called by the dependency manager before the services exported by + * the component are unregistered, this will be followed by a "destroy ()" + * calls * */ - void stop(){ + void stop() { } void stopping() { @@ -626,25 +624,25 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA handlePuntedIPPacket((IPv4) nextPak, inPkt.getIncomingNodeConnector()); } else if (nextPak instanceof ARP) { log.trace("Handle ARP packet: {}", formattedPak); - handleARPPacket((Ethernet) formattedPak, (ARP) nextPak, inPkt - .getIncomingNodeConnector()); + handleARPPacket((Ethernet) formattedPak, (ARP) nextPak, inPkt.getIncomingNodeConnector()); } } return PacketResult.IGNORED; } - private ARP createARP(short opCode, byte[] senderMacAddress, byte[] senderIP, byte[] targetMacAddress, byte[] targetIP) { - ARP arp = new ARP(); - arp.setHardwareType(ARP.HW_TYPE_ETHERNET); - arp.setProtocolType(EtherTypes.IPv4.shortValue()); - arp.setHardwareAddressLength((byte) 6); - arp.setProtocolAddressLength((byte) 4); - arp.setOpCode(opCode); - arp.setSenderHardwareAddress(senderMacAddress) ; - arp.setSenderProtocolAddress(senderIP); - arp.setTargetHardwareAddress(targetMacAddress); - arp.setTargetProtocolAddress(targetIP); - return arp; + private ARP createARP(short opCode, byte[] senderMacAddress, byte[] senderIP, byte[] targetMacAddress, + byte[] targetIP) { + ARP arp = new ARP(); + arp.setHardwareType(ARP.HW_TYPE_ETHERNET); + arp.setProtocolType(EtherTypes.IPv4.shortValue()); + arp.setHardwareAddressLength((byte) 6); + arp.setProtocolAddressLength((byte) 4); + arp.setOpCode(opCode); + arp.setSenderHardwareAddress(senderMacAddress); + arp.setSenderProtocolAddress(senderIP); + arp.setTargetHardwareAddress(targetMacAddress); + arp.setTargetProtocolAddress(targetIP); + return arp; } private Ethernet createEthernet(byte[] sourceMAC, byte[] targetMAC, ARP arp) { @@ -682,10 +680,10 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA // Clean up ARP event cache try { - if (clusterContainerService.amICoordinator() && ! arpRequestReplyEvent.isEmpty()){ + if (clusterContainerService.amICoordinator() && !arpRequestReplyEvent.isEmpty()) { arpRequestReplyEvent.clear(); } - } catch (Exception e){ + } catch (Exception e) { log.warn("ARPHandler: A cluster member failed to clear event cache."); } } @@ -701,7 +699,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA private void generateAndSendReply(InetAddress sourceIP, byte[] sourceMAC) { if (log.isTraceEnabled()) { log.trace("generateAndSendReply called with params sourceIP:{} sourceMAC:{}", sourceIP, - HexEncode.bytesToHexString(sourceMAC)); + HexEncode.bytesToHexString(sourceMAC)); } Set hosts = arpRequestors.remove(sourceIP); if ((hosts == null) || hosts.isEmpty()) { @@ -711,38 +709,27 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA countDownTimers.remove(sourceIP); for (HostNodeConnector host : hosts) { if (log.isTraceEnabled()) { - log.trace("Sending ARP Reply with src {}/{}, target {}/{}", - new Object[] { - HexEncode.bytesToHexString(sourceMAC), - sourceIP, - HexEncode.bytesToHexString(host.getDataLayerAddressBytes()), - host.getNetworkAddress() }); + log.trace( + "Sending ARP Reply with src {}/{}, target {}/{}", + new Object[] { HexEncode.bytesToHexString(sourceMAC), sourceIP, + HexEncode.bytesToHexString(host.getDataLayerAddressBytes()), host.getNetworkAddress() }); } - if (connectionManager.getLocalityStatus(host.getnodeconnectorNode()) == ConnectionLocality.LOCAL){ - sendARPReply(host.getnodeConnector(), - sourceMAC, - sourceIP, - host.getDataLayerAddressBytes(), + if (connectionManager.getLocalityStatus(host.getnodeconnectorNode()) == ConnectionLocality.LOCAL) { + sendARPReply(host.getnodeConnector(), sourceMAC, sourceIP, host.getDataLayerAddressBytes(), host.getNetworkAddress()); } else { /* - * In the remote event a requestor moved to another - * controller it may turn out it now we need to send - * the ARP reply from a different controller, this - * cover the case + * In the remote event a requestor moved to another controller + * it may turn out it now we need to send the ARP reply from a + * different controller, this cover the case */ arpRequestReplyEvent.put( - new ARPReply( - host.getnodeConnector(), - sourceIP, - sourceMAC, - host.getNetworkAddress(), - host.getDataLayerAddressBytes()), false); + new ARPReply(host.getnodeConnector(), sourceIP, sourceMAC, host.getNetworkAddress(), host + .getDataLayerAddressBytes()), false); } } } - @Override public void entryUpdated(ARPEvent key, Boolean new_value, String cacheName, boolean originLocal) { log.trace("Got and entryUpdated for cacheName {} key {} isNew {}", cacheName, key, new_value); @@ -753,12 +740,13 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA public void entryCreated(ARPEvent key, String cacheName, boolean originLocal) { // nothing to do } + @Override public void entryDeleted(ARPEvent key, String cacheName, boolean originLocal) { // nothing to do } - private void enqueueARPCacheEvent (ARPEvent event, boolean new_value) { + private void enqueueARPCacheEvent(ARPEvent event, boolean new_value) { try { ARPCacheEvent cacheEvent = new ARPCacheEvent(event, new_value); if (!ARPCacheEvents.contains(cacheEvent)) { @@ -771,7 +759,8 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } /* - * this thread monitors the connectionEvent queue for new incoming events from + * this thread monitors the connectionEvent queue for new incoming events + * from */ private class ARPCacheEventHandler implements Runnable { @Override @@ -787,24 +776,22 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA log.trace("Trigger and ARP Broadcast Request upon receipt of {}", req); sendBcastARPRequest(req.getTargetIP(), req.getSubnet()); - //If unicast and local, send reply + // If unicast and local, send reply } else if (connectionManager.getLocalityStatus(req.getHost().getnodeconnectorNode()) == ConnectionLocality.LOCAL) { log.trace("ARPCacheEventHandler - sendUcatARPRequest upon receipt of {}", req); sendUcastARPRequest(req.getHost(), req.getSubnet()); } } else if (event instanceof ARPReply) { ARPReply rep = (ARPReply) event; - // New reply received by controller, notify all awaiting requestors across the cluster + // New reply received by controller, notify all awaiting + // requestors across the cluster if (ev.isNewReply()) { log.trace("Trigger a generateAndSendReply in response to {}", rep); generateAndSendReply(rep.getTargetIP(), rep.getTargetMac()); - // Otherwise, a specific reply. If local, send out. + // Otherwise, a specific reply. If local, send out. } else if (connectionManager.getLocalityStatus(rep.getPort().getNode()) == ConnectionLocality.LOCAL) { log.trace("ARPCacheEventHandler - sendUcatARPReply locally in response to {}", rep); - sendARPReply(rep.getPort(), - rep.getSourceMac(), - rep.getSourceIP(), - rep.getTargetMac(), + sendARPReply(rep.getPort(), rep.getSourceMac(), rep.getSourceIP(), rep.getTargetMac(), rep.getTargetIP()); } } diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 8feb1600b5..794986a7bb 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -76,6 +76,10 @@ 0.6.0-SNAPSHOT 0.4.1-SNAPSHOT + 0.5.1-SNAPSHOT + 0.5.1-SNAPSHOT + 0.5.1-SNAPSHOT + 0.5.1-SNAPSHOT 0.2.3-SNAPSHOT 0.2.3-SNAPSHOT 1.0-SNAPSHOT diff --git a/opendaylight/configuration/integrationtest/pom.xml b/opendaylight/configuration/integrationtest/pom.xml index 788c8e8a09..894f94bc46 100644 --- a/opendaylight/configuration/integrationtest/pom.xml +++ b/opendaylight/configuration/integrationtest/pom.xml @@ -84,7 +84,7 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index 74a133f913..55ab5caeeb 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -456,7 +456,7 @@ org.opendaylight.controller forwarding.staticrouting - ${controller.version} + ${forwarding.staticrouting} org.opendaylight.controller @@ -486,17 +486,17 @@ org.opendaylight.controller arphandler - ${controller.version} + ${arphandler.version} org.opendaylight.controller hosttracker - ${controller.version} + ${hosttracker.version} org.opendaylight.controller hosttracker.implementation - ${controller.version} + ${hosttracker.version} org.opendaylight.controller @@ -772,7 +772,7 @@ org.opendaylight.controller samples.loadbalancer - ${controller.version} + ${samples.loadbalancer} org.opendaylight.controller diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini index dacdd2546e..1db1d759f3 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini @@ -115,3 +115,6 @@ org.jolokia.listenForHttpService=false # Logging configuration for Tomcat-JUL logging java.util.logging.config.file=configuration/tomcat-logging.properties + +#Hosttracker hostsdb key scheme setting +hosttracker.keyscheme=IP diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml index bee0da2496..f160cddaad 100644 --- a/opendaylight/forwarding/staticrouting/pom.xml +++ b/opendaylight/forwarding/staticrouting/pom.xml @@ -1,90 +1,92 @@ - - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.1-SNAPSHOT - ../../commons/opendaylight - - - scm:git:ssh://git.opendaylight.org:29418/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main - HEAD - + + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.1-SNAPSHOT + ../../commons/opendaylight + + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main + HEAD + - forwarding.staticrouting - 0.4.1-SNAPSHOT - bundle + forwarding.staticrouting + 0.5.1-SNAPSHOT + bundle - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.configuration, - org.opendaylight.controller.forwardingrulesmanager, - org.opendaylight.controller.hosttracker, - org.opendaylight.controller.hosttracker.hostAware, - org.opendaylight.controller.clustering.services, - org.opendaylight.controller.sal.packet, - org.opendaylight.controller.sal.routing, - org.opendaylight.controller.topologymanager, - org.eclipse.osgi.framework.console, - org.osgi.framework, - org.slf4j, - org.apache.felix.dm, - org.apache.commons.lang3.builder - - - org.opendaylight.controller.forwarding.staticrouting - - - org.opendaylight.controller.forwarding.staticrouting.internal.Activator - - - ${project.basedir}/META-INF - - - - - - - org.opendaylight.controller - topologymanager - 0.4.1-SNAPSHOT - - - org.opendaylight.controller - forwardingrulesmanager - 0.4.1-SNAPSHOT - - - org.opendaylight.controller - hosttracker - 0.4.1-SNAPSHOT - - - org.opendaylight.controller - configuration - 0.4.1-SNAPSHOT - - - junit - junit - - - org.opendaylight.controller - sal - 0.5.1-SNAPSHOT - - + + + + org.apache.felix + maven-bundle-plugin + ${bundle.plugin.version} + true + + + + org.opendaylight.controller.sal.packet.address, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.configuration, + org.opendaylight.controller.forwardingrulesmanager, + org.opendaylight.controller.hosttracker, + org.opendaylight.controller.hosttracker.hostAware, + org.opendaylight.controller.clustering.services, + org.opendaylight.controller.sal.packet, + org.opendaylight.controller.sal.routing, + org.opendaylight.controller.topologymanager, + org.eclipse.osgi.framework.console, + org.osgi.framework, + org.slf4j, + org.apache.felix.dm, + org.apache.commons.lang3.builder + + + org.opendaylight.controller.forwarding.staticrouting + + + org.opendaylight.controller.forwarding.staticrouting.internal.Activator + + + ${project.basedir}/META-INF + + + + + + + org.opendaylight.controller + topologymanager + 0.4.1-SNAPSHOT + + + org.opendaylight.controller + forwardingrulesmanager + 0.4.1-SNAPSHOT + + + org.opendaylight.controller + hosttracker + ${hosttracker.version} + + + org.opendaylight.controller + configuration + 0.4.1-SNAPSHOT + + + junit + junit + + + org.opendaylight.controller + sal + 0.5.1-SNAPSHOT + + diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java b/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java index 315543514e..2ce2465d97 100644 --- a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java +++ b/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java @@ -1,4 +1,3 @@ - /* * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. * @@ -42,6 +41,8 @@ import org.opendaylight.controller.forwarding.staticrouting.IForwardingStaticRou import org.opendaylight.controller.forwarding.staticrouting.IStaticRoutingAware; import org.opendaylight.controller.forwarding.staticrouting.StaticRoute; import org.opendaylight.controller.forwarding.staticrouting.StaticRouteConfig; +import org.opendaylight.controller.hosttracker.HostIdFactory; +import org.opendaylight.controller.hosttracker.IHostId; import org.opendaylight.controller.hosttracker.IfIptoHost; import org.opendaylight.controller.hosttracker.IfNewHostNotify; import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector; @@ -57,10 +58,9 @@ import org.slf4j.LoggerFactory; /** * Static Routing feature provides the bridge between SDN and Non-SDN networks. */ -public class StaticRoutingImplementation implements IfNewHostNotify, - IForwardingStaticRouting, IObjectReader, IConfigurationContainerAware { - private static Logger log = LoggerFactory - .getLogger(StaticRoutingImplementation.class); +public class StaticRoutingImplementation implements IfNewHostNotify, IForwardingStaticRouting, IObjectReader, + IConfigurationContainerAware { + private static Logger log = LoggerFactory.getLogger(StaticRoutingImplementation.class); private static String ROOT = GlobalConstants.STARTUPHOME.toString(); ConcurrentMap staticRoutes; ConcurrentMap staticRouteConfigs; @@ -101,8 +101,7 @@ public class StaticRoutingImplementation implements IfNewHostNotify, } @Override - public Object readObject(ObjectInputStream ois) - throws FileNotFoundException, IOException, ClassNotFoundException { + public Object readObject(ObjectInputStream ois) throws FileNotFoundException, IOException, ClassNotFoundException { // Perform the class deserialization locally, from inside the package // where the class is defined return ois.readObject(); @@ -111,8 +110,8 @@ public class StaticRoutingImplementation implements IfNewHostNotify, @SuppressWarnings("unchecked") private void loadConfiguration() { ObjectReader objReader = new ObjectReader(); - ConcurrentMap confList = (ConcurrentMap) objReader - .read(this, staticRoutesFileName); + ConcurrentMap confList = (ConcurrentMap) objReader.read( + this, staticRoutesFileName); if (confList == null) { return; @@ -123,7 +122,6 @@ public class StaticRoutingImplementation implements IfNewHostNotify, } } - private Status saveConfig() { return saveConfigInternal(); } @@ -132,9 +130,8 @@ public class StaticRoutingImplementation implements IfNewHostNotify, Status status; ObjectWriter objWriter = new ObjectWriter(); - status = objWriter.write( - new ConcurrentHashMap( - staticRouteConfigs), staticRoutesFileName); + status = objWriter.write(new ConcurrentHashMap(staticRouteConfigs), + staticRoutesFileName); if (status.isSuccess()) { return status; @@ -144,23 +141,19 @@ public class StaticRoutingImplementation implements IfNewHostNotify, } @SuppressWarnings("deprecation") - private void allocateCaches() { + private void allocateCaches() { if (this.clusterContainerService == null) { - log - .info("un-initialized clusterContainerService, can't create cache"); + log.info("un-initialized clusterContainerService, can't create cache"); return; } try { - clusterContainerService.createCache( - "forwarding.staticrouting.routes", EnumSet - .of(IClusterServices.cacheMode.TRANSACTIONAL)); - clusterContainerService.createCache( - "forwarding.staticrouting.configs", EnumSet - .of(IClusterServices.cacheMode.TRANSACTIONAL)); + clusterContainerService.createCache("forwarding.staticrouting.routes", + EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); + clusterContainerService.createCache("forwarding.staticrouting.configs", + EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); } catch (CacheExistException cee) { - log - .error("\nCache already exists - destroy and recreate if needed"); + log.error("\nCache already exists - destroy and recreate if needed"); } catch (CacheConfigException cce) { log.error("\nCache configuration invalid - check cache mode"); } @@ -169,8 +162,7 @@ public class StaticRoutingImplementation implements IfNewHostNotify, @SuppressWarnings({ "unchecked", "deprecation" }) private void retrieveCaches() { if (this.clusterContainerService == null) { - log - .info("un-initialized clusterContainerService, can't retrieve cache"); + log.info("un-initialized clusterContainerService, can't retrieve cache"); return; } @@ -195,7 +187,7 @@ public class StaticRoutingImplementation implements IfNewHostNotify, try { ra.staticRouteUpdate(s, update); } catch (Exception e) { - log.error("",e); + log.error("", e); } } } @@ -216,15 +208,16 @@ public class StaticRoutingImplementation implements IfNewHostNotify, @Override public Object call() throws Exception { - if (!added - || (staticRoute.getType() == StaticRoute.NextHopType.SWITCHPORT)) { + if (!added || (staticRoute.getType() == StaticRoute.NextHopType.SWITCHPORT)) { notifyStaticRouteUpdate(staticRoute, added); } else { InetAddress nh = staticRoute.getNextHopAddress(); - HostNodeConnector host = hostTracker.hostQuery(nh); + // HostTracker hosts db key scheme implementation + IHostId id = HostIdFactory.create(nh, null); + HostNodeConnector host = hostTracker.hostQuery(id); if (host == null) { log.debug("Next hop {} is not present, try to discover it", nh.getHostAddress()); - Future future = hostTracker.discoverHost(nh); + Future future = hostTracker.discoverHost(id); if (future != null) { try { host = future.get(); @@ -337,8 +330,7 @@ public class StaticRoutingImplementation implements IfNewHostNotify, public StaticRoute getBestMatchStaticRoute(InetAddress ipAddress) { ByteBuffer bblongestPrefix = null; try { - bblongestPrefix = ByteBuffer.wrap(InetAddress.getByName("0.0.0.0") - .getAddress()); + bblongestPrefix = ByteBuffer.wrap(InetAddress.getByName("0.0.0.0").getAddress()); } catch (Exception e) { return null; } @@ -368,9 +360,8 @@ public class StaticRoutingImplementation implements IfNewHostNotify, return status; } if (staticRouteConfigs.get(config.getName()) != null) { - return new Status(StatusCode.CONFLICT, - "A valid Static Route configuration with this name " + - "already exists. Please use a different name"); + return new Status(StatusCode.CONFLICT, "A valid Static Route configuration with this name " + + "already exists. Please use a different name"); } // Update database @@ -378,10 +369,8 @@ public class StaticRoutingImplementation implements IfNewHostNotify, for (Map.Entry entry : staticRoutes.entrySet()) { if (entry.getValue().compareTo(sRoute) == 0) { - return new Status(StatusCode.CONFLICT, - "This conflicts with an existing Static Route " + - "Configuration. Please check the configuration " + - "and try again"); + return new Status(StatusCode.CONFLICT, "This conflicts with an existing Static Route " + + "Configuration. Please check the configuration " + "and try again"); } } staticRoutes.put(config.getName(), sRoute); @@ -402,8 +391,7 @@ public class StaticRoutingImplementation implements IfNewHostNotify, checkAndUpdateListeners(name, sRoute, false); return new Status(StatusCode.SUCCESS, null); } - return new Status(StatusCode.NOTFOUND, - "Static Route with name " + name + " is not found"); + return new Status(StatusCode.NOTFOUND, "Static Route with name " + name + " is not found"); } void setClusterContainerService(IClusterContainerServices s) { @@ -433,11 +421,9 @@ public class StaticRoutingImplementation implements IfNewHostNotify, containerName = ""; } - staticRoutesFileName = ROOT + "staticRouting_" + containerName - + ".conf"; + staticRoutesFileName = ROOT + "staticRouting_" + containerName + ".conf"; - log.debug("forwarding.staticrouting starting on container {}", - containerName); + log.debug("forwarding.staticrouting starting on container {}", containerName); allocateCaches(); retrieveCaches(); this.executor = Executors.newFixedThreadPool(1); @@ -446,8 +432,8 @@ public class StaticRoutingImplementation implements IfNewHostNotify, } /* - * Slow probe to identify any gateway that might have silently appeared - * after the Static Routing Configuration. + * Slow probe to identify any gateway that might have silently appeared + * after the Static Routing Configuration. */ gatewayProbeTimer = new Timer(); gatewayProbeTimer.schedule(new TimerTask() { @@ -455,24 +441,23 @@ public class StaticRoutingImplementation implements IfNewHostNotify, public void run() { for (Map.Entry s : staticRoutes.entrySet()) { StaticRoute route = s.getValue(); - if ((route.getType() == StaticRoute.NextHopType.IPADDRESS) - && route.getHost() == null) { + if ((route.getType() == StaticRoute.NextHopType.IPADDRESS) && route.getHost() == null) { checkAndUpdateListeners(s.getKey(), route, true); } } } }, 60 * 1000, 60 * 1000); + } /** - * Function called by the dependency manager when at least one - * dependency become unsatisfied or when the component is shutting - * down because for example bundle is being stopped. + * Function called by the dependency manager when at least one dependency + * become unsatisfied or when the component is shutting down because for + * example bundle is being stopped. * */ void destroy() { - log.debug("Destroy all the Static Routing Rules given we are " - + "shutting down"); + log.debug("Destroy all the Static Routing Rules given we are " + "shutting down"); gatewayProbeTimer.cancel(); @@ -481,18 +466,17 @@ public class StaticRoutingImplementation implements IfNewHostNotify, } /** - * Function called by dependency manager after "init ()" is called - * and after the services provided by the class are registered in - * the service registry + * Function called by dependency manager after "init ()" is called and after + * the services provided by the class are registered in the service registry * */ void start() { } /** - * Function called by the dependency manager before the services - * exported by the component are unregistered, this will be - * followed by a "destroy ()" calls + * Function called by the dependency manager before the services exported by + * the component are unregistered, this will be followed by a "destroy ()" + * calls * */ void stop() { diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/forwardingrulesmanager/api/pom.xml index 2de9287670..f25756cc11 100644 --- a/opendaylight/forwardingrulesmanager/api/pom.xml +++ b/opendaylight/forwardingrulesmanager/api/pom.xml @@ -68,7 +68,7 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/forwardingrulesmanager/implementation/pom.xml index 613c2f164f..23c36a3752 100644 --- a/opendaylight/forwardingrulesmanager/implementation/pom.xml +++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml @@ -74,7 +74,7 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml index 15b31d5ea6..7904bd3a8f 100644 --- a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml +++ b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml @@ -21,12 +21,12 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller hosttracker.implementation - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml index 5846aa3d1a..ea66c34fa3 100644 --- a/opendaylight/hosttracker/api/pom.xml +++ b/opendaylight/hosttracker/api/pom.xml @@ -1,81 +1,82 @@ - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.4.1-SNAPSHOT - ../../commons/opendaylight - - - scm:git:ssh://git.opendaylight.org:29418/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main - HEAD - - hosttracker - 0.4.1-SNAPSHOT - bundle + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.1-SNAPSHOT + ../../commons/opendaylight + + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main + HEAD + + hosttracker + 0.5.1-SNAPSHOT + bundle - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - - org.opendaylight.controller.hosttracker, - org.opendaylight.controller.hosttracker.hostAware - - - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.opendaylight.controller.topologymanager, - org.opendaylight.controller.sal.packet.address, - org.opendaylight.controller.switchmanager, - org.opendaylight.controller.clustering.services, - javax.xml.bind.annotation, - javax.xml.bind, - org.apache.felix.dm, - org.apache.commons.lang3.builder, - org.osgi.service.component, - org.slf4j, - org.eclipse.osgi.framework.console, - org.osgi.framework - - - ${project.basedir}/META-INF - - - - - - - org.opendaylight.controller - topologymanager - 0.4.1-SNAPSHOT - - - org.opendaylight.controller - switchmanager - - - org.opendaylight.controller - clustering.services - 0.4.1-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.1-SNAPSHOT - - - junit - junit - - + + + + org.apache.felix + maven-bundle-plugin + ${bundle.plugin.version} + true + + + + org.opendaylight.controller.hosttracker, + org.opendaylight.controller.hosttracker.hostAware + + + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.opendaylight.controller.topologymanager, + org.opendaylight.controller.sal.packet.address, + org.opendaylight.controller.switchmanager, + org.opendaylight.controller.clustering.services, + javax.xml.bind.annotation, + javax.xml.bind, + org.apache.felix.dm, + org.apache.commons.lang3.builder, + org.osgi.service.component, + org.slf4j, + org.eclipse.osgi.framework.console, + org.osgi.framework + + + ${project.basedir}/META-INF + + + + + + + org.opendaylight.controller + topologymanager + 0.4.1-SNAPSHOT + + + org.opendaylight.controller + switchmanager + + + org.opendaylight.controller + clustering.services + 0.4.1-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.1-SNAPSHOT + + + junit + junit + + + diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/HostIdFactory.java b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/HostIdFactory.java new file mode 100644 index 0000000000..4585306214 --- /dev/null +++ b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/HostIdFactory.java @@ -0,0 +1,48 @@ +/* + * Copyright IBM Corporation, 2013. 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.controller.hosttracker; + +import java.net.InetAddress; + +import org.opendaylight.controller.sal.packet.address.DataLinkAddress; + +/* + * Class used to generate a key based on the scheme choosen for hostsdb storage in hosttracker. + * @author Deepak Udapudi + */ +public class HostIdFactory { + public static final String DEFAULT_IP_KEY_SCHEME = "IP"; + public static final String IP_MAC_KEY_SCHEME = "IP+MAC"; + private static String scheme = null; + static { + scheme = System.getProperty("hosttracker.keyscheme"); + } + + public static String getScheme() { + return scheme; + } + + public static IHostId create(InetAddress ip, DataLinkAddress mac) { + IHostId ipHostId = new IPHostId(ip); + if (scheme != null) { + switch (scheme) { + + case DEFAULT_IP_KEY_SCHEME: + return ipHostId; + case IP_MAC_KEY_SCHEME: + IHostId ipMacHostId = new IPMacHostId(ip, mac); + return ipMacHostId; + default: + return ipHostId; + + } + } + return ipHostId; + } + +} diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostId.java b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostId.java new file mode 100644 index 0000000000..03f409e737 --- /dev/null +++ b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostId.java @@ -0,0 +1,19 @@ +/* + * Copyright IBM Corporation, 2013. 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.controller.hosttracker; + +import java.io.Serializable; + +/* + * Marker interface used by the key classes for their implementation + * @author Deepak Udapudi + */ + +public interface IHostId extends Serializable { + +} diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java new file mode 100644 index 0000000000..9e2123c6cd --- /dev/null +++ b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java @@ -0,0 +1,64 @@ +/* + * Copyright IBM Corporation, 2013. 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.controller.hosttracker; + +import java.io.Serializable; +import java.net.InetAddress; + +/* + * IP only key class implementation using the marker interface IHostId + * @author Deepak Udapudi + */ + +public class IPHostId implements IHostId, Serializable { + private static final long serialVersionUID = 1L; + private InetAddress ipAddress; + + public InetAddress getIpAddress() { + return ipAddress; + } + + public void setIpAddress(InetAddress ipAddress) { + this.ipAddress = ipAddress; + } + + public IPHostId(InetAddress ipAddress) { + super(); + this.ipAddress = ipAddress; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((ipAddress == null) ? 0 : ipAddress.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + IPHostId other = (IPHostId) obj; + if (ipAddress == null) { + if (other.ipAddress != null) + return false; + } else if (!ipAddress.equals(other.ipAddress)) + return false; + return true; + } + + public static IHostId fromIP(InetAddress addr) { + return new IPHostId(addr); + } + +} diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java new file mode 100644 index 0000000000..4ab84eb653 --- /dev/null +++ b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java @@ -0,0 +1,83 @@ +/* + * Copyright IBM Corporation, 2013. 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.controller.hosttracker; + +import java.io.Serializable; +import java.net.InetAddress; + +/* + * IP + Mac key class implementation using the marker interface IHostId + * @author Deepak Udapudi + */ + +import org.opendaylight.controller.sal.packet.address.DataLinkAddress; + +public class IPMacHostId implements IHostId, Serializable { + + private static final long serialVersionUID = 1L; + private InetAddress ipAddress; + private DataLinkAddress macAddr; + + public IPMacHostId(InetAddress ipAddress, DataLinkAddress macAddr) { + super(); + this.ipAddress = ipAddress; + this.macAddr = macAddr; + } + + public InetAddress getIpAddress() { + return ipAddress; + } + + public void setIpAddress(InetAddress ipAddress) { + this.ipAddress = ipAddress; + } + + public DataLinkAddress getMacAddr() { + return macAddr; + } + + public void setMacAddr(DataLinkAddress macAddr) { + this.macAddr = macAddr; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((ipAddress == null) ? 0 : ipAddress.hashCode()); + result = prime * result + ((macAddr == null) ? 0 : macAddr.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + IPMacHostId other = (IPMacHostId) obj; + if (ipAddress == null) { + if (other.ipAddress != null) + return false; + } else if (!ipAddress.equals(other.ipAddress)) + return false; + if (macAddr == null) { + if (other.macAddr != null) + return false; + } else if (!macAddr.equals(other.macAddr)) + return false; + return true; + } + + public static IHostId fromIPAndMac(InetAddress ip, DataLinkAddress mac) { + return new IPMacHostId(ip, mac); + } + +} diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java index 2451e196f2..e70a6e1865 100644 --- a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java +++ b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java @@ -32,47 +32,100 @@ public interface IfIptoHost { * statically through Northbound APIs. If a binding is unknown, then an ARP * request is initiated immediately to discover the host. * - * @param networkAddress - * IP Address of the Host encapsulated in class InetAddress + * @param id + * IP address and Mac Address combination encapsulated in IHostId + * interface * @return {@link org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector} * Class that contains the Host info such as its MAC address, Switch * ID, port, VLAN. If Host is not found, returns NULL */ - public HostNodeConnector hostFind(InetAddress networkAddress); + public HostNodeConnector hostFind(IHostId id); + + /** + * Applications call this interface methods to determine IP address to MAC + * binding and its connectivity to an OpenFlow switch in term of Node, Port, + * and VLAN. These bindings are learned dynamically as well as can be added + * statically through Northbound APIs. If a binding is unknown, then an ARP + * request is initiated immediately to discover the host. + * + * @param addr + * IP address of the host + * @return {@link org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector} + * Class that contains the Host info such as its MAC address, Switch + * ID, port, VLAN. If Host is not found, returns NULL + */ + public HostNodeConnector hostFind(InetAddress addr); /** * Checks the local Host Database to see if a Host has been learned for a - * given IP address. + * given IP address and Mac combination using the HostId. * - * @param networkAddress - * IP Address of the Host encapsulated in class InetAddress + * @param id + * IP address and Mac Address combination encapsulated in IHostId + * interface + * @return {@link org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector} + * Class that contains the Host info such as its MAC address, Switch + * ID, port, VLAN. If Host is not found, returns NULL + * + */ + public HostNodeConnector hostQuery(IHostId id); + + /** + * Checks the local Host Database to see if a Host has been learned for a + * given IP address and Mac combination using the HostId. + * + * @param addr + * IP address of the Host * @return {@link org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector} * Class that contains the Host info such as its MAC address, Switch * ID, port, VLAN. If Host is not found, returns NULL * */ - public HostNodeConnector hostQuery(InetAddress networkAddress); + public HostNodeConnector hostQuery(InetAddress addr); /** - * Initiates an immediate discovery of the Host for a given IP address. This + * Initiates an immediate discovery of the Host for a given Host id. This * provides for the calling applications to block on the host discovery. * - * @param networkAddress - * IP address encapsulated in InetAddress class + * @param id + * IP address and Mac Address combination encapsulated in IHostId + * interface + * @return Future + * {@link org.opendaylight.controller.hosttracker.HostTrackerCallable} + */ + public Future discoverHost(IHostId id); + + /** + * Initiates an immediate discovery of the Host for a given Host id. This + * provides for the calling applications to block on the host discovery. + * + * @param addr + * IP address of the host * @return Future * {@link org.opendaylight.controller.hosttracker.HostTrackerCallable} */ - public Future discoverHost(InetAddress networkAddress); + public Future discoverHost(InetAddress addr); /** * Returns the Network Hierarchy for a given Host. This API is typically * used by applications like Hadoop for Rack Awareness functionality. * - * @param IP - * address of the Host encapsulated in InetAddress class + * @param id + * IP address and Mac Address combination encapsulated in IHostId + * interface * @return List of String ArrayList containing the Hierarchies. */ - public List> getHostNetworkHierarchy(InetAddress hostAddress); + public List> getHostNetworkHierarchy(IHostId id); + + /** + * Returns the Network Hierarchy for a given Host. This API is typically + * used by applications like Hadoop for Rack Awareness functionality. + * + * @param addr + * IP address of the host + * @return List of String ArrayList containing the Hierarchies. + */ + public List> getHostNetworkHierarchy(InetAddress addr); /** * Returns all the the Hosts either learned dynamically or added statically @@ -124,8 +177,7 @@ public interface IfIptoHost { * @return The status object as described in {@code Status} indicating the * result of this action. */ - public Status addStaticHost(String networkAddress, String dataLayerAddress, - NodeConnector nc, String vlan); + public Status addStaticHost(String networkAddress, String dataLayerAddress, NodeConnector nc, String vlan); /** * Allows the deletion of statically learned Host @@ -135,4 +187,14 @@ public interface IfIptoHost { * result of this action. */ public Status removeStaticHost(String networkAddress); + + /** + * Allows the deletion of statically learned Host + * + * @param networkAddress + * @param macAddress + * @return The status object as described in {@code Status} indicating the + * result of this action. + */ + public Status removeStaticHostUsingIPAndMac(String networkAddress, String macAddress); } diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml index 6faf2e9178..258327cca7 100644 --- a/opendaylight/hosttracker/implementation/pom.xml +++ b/opendaylight/hosttracker/implementation/pom.xml @@ -8,7 +8,7 @@ ../../commons/opendaylight hosttracker.implementation - 0.4.1-SNAPSHOT + 0.5.1-SNAPSHOT bundle scm:git:ssh://git.opendaylight.org:29418/controller.git @@ -139,7 +139,7 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} junit diff --git a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java b/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java index df62c1985a..e1a8ef806a 100644 --- a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java +++ b/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java @@ -37,6 +37,10 @@ import org.opendaylight.controller.clustering.services.CacheExistException; import org.opendaylight.controller.clustering.services.ICacheUpdateAware; import org.opendaylight.controller.clustering.services.IClusterContainerServices; import org.opendaylight.controller.clustering.services.IClusterServices; +import org.opendaylight.controller.hosttracker.HostIdFactory; +import org.opendaylight.controller.hosttracker.IHostId; +import org.opendaylight.controller.hosttracker.IPHostId; +import org.opendaylight.controller.hosttracker.IPMacHostId; import org.opendaylight.controller.hosttracker.IfHostListener; import org.opendaylight.controller.hosttracker.IfIptoHost; import org.opendaylight.controller.hosttracker.IfNewHostNotify; @@ -84,13 +88,25 @@ import org.slf4j.LoggerFactory; * removed the database */ +/*** + * + * HostTracker db key scheme implementation support. Support has been added for + * IP only or IP + MAC scheme as of now. User can use either of the schemes + * based on the configuration done in config.ini file. By default IP only key + * scheme is choosen. The attribute to be set in config.ini is + * hosttracker.keyscheme. It could have a value of 0 or 1 as of now. 0 is for IP + * only scheme. 1 is for IP + MAC scheme. + * + * + */ + public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAware, IInventoryListener, - ITopologyManagerAware, ICacheUpdateAware, CommandProvider { + ITopologyManagerAware, ICacheUpdateAware, CommandProvider { static final String ACTIVE_HOST_CACHE = "hosttracker.ActiveHosts"; static final String INACTIVE_HOST_CACHE = "hosttracker.InactiveHosts"; private static final Logger logger = LoggerFactory.getLogger(HostTracker.class); protected final Set hostFinder = new CopyOnWriteArraySet();; - protected ConcurrentMap hostsDB; + protected ConcurrentMap hostsDB; /* * Following is a list of hosts which have been requested by NB APIs to be * added, but either the switch or the port is not sup, so they will be @@ -109,13 +125,15 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw protected boolean stopping; private static boolean hostRefresh = true; private static int hostRetryCount = 5; + private String keyScheme = null; + private static class ARPPending { - protected InetAddress hostIP; + protected IHostId hostId; protected short sent_count; protected HostTrackerCallable hostTrackerCallable; - public InetAddress getHostIP() { - return hostIP; + public IHostId getHostId() { + return hostId; } public short getSent_count() { @@ -126,8 +144,8 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw return hostTrackerCallable; } - public void setHostIP(InetAddress networkAddr) { - this.hostIP = networkAddr; + public void setHostId(IHostId id) { + this.hostId = id; } public void setSent_count(short count) { @@ -141,7 +159,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw // This list contains the hosts for which ARP requests are being sent // periodically - ConcurrentMap ARPPendingList; + ConcurrentMap ARPPendingList; /* * This list below contains the hosts which were initially in ARPPendingList * above, but ARP response didn't come from there hosts after multiple @@ -158,7 +176,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw * * We can't recover from condition 3 above */ - ConcurrentMap failedARPReqList; + ConcurrentMap failedARPReqList; public HostTracker() { } @@ -175,6 +193,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw /* ARP Refresh Timer to go off every 5 seconds to implement ARP aging */ arpRefreshTimer = new Timer(); arpRefreshTimer.schedule(new ARPRefreshHandler(), 5000, 5000); + keyScheme = HostIdFactory.getScheme(); logger.debug("startUp: Caches created, timers started"); } @@ -204,8 +223,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw return; } logger.debug("Retrieving cache for HostTrackerAH"); - hostsDB = (ConcurrentMap) this.clusterContainerService - .getCache(ACTIVE_HOST_CACHE); + hostsDB = (ConcurrentMap) this.clusterContainerService.getCache(ACTIVE_HOST_CACHE); if (hostsDB == null) { logger.error("Cache couldn't be retrieved for HostTracker"); } @@ -220,10 +238,10 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw } public void nonClusterObjectCreate() { - hostsDB = new ConcurrentHashMap(); + hostsDB = new ConcurrentHashMap(); inactiveStaticHosts = new ConcurrentHashMap(); - ARPPendingList = new ConcurrentHashMap(); - failedARPReqList = new ConcurrentHashMap(); + ARPPendingList = new ConcurrentHashMap(); + failedARPReqList = new ConcurrentHashMap(); } public void shutDown() { @@ -262,66 +280,72 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw } private boolean hostExists(HostNodeConnector host) { - HostNodeConnector lhost = hostsDB.get(host.getNetworkAddress()); + IHostId id = HostIdFactory.create(host.getNetworkAddress(), host.getDataLayerAddress()); + HostNodeConnector lhost = hostsDB.get(id); return host.equals(lhost); } - private HostNodeConnector getHostFromOnActiveDB(InetAddress networkAddress) { - return hostsDB.get(networkAddress); + private HostNodeConnector getHostFromOnActiveDB(IHostId id) { + return hostsDB.get(id); } - private Entry getHostFromInactiveDB(InetAddress networkAddress) { + private Entry getHostFromInactiveDB(IHostId id) { for (Entry entry : inactiveStaticHosts.entrySet()) { - if (entry.getValue().equalsByIP(networkAddress)) { - logger.debug("getHostFromInactiveDB(): Inactive Host found for IP:{} ", networkAddress.getHostAddress()); + HostNodeConnector hnc = entry.getValue(); + IHostId cmpId = HostIdFactory.create(hnc.getNetworkAddress(), hnc.getDataLayerAddress()); + if (cmpId.equals(id)) { + logger.debug("getHostFromInactiveDB(): Inactive Host found for ID:{} ", decodeIPFromId(id)); return entry; } } - logger.debug("getHostFromInactiveDB() Inactive Host Not found for IP: {}", networkAddress.getHostAddress()); + logger.debug("getHostFromInactiveDB() Inactive Host Not found for ID: {}", decodeIPFromId(id)); return null; } - private void removeHostFromInactiveDB(InetAddress networkAddress) { + private void removeHostFromInactiveDB(IHostId id) { NodeConnector nodeConnector = null; for (Entry entry : inactiveStaticHosts.entrySet()) { - if (entry.getValue().equalsByIP(networkAddress)) { + HostNodeConnector hnc = entry.getValue(); + IHostId cmpId = HostIdFactory.create(hnc.getNetworkAddress(), hnc.getDataLayerAddress()); + if (cmpId.equals(id)) { nodeConnector = entry.getKey(); break; } } if (nodeConnector != null) { inactiveStaticHosts.remove(nodeConnector); - logger.debug("removeHostFromInactiveDB(): Host Removed for IP: {}", networkAddress.getHostAddress()); + logger.debug("removeHostFromInactiveDB(): Host Removed for IP: {}", decodeIPFromId(id)); return; } - logger.debug("removeHostFromInactiveDB(): Host Not found for IP: {}", networkAddress.getHostAddress()); + logger.debug("removeHostFromInactiveDB(): Host Not found for IP: {}", decodeIPFromId(id)); } protected boolean hostMoved(HostNodeConnector host) { - if (hostQuery(host.getNetworkAddress()) != null) { + IHostId id = HostIdFactory.create(host.getNetworkAddress(), host.getDataLayerAddress()); + if (hostQuery(id) != null) { return true; } return false; } @Override - public HostNodeConnector hostQuery(InetAddress networkAddress) { - return hostsDB.get(networkAddress); + public HostNodeConnector hostQuery(IHostId id) { + return hostsDB.get(id); } @Override - public Future discoverHost(InetAddress networkAddress) { + public Future discoverHost(IHostId id) { if (executor == null) { logger.debug("discoverHost: Null executor"); return null; } - Callable worker = new HostTrackerCallable(this, networkAddress); + Callable worker = new HostTrackerCallable(this, id); Future submit = executor.submit(worker); return submit; } @Override - public HostNodeConnector hostFind(InetAddress networkAddress) { + public HostNodeConnector hostFind(IHostId id) { /* * Sometimes at boot with containers configured in the startup we hit * this path (from TIF) when hostFinder has not been set yet Caller @@ -333,21 +357,21 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw return null; } - HostNodeConnector host = hostQuery(networkAddress); + HostNodeConnector host = hostQuery(id); if (host != null) { - logger.debug("hostFind(): Host found for IP: {}", networkAddress.getHostAddress()); + logger.debug("hostFind(): Host found for IP: {}", id); return host; } /* Add this host to ARPPending List for any potential retries */ - addToARPPendingList(networkAddress); - logger.debug("hostFind(): Host Not Found for IP: {}, Inititated Host Discovery ...", - networkAddress.getHostAddress()); + addToARPPendingList(id); + logger.debug("hostFind(): Host Not Found for IP: {}, Inititated Host Discovery ...", id); /* host is not found, initiate a discovery */ for (IHostFinder hf : hostFinder) { - hf.find(networkAddress); + InetAddress addr = decodeIPFromId(id); + hf.find(addr); } return null; } @@ -361,7 +385,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw @Override public Set getActiveStaticHosts() { Set list = new HashSet(); - for (Entry entry : hostsDB.entrySet()) { + for (Entry entry : hostsDB.entrySet()) { HostNodeConnector host = entry.getValue(); if (host.isStaticHost()) { list.add(host); @@ -376,31 +400,32 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw return list; } - private void addToARPPendingList(InetAddress networkAddr) { + private void addToARPPendingList(IHostId id) { ARPPending arphost = new ARPPending(); - arphost.setHostIP(networkAddr); + arphost.setHostId(id); arphost.setSent_count((short) 1); - ARPPendingList.put(networkAddr, arphost); - logger.debug("Host Added to ARPPending List, IP: {}", networkAddr); + ARPPendingList.put(id, arphost); + logger.debug("Host Added to ARPPending List, IP: {}", decodeIPFromId(id)); + } - public void setCallableOnPendingARP(InetAddress networkAddr, HostTrackerCallable callable) { + public void setCallableOnPendingARP(IHostId id, HostTrackerCallable callable) { ARPPending arphost; - for (Entry entry : ARPPendingList.entrySet()) { + for (Entry entry : ARPPendingList.entrySet()) { arphost = entry.getValue(); - if (arphost.getHostIP().equals(networkAddr)) { + if (arphost.getHostId().equals(id)) { arphost.setHostTrackerCallable(callable); } } } - private void processPendingARPReqs(InetAddress networkAddr) { + private void processPendingARPReqs(IHostId id) { ARPPending arphost; - if ((arphost = ARPPendingList.remove(networkAddr)) != null) { + if ((arphost = ARPPendingList.remove(id)) != null) { // Remove the arphost from ARPPendingList as it has been learned now - logger.debug("Host Removed from ARPPending List, IP: {}", networkAddr); + logger.debug("Host Removed from ARPPending List, IP: {}", id); HostTrackerCallable htCallable = arphost.getHostTrackerCallable(); if (htCallable != null) { htCallable.wakeup(); @@ -412,26 +437,27 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw * It could have been a host from the FailedARPReqList */ - if (failedARPReqList.containsKey(networkAddr)) { - failedARPReqList.remove(networkAddr); - logger.debug("Host Removed from FailedARPReqList List, IP: {}", networkAddr); + if (failedARPReqList.containsKey(id)) { + failedARPReqList.remove(id); + logger.debug("Host Removed from FailedARPReqList List, IP: {}", decodeIPFromId(id)); } } // Learn a new Host private void learnNewHost(HostNodeConnector host) { + IHostId id = HostIdFactory.create(host.getNetworkAddress(), host.getDataLayerAddress()); host.initArpSendCountDown(); - HostNodeConnector rHost = hostsDB.putIfAbsent(host.getNetworkAddress(), host); + HostNodeConnector rHost = hostsDB.putIfAbsent(id, host); if (rHost != null) { // Another host is already learned for this IP address, replace it - replaceHost(host.getNetworkAddress(), rHost, host); + replaceHost(id, rHost, host); } else { logger.debug("New Host Learned: MAC: {} IP: {}", HexEncode.bytesToHexString(host .getDataLayerAddressBytes()), host.getNetworkAddress().getHostAddress()); } } - private void replaceHost(InetAddress networkAddr, HostNodeConnector removedHost, HostNodeConnector newHost) { + private void replaceHost(IHostId id, HostNodeConnector removedHost, HostNodeConnector newHost) { // Ignore ARP messages from internal nodes NodeConnector newHostNc = newHost.getnodeConnector(); boolean newHostIsInternal = topologyManager.isInternal(newHostNc); @@ -441,7 +467,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw newHost.initArpSendCountDown(); - if (hostsDB.replace(networkAddr, removedHost, newHost)) { + if (hostsDB.replace(id, removedHost, newHost)) { logger.debug("Host move occurred: Old Host IP:{}, New Host IP: {}", removedHost.getNetworkAddress() .getHostAddress(), newHost.getNetworkAddress().getHostAddress()); logger.debug("Old Host MAC: {}, New Host MAC: {}", @@ -453,25 +479,25 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw /* * Host replacement has failed, do the recovery */ - hostsDB.put(networkAddr, newHost); + hostsDB.put(id, newHost); logger.error("Host replacement failed. Overwrite the host. Repalced Host: {}, New Host: {}", removedHost, newHost); } notifyHostLearnedOrRemoved(removedHost, false); notifyHostLearnedOrRemoved(newHost, true); if (!newHost.isStaticHost()) { - processPendingARPReqs(networkAddr); + processPendingARPReqs(id); } } // Remove known Host - private void removeKnownHost(InetAddress key) { + private void removeKnownHost(IHostId key) { HostNodeConnector host = hostsDB.get(key); if (host != null) { logger.debug("Removing Host: IP:{}", host.getNetworkAddress().getHostAddress()); hostsDB.remove(key); } else { - logger.error("removeKnownHost(): Host for IP address {} not found in hostsDB", key.getHostAddress()); + logger.error("removeKnownHost(): Host for IP address {} not found in hostsDB", decodeIPFromId(key)); } } @@ -487,7 +513,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw public void run() { HostNodeConnector removedHost = null; InetAddress networkAddr = host.getNetworkAddress(); - + IHostId id = HostIdFactory.create(networkAddr, host.getDataLayerAddress()); /* Check for Host Move case */ if (hostMoved(host)) { /* @@ -496,9 +522,10 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw * location parameters with new information, and notify the * applications listening to host move. */ - removedHost = hostsDB.get(networkAddr); + + removedHost = hostsDB.get(id); if (removedHost != null) { - replaceHost(networkAddr, removedHost, host); + replaceHost(id, removedHost, host); return; } else { logger.error("Host to be removed not found in hostsDB"); @@ -509,7 +536,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw learnNewHost(host); /* check if there is an outstanding request for this host */ - processPendingARPReqs(networkAddr); + processPendingARPReqs(id); notifyHostLearnedOrRemoved(host, true); } } @@ -519,10 +546,13 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw logger.debug("Received for Host: IP {}, MAC {}, {}", host.getNetworkAddress().getHostAddress(), HexEncode.bytesToHexString(host.getDataLayerAddressBytes()), host); if (hostExists(host)) { - HostNodeConnector existinghost = hostsDB.get(host.getNetworkAddress()); + IHostId id = HostIdFactory.create(host.getNetworkAddress(), host.getDataLayerAddress()); + HostNodeConnector existinghost = hostsDB.get(id); existinghost.initArpSendCountDown(); // Update the host - hostsDB.put(host.getNetworkAddress(), existinghost); + + hostsDB.put(id, existinghost); + logger.debug("hostListener returned without adding the host"); return; } new NotifyHostThread(host).start(); @@ -720,8 +750,8 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw * Switch-Ids as String). */ @Override - public List> getHostNetworkHierarchy(InetAddress hostAddress) { - HostNodeConnector host = hostQuery(hostAddress); + public List> getHostNetworkHierarchy(IHostId id) { + HostNodeConnector host = hostQuery(id); if (host == null) { return null; } @@ -903,16 +933,16 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw public void subnetNotify(Subnet sub, boolean add) { logger.debug("Received subnet notification: {} add={}", sub, add); if (add) { - for (Entry entry : failedARPReqList.entrySet()) { + for (Entry entry : failedARPReqList.entrySet()) { ARPPending arphost; arphost = entry.getValue(); if (hostFinder == null) { logger.warn("ARPHandler Services are not available on subnet addition"); continue; } - logger.debug("Sending the ARP from FailedARPReqList fors IP: {}", arphost.getHostIP().getHostAddress()); + logger.debug("Sending the ARP from FailedARPReqList fors IP: {}", decodeIPFromId(arphost.getHostId())); for (IHostFinder hf : hostFinder) { - hf.find(arphost.getHostIP()); + hf.find(decodeIPFromId(arphost.getHostId())); } } } @@ -928,14 +958,14 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw /* This routine runs every 4 seconds */ logger.trace("Number of Entries in ARP Pending/Failed Lists: ARPPendingList = {}, failedARPReqList = {}", ARPPendingList.size(), failedARPReqList.size()); - for (Entry entry : ARPPendingList.entrySet()) { + for (Entry entry : ARPPendingList.entrySet()) { arphost = entry.getValue(); - if (hostsDB.containsKey(arphost.getHostIP())) { + if (hostsDB.containsKey(arphost.getHostId())) { // this host is already learned, shouldn't be in // ARPPendingList // Remove it and continue - logger.warn("Learned Host {} found in ARPPendingList", arphost.getHostIP()); + logger.warn("Learned Host {} found in ARPPendingList", decodeIPFromId(arphost.getHostId())); ARPPendingList.remove(entry.getKey()); continue; } @@ -950,10 +980,10 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw continue; } for (IHostFinder hf : hostFinder) { - hf.find(arphost.getHostIP()); + hf.find(decodeIPFromId(arphost.getHostId())); } arphost.sent_count++; - logger.debug("ARP Sent from ARPPending List, IP: {}", arphost.getHostIP().getHostAddress()); + logger.debug("ARP Sent from ARPPending List, IP: {}", decodeIPFromId(arphost.getHostId())); } else if (arphost.getSent_count() >= hostRetryCount) { /* * ARP requests have been sent without receiving a reply, @@ -961,12 +991,12 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw */ ARPPendingList.remove(entry.getKey()); logger.debug("ARP reply not received after multiple attempts, removing from Pending List IP: {}", - arphost.getHostIP().getHostAddress()); + decodeIPFromId(arphost.getHostId())); /* * Add this host to a different list which will be processed * on link up events */ - logger.debug("Adding the host to FailedARPReqList IP: {}", arphost.getHostIP().getHostAddress()); + logger.debug("Adding the host to FailedARPReqList IP: {}", decodeIPFromId(arphost.getHostId())); failedARPReqList.put(entry.getKey(), arphost); } else { @@ -996,7 +1026,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw logger.error("ARPRefreshHandler(): hostsDB is not allocated yet:"); return; } - for (Entry entry : hostsDB.entrySet()) { + for (Entry entry : hostsDB.entrySet()) { HostNodeConnector host = entry.getValue(); if (host.isStaticHost()) { /* this host was learned via API3, don't age it out */ @@ -1073,6 +1103,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw HostNodeConnector host = null; try { host = new HostNodeConnector(dataLayerAddress, networkAddr, nc, vlan); + IHostId id = HostIdFactory.create(networkAddr, new EthernetAddress(dataLayerAddress)); if (hostExists(host)) { // This host is already learned either via ARP or through a // northbound request @@ -1081,7 +1112,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw return new Status(StatusCode.SUCCESS); } - if (hostsDB.get(networkAddr) != null) { + if (hostsDB.get(id) != null) { // There is already a host with this IP address (but behind // a different (switch, port, vlan) tuple. Return an error return new Status(StatusCode.CONFLICT, "Host with this IP already exists."); @@ -1101,7 +1132,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw */ if (switchManager.isNodeConnectorEnabled(nc)) { learnNewHost(host); - processPendingARPReqs(networkAddr); + processPendingARPReqs(id); notifyHostLearnedOrRemoved(host, true); } else { inactiveStaticHosts.put(nc, host); @@ -1152,8 +1183,10 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw return new Status(StatusCode.BADREQUEST, "Host already exists"); } + IHostId id = HostIdFactory.create(networkAddr, new EthernetAddress(dataLayerAddress)); + if ((tobeUpdatedHost = hostsDB.get(networkAddr)) != null) { - if (hostsDB.replace(networkAddr, tobeUpdatedHost, host)) { + if (hostsDB.replace(id, tobeUpdatedHost, host)) { logger.debug("Host replaced from hostsDB. Old host: {} New Host: {}", tobeUpdatedHost, host); notifyHostLearnedOrRemoved(tobeUpdatedHost, false); notifyHostLearnedOrRemoved(host, true); @@ -1199,9 +1232,10 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw * otherwise */ - public Status removeStaticHostReq(InetAddress networkAddress) { + public Status removeStaticHostReq(InetAddress networkAddress, DataLinkAddress mac) { // Check if host is in active hosts database - HostNodeConnector host = getHostFromOnActiveDB(networkAddress); + IHostId id = HostIdFactory.create(networkAddress, mac); + HostNodeConnector host = getHostFromOnActiveDB(id); if (host != null) { // Validation check if (!host.isStaticHost()) { @@ -1209,19 +1243,19 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw } // Remove and notify notifyHostLearnedOrRemoved(host, false); - removeKnownHost(networkAddress); + removeKnownHost(id); return new Status(StatusCode.SUCCESS, null); } // Check if host is in inactive hosts database - Entry entry = getHostFromInactiveDB(networkAddress); + Entry entry = getHostFromInactiveDB(id); if (entry != null) { host = entry.getValue(); // Validation check if (!host.isStaticHost()) { return new Status(StatusCode.FORBIDDEN, "Host " + networkAddress.getHostName() + " is not static"); } - this.removeHostFromInactiveDB(networkAddress); + this.removeHostFromInactiveDB(id); return new Status(StatusCode.SUCCESS, null); } @@ -1243,7 +1277,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw switch (type) { case REMOVED: logger.debug("Received removed node {}", node); - for (Entry entry : hostsDB.entrySet()) { + for (Entry entry : hostsDB.entrySet()) { HostNodeConnector host = entry.getValue(); if (host.getnodeconnectorNode().equals(node)) { logger.debug("Node: {} is down, remove from Hosts_DB", node); @@ -1313,23 +1347,65 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw @Override public Status removeStaticHost(String networkAddress) { try { + if ((keyScheme != null) && (!keyScheme.equals(HostIdFactory.DEFAULT_IP_KEY_SCHEME))) { + return new Status(StatusCode.NOTALLOWED, "Host DB Key scheme used is not IP only scheme."); + } InetAddress address = InetAddress.getByName(networkAddress); - return removeStaticHostReq(address); + return removeStaticHostReq(address, null); } catch (UnknownHostException e) { logger.debug("Invalid IP Address when trying to remove host", e); return new Status(StatusCode.BADREQUEST, "Invalid IP Address when trying to remove host"); } } + @Override + public Status removeStaticHostUsingIPAndMac(String networkAddress, String macAddress) { + try { + if ((keyScheme != null) && (keyScheme.equals(HostIdFactory.DEFAULT_IP_KEY_SCHEME))) { + return new Status(StatusCode.NOTALLOWED, "Host DB Key scheme used is not IP only scheme."); + } + InetAddress address = InetAddress.getByName(networkAddress); + DataLinkAddress mac = new EthernetAddress(HexEncode.bytesFromHexString(macAddress)); + return removeStaticHostReq(address, mac); + } catch (UnknownHostException e) { + logger.debug("Invalid IP Address when trying to remove host", e); + return new Status(StatusCode.BADREQUEST, "Invalid IP Address when trying to remove host"); + } catch (ConstructionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return new Status(StatusCode.BADREQUEST, "Invalid Input parameters have been passed."); + } + } + + private InetAddress decodeIPFromId(IHostId id) { + if ((keyScheme != null) && (keyScheme.equals(HostIdFactory.DEFAULT_IP_KEY_SCHEME))) { + IPHostId ipId = (IPHostId) id; + return (ipId.getIpAddress()); + } else if ((keyScheme != null) && (keyScheme.equals(HostIdFactory.IP_MAC_KEY_SCHEME))) { + IPMacHostId ipMacId = (IPMacHostId) id; + return (ipMacId.getIpAddress()); + } + return null; + } + + private DataLinkAddress decodeMacFromId(IHostId id) { + if ((keyScheme != null) && (!keyScheme.equals(HostIdFactory.DEFAULT_IP_KEY_SCHEME))) { + IPMacHostId ipMacId = (IPMacHostId) id; + return (ipMacId.getMacAddr()); + } + + return null; + } + private void handleNodeConnectorStatusUp(NodeConnector nodeConnector) { ARPPending arphost; HostNodeConnector host = null; logger.trace("handleNodeConnectorStatusUp {}", nodeConnector); - for (Entry entry : failedARPReqList.entrySet()) { + for (Entry entry : failedARPReqList.entrySet()) { arphost = entry.getValue(); - logger.trace("Sending the ARP from FailedARPReqList fors IP: {}", arphost.getHostIP().getHostAddress()); + logger.trace("Sending the ARP from FailedARPReqList fors IP: {}", arphost.getHostId()); if (hostFinder == null) { logger.warn("ARPHandler is not available at interface up"); logger.warn("Since this event is missed, host(s) connected to interface {} may not be discovered", @@ -1341,13 +1417,14 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw // Use hostFinder's "probe" method try { byte[] dataLayerAddress = NetUtils.getBroadcastMACAddr(); - host = new HostNodeConnector(dataLayerAddress, arphost.getHostIP(), nodeConnector, (short) 0); + host = new HostNodeConnector(dataLayerAddress, decodeIPFromId(arphost.getHostId()), nodeConnector, + (short) 0); for (IHostFinder hf : hostFinder) { hf.probe(host); } } catch (ConstructionException e) { logger.debug("HostNodeConnector couldn't be created for Host: {}, NodeConnector: {}", - arphost.getHostIP(), nodeConnector); + arphost.getHostId(), nodeConnector); logger.error("", e); } } @@ -1356,7 +1433,8 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw if (host != null) { inactiveStaticHosts.remove(nodeConnector); learnNewHost(host); - processPendingARPReqs(host.getNetworkAddress()); + IHostId id = HostIdFactory.create(host.getNetworkAddress(), host.getDataLayerAddress()); + processPendingARPReqs(id); notifyHostLearnedOrRemoved(host, true); } } @@ -1364,7 +1442,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw private void handleNodeConnectorStatusDown(NodeConnector nodeConnector) { logger.trace("handleNodeConnectorStatusDown {}", nodeConnector); - for (Entry entry : hostsDB.entrySet()) { + for (Entry entry : hostsDB.entrySet()) { HostNodeConnector host = entry.getValue(); if (host.getnodeConnector().equals(nodeConnector)) { logger.debug(" NodeConnector: {} is down, remove from Hosts_DB", nodeConnector); @@ -1420,6 +1498,8 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw this.containerName = ""; } startUp(); + + logger.debug("key Scheme in hosttracker is {}", keyScheme); } /** @@ -1467,7 +1547,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw } @Override - public void entryCreated(InetAddress key, String cacheName, boolean originLocal) { + public void entryCreated(IHostId key, String cacheName, boolean originLocal) { if (originLocal) { return; } @@ -1475,11 +1555,11 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw } @Override - public void entryUpdated(InetAddress key, HostNodeConnector new_value, String cacheName, boolean originLocal) { + public void entryUpdated(IHostId key, HostNodeConnector new_value, String cacheName, boolean originLocal) { } @Override - public void entryDeleted(InetAddress key, String cacheName, boolean originLocal) { + public void entryDeleted(IHostId key, String cacheName, boolean originLocal) { } private void registerWithOSGIConsole() { @@ -1494,17 +1574,41 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw public void _dumpPendingARPReqList(CommandInterpreter ci) { ARPPending arphost; - for (Entry entry : ARPPendingList.entrySet()) { + for (Entry entry : ARPPendingList.entrySet()) { arphost = entry.getValue(); - ci.println(arphost.getHostIP().toString()); + ci.println(arphost.getHostId().toString()); } } public void _dumpFailedARPReqList(CommandInterpreter ci) { ARPPending arphost; - for (Entry entry : failedARPReqList.entrySet()) { + for (Entry entry : failedARPReqList.entrySet()) { arphost = entry.getValue(); - ci.println(arphost.getHostIP().toString()); + ci.println(arphost.getHostId().toString()); } } + + @Override + public HostNodeConnector hostFind(InetAddress addr) { + IHostId id = HostIdFactory.create(addr, null); + return (hostFind(id)); + } + + @Override + public HostNodeConnector hostQuery(InetAddress addr) { + IHostId id = HostIdFactory.create(addr, null); + return (hostQuery(id)); + } + + @Override + public Future discoverHost(InetAddress addr) { + IHostId id = HostIdFactory.create(addr, null); + return discoverHost(id); + } + + @Override + public List> getHostNetworkHierarchy(InetAddress addr) { + IHostId id = HostIdFactory.create(addr, null); + return getHostNetworkHierarchy(id); + } } diff --git a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java b/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java index 303308270d..a1d29dd27f 100644 --- a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java +++ b/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java @@ -18,19 +18,24 @@ package org.opendaylight.controller.hosttracker.internal; * find a host in HostTracker's database and want to discover the host * in the same thread without being called by a callback function. */ -import java.net.InetAddress; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; +import org.opendaylight.controller.hosttracker.IHostId; import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector; +/** + * + * + */ public class HostTrackerCallable implements Callable { - InetAddress trackedHost; + //host id which could be ip or a combination of ip + mac based on the scheme chosen. + IHostId trackedHost; HostTracker hostTracker; protected CountDownLatch latch; - public HostTrackerCallable(HostTracker tracker, InetAddress inet) { + public HostTrackerCallable(HostTracker tracker, IHostId inet) { trackedHost = inet; hostTracker = tracker; latch = new CountDownLatch(1); diff --git a/opendaylight/hosttracker/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerTest.java b/opendaylight/hosttracker/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerTest.java index dc15f96f6e..d7c60e67a9 100644 --- a/opendaylight/hosttracker/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerTest.java +++ b/opendaylight/hosttracker/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerTest.java @@ -10,10 +10,13 @@ package org.opendaylight.controller.hosttracker.internal; import java.net.InetAddress; import java.net.UnknownHostException; + import junit.framework.TestCase; import org.junit.Assert; import org.junit.Test; +import org.opendaylight.controller.hosttracker.IHostId; +import org.opendaylight.controller.hosttracker.IPHostId; public class HostTrackerTest extends TestCase { @@ -25,10 +28,11 @@ public class HostTrackerTest extends TestCase { Assert.assertFalse(hostTracker == null); InetAddress hostIP = InetAddress.getByName("192.168.0.8"); + IHostId id = IPHostId.fromIP(hostIP); HostTrackerCallable htCallable = new HostTrackerCallable(hostTracker, - hostIP); - Assert.assertTrue(htCallable.trackedHost.equals(hostIP)); + id); + Assert.assertTrue(htCallable.trackedHost.equals(id)); Assert.assertTrue(htCallable.hostTracker.equals(hostTracker)); long count = htCallable.latch.getCount(); @@ -43,9 +47,11 @@ public class HostTrackerTest extends TestCase { Assert.assertFalse(hostTracker == null); InetAddress hostIP_1 = InetAddress.getByName("192.168.0.8"); + IHostId id1 = IPHostId.fromIP(hostIP_1); InetAddress hostIP_2 = InetAddress.getByName("192.168.0.18"); - hostTracker.discoverHost(hostIP_1); - hostTracker.discoverHost(hostIP_2); + IHostId id2 = IPHostId.fromIP(hostIP_2); + hostTracker.discoverHost(id1); + hostTracker.discoverHost(id2); hostTracker.nonClusterObjectCreate(); } diff --git a/opendaylight/hosttracker/integrationtest/pom.xml b/opendaylight/hosttracker/integrationtest/pom.xml index 7274ef8e55..8f4163d686 100644 --- a/opendaylight/hosttracker/integrationtest/pom.xml +++ b/opendaylight/hosttracker/integrationtest/pom.xml @@ -15,18 +15,18 @@ hosttracker.integrationtest - 0.4.1-SNAPSHOT + 0.5.1-SNAPSHOT org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller hosttracker.implementation - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller @@ -53,7 +53,7 @@ org.opendaylight.controller arphandler - 0.4.1-SNAPSHOT + ${arphandler.version} org.opendaylight.controller diff --git a/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java b/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java index cea8af009f..a454eb97e1 100644 --- a/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java +++ b/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java @@ -27,6 +27,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.opendaylight.controller.hosttracker.IHostId; +import org.opendaylight.controller.hosttracker.IPHostId; import org.opendaylight.controller.hosttracker.IfIptoHost; import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector; import org.opendaylight.controller.sal.core.Node; @@ -45,6 +47,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + //import org.opendaylight.controller.hosttracker.*; @RunWith(PaxExam.class) @@ -56,6 +59,7 @@ public class HostTrackerIT { private IfIptoHost hosttracker = null; private IInventoryListener invtoryListener = null; + // Configure the OSGi container @Configuration public Option[] config() { @@ -218,7 +222,6 @@ public class HostTrackerIT { st = this.hosttracker.addStaticHost("192.168.0.13", "11:22:33:44:55:77", nc1_2, "0"); Assert.assertFalse(st.isSuccess()); - this.invtoryListener.notifyNodeConnector(nc1_1, UpdateType.ADDED, null); // check all host list @@ -257,12 +260,15 @@ public class HostTrackerIT { Status st = this.hosttracker.addStaticHost("192.168.0.8", "11:22:33:44:55:66", nc1_1, null); st = this.hosttracker.addStaticHost("192.168.0.13", "11:22:33:44:55:77", nc1_2, ""); - HostNodeConnector hnc_1 = this.hosttracker.hostFind(InetAddress.getByName("192.168.0.8")); + IHostId id1 = IPHostId.fromIP(InetAddress.getByName("192.168.0.8")); + HostNodeConnector hnc_1 = this.hosttracker.hostFind(id1); assertNull(hnc_1); this.invtoryListener.notifyNodeConnector(nc1_1, UpdateType.ADDED, null); - hnc_1 = this.hosttracker.hostFind(InetAddress.getByName("192.168.0.8")); + IHostId id2 = IPHostId.fromIP(InetAddress.getByName("192.168.0.8")); + hnc_1 = this.hosttracker.hostFind(id2); + assertNotNull(hnc_1); } diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml index 040484e695..541dfcfe2d 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@ -79,7 +79,7 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml index 4b79865ca9..b4e0b34d09 100644 --- a/opendaylight/northbound/integrationtest/pom.xml +++ b/opendaylight/northbound/integrationtest/pom.xml @@ -69,7 +69,7 @@ org.opendaylight.controller forwarding.staticrouting - 0.4.1-SNAPSHOT + ${forwarding.staticrouting} org.opendaylight.controller @@ -99,7 +99,7 @@ org.opendaylight.controller arphandler - 0.4.1-SNAPSHOT + ${arphandler.version} org.opendaylight.controller @@ -114,12 +114,12 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller hosttracker.implementation - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml index a869519c58..d169de9f2a 100644 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/northbound/staticrouting/pom.xml @@ -84,7 +84,7 @@ org.opendaylight.controller forwarding.staticrouting - 0.4.1-SNAPSHOT + ${forwarding.staticrouting} org.codehaus.enunciate diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/samples/loadbalancer/pom.xml index 69163c6939..cf7a18ea65 100644 --- a/opendaylight/samples/loadbalancer/pom.xml +++ b/opendaylight/samples/loadbalancer/pom.xml @@ -15,7 +15,7 @@ samples.loadbalancer - 0.4.1-SNAPSHOT + 0.5.1-SNAPSHOT bundle @@ -90,7 +90,7 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java index 1e3b845b86..b2229cb022 100644 --- a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java +++ b/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java @@ -17,6 +17,8 @@ import java.util.Set; import org.apache.felix.dm.Component; import org.opendaylight.controller.forwardingrulesmanager.FlowEntry; import org.opendaylight.controller.forwardingrulesmanager.IForwardingRulesManager; +import org.opendaylight.controller.hosttracker.HostIdFactory; +import org.opendaylight.controller.hosttracker.IHostId; import org.opendaylight.controller.hosttracker.IfIptoHost; import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector; import org.opendaylight.controller.sal.action.Action; @@ -56,35 +58,36 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * This class is the main class that represents the load balancer service. - * This is a sample load balancer application that balances traffic to backend servers - * based on the source address and source port on each incoming packet. The service - * reactively installs OpenFlow rules to direct all packets with a specific source address - * and source port to one of the appropriate backend servers. The servers may be chosen - * using a round robin policy or a random policy. This service can be configured via a - * REST APIs which are similar to the OpenStack Quantum LBaaS (Load-balancer-as-a-Service) - * v1.0 API proposal (http://wiki.openstack.org/Quantum/LBaaS) + * This class is the main class that represents the load balancer service. This + * is a sample load balancer application that balances traffic to backend + * servers based on the source address and source port on each incoming packet. + * The service reactively installs OpenFlow rules to direct all packets with a + * specific source address and source port to one of the appropriate backend + * servers. The servers may be chosen using a round robin policy or a random + * policy. This service can be configured via a REST APIs which are similar to + * the OpenStack Quantum LBaaS (Load-balancer-as-a-Service) v1.0 API proposal + * (http://wiki.openstack.org/Quantum/LBaaS) * - * To use this service, a virtual IP (or VIP) should be exposed to the clients of this service - * and used as the destination address. A VIP is a entity that comprises of a virtual IP, port - * and protocol (TCP or UDP). - * Assumptions: - * 1. One or more VIPs may be mapped to the same server pool. All VIPs that share the same - * pool must also share the same load balancing policy (random or round robin). + * To use this service, a virtual IP (or VIP) should be exposed to the clients + * of this service and used as the destination address. A VIP is a entity that + * comprises of a virtual IP, port and protocol (TCP or UDP). Assumptions: 1. + * One or more VIPs may be mapped to the same server pool. All VIPs that share + * the same pool must also share the same load balancing policy (random or round + * robin). * - * 2. Only one server pool can be be assigned to a VIP. + * 2. Only one server pool can be be assigned to a VIP. * - * 3. All flow rules are installed with an idle timeout of 5 seconds. + * 3. All flow rules are installed with an idle timeout of 5 seconds. * - * 4. Packets to a VIP must leave the OpenFlow cluster from the same switch from where - * it entered it. + * 4. Packets to a VIP must leave the OpenFlow cluster from the same switch from + * where it entered it. * - * 5. When you delete a VIP or a server pool or a server from a pool, the service does not - * delete the flow rules it has already installed. The flow rules should automatically - * time out after the idle timeout of 5 seconds. + * 5. When you delete a VIP or a server pool or a server from a pool, the + * service does not delete the flow rules it has already installed. The flow + * rules should automatically time out after the idle timeout of 5 seconds. * */ -public class LoadBalancerService implements IListenDataPacket, IConfigManager{ +public class LoadBalancerService implements IListenDataPacket, IConfigManager { /* * Logger instance @@ -92,8 +95,8 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ private static Logger lbsLogger = LoggerFactory.getLogger(LoadBalancerService.class); /* - * Single instance of the configuration manager. Application passes this reference to all - * the new policies implemented for load balancing. + * Single instance of the configuration manager. Application passes this + * reference to all the new policies implemented for load balancing. */ private static ConfigManager configManager = new ConfigManager(); @@ -101,12 +104,12 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ * Round robing policy instance. Need to implement factory patterns to get * policy instance. */ - private static RoundRobinLBPolicy rrLBMethod= new RoundRobinLBPolicy(configManager); + private static RoundRobinLBPolicy rrLBMethod = new RoundRobinLBPolicy(configManager); /* * Random policy instance. */ - private static RandomLBPolicy ranLBMethod= new RandomLBPolicy(configManager); + private static RandomLBPolicy ranLBMethod = new RandomLBPolicy(configManager); /* * Reference to the data packet service @@ -139,8 +142,8 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ private String containerName = null; /* - * Set/unset methods for the service instance that load balancer - * service requires + * Set/unset methods for the service instance that load balancer service + * requires */ public String getContainerName() { if (containerName == null) @@ -179,32 +182,30 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ } } - public void setForwardingRulesManager( - IForwardingRulesManager forwardingRulesManager) { + public void setForwardingRulesManager(IForwardingRulesManager forwardingRulesManager) { lbsLogger.debug("Setting ForwardingRulesManager"); this.ruleManager = forwardingRulesManager; } - public void unsetForwardingRulesManager( - IForwardingRulesManager forwardingRulesManager) { + public void unsetForwardingRulesManager(IForwardingRulesManager forwardingRulesManager) { if (this.ruleManager == forwardingRulesManager) { this.ruleManager = null; } } /** - * This method receives first packet of flows for which there is no - * matching flow rule installed on the switch. IP addresses used for VIPs - * are not supposed to be used by any real/virtual host in the network. - * Hence, any forwarding/routing service will not install any flows rules matching - * these VIPs. This ensures that all the flows destined for VIPs will not find a match - * in the switch and will be forwarded to the load balancing service. - * Service will decide where to route this traffic based on the load balancing - * policy of the VIP's attached pool and will install appropriate flow rules - * in a reactive manner. + * This method receives first packet of flows for which there is no matching + * flow rule installed on the switch. IP addresses used for VIPs are not + * supposed to be used by any real/virtual host in the network. Hence, any + * forwarding/routing service will not install any flows rules matching + * these VIPs. This ensures that all the flows destined for VIPs will not + * find a match in the switch and will be forwarded to the load balancing + * service. Service will decide where to route this traffic based on the + * load balancing policy of the VIP's attached pool and will install + * appropriate flow rules in a reactive manner. */ @Override - public PacketResult receiveDataPacket(RawPacket inPkt){ + public PacketResult receiveDataPacket(RawPacket inPkt) { if (inPkt == null) { return PacketResult.IGNORED; @@ -218,88 +219,89 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ if (ipPkt instanceof IPv4) { - lbsLogger.debug("Packet recieved from switch : {}",inPkt.getIncomingNodeConnector().getNode().toString()); - IPv4 ipv4Pkt = (IPv4)ipPkt; - if(IPProtocols.getProtocolName(ipv4Pkt.getProtocol()).equals(IPProtocols.TCP.toString()) - || IPProtocols.getProtocolName(ipv4Pkt.getProtocol()).equals(IPProtocols.UDP.toString())){ + lbsLogger.debug("Packet recieved from switch : {}", inPkt.getIncomingNodeConnector().getNode() + .toString()); + IPv4 ipv4Pkt = (IPv4) ipPkt; + if (IPProtocols.getProtocolName(ipv4Pkt.getProtocol()).equals(IPProtocols.TCP.toString()) + || IPProtocols.getProtocolName(ipv4Pkt.getProtocol()).equals(IPProtocols.UDP.toString())) { - lbsLogger.debug("Packet protocol : {}",IPProtocols.getProtocolName(ipv4Pkt.getProtocol())); + lbsLogger.debug("Packet protocol : {}", IPProtocols.getProtocolName(ipv4Pkt.getProtocol())); Client client = new LBUtil().getClientFromPacket(ipv4Pkt); VIP vip = new LBUtil().getVIPFromPacket(ipv4Pkt); - if(configManager.vipExists(vip)){ + if (configManager.vipExists(vip)) { VIP vipWithPoolName = configManager.getVIPWithPoolName(vip); String poolMemberIp = null; - if(vipWithPoolName.getPoolName() == null){ - lbsLogger.error("No pool attached. Please attach pool with the VIP -- {}",vip); + if (vipWithPoolName.getPoolName() == null) { + lbsLogger.error("No pool attached. Please attach pool with the VIP -- {}", vip); return PacketResult.IGNORED; } - if(configManager.getPool(vipWithPoolName.getPoolName()).getLbMethod().equalsIgnoreCase(LBConst.ROUND_ROBIN_LB_METHOD)){ + if (configManager.getPool(vipWithPoolName.getPoolName()).getLbMethod() + .equalsIgnoreCase(LBConst.ROUND_ROBIN_LB_METHOD)) { - poolMemberIp = rrLBMethod.getPoolMemberForClient(client,vipWithPoolName); + poolMemberIp = rrLBMethod.getPoolMemberForClient(client, vipWithPoolName); } - if(configManager.getPool(vipWithPoolName.getPoolName()).getLbMethod().equalsIgnoreCase(LBConst.RANDOM_LB_METHOD)){ - poolMemberIp = ranLBMethod.getPoolMemberForClient(client,vipWithPoolName); + if (configManager.getPool(vipWithPoolName.getPoolName()).getLbMethod() + .equalsIgnoreCase(LBConst.RANDOM_LB_METHOD)) { + poolMemberIp = ranLBMethod.getPoolMemberForClient(client, vipWithPoolName); } try { Node clientNode = inPkt.getIncomingNodeConnector().getNode(); - HostNodeConnector hnConnector = this.hostTracker.hostFind(InetAddress.getByName(poolMemberIp)); + // HostTracker hosts db key scheme implementation + IHostId id = HostIdFactory.create(InetAddress.getByName(poolMemberIp), null); + HostNodeConnector hnConnector = this.hostTracker.hostFind(id); Node destNode = hnConnector.getnodeconnectorNode(); - lbsLogger.debug("Client is connected to switch : {}",clientNode.toString()); - lbsLogger.debug("Destination pool machine is connected to switch : {}",destNode.toString()); + lbsLogger.debug("Client is connected to switch : {}", clientNode.toString()); + lbsLogger + .debug("Destination pool machine is connected to switch : {}", destNode.toString()); - //Get path between both the nodes + // Get path between both the nodes NodeConnector forwardPort = null; - if(clientNode.getNodeIDString().equals(destNode.getNodeIDString())){ + if (clientNode.getNodeIDString().equals(destNode.getNodeIDString())) { forwardPort = hnConnector.getnodeConnector(); - lbsLogger.info("Both source (client) and destination pool machine is connected to same switch nodes. Respective ports are - {},{}",forwardPort,inPkt.getIncomingNodeConnector()); + lbsLogger + .info("Both source (client) and destination pool machine is connected to same switch nodes. Respective ports are - {},{}", + forwardPort, inPkt.getIncomingNodeConnector()); - }else{ + } else { Path route = this.routing.getRoute(clientNode, destNode); - lbsLogger.info("Path between source (client) and destination switch nodes : {}",route.toString()); + lbsLogger.info("Path between source (client) and destination switch nodes : {}", + route.toString()); forwardPort = route.getEdges().get(0).getTailNodeConnector(); } - if(installLoadBalancerFlow(client, - vip, - clientNode, - poolMemberIp, - hnConnector.getDataLayerAddressBytes(), - forwardPort, - LBConst.FORWARD_DIRECTION_LB_FLOW)){ - lbsLogger.info("Traffic from client : {} will be routed " + - "to pool machine : {}",client,poolMemberIp); - }else{ - lbsLogger.error("Not able to route traffic from client : {}",client ); + if (installLoadBalancerFlow(client, vip, clientNode, poolMemberIp, + hnConnector.getDataLayerAddressBytes(), forwardPort, + LBConst.FORWARD_DIRECTION_LB_FLOW)) { + lbsLogger.info("Traffic from client : {} will be routed " + "to pool machine : {}", + client, poolMemberIp); + } else { + lbsLogger.error("Not able to route traffic from client : {}", client); } - if(installLoadBalancerFlow(client, - vip, - clientNode, - poolMemberIp, - vipMacAddr, - inPkt.getIncomingNodeConnector(), - LBConst.REVERSE_DIRECTION_LB_FLOW)){ - lbsLogger.info("Flow rule installed to change the source ip/mac from " + - "pool machine ip {} to VIP {} for traffic coming pool machine",poolMemberIp,vip); - }else{ - lbsLogger.error("Not able to route traffic from client : {}",client ); + if (installLoadBalancerFlow(client, vip, clientNode, poolMemberIp, vipMacAddr, + inPkt.getIncomingNodeConnector(), LBConst.REVERSE_DIRECTION_LB_FLOW)) { + lbsLogger.info("Flow rule installed to change the source ip/mac from " + + "pool machine ip {} to VIP {} for traffic coming pool machine", poolMemberIp, + vip); + } else { + lbsLogger.error("Not able to route traffic from client : {}", client); } - }catch (UnknownHostException e) { - lbsLogger.error("Pool member not found in the network : {}",e.getMessage()); - lbsLogger.error("",e); + } catch (UnknownHostException e) { + lbsLogger.error("Pool member not found in the network : {}", e.getMessage()); + lbsLogger.error("", e); } } } @@ -309,30 +311,37 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ } /* - * This method installs the flow rule for routing the traffic between two hosts. - * @param source Traffic is sent by this source - * @param dest Traffic is destined to this destination (VIP) - * @param sourceSwitch Switch from where controller received the packet - * @param destMachineIp IP address of the pool member where traffic needs to be routed - * @param destMachineMac MAC address of the pool member where traffic needs to be routed - * @param outport Use this port to send out traffic - * @param flowDirection FORWARD_DIRECTION_LB_FLOW or REVERSE_DIRECTION_LB_FLOW - * @return true If flow installation was successful - * false else - * @throws UnknownHostException + * This method installs the flow rule for routing the traffic between two + * hosts. + * + * @param source Traffic is sent by this source + * + * @param dest Traffic is destined to this destination (VIP) + * + * @param sourceSwitch Switch from where controller received the packet + * + * @param destMachineIp IP address of the pool member where traffic needs to + * be routed + * + * @param destMachineMac MAC address of the pool member where traffic needs + * to be routed + * + * @param outport Use this port to send out traffic + * + * @param flowDirection FORWARD_DIRECTION_LB_FLOW or + * REVERSE_DIRECTION_LB_FLOW + * + * @return true If flow installation was successful false else + * + * @throws UnknownHostException */ - private boolean installLoadBalancerFlow(Client source, - VIP dest, - Node sourceSwitch, - String destMachineIp, - byte[] destMachineMac, - NodeConnector outport, - int flowDirection) throws UnknownHostException{ + private boolean installLoadBalancerFlow(Client source, VIP dest, Node sourceSwitch, String destMachineIp, + byte[] destMachineMac, NodeConnector outport, int flowDirection) throws UnknownHostException { Match match = new Match(); List actions = new ArrayList(); - if(flowDirection == LBConst.FORWARD_DIRECTION_LB_FLOW){ + if (flowDirection == LBConst.FORWARD_DIRECTION_LB_FLOW) { match.setField(MatchType.DL_TYPE, EtherTypes.IPv4.shortValue()); match.setField(MatchType.NW_SRC, InetAddress.getByName(source.getIp())); match.setField(MatchType.NW_DST, InetAddress.getByName(dest.getIp())); @@ -344,13 +353,13 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ actions.add(new SetDlDst(destMachineMac)); } - if(flowDirection == LBConst.REVERSE_DIRECTION_LB_FLOW){ + if (flowDirection == LBConst.REVERSE_DIRECTION_LB_FLOW) { match.setField(MatchType.DL_TYPE, EtherTypes.IPv4.shortValue()); match.setField(MatchType.NW_SRC, InetAddress.getByName(destMachineIp)); match.setField(MatchType.NW_DST, InetAddress.getByName(source.getIp())); match.setField(MatchType.NW_PROTO, IPProtocols.getProtocolNumberByte(source.getProtocol())); match.setField(MatchType.TP_SRC, dest.getPort()); - match.setField(MatchType.TP_DST,source.getPort()); + match.setField(MatchType.TP_DST, source.getPort()); actions.add(new SetNwSrc(InetAddress.getByName(dest.getIp()))); actions.add(new SetDlSrc(destMachineMac)); @@ -366,30 +375,30 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ flow.setHardTimeout((short) 0); flow.setPriority(LB_IPSWITCH_PRIORITY); - String policyName = source.getIp()+":"+source.getProtocol()+":"+source.getPort(); - String flowName =null; + String policyName = source.getIp() + ":" + source.getProtocol() + ":" + source.getPort(); + String flowName = null; - if(flowDirection == LBConst.FORWARD_DIRECTION_LB_FLOW){ - flowName = "["+policyName+":"+source.getIp() + ":"+dest.getIp()+"]"; + if (flowDirection == LBConst.FORWARD_DIRECTION_LB_FLOW) { + flowName = "[" + policyName + ":" + source.getIp() + ":" + dest.getIp() + "]"; } - if(flowDirection == LBConst.REVERSE_DIRECTION_LB_FLOW){ + if (flowDirection == LBConst.REVERSE_DIRECTION_LB_FLOW) { - flowName = "["+policyName+":"+dest.getIp() + ":"+source.getIp()+"]"; + flowName = "[" + policyName + ":" + dest.getIp() + ":" + source.getIp() + "]"; } FlowEntry fEntry = new FlowEntry(policyName, flowName, flow, sourceSwitch); - lbsLogger.info("Install flow entry {} on node {}",fEntry.toString(),sourceSwitch.toString()); + lbsLogger.info("Install flow entry {} on node {}", fEntry.toString(), sourceSwitch.toString()); - if(!this.ruleManager.checkFlowEntryConflict(fEntry)){ - if(this.ruleManager.installFlowEntry(fEntry).isSuccess()){ + if (!this.ruleManager.checkFlowEntryConflict(fEntry)) { + if (this.ruleManager.installFlowEntry(fEntry).isSuccess()) { return true; - }else{ - lbsLogger.error("Error in installing flow entry to node : {}",sourceSwitch); + } else { + lbsLogger.error("Error in installing flow entry to node : {}", sourceSwitch); } - }else{ - lbsLogger.error("Conflicting flow entry exists : {}",fEntry.toString()); + } else { + lbsLogger.error("Conflicting flow entry exists : {}", fEntry.toString()); } return false; } @@ -405,45 +414,45 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ this.containerName = (String) props.get("containerName"); lbsLogger.info("Running container name:" + this.containerName); - }else { + } else { // In the Global instance case the containerName is empty this.containerName = ""; } lbsLogger.info(configManager.toString()); + } /** - * Function called by the dependency manager when at least one - * dependency become unsatisfied or when the component is shutting - * down because for example bundle is being stopped. + * Function called by the dependency manager when at least one dependency + * become unsatisfied or when the component is shutting down because for + * example bundle is being stopped. * */ void destroy() { } /** - * Function called by dependency manager after "init ()" is called - * and after the services provided by the class are registered in - * the service registry + * Function called by dependency manager after "init ()" is called and after + * the services provided by the class are registered in the service registry * */ void start() { } /** - * Function called by the dependency manager before the services - * exported by the component are unregistered, this will be - * followed by a "destroy ()" calls + * Function called by the dependency manager before the services exported by + * the component are unregistered, this will be followed by a "destroy ()" + * calls * */ void stop() { } /* - * All the methods below are just proxy methods to direct the REST API requests to configuration - * manager. We need this redirection as currently, opendaylight supports only one - * implementation of the service. + * All the methods below are just proxy methods to direct the REST API + * requests to configuration manager. We need this redirection as currently, + * opendaylight supports only one implementation of the service. */ @Override public Set getAllVIPs() { @@ -451,8 +460,7 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ } @Override - public boolean vipExists(String name, String ip, String protocol, - short protocolPort, String poolName) { + public boolean vipExists(String name, String ip, String protocol, short protocolPort, String poolName) { return configManager.vipExists(name, ip, protocol, protocolPort, poolName); } @@ -462,8 +470,7 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ } @Override - public VIP createVIP(String name, String ip, String protocol, - short protocolPort, String poolName) { + public VIP createVIP(String name, String ip, String protocol, short protocolPort, String poolName) { return configManager.createVIP(name, ip, protocol, protocolPort, poolName); } @@ -489,9 +496,7 @@ public class LoadBalancerService implements IListenDataPacket, IConfigManager{ } @Override - public PoolMember addPoolMember(String name, - String memberIP, - String poolName) { + public PoolMember addPoolMember(String name, String memberIP, String poolName) { return configManager.addPoolMember(name, memberIP, poolName); } diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml index a3f0ba122e..543aa8ca54 100644 --- a/opendaylight/samples/northbound/loadbalancer/pom.xml +++ b/opendaylight/samples/northbound/loadbalancer/pom.xml @@ -79,12 +79,12 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller samples.loadbalancer - 0.4.1-SNAPSHOT + ${samples.loadbalancer} org.opendaylight.controller diff --git a/opendaylight/statisticsmanager/integrationtest/pom.xml b/opendaylight/statisticsmanager/integrationtest/pom.xml index c9103994a0..743c6784a5 100644 --- a/opendaylight/statisticsmanager/integrationtest/pom.xml +++ b/opendaylight/statisticsmanager/integrationtest/pom.xml @@ -91,7 +91,7 @@ org.opendaylight.controller hosttracker - 0.4.1-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/topologymanager/integrationtest/pom.xml b/opendaylight/topologymanager/integrationtest/pom.xml index 0f2138bf87..d4d3d1c857 100644 --- a/opendaylight/topologymanager/integrationtest/pom.xml +++ b/opendaylight/topologymanager/integrationtest/pom.xml @@ -91,7 +91,7 @@ org.opendaylight.controller hosttracker - 0.4.0-SNAPSHOT + ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml index f5605eaffe..d66381f6ce 100644 --- a/opendaylight/web/devices/pom.xml +++ b/opendaylight/web/devices/pom.xml @@ -124,7 +124,7 @@ org.opendaylight.controller forwarding.staticrouting - 0.4.1-SNAPSHOT + ${forwarding.staticrouting} org.codehaus.jackson -- 2.36.6