commit 3d322f41e52faa27408aaf98ce001d4bc04c2bce
author Pavlin Radoslavov <pavlin@onlab.us> Mon Aug 18 14:58:55 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:20 2014 -0700
tree 4ec02d05bc43b1f7a9f45e6dc5743820bb06b4af
parent 5317ac9f3dd606a52160a165d4078ab95f64e98e

Removed obsolete methods SwitchPort.dpid() and SwitchPort.port()

Instead, always use the equivalent SwitchPort.getDpid() and
SwitchPort.getPortNumber()

No functional changes.

Change-Id: Ia654bb4b1e2c2f7582307f5b0d2c83dd60405525

src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java

diff --git a/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java b/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
index 7118f71..e39f404 100644
--- a/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
+++ b/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
@@ -859,20 +859,20 @@
             String bwdIntentId = caller + ":"
                     + controllerRegistryService.getNextUniqueId();
             SwitchPort srcPort =
-                    new SwitchPort(bgpdAttachmentPoint.dpid(),
-                            bgpdAttachmentPoint.port());
+                    new SwitchPort(bgpdAttachmentPoint.getDpid(),
+                            bgpdAttachmentPoint.getPortNumber());
             SwitchPort dstPort =
                     new SwitchPort(new Dpid(peerInterface.getDpid()),
-                            new PortNumber(peerInterface.getSwitchPort().port()));
+                            new PortNumber(peerInterface.getSwitchPort().getPortNumber()));
             ShortestPathIntent fwdIntent = new ShortestPathIntent(fwdIntentId,
-                    srcPort.dpid().value(), srcPort.port().value(),
+                    srcPort.getDpid().value(), srcPort.getPortNumber().value(),
                     ShortestPathIntent.EMPTYMACADDRESS, srcIP,
-                    dstPort.dpid().value(), dstPort.port().value(),
+                    dstPort.getDpid().value(), dstPort.getPortNumber().value(),
                     ShortestPathIntent.EMPTYMACADDRESS, dstIP);
             ShortestPathIntent bwdIntent = new ShortestPathIntent(bwdIntentId,
-                    dstPort.dpid().value(), dstPort.port().value(),
+                    dstPort.getDpid().value(), dstPort.getPortNumber().value(),
                     ShortestPathIntent.EMPTYMACADDRESS, dstIP,
-                    srcPort.dpid().value(), srcPort.port().value(),
+                    srcPort.getDpid().value(), srcPort.getPortNumber().value(),
                     ShortestPathIntent.EMPTYMACADDRESS, srcIP);
             IntentOperation.Operator operator = IntentOperation.Operator.ADD;
             operations.add(operator, fwdIntent);