commit 203189901e2997750914034d9a0432b06ea3d674
author Pavlin Radoslavov <pavlin@onlab.us> Wed Feb 04 13:41:14 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Feb 05 04:54:51 2015 +0000
tree 5c5adbe55089e5ed6132ee2c1443329cf8fc87a5
parent 24077f15ffc544af98704fc4aa09484720adf53e

Renamed private method to avoid naming confusion

  DefaultOpenFlowPacketContext.inport() -> pktinInPort()

There is a public method DefaultOpenFlowPacketContext.inPort()
and having another method called inport() is confusing.

Change-Id: I6b703eb640edab24fb0112bd2019395eeb3d8421

openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java

diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
index 5f453df..7a265a0 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
@@ -60,7 +60,7 @@
         OFPacketOut.Builder builder = sw.factory().buildPacketOut();
         OFAction act = buildOutput(outPort.getPortNumber());
         pktout = builder.setXid(pktin.getXid())
-                .setInPort(inport())
+                .setInPort(pktinInPort())
                 .setBufferId(OFBufferId.NO_BUFFER)
                 .setData(pktin.getData())
 //                .setBufferId(pktin.getBufferId())
@@ -77,7 +77,7 @@
         OFAction act = buildOutput(outPort.getPortNumber());
         pktout = builder.setXid(pktin.getXid())
                 .setBufferId(OFBufferId.NO_BUFFER)
-                .setInPort(inport())
+                .setInPort(pktinInPort())
                 .setActions(Collections.singletonList(act))
                 .setData(ethFrame.serialize())
                 .build();
@@ -106,11 +106,10 @@
 
     @Override
     public Integer inPort() {
-        return inport().getPortNumber();
+        return pktinInPort().getPortNumber();
     }
 
-
-    private OFPort inport() {
+    private OFPort pktinInPort() {
         //FIXME: this has to change in loxi
         try {
             return pktin.getInPort();