From c7c7438d4456718c4bcc2af899209ee7d33c7882 Mon Sep 17 00:00:00 2001 From: Ryan Izard <rizard@g.clemson.edu> Date: Tue, 26 Apr 2016 14:25:31 -0400 Subject: [PATCH] Make NPT members private and refactor impacted unit test. --- .../net/floodlightcontroller/core/types/NodePortTuple.java | 4 ++-- .../floodlightcontroller/topology/TopologyInstanceTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/floodlightcontroller/core/types/NodePortTuple.java b/src/main/java/net/floodlightcontroller/core/types/NodePortTuple.java index c289368b7..828c9bc5c 100644 --- a/src/main/java/net/floodlightcontroller/core/types/NodePortTuple.java +++ b/src/main/java/net/floodlightcontroller/core/types/NodePortTuple.java @@ -32,8 +32,8 @@ import org.projectfloodlight.openflow.types.OFPort; */ public class NodePortTuple implements Comparable<NodePortTuple> { - protected DatapathId nodeId; // switch DPID - protected OFPort portId; // switch port id + private DatapathId nodeId; // switch DPID + private OFPort portId; // switch port id /** * Creates a NodePortTuple diff --git a/src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java b/src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java index 4b542db1d..7488a8aec 100644 --- a/src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java +++ b/src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java @@ -135,7 +135,7 @@ public class TopologyInstanceTest { expected.add(npt); } TopologyInstance ti = topologyManager.getCurrentInstance(tunnelsEnabled); - Set<NodePortTuple> computed = ti.getBroadcastNodePortsInCluster(npt.nodeId); + Set<NodePortTuple> computed = ti.getBroadcastNodePortsInCluster(npt.getNodeId()); log.info("computed: {}", computed); if (computed != null) assertTrue(computed.equals(expected)); -- GitLab