홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Pavlin Radoslavov
Committed by Gerrit Code Review
20318990 1 parent 24077f15

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
Inline Side-by-side
Showing 1 changed file with 4 additions and 5 deletions
...@@ -60,7 +60,7 @@ public final class DefaultOpenFlowPacketContext implements OpenFlowPacketContext ...@@ -60,7 +60,7 @@ public final class DefaultOpenFlowPacketContext implements OpenFlowPacketContext
60 OFPacketOut.Builder builder = sw.factory().buildPacketOut(); 60 OFPacketOut.Builder builder = sw.factory().buildPacketOut();
61 OFAction act = buildOutput(outPort.getPortNumber()); 61 OFAction act = buildOutput(outPort.getPortNumber());
62 pktout = builder.setXid(pktin.getXid()) 62 pktout = builder.setXid(pktin.getXid())
63 - .setInPort(inport()) 63 + .setInPort(pktinInPort())
64 .setBufferId(OFBufferId.NO_BUFFER) 64 .setBufferId(OFBufferId.NO_BUFFER)
65 .setData(pktin.getData()) 65 .setData(pktin.getData())
66 // .setBufferId(pktin.getBufferId()) 66 // .setBufferId(pktin.getBufferId())
...@@ -77,7 +77,7 @@ public final class DefaultOpenFlowPacketContext implements OpenFlowPacketContext ...@@ -77,7 +77,7 @@ public final class DefaultOpenFlowPacketContext implements OpenFlowPacketContext
77 OFAction act = buildOutput(outPort.getPortNumber()); 77 OFAction act = buildOutput(outPort.getPortNumber());
78 pktout = builder.setXid(pktin.getXid()) 78 pktout = builder.setXid(pktin.getXid())
79 .setBufferId(OFBufferId.NO_BUFFER) 79 .setBufferId(OFBufferId.NO_BUFFER)
80 - .setInPort(inport()) 80 + .setInPort(pktinInPort())
81 .setActions(Collections.singletonList(act)) 81 .setActions(Collections.singletonList(act))
82 .setData(ethFrame.serialize()) 82 .setData(ethFrame.serialize())
83 .build(); 83 .build();
...@@ -106,11 +106,10 @@ public final class DefaultOpenFlowPacketContext implements OpenFlowPacketContext ...@@ -106,11 +106,10 @@ public final class DefaultOpenFlowPacketContext implements OpenFlowPacketContext
106 106
107 @Override 107 @Override
108 public Integer inPort() { 108 public Integer inPort() {
109 - return inport().getPortNumber(); 109 + return pktinInPort().getPortNumber();
110 } 110 }
111 111
112 - 112 + private OFPort pktinInPort() {
113 - private OFPort inport() {
114 //FIXME: this has to change in loxi 113 //FIXME: this has to change in loxi
115 try { 114 try {
116 return pktin.getInPort(); 115 return pktin.getInPort();
......