X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcompatibility%2Fsal-compatibility%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcompatibility%2Ftest%2FTestToSalConversionsUtils.java;fp=opendaylight%2Fmd-sal%2Fcompatibility%2Fsal-compatibility%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcompatibility%2Ftest%2FTestToSalConversionsUtils.java;h=60b77394c1f15e8055d93afa259862dccd33c5a3;hb=e38e37d94000a573ccfec627f490d1847ae6304d;hp=7601a7d9cf67ba543d50d8e49b3fb0d6bbe1ae82;hpb=b10d77375b5a290143106180f1583ea4e18f8478;p=controller.git diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java index 7601a7d9cf..60b77394c1 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/test/java/org/opendaylight/controller/sal/compatibility/test/TestToSalConversionsUtils.java @@ -330,9 +330,6 @@ public class TestToSalConversionsUtils { // be defined } else if (action instanceof PushVlan) { assertEquals("Wrong value for action PushVlan for tag.", 0x8100, ((PushVlan) action).getTag()); - assertEquals("Wrong value for action PushVlan for pcp.", 7, ((PushVlan) action).getPcp()); - assertEquals("Wrong value for action PushVlan for cfi.", 1, ((PushVlan) action).getCfi()); - assertEquals("Wrong value for action PushVlan for vlanID.", 4095, ((PushVlan) action).getVlanId()); } else if (action instanceof SetDlDst) { //assertEquals("Wrong value for action SetDlDst for MAC address.", "3C:A9:F4:00:E0:C8", new String( // ((SetDlDst) action).getDlAddress())); @@ -575,9 +572,6 @@ public class TestToSalConversionsUtils { private void prepareActionPushVlan(PushVlanActionCaseBuilder wrapper) { PushVlanActionBuilder pushVlanActionBuilder = new PushVlanActionBuilder(); - pushVlanActionBuilder.setPcp(7); // 3 bits - pushVlanActionBuilder.setCfi(new VlanCfi(1)); // 1 bit - pushVlanActionBuilder.setVlanId(new VlanId(4095)); pushVlanActionBuilder.setTag(0x8100); // 12 bit wrapper.setPushVlanAction(pushVlanActionBuilder.build()); }