mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-22 12:51:09 +02:00
Code Issues Projects Releases Wiki Activity

ONOS-2037: Fix cast exception on execution of "flows -j" command

Browse Source 
Change-Id: If481573f405d812b0b103e1752a559d8f81d6bd8
This commit is contained in:
Sho SHIMIZU 2015-05-29 17:27:22 -07:00
parent d910a5c5e1
commit 6c70f6482f
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
View File

@ -37,7 +37,7 @@ import org.onosproject.net.flow.criteria.Icmpv6TypeCriterion;
import org.onosproject.net.flow.criteria.LambdaCriterion; import org.onosproject.net.flow.criteria.LambdaCriterion;
import org.onosproject.net.flow.criteria.MetadataCriterion; import org.onosproject.net.flow.criteria.MetadataCriterion;
import org.onosproject.net.flow.criteria.MplsCriterion; import org.onosproject.net.flow.criteria.MplsCriterion;
import org.onosproject.net.flow.criteria.OpticalSignalTypeCriterion; import org.onosproject.net.flow.criteria.OchSignalTypeCriterion;
import org.onosproject.net.flow.criteria.PortCriterion; import org.onosproject.net.flow.criteria.PortCriterion;
import org.onosproject.net.flow.criteria.SctpPortCriterion; import org.onosproject.net.flow.criteria.SctpPortCriterion;
import org.onosproject.net.flow.criteria.TcpPortCriterion; import org.onosproject.net.flow.criteria.TcpPortCriterion;
@ -334,9 +334,9 @@ public final class CriterionCodec extends JsonCodec<Criterion> {
private static class FormatOchSigType implements CriterionTypeFormatter { private static class FormatOchSigType implements CriterionTypeFormatter {
@Override @Override
public ObjectNode encodeCriterion(ObjectNode root, Criterion criterion) { public ObjectNode encodeCriterion(ObjectNode root, Criterion criterion) {
final OpticalSignalTypeCriterion opticalSignalTypeCriterion = final OchSignalTypeCriterion ochSignalTypeCriterion =
(OpticalSignalTypeCriterion) criterion; (OchSignalTypeCriterion) criterion;
return root.put("signalType", opticalSignalTypeCriterion.signalType()); return root.put("ochSignalType", ochSignalTypeCriterion.signalType().name());
} }
} }

3
core/common/src/test/java/org/onosproject/codec/impl/CriterionCodecTest.java
View File

@ -26,6 +26,7 @@ import org.onlab.packet.MplsLabel;
import org.onlab.packet.VlanId; import org.onlab.packet.VlanId;
import org.onosproject.codec.CodecContext; import org.onosproject.codec.CodecContext;
import org.onosproject.codec.JsonCodec; import org.onosproject.codec.JsonCodec;
import org.onosproject.net.OchSignalType;
import org.onosproject.net.PortNumber; import org.onosproject.net.PortNumber;
import org.onosproject.net.flow.criteria.Criteria; import org.onosproject.net.flow.criteria.Criteria;
import org.onosproject.net.flow.criteria.Criterion; import org.onosproject.net.flow.criteria.Criterion;
@ -416,7 +417,7 @@ public class CriterionCodecTest {
*/ */
@Test @Test
public void matchOpticalSignalTypeTest() { public void matchOpticalSignalTypeTest() {
Criterion criterion = Criteria.matchOpticalSignalType((byte) 250); Criterion criterion = Criteria.matchOchSignalType(OchSignalType.FIXED_GRID);
ObjectNode result = criterionCodec.encode(criterion, context); ObjectNode result = criterionCodec.encode(criterion, context);
assertThat(result, matchesCriterion(criterion)); assertThat(result, matchesCriterion(criterion));
} }

15
core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java
View File

@ -37,7 +37,7 @@ import org.onosproject.net.flow.criteria.Icmpv6TypeCriterion;
import org.onosproject.net.flow.criteria.LambdaCriterion; import org.onosproject.net.flow.criteria.LambdaCriterion;
import org.onosproject.net.flow.criteria.MetadataCriterion; import org.onosproject.net.flow.criteria.MetadataCriterion;
import org.onosproject.net.flow.criteria.MplsCriterion; import org.onosproject.net.flow.criteria.MplsCriterion;
import org.onosproject.net.flow.criteria.OpticalSignalTypeCriterion; import org.onosproject.net.flow.criteria.OchSignalTypeCriterion;
import org.onosproject.net.flow.criteria.PortCriterion; import org.onosproject.net.flow.criteria.PortCriterion;
import org.onosproject.net.flow.criteria.SctpPortCriterion; import org.onosproject.net.flow.criteria.SctpPortCriterion;
import org.onosproject.net.flow.criteria.TcpPortCriterion; import org.onosproject.net.flow.criteria.TcpPortCriterion;
@ -469,11 +469,11 @@ public final class CriterionJsonMatcher extends
* @param criterion criterion to match * @param criterion criterion to match
* @return true if the JSON matches the criterion, false otherwise. * @return true if the JSON matches the criterion, false otherwise.
*/ */
private boolean matchCriterion(OpticalSignalTypeCriterion criterion) { private boolean matchCriterion(OchSignalTypeCriterion criterion) {
final short signalType = criterion.signalType(); final String signalType = criterion.signalType().name();
final short jsonSignalType = jsonCriterion.get("signalType").shortValue(); final String jsonSignalType = jsonCriterion.get("ochSignalType").textValue();
if (signalType != jsonSignalType) { if (!signalType.equals(jsonSignalType)) {
description.appendText("signal type was " + Short.toString(signalType)); description.appendText("signal type was " + signalType);
return false; return false;
} }
return true; return true;
@ -575,8 +575,7 @@ public final class CriterionJsonMatcher extends
return matchCriterion((LambdaCriterion) criterion); return matchCriterion((LambdaCriterion) criterion);
case OCH_SIGTYPE: case OCH_SIGTYPE:
return matchCriterion( return matchCriterion((OchSignalTypeCriterion) criterion);
(OpticalSignalTypeCriterion) criterion);
default: default:
// Don't know how to format this type // Don't know how to format this type

4
core/common/src/test/java/org/onosproject/codec/impl/IntentCodecTest.java
View File

@ -31,11 +31,13 @@ import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId; import org.onosproject.net.DeviceId;
import org.onosproject.net.HostId; import org.onosproject.net.HostId;
import org.onosproject.net.NetTestTools; import org.onosproject.net.NetTestTools;
import org.onosproject.net.OchSignalType;
import org.onosproject.net.PortNumber; import org.onosproject.net.PortNumber;
import org.onosproject.net.flow.DefaultTrafficSelector; import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment; import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.TrafficSelector; import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment; import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.flow.criteria.Criteria;
import org.onosproject.net.intent.AbstractIntentTest; import org.onosproject.net.intent.AbstractIntentTest;
import org.onosproject.net.intent.Constraint; import org.onosproject.net.intent.Constraint;
import org.onosproject.net.intent.HostToHostIntent; import org.onosproject.net.intent.HostToHostIntent;
@ -139,7 +141,7 @@ public class IntentCodecTest extends AbstractIntentTest {
final TrafficSelector selector = DefaultTrafficSelector.builder() final TrafficSelector selector = DefaultTrafficSelector.builder()
.matchIPProtocol((byte) 3) .matchIPProtocol((byte) 3)
.matchMplsLabel(MplsLabel.mplsLabel(4)) .matchMplsLabel(MplsLabel.mplsLabel(4))
.matchOpticalSignalType((short) 5) .add(Criteria.matchOchSignalType(OchSignalType.FIXED_GRID))
.matchLambda((short) 6) .matchLambda((short) 6)
.matchEthDst(MacAddress.BROADCAST) .matchEthDst(MacAddress.BROADCAST)
.matchIPDst(IpPrefix.valueOf("1.2.3.4/24")) .matchIPDst(IpPrefix.valueOf("1.2.3.4/24"))