Bump upstreams

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / match / cases / SalToOfArpMatchCase.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfArpMatchCase.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfArpMatchCase.java
index c7f45fe6b119ba3e81614a3980761be8a9a356a1..2090d65fb1e7d84c53d9222d17f65bef90c0c440 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfArpMatchCase.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfArpMatchCase.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
 
 import java.util.ArrayList;
@@ -13,7 +12,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.IpConversionUtil;
@@ -21,6 +19,7 @@ import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.Versi
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.MatchConvertorUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.IetfYangUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.arp.match.fields.ArpSourceHardwareAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.arp.match.fields.ArpTargetHardwareAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.ArpMatch;
@@ -55,9 +54,9 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
 
         if (source.getArpOp() != null) {
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
-            matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
+            matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
             matchEntryBuilder.setHasMask(false);
-            matchEntryBuilder.setOxmMatchField(ArpOp.class);
+            matchEntryBuilder.setOxmMatchField(ArpOp.VALUE);
             ArpOpCaseBuilder arpOpCaseBuilder = new ArpOpCaseBuilder();
             ArpOpBuilder arpOpBuilder = new ArpOpBuilder();
             arpOpBuilder.setOpCode(source.getArpOp());
@@ -69,8 +68,8 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
         if (source.getArpSourceTransportAddress() != null) {
             Ipv4Prefix ipv4Prefix = source.getArpSourceTransportAddress();
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
-            matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
-            matchEntryBuilder.setOxmMatchField(ArpSpa.class);
+            matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+            matchEntryBuilder.setOxmMatchField(ArpSpa.VALUE);
 
             ArpSpaBuilder arpSpaBuilder = new ArpSpaBuilder();
 
@@ -94,8 +93,8 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
         if (source.getArpTargetTransportAddress() != null) {
             Ipv4Prefix ipv4Prefix = source.getArpTargetTransportAddress();
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
-            matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
-            matchEntryBuilder.setOxmMatchField(ArpTpa.class);
+            matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+            matchEntryBuilder.setOxmMatchField(ArpTpa.VALUE);
 
             ArpTpaBuilder arpTpaBuilder = new ArpTpaBuilder();
 
@@ -119,15 +118,15 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
         ArpSourceHardwareAddress arpSourceHardwareAddress = source.getArpSourceHardwareAddress();
         if (arpSourceHardwareAddress != null) {
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
-            matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
-            matchEntryBuilder.setOxmMatchField(ArpSha.class);
+            matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+            matchEntryBuilder.setOxmMatchField(ArpSha.VALUE);
 
             ArpShaCaseBuilder arpShaCaseBuilder = new ArpShaCaseBuilder();
             ArpShaBuilder arpShaBuilder = new ArpShaBuilder();
             arpShaBuilder.setMacAddress(arpSourceHardwareAddress.getAddress());
             boolean hasMask = false;
             if (null != arpSourceHardwareAddress.getMask()) {
-                arpShaBuilder.setMask(ByteBufUtils.macAddressToBytes(arpSourceHardwareAddress.getMask().getValue()));
+                arpShaBuilder.setMask(IetfYangUtil.macAddressBytes(arpSourceHardwareAddress.getMask()));
                 hasMask = true;
             }
             arpShaCaseBuilder.setArpSha(arpShaBuilder.build());
@@ -139,15 +138,15 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
         ArpTargetHardwareAddress arpTargetHardwareAddress = source.getArpTargetHardwareAddress();
         if (arpTargetHardwareAddress != null) {
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
-            matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
-            matchEntryBuilder.setOxmMatchField(ArpTha.class);
+            matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+            matchEntryBuilder.setOxmMatchField(ArpTha.VALUE);
 
             ArpThaCaseBuilder arpThaCaseBuilder = new ArpThaCaseBuilder();
             ArpThaBuilder arpThaBuilder = new ArpThaBuilder();
             arpThaBuilder.setMacAddress(arpTargetHardwareAddress.getAddress());
             boolean hasMask = false;
             if (null != arpTargetHardwareAddress.getMask()) {
-                arpThaBuilder.setMask(ByteBufUtils.macAddressToBytes(arpTargetHardwareAddress.getMask().getValue()));
+                arpThaBuilder.setMask(IetfYangUtil.macAddressBytes(arpTargetHardwareAddress.getMask()));
                 hasMask = true;
             }
             arpThaCaseBuilder.setArpTha(arpThaBuilder.build());