X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcompatibility%2Fsal-compatibility%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcompatibility%2Ftest%2FTestFromSalConversionsUtils.java;h=63c5664a0c4b2de63e5b6e90279eb59f37e050ef;hp=c37cce0837a00e6214ac8230d913bcb335781754;hb=31b7a44c89d1057489338492fcf62a64147bea24;hpb=17c23f3c4f9726f268b481398ee0ca1df499b324 diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestFromSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestFromSalConversionsUtils.java index c37cce0837..63c5664a0c 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestFromSalConversionsUtils.java +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestFromSalConversionsUtils.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.ETHERNET_ARP; -import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.SCTP; +import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.CRUDP; import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.TCP; import static org.opendaylight.controller.sal.compatibility.ProtocolConstants.UDP; @@ -26,9 +26,10 @@ import org.opendaylight.controller.sal.flowprogrammer.Flow; import org.opendaylight.controller.sal.match.Match; import org.opendaylight.controller.sal.match.MatchType; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.NodeFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.action.action.*; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.address.Address; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.address.address.Ipv4; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.*; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.vlan.action._case.PopVlanAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.address.Address; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.address.address.Ipv4; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.Layer3Match; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.Layer4Match; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.ArpMatch; @@ -134,7 +135,7 @@ public class TestFromSalConversionsUtils { break; case sctp: boolean sctpFound = false; - assertEquals("Wrong protocol", SCTP, match.getIpMatch().getIpProtocol().byteValue()); + assertEquals("Wrong protocol", CRUDP, match.getIpMatch().getIpProtocol().byteValue()); Layer4Match layer4Match = match.getLayer4Match(); if (layer4Match instanceof SctpMatch) { assertEquals("Sctp source port is incorrect.", 0xffff, (int) ((SctpMatch) layer4Match) @@ -176,7 +177,7 @@ public class TestFromSalConversionsUtils { } private void checkOdFlow(NodeFlow odNodeFlow) { - assertEquals("Cookie is incorrect.", 9223372036854775807L, odNodeFlow.getCookie().longValue()); + assertEquals("Cookie is incorrect.", 9223372036854775807L, odNodeFlow.getCookie().getValue().longValue()); assertEquals("Hard timeout is incorrect.", 32765, odNodeFlow.getHardTimeout().shortValue()); assertEquals("Iddle timeout is incorrect.", 32766, odNodeFlow.getIdleTimeout().shortValue()); assertEquals("Priority is incorrect.", 32767, odNodeFlow.getPriority().shortValue()); @@ -185,57 +186,57 @@ public class TestFromSalConversionsUtils { } private void checkOdActions( - List actions) { - checkOdAction(actions, FloodAction.class, false); - checkOdAction(actions, FloodAllAction.class, false); - checkOdAction(actions, HwPathAction.class, false); - checkOdAction(actions, LoopbackAction.class, false); - checkOdAction(actions, PopVlanAction.class, false); - checkOdAction(actions, PushVlanAction.class, true); - checkOdAction(actions, SetDlDstAction.class, true); - checkOdAction(actions, SetDlSrcAction.class, true); - checkOdAction(actions, SetDlTypeAction.class, true); - checkOdAction(actions, SetNwTosAction.class, true); - checkOdAction(actions, SetNwDstAction.class, true); - checkOdAction(actions, SetNwSrcAction.class, true); - checkOdAction(actions, SetNextHopAction.class, true); - checkOdAction(actions, SetTpDstAction.class, true); - checkOdAction(actions, SetTpSrcAction.class, true); - checkOdAction(actions, SetVlanCfiAction.class, true); - checkOdAction(actions, SetVlanIdAction.class, true); - checkOdAction(actions, SetVlanPcpAction.class, true); - checkOdAction(actions, SwPathAction.class, false); + List actions) { + checkOdAction(actions, FloodActionCase.class, false); + checkOdAction(actions, FloodAllActionCase.class, false); + checkOdAction(actions, HwPathActionCase.class, false); + checkOdAction(actions, LoopbackActionCase.class, false); + checkOdAction(actions, PopVlanActionCase.class, false); + checkOdAction(actions, PushVlanActionCase.class, true); + checkOdAction(actions, SetDlDstActionCase.class, true); + checkOdAction(actions, SetDlSrcActionCase.class, true); + checkOdAction(actions, SetDlTypeActionCase.class, true); + checkOdAction(actions, SetNwTosActionCase.class, true); + checkOdAction(actions, SetNwDstActionCase.class, true); + checkOdAction(actions, SetNwSrcActionCase.class, true); + checkOdAction(actions, SetNextHopActionCase.class, true); + checkOdAction(actions, SetTpDstActionCase.class, true); + checkOdAction(actions, SetTpSrcActionCase.class, true); + checkOdAction(actions, SetVlanCfiActionCase.class, true); + checkOdAction(actions, SetVlanIdActionCase.class, true); + checkOdAction(actions, SetVlanPcpActionCase.class, true); + checkOdAction(actions, SwPathActionCase.class, false); } private void checkOdAction( - List actions, Class cl, + List actions, Class cl, boolean b) { int numOfFoundActions = 0; - for (org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.action.list.Action action : actions) { - org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.action.Action innerAction = action + for (org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action action : actions) { + org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action innerAction = action .getAction(); if (cl.isInstance(innerAction)) { numOfFoundActions++; - if (innerAction instanceof PushVlanAction) { - assertEquals("Wrong value of cfi in PushVlanAction.", (Integer) 1, ((PushVlanAction) innerAction) + if (innerAction instanceof PushVlanActionCase) { + assertEquals("Wrong value of cfi in PushVlanAction.", (Integer) 1, ((PushVlanActionCase) innerAction).getPushVlanAction() .getCfi().getValue()); assertEquals("Wrong value of pcp in PushVlanAction.", (Integer) 7, - ((PushVlanAction) innerAction).getPcp()); + ((PushVlanActionCase) innerAction).getPushVlanAction().getPcp()); assertEquals("Wrong value of tag in PushVlanAction.", (Integer) 0x8100, - ((PushVlanAction) innerAction).getTag()); + ((PushVlanActionCase) innerAction).getPushVlanAction().getTag()); assertEquals("Wrong value of vlad ID in PushVlanAction.", (Integer) 4095, - ((PushVlanAction) innerAction).getVlanId().getValue()); - } else if (innerAction instanceof SetDlDstAction) { + ((PushVlanActionCase) innerAction).getPushVlanAction().getVlanId().getValue()); + } else if (innerAction instanceof SetDlDstActionCase) { assertEquals("Wrong MAC destination address in SetDlDstAction.", "ff:ee:dd:cc:bb:aa", - ((SetDlDstAction) innerAction).getAddress().getValue()); - } else if (innerAction instanceof SetDlSrcAction) { + ((SetDlDstActionCase) innerAction).getSetDlDstAction().getAddress().getValue()); + } else if (innerAction instanceof SetDlSrcActionCase) { assertEquals("Wrong MAC source address in SetDlDstAction.", "ff:ee:dd:cc:bb:aa", - ((SetDlSrcAction) innerAction).getAddress().getValue()); - } else if (innerAction instanceof SetDlTypeAction) { + ((SetDlSrcActionCase) innerAction).getSetDlSrcAction().getAddress().getValue()); + } else if (innerAction instanceof SetDlTypeActionCase) { assertEquals("Wrong data link type in SetDlTypeAction.", (long) 513, - (long) ((SetDlTypeAction) innerAction).getDlType().getValue()); - } else if (innerAction instanceof SetNextHopAction) { - Address address = ((SetNextHopAction) innerAction).getAddress(); + (long) ((SetDlTypeActionCase) innerAction).getSetDlTypeAction().getDlType().getValue()); + } else if (innerAction instanceof SetNextHopActionCase) { + Address address = ((SetNextHopActionCase) innerAction).getSetNextHopAction().getAddress(); boolean ipv4AddressFound = false; if (address instanceof Ipv4) { ipv4AddressFound = true; @@ -243,10 +244,10 @@ public class TestFromSalConversionsUtils { .getIpv4Address().getValue()); } assertTrue("Ipv4 address wasn't found.", ipv4AddressFound); - } else if (innerAction instanceof SetNwTosAction) { - assertEquals("Wrong TOS in SetNwTosAction.", (Integer) 63, ((SetNwTosAction) innerAction).getTos()); - } else if (innerAction instanceof SetNwDstAction) { - Address address = ((SetNwDstAction) innerAction).getAddress(); + } else if (innerAction instanceof SetNwTosActionCase) { + assertEquals("Wrong TOS in SetNwTosAction.", (Integer) 63, ((SetNwTosActionCase) innerAction).getSetNwTosAction().getTos()); + } else if (innerAction instanceof SetNwDstActionCase) { + Address address = ((SetNwDstActionCase) innerAction).getSetNwDstAction().getAddress(); boolean ipv4AddressFound = false; if (address instanceof Ipv4) { ipv4AddressFound = true; @@ -254,8 +255,8 @@ public class TestFromSalConversionsUtils { .getIpv4Address().getValue()); } assertTrue("Ipv4 address wasn't found.", ipv4AddressFound); - } else if (innerAction instanceof SetNwSrcAction) { - Address address = ((SetNwSrcAction) innerAction).getAddress(); + } else if (innerAction instanceof SetNwSrcActionCase) { + Address address = ((SetNwSrcActionCase) innerAction).getSetNwSrcAction().getAddress(); boolean ipv4AddressFound = false; if (address instanceof Ipv4) { ipv4AddressFound = true; @@ -263,21 +264,21 @@ public class TestFromSalConversionsUtils { .getIpv4Address().getValue()); } assertTrue("Ipv4 address wasn't found.", ipv4AddressFound); - } else if (innerAction instanceof SetTpDstAction) { + } else if (innerAction instanceof SetTpDstActionCase) { assertEquals("Port number is incorrect in SetTpDstAction.", (Integer) 65534, - ((SetTpDstAction) innerAction).getPort().getValue()); - } else if (innerAction instanceof SetTpSrcAction) { + ((SetTpDstActionCase) innerAction).getSetTpDstAction().getPort().getValue()); + } else if (innerAction instanceof SetTpSrcActionCase) { assertEquals("Port number is incorrect in SetTpSrcAction.", (Integer) 65535, - ((SetTpSrcAction) innerAction).getPort().getValue()); - } else if (innerAction instanceof SetVlanCfiAction) { + ((SetTpSrcActionCase) innerAction).getSetTpSrcAction().getPort().getValue()); + } else if (innerAction instanceof SetVlanCfiActionCase) { assertEquals("Vlan cfi number is incorrect in SetVlanCfiAction.", (Integer) 1, - ((SetVlanCfiAction) innerAction).getVlanCfi().getValue()); - } else if (innerAction instanceof SetVlanIdAction) { + ((SetVlanCfiActionCase) innerAction).getSetVlanCfiAction().getVlanCfi().getValue()); + } else if (innerAction instanceof SetVlanIdActionCase) { assertEquals("Vlan id number is incorrect in SetVlanIdAction.", (Integer) 4095, - ((SetVlanIdAction) innerAction).getVlanId().getValue()); - } else if (innerAction instanceof SetVlanPcpAction) { + ((SetVlanIdActionCase) innerAction).getSetVlanIdAction().getVlanId().getValue()); + } else if (innerAction instanceof SetVlanPcpActionCase) { assertEquals("Vlan pcp number is incorrect in SetVlanPcpAction.", new Short((short) 7), - ((SetVlanPcpAction) innerAction).getVlanPcp().getValue()); + ((SetVlanPcpActionCase) innerAction).getSetVlanPcpAction().getVlanPcp().getValue()); } } } @@ -325,7 +326,7 @@ public class TestFromSalConversionsUtils { salMatch.setField(MatchType.NW_TOS, (byte) 0x3f); break; case sctp: - salMatch.setField(MatchType.NW_PROTO, SCTP); + salMatch.setField(MatchType.NW_PROTO, CRUDP); salMatch.setField(MatchType.TP_SRC, (short) 0xffff); salMatch.setField(MatchType.TP_DST, (short) 0xfffe); break;