From 499291c8a7ba26af11ce5a8846f93c47690e8c97 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Thu, 6 Jun 2013 21:21:45 -0700 Subject: [PATCH 1/1] Removing invalid casts from hosttracker. Signed-off-by: Madhu Venugopal Change-Id: I4a2c7e73a025112ee77a2b0f7058a4d6d593c76a Signed-off-by: Madhu Venugopal --- .../hosttracker/hostAware/HostNodeConnector.java | 14 -------------- .../hostAware/HostNodeConnectorTest.java | 3 +-- .../hosttracker/internal/HostTracker.java | 10 ++-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java index e7b5745a2e..243da05869 100644 --- a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java +++ b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java @@ -82,20 +82,6 @@ public class HostNodeConnector extends Host { return this.nodeConnector.getNode(); } - /** - * @return the NodeId - */ - public Long getnodeconnectornodeId() { - return (Long) this.nodeConnector.getNode().getID(); - } - - /** - * @return the port - */ - public Short getnodeconnectorportId() { - return (Short) this.nodeConnector.getID(); - } - /** * @return the DataLayerAddress */ diff --git a/opendaylight/hosttracker/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java b/opendaylight/hosttracker/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java index ee38fc72e8..c29e5b1645 100644 --- a/opendaylight/hosttracker/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java +++ b/opendaylight/hosttracker/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java @@ -57,8 +57,7 @@ public class HostNodeConnectorTest extends TestCase { Assert.assertTrue(hostnodeconnector_2.isV6Host()); Assert.assertTrue(hostnodeconnector_2.getnodeConnector().equals(nc1)); Assert.assertTrue(hostnodeconnector_2.getnodeconnectorNode().equals(node)); - Assert.assertTrue(node.getID().equals(hostnodeconnector_2.getnodeconnectornodeId())); - Assert.assertTrue(hostnodeconnector_2.getnodeconnectorportId().equals((short)2)); + Assert.assertTrue(node.equals(hostnodeconnector_2.getnodeconnectorNode())); } catch (ConstructionException e) { Assert.assertTrue(false); } 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 9096797553..f8534e9810 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 @@ -1255,18 +1255,12 @@ public class HostTracker implements IfIptoHost, IfHostListener, } private void handleNodeConnectorStatusDown(NodeConnector nodeConnector) { - long sid = (Long) nodeConnector.getNode().getID(); - short port = (Short) nodeConnector.getID(); - logger.debug("handleNodeConnectorStatusDown {}", nodeConnector); for (Entry entry : hostsDB.entrySet()) { HostNodeConnector host = entry.getValue(); - if ((host.getnodeconnectornodeId() == sid) - && (host.getnodeconnectorportId() == port)) { - logger.debug( - "Switch: {}, Port: {} is down, remove from Hosts_DB", - sid, port); + if (host.getnodeConnector().equals(nodeConnector)) { + logger.debug(" NodeConnector: {} is down, remove from Hosts_DB", nodeConnector); removeKnownHost(entry.getKey()); notifyHostLearnedOrRemoved(host, false); } -- 2.36.6