홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
alshabib
Committed by Gerrit Code Review
44852fba 1 parent 31dacd4c

fix for erroneous unsupported messages for devices with extensions. 

Change-Id: I63264cd360f260daa4b8a394c9339f1f8c7a1267
Inline Side-by-side
Showing 1 changed file with 11 additions and 19 deletions
...@@ -94,16 +94,10 @@ import org.slf4j.LoggerFactory; ...@@ -94,16 +94,10 @@ import org.slf4j.LoggerFactory;
94 94
95 import java.util.List; 95 import java.util.List;
96 96
97 -import static org.onosproject.net.flow.criteria.Criteria.matchLambda; 97 +import static org.onosproject.net.flow.criteria.Criteria.*;
98 -import static org.onosproject.net.flow.criteria.Criteria.matchOchSignalType;
99 -import static org.onosproject.net.flow.criteria.Criteria.matchOduSignalId;
100 -import static org.onosproject.net.flow.criteria.Criteria.matchOduSignalType;
101 import static org.onosproject.net.flow.instructions.Instructions.modL0Lambda; 98 import static org.onosproject.net.flow.instructions.Instructions.modL0Lambda;
102 import static org.onosproject.net.flow.instructions.Instructions.modL1OduSignalId; 99 import static org.onosproject.net.flow.instructions.Instructions.modL1OduSignalId;
103 -import static org.onosproject.provider.of.flow.util.OpenFlowValueMapper.lookupChannelSpacing; 100 +import static org.onosproject.provider.of.flow.util.OpenFlowValueMapper.*;
104 -import static org.onosproject.provider.of.flow.util.OpenFlowValueMapper.lookupGridType;
105 -import static org.onosproject.provider.of.flow.util.OpenFlowValueMapper.lookupOchSignalType;
106 -import static org.onosproject.provider.of.flow.util.OpenFlowValueMapper.lookupOduSignalType;
107 101
108 public class FlowEntryBuilder { 102 public class FlowEntryBuilder {
109 private static final Logger log = LoggerFactory.getLogger(FlowEntryBuilder.class); 103 private static final Logger log = LoggerFactory.getLogger(FlowEntryBuilder.class);
...@@ -447,17 +441,15 @@ public class FlowEntryBuilder { ...@@ -447,17 +441,15 @@ public class FlowEntryBuilder {
447 builder.setVlanPcp(vlanpcp.getValue().getValue()); 441 builder.setVlanPcp(vlanpcp.getValue().getValue());
448 break; 442 break;
449 case VLAN_VID: 443 case VLAN_VID:
450 - if (treatmentInterpreter != null) { 444 + try {
451 - try { 445 + builder.extension(treatmentInterpreter.mapAction(action), deviceId);
452 - builder.extension(treatmentInterpreter.mapAction(action), deviceId); 446 + break;
453 - } catch (UnsupportedOperationException e) { 447 + } catch (UnsupportedOperationException e) {
454 - log.warn(e.getMessage()); 448 + log.debug("Unsupported action extension; defaulting to native OF");
455 - }
456 - } else {
457 - @SuppressWarnings("unchecked")
458 - OFOxm<OFVlanVidMatch> vlanvid = (OFOxm<OFVlanVidMatch>) oxm;
459 - builder.setVlanId(VlanId.vlanId(vlanvid.getValue().getVlan()));
460 } 449 }
450 + @SuppressWarnings("unchecked")
451 + OFOxm<OFVlanVidMatch> vlanvid = (OFOxm<OFVlanVidMatch>) oxm;
452 + builder.setVlanId(VlanId.vlanId(vlanvid.getValue().getVlan()));
461 break; 453 break;
462 case ETH_DST: 454 case ETH_DST:
463 @SuppressWarnings("unchecked") 455 @SuppressWarnings("unchecked")
...@@ -521,7 +513,7 @@ public class FlowEntryBuilder { ...@@ -521,7 +513,7 @@ public class FlowEntryBuilder {
521 try { 513 try {
522 builder.extension(treatmentInterpreter.mapAction(action), deviceId); 514 builder.extension(treatmentInterpreter.mapAction(action), deviceId);
523 } catch (UnsupportedOperationException e) { 515 } catch (UnsupportedOperationException e) {
524 - log.warn(e.getMessage()); 516 + log.debug(e.getMessage());
525 } 517 }
526 } 518 }
527 break; 519 break;
......