Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump upstreams
[openflowplugin.git] / extension / openflowjava-extension-nicira / src / test / java / org / opendaylight / openflowjava / nx / codec / action / ConntrackCodecTest.java
diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java
index 0f7c8bf2da588485f7dee6ef0fc4eedc40bbf72d..e048d645d452ff693e0f80b594962b63752adb2c 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java
+++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java
@@ -1,11 +1,10 @@
-/**
+/*
  * Copyright (c) 2016, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.openflowjava.nx.codec.action;
 
 import io.netty.buffer.ByteBuf;
@@ -18,13 +17,13 @@ import org.junit.Test;
 import org.opendaylight.openflowjava.nx.api.NiciraConstants;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrack;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrackBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrack;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrackBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.NxActionConntrackBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.nx.action.conntrack.CtActions;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.nx.action.conntrack.CtActionsBuilder;
@@ -36,6 +35,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev1
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofpact.actions.ofpact.actions.nx.action.ct.mark._case.NxActionCtMarkBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofpact.actions.ofpact.actions.nx.action.nat._case.NxActionNat;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofpact.actions.ofpact.actions.nx.action.nat._case.NxActionNatBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 public class ConntrackCodecTest {
 
@@ -167,21 +169,21 @@ public class ConntrackCodecTest {
         Assert.assertEquals(4, result.getNxActionConntrack().getRecircTable().byteValue());
     }
 
-    private Action createAction() {
+    private static Action createAction() {
 
         NxActionConntrackBuilder nxActionConntrackBuilder = new NxActionConntrackBuilder();
-        nxActionConntrackBuilder.setFlags(1);
-        nxActionConntrackBuilder.setZoneSrc((long) 2);
-        nxActionConntrackBuilder.setConntrackZone(3);
-        nxActionConntrackBuilder.setRecircTable((short) 4);
+        nxActionConntrackBuilder.setFlags(Uint16.ONE);
+        nxActionConntrackBuilder.setZoneSrc(Uint32.TWO);
+        nxActionConntrackBuilder.setConntrackZone(Uint16.valueOf(3));
+        nxActionConntrackBuilder.setRecircTable(Uint8.valueOf(4));
 
         NxActionNatBuilder nxActionNatBuilder = new NxActionNatBuilder();
-        nxActionNatBuilder.setFlags(5);
-        nxActionNatBuilder.setRangePresent(0x3F);
-        nxActionNatBuilder.setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"));
-        nxActionNatBuilder.setIpAddressMax(IpAddressBuilder.getDefaultInstance("192.168.10.0"));
-        nxActionNatBuilder.setPortMin(3000);
-        nxActionNatBuilder.setPortMax(4000);
+        nxActionNatBuilder.setFlags(Uint16.valueOf(5));
+        nxActionNatBuilder.setRangePresent(Uint16.valueOf(0x3F));
+        nxActionNatBuilder.setIpAddressMin(new IpAddress(new Ipv4Address("192.168.0.0")));
+        nxActionNatBuilder.setIpAddressMax(new IpAddress(new Ipv4Address("192.168.10.0")));
+        nxActionNatBuilder.setPortMin(Uint16.valueOf(3000));
+        nxActionNatBuilder.setPortMax(Uint16.valueOf(4000));
         NxActionNatCaseBuilder nxActionNatCaseBuilder = new NxActionNatCaseBuilder();
         nxActionNatCaseBuilder.setNxActionNat(nxActionNatBuilder.build());
         CtActionsBuilder ctActionsBuilder = new CtActionsBuilder();
@@ -189,10 +191,10 @@ public class ConntrackCodecTest {
         List<CtActions> ctActionsList = new  ArrayList<>();
         ctActionsList.add(ctActionsBuilder.build());
         nxActionNatBuilder = new NxActionNatBuilder();
-        nxActionNatBuilder.setFlags(5);
-        nxActionNatBuilder.setRangePresent(0x21);
-        nxActionNatBuilder.setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"));
-        nxActionNatBuilder.setPortMax(4000);
+        nxActionNatBuilder.setFlags(Uint16.valueOf(5));
+        nxActionNatBuilder.setRangePresent(Uint16.valueOf(0x21));
+        nxActionNatBuilder.setIpAddressMin(new IpAddress(new Ipv4Address("192.168.0.0")));
+        nxActionNatBuilder.setPortMax(Uint16.valueOf(4000));
         nxActionNatCaseBuilder = new NxActionNatCaseBuilder();
         nxActionNatCaseBuilder.setNxActionNat(nxActionNatBuilder.build());
         ctActionsBuilder = new CtActionsBuilder();
@@ -201,7 +203,7 @@ public class ConntrackCodecTest {
         nxActionConntrackBuilder.setCtActions(ctActionsList);
 
         NxActionCtMarkBuilder nxActionCtMarkBuilder = new NxActionCtMarkBuilder();
-        nxActionCtMarkBuilder.setCtMark((long) 36);
+        nxActionCtMarkBuilder.setCtMark(Uint32.valueOf(36));
         NxActionCtMarkCaseBuilder nxActionCtMarkCaseBuilder = new NxActionCtMarkCaseBuilder();
         nxActionCtMarkCaseBuilder.setNxActionCtMark(nxActionCtMarkBuilder.build());
         ctActionsBuilder = new CtActionsBuilder();
@@ -219,13 +221,13 @@ public class ConntrackCodecTest {
         return actionBuilder.build();
     }
 
-    private Action createActionWithoutCtAction() {
+    private static Action createActionWithoutCtAction() {
 
         NxActionConntrackBuilder nxActionConntrackBuilder = new NxActionConntrackBuilder();
-        nxActionConntrackBuilder.setFlags(1);
-        nxActionConntrackBuilder.setZoneSrc((long) 2);
-        nxActionConntrackBuilder.setConntrackZone(3);
-        nxActionConntrackBuilder.setRecircTable((short) 4);
+        nxActionConntrackBuilder.setFlags(Uint16.ONE);
+        nxActionConntrackBuilder.setZoneSrc(Uint32.TWO);
+        nxActionConntrackBuilder.setConntrackZone(Uint16.valueOf(3));
+        nxActionConntrackBuilder.setRecircTable(Uint8.valueOf(4));
 
         ExperimenterId experimenterId = new ExperimenterId(NiciraConstants.NX_VENDOR_ID);
         ActionBuilder actionBuilder = new ActionBuilder();
@@ -262,9 +264,9 @@ public class ConntrackCodecTest {
         //RANGE PRESENT
         message.writeShort(0x3F);
         //IP ADDRESS MIN
-        message.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address("192.168.0.0")));
+        message.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address("192.168.0.0")));
         //IP ADDRESS MAX
-        message.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address("192.168.10.0")));
+        message.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address("192.168.10.0")));
         //PORT MIN
         message.writeShort(3000);
         //PORT MAX
@@ -281,7 +283,7 @@ public class ConntrackCodecTest {
         //RANGE PRESENT
         message.writeShort(0x21);
         //IP ADDRESS MIN
-        message.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address("192.168.0.0")));
+        message.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address("192.168.0.0")));
         //PORT MAX
         message.writeShort(4000);
         message.writeZero(2);
OpenFlow Plugin