X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcompatibility%2Fsal-compatibility%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcompatibility%2FToSalConversionsUtils.java;h=28dd57c3b7986fecabae2c2fa9749e8d58fbd36e;hb=42b0a219eb651783d50caedbfec0718cd4d9558c;hp=58cfb20650930f82f5768fa9f96bbcd1e287ad14;hpb=c46e223995956f1f759c551163c212947c1e2fb7;p=controller.git diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java index 58cfb20650..28dd57c3b7 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java @@ -356,23 +356,9 @@ public class ToSalConversionsUtils { } private static PushVlan pushVlanFrom(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanAction pushVlanAction) { - final int tag; - final int pcp; - final int cfi; - final int vlanId; - - if (pushVlanAction.getTag() != null) { - tag = pushVlanAction.getTag(); - if (pushVlanAction.getPcp() != null) { - pcp = pushVlanAction.getPcp(); - if (pushVlanAction.getCfi() != null && pushVlanAction.getCfi().getValue() != null) { - cfi = pushVlanAction.getCfi().getValue(); - if (pushVlanAction.getVlanId() != null && pushVlanAction.getVlanId().getValue() != null) { - vlanId = pushVlanAction.getVlanId().getValue(); - return new PushVlan(tag, pcp, cfi, vlanId); - } - } - } + Integer tag = pushVlanAction.getTag(); + if (tag != null) { + return new PushVlan(tag.intValue()); } return null; }