홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
Committed by Ali "The Bomb" Al-Shabibi
e106e4b7 1 parent 5b141421

Add support for building group bucket entries with push and pop vlans 

Change-Id: I96932509ffda6167bfea74bda1de78ffaab29963
Inline Side-by-side
Showing 2 changed files with 7 additions and 4 deletions
...@@ -144,6 +144,12 @@ public class GroupBucketEntryBuilder { ...@@ -144,6 +144,12 @@ public class GroupBucketEntryBuilder {
144 OFActionSetVlanPcp pcp = (OFActionSetVlanPcp) act; 144 OFActionSetVlanPcp pcp = (OFActionSetVlanPcp) act;
145 builder.setVlanPcp(pcp.getVlanPcp().getValue()); 145 builder.setVlanPcp(pcp.getVlanPcp().getValue());
146 break; 146 break;
147 + case POP_VLAN:
148 + builder.popVlan();
149 + break;
150 + case PUSH_VLAN:
151 + builder.pushVlan();
152 + break;
147 case SET_DL_DST: 153 case SET_DL_DST:
148 OFActionSetDlDst dldst = (OFActionSetDlDst) act; 154 OFActionSetDlDst dldst = (OFActionSetDlDst) act;
149 builder.setEthDst( 155 builder.setEthDst(
...@@ -206,9 +212,7 @@ public class GroupBucketEntryBuilder { ...@@ -206,9 +212,7 @@ public class GroupBucketEntryBuilder {
206 case SET_TP_DST: 212 case SET_TP_DST:
207 case SET_TP_SRC: 213 case SET_TP_SRC:
208 case POP_PBB: 214 case POP_PBB:
209 - case POP_VLAN:
210 case PUSH_PBB: 215 case PUSH_PBB:
211 - case PUSH_VLAN:
212 case SET_MPLS_LABEL: 216 case SET_MPLS_LABEL:
213 case SET_MPLS_TC: 217 case SET_MPLS_TC:
214 case SET_MPLS_TTL: 218 case SET_MPLS_TTL:
...@@ -218,7 +222,6 @@ public class GroupBucketEntryBuilder { ...@@ -218,7 +222,6 @@ public class GroupBucketEntryBuilder {
218 case SET_QUEUE: 222 case SET_QUEUE:
219 case STRIP_VLAN: 223 case STRIP_VLAN:
220 case ENQUEUE: 224 case ENQUEUE:
221 -
222 case GROUP: 225 case GROUP:
223 default: 226 default:
224 log.warn("Action type {} not yet implemented.", act.getType()); 227 log.warn("Action type {} not yet implemented.", act.getType());
......
...@@ -96,7 +96,7 @@ public class GroupStatsCollector implements TimerTask { ...@@ -96,7 +96,7 @@ public class GroupStatsCollector implements TimerTask {
96 * Starts the collector. 96 * Starts the collector.
97 */ 97 */
98 public void start() { 98 public void start() {
99 - log.info("Staring Group Stats collection thread for {}", sw.getStringId()); 99 + log.info("Starting Group Stats collection thread for {}", sw.getStringId());
100 timeout = timer.newTimeout(this, 1, TimeUnit.SECONDS); 100 timeout = timer.newTimeout(this, 1, TimeUnit.SECONDS);
101 } 101 }
102 102
......