Clean up use of deprecated methods 18/91418/8
authorRobert Varga <robert.varga@pantheon.tech>
Sat, 18 Jul 2020 14:06:05 +0000 (16:06 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Mon, 27 Jul 2020 18:44:12 +0000 (20:44 +0200)
This is mostly simplification of addAugmentation() calls, but also
contains a few list type migrations.

JIRA: OPNFLWPLUG-1098
Change-Id: Ib32b2b34b5642d9a9ccd06f89e7b757fbf115f03
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
44 files changed:
applications/forwardingrules-manager/src/test/java/test/mock/util/FRMTest.java
applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableNodeMapping.java
applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImpl.java
applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImpl.java
extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodec.java
extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodecTest.java
extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolverTest.java
extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java
extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/SetFieldExtensionTest.java
extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java
extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java
extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/MatchUtil.java
extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/deserializer/OnfExperimenterErrorFactory.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestInputMessageFactory.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10QueueGetConfigReplyMessageFactory.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactory.java
openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/ext/OnfOxmTcpFlagsDeserializer.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestTableFeaturesInputMessageFactoryTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryMultiTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactoryTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigReplyMessageFactoryTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/QueueGetConfigReplyMessageFactoryTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableFeaturesTest.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/FlowStatsMultipartWriter.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/GroupDescMultipartWriter.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/MeterConfigMultipartWriter.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/PortDescMultipartWriter.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/QueueStatsMultipartWriter.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/TableFeaturesMultipartWriter.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/AbstractFlowDirectStatisticsService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtil.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelper.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertor.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertor.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowStatsResponseConvertor.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertor.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertorTest.java

index 125678fc1843b5c1dd15f913ebc3c7409f4527a2..58f00b1fcf515453304793286516fae7ef7ac4a8 100644 (file)
@@ -36,10 +36,9 @@ public abstract class FRMTest extends AbstractDataBrokerTest {
     public void addFlowCapableNode(NodeKey nodeKey) {
         Nodes nodes = new NodesBuilder().build();
 
-        FlowCapableNodeBuilder fcnBuilder = new FlowCapableNodeBuilder();
         NodeBuilder nodeBuilder = new NodeBuilder();
         nodeBuilder.withKey(nodeKey);
-        nodeBuilder.addAugmentation(FlowCapableNode.class, fcnBuilder.build());
+        nodeBuilder.addAugmentation(new FlowCapableNodeBuilder().build());
 
         WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction();
         writeTx.put(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Nodes.class), nodes);
index d79cebb1e67d663b968d807c9850dd5e7d6c072e..8a30779780fb34b1319d6f480c783712ff9e3d8b 100644 (file)
@@ -14,9 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.topology.inventory.rev131030.InventoryNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.topology.inventory.rev131030.InventoryNodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.topology.inventory.rev131030.InventoryNodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.topology.inventory.rev131030.InventoryNodeConnectorBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.LinkId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
@@ -67,14 +65,14 @@ public final class FlowCapableNodeMapping {
     public static org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology
             .topology.Node toTopologyNode(
             final NodeId nodeId, final NodeRef invNodeRef) {
-        return new NodeBuilder().setNodeId(nodeId).addAugmentation(InventoryNode.class, new InventoryNodeBuilder()
+        return new NodeBuilder().setNodeId(nodeId).addAugmentation(new InventoryNodeBuilder()
                 .setInventoryNodeRef(invNodeRef).build()).build();
     }
 
     public static TerminationPoint toTerminationPoint(final TpId id, final NodeConnectorRef invNodeConnectorRef) {
         return new TerminationPointBuilder()
                 .setTpId(id)
-                .addAugmentation(InventoryNodeConnector.class, new InventoryNodeConnectorBuilder()
+                .addAugmentation(new InventoryNodeConnectorBuilder()
                     .setInventoryNodeConnectorRef(invNodeConnectorRef)
                     .build())
                 .build();
index 7e900a614bec0ec7a261f94df5bc1b11fb00f7a1..f8030e30acb4b848b697eb100b0051538692c093 100644 (file)
@@ -19,7 +19,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.topology.inventory.rev131030.InventoryNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.topology.inventory.rev131030.InventoryNodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
@@ -97,14 +96,11 @@ public class NodeChangeListenerImpl extends DataTreeChangeListenerImpl<FlowCapab
     private static org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network
             .topology.topology.Node prepareTopologyNode(
             final NodeId nodeIdInTopology, final InstanceIdentifier<FlowCapableNode> iiToNodeInInventory) {
-        final InventoryNode inventoryNode = new InventoryNodeBuilder()
-                .setInventoryNodeRef(new NodeRef(iiToNodeInInventory.firstIdentifierOf(Node.class))).build();
-
-        final NodeBuilder topologyNodeBuilder = new NodeBuilder();
-        topologyNodeBuilder.setNodeId(nodeIdInTopology);
-        topologyNodeBuilder.addAugmentation(InventoryNode.class, inventoryNode);
-
-        return topologyNodeBuilder.build();
+        return new NodeBuilder()
+                .setNodeId(nodeIdInTopology)
+                .addAugmentation(new InventoryNodeBuilder()
+                    .setInventoryNodeRef(new NodeRef(iiToNodeInInventory.firstIdentifierOf(Node.class)))
+                    .build())
+                .build();
     }
-
 }
index a89ee71c176d4d6553fdccadbf1df7084ea181de..43ac954e3d22b69358fb47dd359aea40f38a1b24 100644 (file)
@@ -23,7 +23,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.topology.inventory.rev131030.InventoryNodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.topology.inventory.rev131030.InventoryNodeConnectorBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId;
@@ -140,13 +139,13 @@ public class TerminationPointChangeListenerImpl extends DataTreeChangeListenerIm
                                                                     final
                                                                     InstanceIdentifier<FlowCapableNodeConnector>
                                                                             iiToNodeInInventory) {
-        final InventoryNodeConnector inventoryNodeConnector = new InventoryNodeConnectorBuilder()
-                .setInventoryNodeConnectorRef(
-                        new NodeConnectorRef(iiToNodeInInventory.firstIdentifierOf(NodeConnector.class))).build();
-        final TerminationPointBuilder terminationPointBuilder = new TerminationPointBuilder();
-        terminationPointBuilder.setTpId(terminationPointIdInTopology);
-        terminationPointBuilder.addAugmentation(InventoryNodeConnector.class, inventoryNodeConnector);
-        return terminationPointBuilder.build();
+        return new TerminationPointBuilder()
+                .setTpId(terminationPointIdInTopology)
+                .addAugmentation(new InventoryNodeConnectorBuilder()
+                    .setInventoryNodeConnectorRef(
+                        new NodeConnectorRef(iiToNodeInInventory.firstIdentifierOf(NodeConnector.class)))
+                    .build())
+                .build();
     }
 
     private InstanceIdentifier<TerminationPoint> provideIIToTopologyTerminationPoint(
index 2b22420a2c5e3a49d7da583408e7c7e4495c4c33..05d16c234f5272665e654f2de9e6de83d00d11a3 100644 (file)
@@ -82,12 +82,12 @@ public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec
     private static MatchEntry buildMatchEntry(MatchEntryBuilder matchEntryBuilder,
                                                 ExperimenterIdCaseBuilder experimenterIdCaseBuilder,
                                                 NxExpMatchEntryValue nxExpMatchEntryValue) {
-        OfjAugNxExpMatch ofjAugNxExpMatch = new OfjAugNxExpMatchBuilder()
-                .setNxExpMatchEntryValue(nxExpMatchEntryValue)
+        return matchEntryBuilder
+                .setMatchEntryValue(experimenterIdCaseBuilder.addAugmentation(new OfjAugNxExpMatchBuilder()
+                    .setNxExpMatchEntryValue(nxExpMatchEntryValue)
+                    .build())
+                    .build())
                 .build();
-        experimenterIdCaseBuilder.addAugmentation(OfjAugNxExpMatch.class, ofjAugNxExpMatch);
-        matchEntryBuilder.setMatchEntryValue(experimenterIdCaseBuilder.build());
-        return matchEntryBuilder.build();
     }
 
     @Override
index 69a23487e8486bf2ef9ed6a6df65b846abedf723..28e1a6104a67ee7c1c55d9e5cc217bbe557fff5d 100644 (file)
@@ -29,7 +29,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Expe
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue;
 import org.opendaylight.yangtools.yang.common.Uint32;
@@ -107,7 +106,7 @@ public class AbstractExperimenterMatchCodecTest {
 
         assertEquals(EncodeConstants.EXPERIMENTER_VALUE, buffer.readUnsignedShort());
         assertEquals(FIELD_CODE << 1 | 1, buffer.readUnsignedByte());
-        assertEquals(EncodeConstants.SIZE_OF_INT_IN_BYTES + (VALUE_LENGTH * 2), buffer.readUnsignedByte());
+        assertEquals(EncodeConstants.SIZE_OF_INT_IN_BYTES + VALUE_LENGTH * 2, buffer.readUnsignedByte());
         assertEquals(EXPERIMENTER_ID.longValue(), buffer.readUnsignedInt());
         assertFalse(buffer.isReadable());
         verify(testCodec).serializeValue(null, true, buffer);
@@ -144,19 +143,17 @@ public class AbstractExperimenterMatchCodecTest {
     }
 
     static MatchEntry createMatchEntry(NxExpMatchEntryValue value, boolean hasMask) {
-        OfjAugNxExpMatchBuilder ofjAugNxExpMatchBuilder = new OfjAugNxExpMatchBuilder();
-        ofjAugNxExpMatchBuilder.setNxExpMatchEntryValue(value);
-        ExperimenterBuilder experimenterBuilder = new ExperimenterBuilder();
-        experimenterBuilder.setExperimenter(new ExperimenterId(EXPERIMENTER_ID));
-        ExperimenterIdCaseBuilder experimenterIdCaseBuilder = new ExperimenterIdCaseBuilder();
-        experimenterIdCaseBuilder.setExperimenter(experimenterBuilder.build());
-        experimenterIdCaseBuilder.addAugmentation(OfjAugNxExpMatch.class, ofjAugNxExpMatchBuilder.build());
-        MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
-        matchEntryBuilder.setOxmClass(ExperimenterClass.class);
-        matchEntryBuilder.setOxmMatchField(TestNxmField.class);
-        matchEntryBuilder.setHasMask(hasMask);
-        matchEntryBuilder.setMatchEntryValue(experimenterIdCaseBuilder.build());
-        return matchEntryBuilder.build();
+        return new MatchEntryBuilder()
+                .setOxmClass(ExperimenterClass.class)
+                .setOxmMatchField(TestNxmField.class)
+                .setHasMask(hasMask)
+                .setMatchEntryValue(new ExperimenterIdCaseBuilder()
+                    .setExperimenter(new ExperimenterBuilder()
+                        .setExperimenter(new ExperimenterId(EXPERIMENTER_ID))
+                        .build())
+                    .addAugmentation(new OfjAugNxExpMatchBuilder().setNxExpMatchEntryValue(value).build())
+                    .build())
+                .build();
     }
 
     static void writeBuffer(ByteBuf message, boolean hasMask) {
index d0dd60f4e832e8e9ca01c5b8e014e33215cc1be7..62b31f0dfb986b92fae3c75cfaa334fc2a62ce28 100644 (file)
@@ -33,20 +33,20 @@ public class GroupingLooseResolverTest {
         eqGroup.add(GeneralAugMatchNodesNodeTableFlow.class);
         eqGroup.add(GeneralAugMatchNotifPacketIn.class);
 
-        MatchBuilder mb1 = new MatchBuilder();
         ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.class).build();
-        GeneralAugMatchNodesNodeTableFlow odlxxx1 = new GeneralAugMatchNodesNodeTableFlowBuilder()
-            .setExtensionList(Collections.singletonList(extension1)).build();
-        Match match1 = mb1.addAugmentation(GeneralAugMatchNodesNodeTableFlow.class, odlxxx1).build();
+        Match match1 = new MatchBuilder()
+                .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
+                    .setExtensionList(Collections.singletonMap(extension1.key(), extension1))
+                    .build())
+                .build();
 
         org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.MatchBuilder mb2 =
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service
                     .rev130709.packet.received.MatchBuilder();
         ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.class).build();
-        GeneralAugMatchNotifPacketIn odlxxx2 = new GeneralAugMatchNotifPacketInBuilder()
-            .setExtensionList(Collections.singletonList(extension2)).build();
         org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.Match match2 =
-                mb2.addAugmentation(GeneralAugMatchNotifPacketIn.class, odlxxx2).build();
+                mb2.addAugmentation(new GeneralAugMatchNotifPacketInBuilder()
+                    .setExtensionList(Collections.singletonMap(extension2.key(), extension2)).build()).build();
 
         Assert.assertEquals(JoachimTheBig.class,
                 eqGroup.getExtension(match1).get().nonnullExtensionList().values().iterator().next().getExtensionKey());
index 43c1e2998f74726996cf3eabf95db6de1e9f5322..868593eae556e16554fedc1bdb8cc7a7024dcd99 100644 (file)
@@ -36,17 +36,19 @@ public class GroupingResolverTest {
         eqGroup.add(GeneralAugMatchNodesNodeTableFlow.class);
         eqGroup.add(GeneralAugMatchRpcAddFlow.class);
 
-        MatchBuilder mb1 = new MatchBuilder();
         ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.class).build();
-        GeneralAugMatchNodesNodeTableFlow odlxxx1 = new GeneralAugMatchNodesNodeTableFlowBuilder()
-                .setExtensionList(Collections.singletonList(extension1)).build();
-        Match match1 = mb1.addAugmentation(GeneralAugMatchNodesNodeTableFlow.class, odlxxx1).build();
+        Match match1 = new MatchBuilder()
+                .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
+                    .setExtensionList(Collections.singletonMap(extension1.key(), extension1))
+                    .build())
+                .build();
 
-        MatchBuilder mb2 = new MatchBuilder();
         ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.class).build();
-        GeneralAugMatchNodesNodeTableFlow odlxxx2 = new GeneralAugMatchNodesNodeTableFlowBuilder()
-                .setExtensionList(Collections.singletonList(extension2)).build();
-        Match match2 = mb2.addAugmentation(GeneralAugMatchNodesNodeTableFlow.class, odlxxx2).build();
+        Match match2 = new MatchBuilder()
+                .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
+                    .setExtensionList(Collections.singletonMap(extension2.key(), extension2))
+                    .build())
+                .build();
 
         Assert.assertEquals(JoachimTheBig.class,
                 eqGroup.getExtension(match1).get().nonnullExtensionList().values().iterator().next().getExtensionKey());
index 4e49367b4358b86aa149a3f7ca235397f77a9e47..25213d20d92db805998ae711f9487c4f121f8db0 100755 (executable)
@@ -29,20 +29,19 @@ public class SetFieldExtensionTest {
         eqGroup.add(GeneralAugMatchRpcAddFlowWriteActionsSetField.class);
         eqGroup.add(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class);
 
-        SetFieldBuilder sb1 = new SetFieldBuilder();
         ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(ZVendorExt1.class).build();
-        GeneralAugMatchRpcAddFlowWriteActionsSetField odlxxx1 =
-                new GeneralAugMatchRpcAddFlowWriteActionsSetFieldBuilder()
-                    .setExtensionList(Collections.singletonList(extension1)).build();
-        SetField setField1 = sb1.addAugmentation(GeneralAugMatchRpcAddFlowWriteActionsSetField.class, odlxxx1).build();
+        SetField setField1 = new SetFieldBuilder()
+                .addAugmentation(new GeneralAugMatchRpcAddFlowWriteActionsSetFieldBuilder()
+                    .setExtensionList(Collections.singletonMap(extension1.key(), extension1))
+                    .build())
+                .build();
 
-        SetFieldBuilder sb2 = new SetFieldBuilder();
         ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(ZVendorExt2.class).build();
-        GeneralAugMatchNodesNodeTableFlowWriteActionsSetField odlxxx2 =
-                new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
-                    .setExtensionList(Collections.singletonList(extension2)).build();
-        SetField setField2 = sb2.addAugmentation(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class,
-                odlxxx2).build();
+        SetField setField2 = new SetFieldBuilder()
+                .addAugmentation(new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
+                    .setExtensionList(Collections.singletonMap(extension2.key(), extension2))
+                    .build())
+                .build();
 
         Assert.assertEquals(ZVendorExt1.class,
                 eqGroup.getExtension(setField1).get().nonnullExtensionList().values().iterator().next()
index 2e7328352c3e480c919d6a69d2782a6dd61aeca4..2bca7d6db01f993bf4bd752752a033eb6fd530ff 100644 (file)
@@ -128,19 +128,16 @@ public class Icmpv6NDOptionsTypeConvertorTest {
 
         ExtensionListBuilder extListBld = null;
         ExtensionBuilder extBld = new ExtensionBuilder();
-        extBld.addAugmentation(extensionMatch.getAugmentationClass(), extensionMatch.getAugmentationObject());
+        extBld.addAugmentation(extensionMatch.getAugmentationObject());
 
         extListBld = new ExtensionListBuilder();
         extListBld.setExtension(extBld.build());
         extListBld.setExtensionKey(extensionMatch.getKey());
 
-        GeneralAugMatchNodesNodeTableFlowWriteActionsSetField ndOptionsTypeSetField =
-                 new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
-                         .setExtensionList(Collections.singletonList(extListBld.build())).build();
-
-        SetFieldBuilder sb = new SetFieldBuilder();
-        SetField setField = sb.addAugmentation(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class,
-                 ndOptionsTypeSetField).build();
+        SetField setField = new SetFieldBuilder()
+                .addAugmentation(new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
+                    .setExtensionList(Collections.singletonList(extListBld.build())).build())
+                .build();
 
         Assert.assertEquals(Icmpv6NdOptionsTypeKey.class, eqGroup.getExtension(setField).get().nonnullExtensionList()
                  .values().iterator().next().getExtensionKey());
index 38b757bd1cc393f6e3ed0468799f1d726fcc02c4..712a4690a4c74313b01fb368c1806619c5854134 100644 (file)
@@ -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.extension.vendor.eric.convertor.match;
 
 import static org.junit.Assert.assertEquals;
@@ -42,7 +41,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ge
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.ExtensionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.list.grouping.ExtensionListBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
-
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Test for {@link Icmpv6NDReservedConvertor}.
@@ -60,7 +59,7 @@ public class Icmpv6NDReservedConvertorTest {
     @Before
     public void setUp()  {
         final EricOfIcmpv6NdReservedBuilder ericOfIcmpv6NdReservedBuilder = new EricOfIcmpv6NdReservedBuilder()
-                .setIcmpv6NdReserved(1L);
+                .setIcmpv6NdReserved(Uint32.ONE);
         final EricAugMatchNodesNodeTableFlowBuilder ericAugMatchNotifUpdateFlowStatsBuilder =
                 new EricAugMatchNodesNodeTableFlowBuilder();
         ericAugMatchNotifUpdateFlowStatsBuilder.setEricOfIcmpv6NdReserved(ericOfIcmpv6NdReservedBuilder.build());
@@ -82,7 +81,7 @@ public class Icmpv6NDReservedConvertorTest {
     @Test
     public void testConvert1()  {
         final Icmpv6NdReservedValuesBuilder icmpv6NdReservedValuesBuilder = new Icmpv6NdReservedValuesBuilder()
-                .setIcmpv6NdReserved(10L);
+                .setIcmpv6NdReserved(Uint32.TEN);
         final Icmpv6NdReservedCaseValueBuilder icmpv6NdReservedCaseValueBuilder = new Icmpv6NdReservedCaseValueBuilder()
                 .setIcmpv6NdReservedValues(icmpv6NdReservedValuesBuilder.build());
 
@@ -123,24 +122,22 @@ public class Icmpv6NDReservedConvertorTest {
         ExtensionAugment<? extends Augmentation<Extension>> extensionMatch
                 =  new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
                 new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdReserved(
-                        new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved(1L).build()).build(),
+                        new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved(Uint32.ONE).build()).build(),
                 Icmpv6NdReservedKey.class);
 
         ExtensionListBuilder extListBld = null;
         ExtensionBuilder extBld = new ExtensionBuilder();
-        extBld.addAugmentation(extensionMatch.getAugmentationClass(), extensionMatch.getAugmentationObject());
+        extBld.addAugmentation(extensionMatch.getAugmentationObject());
 
         extListBld = new ExtensionListBuilder();
         extListBld.setExtension(extBld.build());
         extListBld.setExtensionKey(extensionMatch.getKey());
 
-        GeneralAugMatchNodesNodeTableFlowWriteActionsSetField ndReservedSetField =
-                 new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
-                         .setExtensionList(Collections.singletonList(extListBld.build())).build();
-
-        SetFieldBuilder sb = new SetFieldBuilder();
-        SetField setField = sb.addAugmentation(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class,
-                ndReservedSetField).build();
+        SetField setField = new SetFieldBuilder()
+                .addAugmentation(new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
+                    .setExtensionList(Collections.singletonList(extListBld.build()))
+                    .build())
+                .build();
 
         Assert.assertEquals(Icmpv6NdReservedKey.class, eqGroup.getExtension(setField).get().nonnullExtensionList()
                 .values().iterator().next().getExtensionKey());
index d6de0ff63754f3c0d544dc539db365667ff5e030..67248e1cd847fb2507b0025ef7348dd2dc42d385 100644 (file)
@@ -25,7 +25,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.MatchEntryValue;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
@@ -181,13 +180,10 @@ public final class MatchUtil {
             final Class<? extends MatchField> matchField,
             final Uint32 experimenterId,
             final NxExpMatchEntryValue value) {
-        ExperimenterBuilder experimenterBuilder = new ExperimenterBuilder();
-        experimenterBuilder.setExperimenter(new ExperimenterId(experimenterId));
-        ExperimenterIdCaseBuilder expCaseBuilder = new ExperimenterIdCaseBuilder();
-        expCaseBuilder.setExperimenter(experimenterBuilder.build());
-        OfjAugNxExpMatch ofjAugNxExpMatch = new OfjAugNxExpMatchBuilder().setNxExpMatchEntryValue(value).build();
-        expCaseBuilder.addAugmentation(OfjAugNxExpMatch.class, ofjAugNxExpMatch);
-        return createDefaultMatchEntryBuilder(matchField, ExperimenterClass.class, expCaseBuilder.build());
+        return createDefaultMatchEntryBuilder(matchField, ExperimenterClass.class, new ExperimenterIdCaseBuilder()
+            .setExperimenter(new ExperimenterBuilder().setExperimenter(new ExperimenterId(experimenterId)).build())
+            .addAugmentation(new OfjAugNxExpMatchBuilder().setNxExpMatchEntryValue(value).build())
+            .build());
     }
 
     public static Long ipv4ToLong(final Ipv4Address ipv4) {
index d51a3b088cf3a4b53a7d85cf2dd3b1286877d625..64c8ed474772b3b78251a7aaf3ffb57e5f712fa2 100644 (file)
@@ -5,13 +5,11 @@
  * 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.extension.onf.deserializer;
 
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ExperimenterIdError;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ExperimenterIdErrorBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ErrorType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId;
@@ -58,7 +56,7 @@ public class OnfExperimenterErrorFactory implements OFDeserializer<ErrorMessage>
             builder.setCodeString(UNKNOWN_CODE);
         }
 
-        builder.addAugmentation(ExperimenterIdError.class, new ExperimenterIdErrorBuilder()
+        builder.addAugmentation(new ExperimenterIdErrorBuilder()
                 .setExperimenter(new ExperimenterId(message.readUnsignedInt()))
                 .build());
 
index 9dfe025d6b862d4900540ced38ea5aa249ef910c..7d96a51b3ac4cf2725daf1bddd6b5507cc3606df 100644 (file)
@@ -23,13 +23,9 @@ import org.opendaylight.openflowjava.protocol.impl.util.CodeKeyMakerFactory;
 import org.opendaylight.openflowjava.protocol.impl.util.ListDeserializer;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowjava.util.ExperimenterDeserializerKeyFactory;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder;
@@ -405,18 +401,15 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             tableFeaturesLength -= propertyLength;
             if (type.equals(TableFeaturesPropType.OFPTFPTINSTRUCTIONS)
                     || type.equals(TableFeaturesPropType.OFPTFPTINSTRUCTIONSMISS)) {
-                InstructionRelatedTableFeaturePropertyBuilder insBuilder =
-                        new InstructionRelatedTableFeaturePropertyBuilder();
                 CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID);
                 List<Instruction> instructions = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID,
                         propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry);
-                insBuilder.setInstruction(instructions);
-                builder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insBuilder.build());
+                builder.addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder()
+                    .setInstruction(instructions)
+                    .build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTNEXTTABLES)
                     || type.equals(TableFeaturesPropType.OFPTFPTNEXTTABLESMISS)) {
                 propertyLength -= COMMON_PROPERTY_LENGTH;
-                NextTableRelatedTableFeaturePropertyBuilder tableBuilder =
-                        new NextTableRelatedTableFeaturePropertyBuilder();
                 List<NextTableIds> ids = new ArrayList<>();
                 while (propertyLength > 0) {
                     NextTableIdsBuilder nextTableIdsBuilder = new NextTableIdsBuilder();
@@ -424,31 +417,25 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
                     ids.add(nextTableIdsBuilder.build());
                     propertyLength--;
                 }
-                tableBuilder.setNextTableIds(ids);
-                builder.addAugmentation(NextTableRelatedTableFeatureProperty.class, tableBuilder.build());
+                builder.addAugmentation(new NextTableRelatedTableFeaturePropertyBuilder().setNextTableIds(ids).build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTWRITEACTIONS)
                     || type.equals(TableFeaturesPropType.OFPTFPTWRITEACTIONSMISS)
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYACTIONS)
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYACTIONSMISS)) {
-                ActionRelatedTableFeaturePropertyBuilder actionBuilder = new ActionRelatedTableFeaturePropertyBuilder();
                 CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID);
                 List<Action> actions = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID,
                         propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry);
-                actionBuilder.setAction(actions);
-                builder.addAugmentation(ActionRelatedTableFeatureProperty.class, actionBuilder.build());
+                builder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(actions).build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTMATCH)
                     || type.equals(TableFeaturesPropType.OFPTFPTWILDCARDS)
                     || type.equals(TableFeaturesPropType.OFPTFPTWRITESETFIELD)
                     || type.equals(TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS)
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD)
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS)) {
-                OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-                CodeKeyMaker keyMaker = CodeKeyMakerFactory
-                        .createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID);
+                CodeKeyMaker keyMaker = CodeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID);
                 List<MatchEntry> entries = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID,
                         propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry);
-                oxmBuilder.setMatchEntry(entries);
-                builder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+                builder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTER)
                     || type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS)) {
                 long expId = input.readUnsignedInt();
index 2e760edfa31b46ccff9e57d50aadf1611cb49bbc..372c4fb0c0b1f7b099bb21c86a0462a5a69e57d9 100644 (file)
@@ -23,13 +23,9 @@ import org.opendaylight.openflowjava.protocol.impl.util.CodeKeyMakerFactory;
 import org.opendaylight.openflowjava.protocol.impl.util.ListDeserializer;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowjava.util.ExperimenterDeserializerKeyFactory;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder;
@@ -236,18 +232,15 @@ public class MultipartRequestInputMessageFactory
             tableFeaturesLength -= propertyLength;
             if (type.equals(TableFeaturesPropType.OFPTFPTINSTRUCTIONS)
                     || type.equals(TableFeaturesPropType.OFPTFPTINSTRUCTIONSMISS)) {
-                InstructionRelatedTableFeaturePropertyBuilder insBuilder =
-                        new InstructionRelatedTableFeaturePropertyBuilder();
                 CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID);
                 List<Instruction> instructions = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID,
                         propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry);
-                insBuilder.setInstruction(instructions);
-                builder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insBuilder.build());
+                builder.addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder()
+                    .setInstruction(instructions)
+                    .build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTNEXTTABLES)
                     || type.equals(TableFeaturesPropType.OFPTFPTNEXTTABLESMISS)) {
                 propertyLength -= COMMON_PROPERTY_LENGTH;
-                NextTableRelatedTableFeaturePropertyBuilder tableBuilder =
-                        new NextTableRelatedTableFeaturePropertyBuilder();
                 List<NextTableIds> ids = new ArrayList<>();
                 while (propertyLength > 0) {
                     NextTableIdsBuilder nextTableIdsBuilder = new NextTableIdsBuilder();
@@ -255,30 +248,25 @@ public class MultipartRequestInputMessageFactory
                     ids.add(nextTableIdsBuilder.build());
                     propertyLength--;
                 }
-                tableBuilder.setNextTableIds(ids);
-                builder.addAugmentation(NextTableRelatedTableFeatureProperty.class, tableBuilder.build());
+                builder.addAugmentation(new NextTableRelatedTableFeaturePropertyBuilder().setNextTableIds(ids).build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTWRITEACTIONS)
                     || type.equals(TableFeaturesPropType.OFPTFPTWRITEACTIONSMISS)
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYACTIONS)
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYACTIONSMISS)) {
-                ActionRelatedTableFeaturePropertyBuilder actionBuilder = new ActionRelatedTableFeaturePropertyBuilder();
                 CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID);
                 List<Action> actions = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID,
                         propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry);
-                actionBuilder.setAction(actions);
-                builder.addAugmentation(ActionRelatedTableFeatureProperty.class, actionBuilder.build());
+                builder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(actions).build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTMATCH)
                     || type.equals(TableFeaturesPropType.OFPTFPTWILDCARDS)
                     || type.equals(TableFeaturesPropType.OFPTFPTWRITESETFIELD)
                     || type.equals(TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS)
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD)
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS)) {
-                OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
                 CodeKeyMaker keyMaker = CodeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID);
                 List<MatchEntry> entries = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID,
                         propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry);
-                oxmBuilder.setMatchEntry(entries);
-                builder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+                builder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTER)
                     || type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS)) {
                 long expId = input.readUnsignedInt();
index c8a259e80e5ab014eb2ed2dc5392972894890546..b6b706425e5aa407d46990b9f5f452f63d8b9a20 100644 (file)
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.RateQueueProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.RateQueuePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.QueueId;
@@ -72,9 +71,9 @@ public class OF10QueueGetConfigReplyMessageFactory implements OFDeserializer<Get
             propertiesLength -= input.readUnsignedShort();
             input.skipBytes(PADDING_IN_QUEUE_PROPERTY_HEADER);
             if (property.equals(QueueProperties.OFPQTMINRATE)) {
-                RateQueuePropertyBuilder rateBuilder = new RateQueuePropertyBuilder();
-                rateBuilder.setRate(input.readUnsignedShort());
-                propertiesBuilder.addAugmentation(RateQueueProperty.class, rateBuilder.build());
+                propertiesBuilder.addAugmentation(new RateQueuePropertyBuilder()
+                    .setRate(input.readUnsignedShort())
+                    .build());
                 input.skipBytes(PADDING_IN_RATE_QUEUE_PROPERTY);
             }
             propertiesList.add(propertiesBuilder.build());
index 40e9168caeb7e7d4bd99feff5934c1c0ece9dd3f..d3e8c33b41d6f1922b5b7426b61e9d179f224e54 100644 (file)
@@ -18,7 +18,6 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegi
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.util.ExperimenterDeserializerKeyFactory;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.RateQueueProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.RateQueuePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.QueueId;
@@ -86,9 +85,9 @@ public class QueueGetConfigReplyMessageFactory implements OFDeserializer<GetQueu
             propertiesLength -= currentPropertyLength;
             input.skipBytes(PADDING_IN_QUEUE_PROPERTY_HEADER);
             if (property.equals(QueueProperties.OFPQTMINRATE) || property.equals(QueueProperties.OFPQTMAXRATE)) {
-                RateQueuePropertyBuilder rateBuilder = new RateQueuePropertyBuilder();
-                rateBuilder.setRate(input.readUnsignedShort());
-                propertiesBuilder.addAugmentation(RateQueueProperty.class, rateBuilder.build());
+                propertiesBuilder.addAugmentation(new RateQueuePropertyBuilder()
+                    .setRate(input.readUnsignedShort())
+                    .build());
                 input.skipBytes(PADDING_IN_RATE_QUEUE_PROPERTY);
             } else if (property.equals(QueueProperties.OFPQTEXPERIMENTER)) {
                 long expId = input.readUnsignedInt();
index 077f37ea3e470c98b1b9c00d4286766b814b7a6a..57c2c9d74b3fc47ab4df947e8361cdaa0e4a163c 100644 (file)
@@ -11,7 +11,6 @@ import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlags;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlagsContainer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlagsContainerBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.oxm.container.match.entry.value.experimenter.id._case.TcpFlagsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder;
@@ -39,7 +38,6 @@ public class OnfOxmTcpFlagsDeserializer extends AbstractOxmExperimenterMatchEntr
 
     private static void addTcpFlagsAugmentation(ByteBuf input, ExperimenterIdCaseBuilder expCaseBuilder,
             boolean hasMask) {
-        TcpFlagsContainerBuilder flagsContainerBuilder = new TcpFlagsContainerBuilder();
         TcpFlagsBuilder flagsBuilder = new TcpFlagsBuilder();
         flagsBuilder.setFlags(input.readUnsignedShort());
         if (hasMask) {
@@ -47,8 +45,7 @@ public class OnfOxmTcpFlagsDeserializer extends AbstractOxmExperimenterMatchEntr
             input.readBytes(mask);
             flagsBuilder.setMask(mask);
         }
-        flagsContainerBuilder.setTcpFlags(flagsBuilder.build());
-        expCaseBuilder.addAugmentation(TcpFlagsContainer.class, flagsContainerBuilder.build());
+        expCaseBuilder.addAugmentation(new TcpFlagsContainerBuilder().setTcpFlags(flagsBuilder.build()).build());
     }
 
     /**
index 59dd8f43e4ae0d640f88c1151634b366d17ced38..e2ae95ee93bcc20f6217867e28ffae6d438e1826 100644 (file)
@@ -8,7 +8,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Assert;
@@ -20,13 +19,9 @@ import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder;
@@ -54,6 +49,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table.features._case.multipart.request.table.features.TableFeaturesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeaturePropertiesBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Unit tests for MultipartRequestTableFeaturesInputMessageFactory.
@@ -95,47 +93,43 @@ public class MultipartRequestTableFeaturesInputMessageFactoryTest {
 
     public List<TableFeatures> createTableFeaturesList() {
         final List<TableFeatures> list = new ArrayList<>();
-        TableFeaturesBuilder builder = new TableFeaturesBuilder();
-        builder.setTableId((short) 1);
-        builder.setName("Name");
-        builder.setMetadataWrite(new BigInteger("1"));
-        builder.setMetadataMatch(new BigInteger("1"));
-        builder.setMaxEntries(1L);
-        builder.setConfig(new TableConfig(false));
-        builder.setTableFeatureProperties(createTableFeatureProperties());
-        list.add(builder.build());
+        list.add(new TableFeaturesBuilder()
+            .setTableId(Uint8.ONE)
+            .setName("Name")
+            .setMetadataWrite(Uint64.ONE)
+            .setMetadataMatch(Uint64.ONE)
+            .setMaxEntries(Uint32.ONE)
+            .setConfig(new TableConfig(false))
+            .setTableFeatureProperties(createTableFeatureProperties())
+            .build());
         return list;
     }
 
     public List<TableFeatureProperties> createTableFeatureProperties() {
         final List<TableFeatureProperties> list = new ArrayList<>();
-        TableFeaturePropertiesBuilder builder = new TableFeaturePropertiesBuilder();
-        builder.setType(TableFeaturesPropType.forValue(0));
-        InstructionRelatedTableFeaturePropertyBuilder insBuilder = new InstructionRelatedTableFeaturePropertyBuilder();
-        insBuilder.setInstruction(createInstructions());
-        builder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insBuilder.build());
-        list.add(builder.build());
-
-        builder = new TableFeaturePropertiesBuilder();
-        builder.setType(TableFeaturesPropType.forValue(2));
-        NextTableRelatedTableFeaturePropertyBuilder nextBuilder = new NextTableRelatedTableFeaturePropertyBuilder();
-        nextBuilder.setNextTableIds(createNextTableIds());
-        builder.addAugmentation(NextTableRelatedTableFeatureProperty.class, nextBuilder.build());
-        list.add(builder.build());
-
-        builder = new TableFeaturePropertiesBuilder();
-        builder.setType(TableFeaturesPropType.forValue(4));
-        ActionRelatedTableFeaturePropertyBuilder actionBuilder = new ActionRelatedTableFeaturePropertyBuilder();
-        actionBuilder.setAction(createAction());
-        builder.addAugmentation(ActionRelatedTableFeatureProperty.class, actionBuilder.build());
-        list.add(builder.build());
-
-        builder = new TableFeaturePropertiesBuilder();
-        builder.setType(TableFeaturesPropType.forValue(8));
-        OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        oxmBuilder.setMatchEntry(createMatchEntries());
-        builder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
-        list.add(builder.build());
+        list.add(new TableFeaturePropertiesBuilder()
+            .setType(TableFeaturesPropType.forValue(0))
+            .addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder()
+                .setInstruction(createInstructions())
+                .build())
+            .build());
+
+        list.add(new TableFeaturePropertiesBuilder()
+            .setType(TableFeaturesPropType.forValue(2))
+            .addAugmentation(new NextTableRelatedTableFeaturePropertyBuilder()
+                .setNextTableIds(createNextTableIds())
+                .build())
+            .build());
+
+        list.add(new TableFeaturePropertiesBuilder()
+            .setType(TableFeaturesPropType.forValue(4))
+            .addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(createAction()).build())
+            .build());
+
+        list.add(new TableFeaturePropertiesBuilder()
+            .setType(TableFeaturesPropType.forValue(8))
+            .addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(createMatchEntries()).build())
+            .build());
 
         return list;
     }
index 497f5aa00003ff8318ac6d027e360a35fbb5374b..a0f73d5aea6c3159906eac017b4a1013b9792dbe 100644 (file)
@@ -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.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
@@ -20,7 +19,6 @@ import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.RateQueueProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.RateQueuePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.QueueId;
@@ -30,6 +28,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.get.config.reply.QueuesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueueProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueuePropertyBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Unit tests for QueueGetConfigReplyMessageFactoryMulti.
@@ -91,24 +91,21 @@ public class QueueGetConfigReplyMessageFactoryMultiTest {
     private static List<Queues> createQueuesList() {
         List<Queues> queuesList = new ArrayList<>();
         for (int i = 1; i < 3; i++) {
-            QueuesBuilder qb = new QueuesBuilder();
-            qb.setQueueId(new QueueId((long) i));
-            qb.setPort(new PortNumber((long) i));
-            qb.setQueueProperty(createPropertiesList());
-            queuesList.add(qb.build());
+            queuesList.add(new QueuesBuilder()
+                .setQueueId(new QueueId(Uint32.valueOf(i)))
+                .setPort(new PortNumber(Uint32.valueOf(i)))
+                .setQueueProperty(createPropertiesList())
+                .build());
         }
         return queuesList;
     }
 
     private static List<QueueProperty> createPropertiesList() {
         final List<QueueProperty> propertiesList = new ArrayList<>();
-        QueuePropertyBuilder pb = new QueuePropertyBuilder();
-        pb.setProperty(QueueProperties.forValue(2));
-        RateQueuePropertyBuilder rateBuilder = new RateQueuePropertyBuilder();
-        rateBuilder.setRate(5);
-        pb.addAugmentation(RateQueueProperty.class, rateBuilder.build());
-        propertiesList.add(pb.build());
+        propertiesList.add(new QueuePropertyBuilder()
+            .setProperty(QueueProperties.forValue(2))
+            .addAugmentation(new RateQueuePropertyBuilder().setRate(Uint16.valueOf(5)).build())
+            .build());
         return propertiesList;
     }
-
 }
index 2771b59f5d2c695765d3d083ef2eabb524b8ef55..abcd2c7fb1f94f34419731abd849e7bc620a2a4c 100644 (file)
@@ -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.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
@@ -20,7 +19,6 @@ import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.RateQueueProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.RateQueuePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.QueueId;
@@ -30,6 +28,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.get.config.reply.QueuesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueueProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueuePropertyBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Unit tests for QueueGetConfigReplyMessageFactory.
@@ -67,23 +67,21 @@ public class QueueGetConfigReplyMessageFactoryTest {
 
     private static List<Queues> createQueuesList() {
         final List<Queues> queuesList = new ArrayList<>();
-        QueuesBuilder qb = new QueuesBuilder();
-        qb.setQueueId(new QueueId(1L));
-        qb.setPort(new PortNumber(3L));
-        qb.setQueueProperty(createPropertiesList());
-        queuesList.add(qb.build());
+        queuesList.add(new QueuesBuilder()
+            .setQueueId(new QueueId(Uint32.ONE))
+            .setPort(new PortNumber(Uint32.valueOf(3)))
+            .setQueueProperty(createPropertiesList())
+            .build());
 
         return queuesList;
     }
 
     private static List<QueueProperty> createPropertiesList() {
         final List<QueueProperty> propertiesList = new ArrayList<>();
-        QueuePropertyBuilder pb = new QueuePropertyBuilder();
-        pb.setProperty(QueueProperties.forValue(2));
-        RateQueuePropertyBuilder rateBuilder = new RateQueuePropertyBuilder();
-        rateBuilder.setRate(5);
-        pb.addAugmentation(RateQueueProperty.class, rateBuilder.build());
-        propertiesList.add(pb.build());
+        propertiesList.add(new QueuePropertyBuilder()
+            .setProperty(QueueProperties.forValue(2))
+            .addAugmentation(new RateQueuePropertyBuilder().setRate(Uint16.valueOf(5)).build())
+            .build());
         return propertiesList;
     }
 }
index 027506e32c8dc738385000f1bf0162747323ef9a..f39db5c95b7558d1757edc0b0a8001b9d397dbd1 100644 (file)
@@ -23,15 +23,10 @@ import org.opendaylight.openflowjava.protocol.impl.serialization.SerializerRegis
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.OutputActionCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopPbbCaseBuilder;
@@ -177,6 +172,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeaturePropertiesBuilder;
 import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Unit tests for MultipartReplyMessageFactory.
@@ -215,20 +211,16 @@ public class MultipartReplyMessageFactoryTest {
         tableFeaturesBuilder.setMaxEntries(65L);
         TableFeaturePropertiesBuilder propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTNEXTTABLES);
-        NextTableRelatedTableFeaturePropertyBuilder nextPropBuilder = new NextTableRelatedTableFeaturePropertyBuilder();
-        List<NextTableIds> nextIds = new ArrayList<>();
-        nextIds.add(new NextTableIdsBuilder().setTableId((short) 1).build());
-        nextIds.add(new NextTableIdsBuilder().setTableId((short) 2).build());
-        nextPropBuilder.setNextTableIds(nextIds);
-        propBuilder.addAugmentation(NextTableRelatedTableFeatureProperty.class, nextPropBuilder.build());
+        propBuilder.addAugmentation(new NextTableRelatedTableFeaturePropertyBuilder()
+            .setNextTableIds(List.of(
+                new NextTableIdsBuilder().setTableId(Uint8.ONE).build(),
+                new NextTableIdsBuilder().setTableId(Uint8.TWO).build()))
+            .build());
         List<TableFeatureProperties> properties = new ArrayList<>();
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTNEXTTABLESMISS);
-        nextPropBuilder = new NextTableRelatedTableFeaturePropertyBuilder();
-        nextIds = new ArrayList<>();
-        nextPropBuilder.setNextTableIds(nextIds);
-        propBuilder.addAugmentation(NextTableRelatedTableFeatureProperty.class, nextPropBuilder.build());
+        propBuilder.addAugmentation(new NextTableRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTINSTRUCTIONS);
@@ -239,14 +231,10 @@ public class MultipartReplyMessageFactoryTest {
         insBuilder = new InstructionBuilder();
         insBuilder.setInstructionChoice(new GotoTableCaseBuilder().build());
         insIds.add(insBuilder.build());
-        InstructionRelatedTableFeaturePropertyBuilder insPropBuilder =
-                new InstructionRelatedTableFeaturePropertyBuilder();
-        insPropBuilder.setInstruction(insIds);
-        propBuilder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insPropBuilder.build());
+        propBuilder.addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder().setInstruction(insIds).build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTINSTRUCTIONSMISS);
-        insPropBuilder = new InstructionRelatedTableFeaturePropertyBuilder();
         insIds = new ArrayList<>();
         insBuilder = new InstructionBuilder();
         insBuilder.setInstructionChoice(new WriteMetadataCaseBuilder().build());
@@ -263,8 +251,7 @@ public class MultipartReplyMessageFactoryTest {
         insBuilder = new InstructionBuilder();
         insBuilder.setInstructionChoice(new GotoTableCaseBuilder().build());
         insIds.add(insBuilder.build());
-        insPropBuilder.setInstruction(insIds);
-        propBuilder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insPropBuilder.build());
+        propBuilder.addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder().setInstruction(insIds).build());
         properties.add(propBuilder.build());
         tableFeaturesBuilder.setTableFeatureProperties(properties);
         tableFeaturesList.add(tableFeaturesBuilder.build());
@@ -280,34 +267,23 @@ public class MultipartReplyMessageFactoryTest {
         properties = new ArrayList<>();
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITEACTIONS);
-        ActionRelatedTableFeaturePropertyBuilder actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
         List<Action> actions = new ArrayList<>();
         ActionBuilder actionBuilder = new ActionBuilder();
         actionBuilder.setActionChoice(new OutputActionCaseBuilder().build());
         actions.add(actionBuilder.build());
-        actBuilder.setAction(actions);
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(actions).build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITEACTIONSMISS);
-        actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
-        actions = new ArrayList<>();
-        actBuilder.setAction(actions);
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYACTIONS);
-        actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
-        actions = new ArrayList<>();
-        actBuilder.setAction(actions);
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYACTIONSMISS);
-        actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
-        actions = new ArrayList<>();
-        actBuilder.setAction(actions);
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTMATCH);
@@ -322,34 +298,22 @@ public class MultipartReplyMessageFactoryTest {
         entriesBuilder.setOxmMatchField(InPort.class);
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
-        OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWILDCARDS);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        entries = new ArrayList<>();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELD);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        entries = new ArrayList<>();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        entries = new ArrayList<>();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
         entries = new ArrayList<>();
         entriesBuilder = new MatchEntryBuilder();
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);
@@ -361,15 +325,11 @@ public class MultipartReplyMessageFactoryTest {
         entriesBuilder.setOxmMatchField(IpEcn.class);
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        entries = new ArrayList<>();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         tableFeaturesBuilder.setTableFeatureProperties(properties);
         tableFeaturesList.add(tableFeaturesBuilder.build());
index 20dcc678d1fe32ffa5703688ffaf5f23c2ec0040..f849802b45f178be9463eae1af98e6e16d2d620d 100644 (file)
@@ -31,6 +31,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.get.config.reply.QueuesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueueProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueuePropertyBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Unit tests for OF10QueueGetConfigReplyMessageFactory.
@@ -53,7 +55,7 @@ public class OF10QueueGetConfigReplyMessageFactoryTest {
     public void testSerialize() throws Exception {
         GetQueueConfigOutputBuilder builder = new GetQueueConfigOutputBuilder();
         BufferHelper.setupHeader(builder, EncodeConstants.OF10_VERSION_ID);
-        builder.setPort(new PortNumber(1L));
+        builder.setPort(new PortNumber(Uint32.ONE));
         builder.setQueues(createQueues());
         GetQueueConfigOutput message = builder.build();
 
@@ -78,22 +80,19 @@ public class OF10QueueGetConfigReplyMessageFactoryTest {
 
     private static List<Queues> createQueues() {
         List<Queues> list = new ArrayList<>();
-        QueuesBuilder builder = new QueuesBuilder();
-        builder.setQueueId(new QueueId(1L));
-        builder.setQueueProperty(createPropertiesList());
-
-        list.add(builder.build());
+        list.add(new QueuesBuilder()
+            .setQueueId(new QueueId(Uint32.ONE))
+            .setQueueProperty(createPropertiesList())
+            .build());
         return list;
     }
 
     private static List<QueueProperty> createPropertiesList() {
         final List<QueueProperty> propertiesList = new ArrayList<>();
-        QueuePropertyBuilder pb = new QueuePropertyBuilder();
-        pb.setProperty(QueueProperties.forValue(1));
-        RateQueuePropertyBuilder rateBuilder = new RateQueuePropertyBuilder();
-        rateBuilder.setRate(5);
-        pb.addAugmentation(RateQueueProperty.class, rateBuilder.build());
-        propertiesList.add(pb.build());
+        propertiesList.add(new QueuePropertyBuilder()
+            .setProperty(QueueProperties.forValue(1))
+            .addAugmentation(new RateQueuePropertyBuilder().setRate(Uint16.valueOf(5)).build())
+            .build());
         return propertiesList;
     }
 }
index c382b5b2280030237ddbdba21df734effd2d3a37..4466563b2d441153bc30a536a29e554342f56b00 100644 (file)
@@ -31,6 +31,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.get.config.reply.QueuesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueueProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueuePropertyBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Unit tests for QueueGetConfigReplyMessageFactory.
@@ -102,23 +104,21 @@ public class QueueGetConfigReplyMessageFactoryTest {
     private static List<Queues> createQueuesList() {
         List<Queues> queuesList = new ArrayList<>();
         for (int i = 1; i < 3; i++) {
-            QueuesBuilder qb = new QueuesBuilder();
-            qb.setQueueId(new QueueId((long) i));
-            qb.setPort(new PortNumber((long) i));
-            qb.setQueueProperty(createPropertiesList());
-            queuesList.add(qb.build());
+            queuesList.add(new QueuesBuilder()
+                .setQueueId(new QueueId(Uint32.valueOf(i)))
+                .setPort(new PortNumber(Uint32.valueOf(i)))
+                .setQueueProperty(createPropertiesList())
+                .build());
         }
         return queuesList;
     }
 
     private static List<QueueProperty> createPropertiesList() {
         final List<QueueProperty> propertiesList = new ArrayList<>();
-        QueuePropertyBuilder pb = new QueuePropertyBuilder();
-        pb.setProperty(QueueProperties.forValue(2));
-        RateQueuePropertyBuilder rateBuilder = new RateQueuePropertyBuilder();
-        rateBuilder.setRate(5);
-        pb.addAugmentation(RateQueueProperty.class, rateBuilder.build());
-        propertiesList.add(pb.build());
+        propertiesList.add(new QueuePropertyBuilder()
+            .setProperty(QueueProperties.forValue(2))
+            .addAugmentation(new RateQueuePropertyBuilder().setRate(Uint16.valueOf(5)).build())
+            .build());
         return propertiesList;
     }
 }
index 2a7c9f963694d588643cccd552ed85558a679771..8fd90bfbbaa9318951edb96c3d409cb264b60c8b 100644 (file)
@@ -30,15 +30,10 @@ import org.opendaylight.openflowjava.protocol.impl.serialization.factories.Multi
 import org.opendaylight.openflowjava.protocol.impl.serialization.factories.MultipartRequestInputFactoryTest;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ExperimenterIdTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ExperimenterIdTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder;
@@ -124,21 +119,15 @@ public class MultipartRequestTableFeaturesTest {
         tableFeaturesBuilder.setMaxEntries(65L);
         TableFeaturePropertiesBuilder propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTNEXTTABLES);
-        NextTableRelatedTableFeaturePropertyBuilder nextPropBuilder =
-                new NextTableRelatedTableFeaturePropertyBuilder();
         List<NextTableIds> nextIds = new ArrayList<>();
         nextIds.add(new NextTableIdsBuilder().setTableId((short) 1).build());
         nextIds.add(new NextTableIdsBuilder().setTableId((short) 2).build());
-        nextPropBuilder.setNextTableIds(nextIds);
-        propBuilder.addAugmentation(NextTableRelatedTableFeatureProperty.class, nextPropBuilder.build());
+        propBuilder.addAugmentation(new NextTableRelatedTableFeaturePropertyBuilder().setNextTableIds(nextIds).build());
         List<TableFeatureProperties> properties = new ArrayList<>();
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTNEXTTABLESMISS);
-        nextPropBuilder = new NextTableRelatedTableFeaturePropertyBuilder();
-        nextIds = new ArrayList<>();
-        nextPropBuilder.setNextTableIds(nextIds);
-        propBuilder.addAugmentation(NextTableRelatedTableFeatureProperty.class, nextPropBuilder.build());
+        propBuilder.addAugmentation(new NextTableRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTINSTRUCTIONS);
@@ -149,14 +138,10 @@ public class MultipartRequestTableFeaturesTest {
         insBuilder = new InstructionBuilder();
         insBuilder.setInstructionChoice(new GotoTableCaseBuilder().build());
         insIds.add(insBuilder.build());
-        InstructionRelatedTableFeaturePropertyBuilder insPropBuilder =
-                new InstructionRelatedTableFeaturePropertyBuilder();
-        insPropBuilder.setInstruction(insIds);
-        propBuilder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insPropBuilder.build());
+        propBuilder.addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder().setInstruction(insIds).build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTINSTRUCTIONSMISS);
-        insPropBuilder = new InstructionRelatedTableFeaturePropertyBuilder();
         insIds = new ArrayList<>();
         insBuilder = new InstructionBuilder();
         insBuilder.setInstructionChoice(new WriteMetadataCaseBuilder().build());
@@ -173,8 +158,7 @@ public class MultipartRequestTableFeaturesTest {
         insBuilder = new InstructionBuilder();
         insBuilder.setInstructionChoice(new GotoTableCaseBuilder().build());
         insIds.add(insBuilder.build());
-        insPropBuilder.setInstruction(insIds);
-        propBuilder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insPropBuilder.build());
+        propBuilder.addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder().setInstruction(insIds).build());
         properties.add(propBuilder.build());
         tableFeaturesBuilder.setTableFeatureProperties(properties);
         List<TableFeatures> tableFeaturesList = new ArrayList<>();
@@ -191,34 +175,23 @@ public class MultipartRequestTableFeaturesTest {
         properties = new ArrayList<>();
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITEACTIONS);
-        ActionRelatedTableFeaturePropertyBuilder actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
         List<Action> actions = new ArrayList<>();
         ActionBuilder actionBuilder = new ActionBuilder();
         actionBuilder.setActionChoice(new OutputActionCaseBuilder().build());
         actions.add(actionBuilder.build());
-        actBuilder.setAction(actions);
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(actions).build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITEACTIONSMISS);
-        actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
-        actions = new ArrayList<>();
-        actBuilder.setAction(actions);
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYACTIONS);
-        actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
-        actions = new ArrayList<>();
-        actBuilder.setAction(actions);
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYACTIONSMISS);
-        actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
-        actions = new ArrayList<>();
-        actBuilder.setAction(actions);
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTMATCH);
@@ -233,34 +206,22 @@ public class MultipartRequestTableFeaturesTest {
         entriesBuilder.setOxmMatchField(InPort.class);
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
-        OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWILDCARDS);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        entries = new ArrayList<>();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELD);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        entries = new ArrayList<>();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        entries = new ArrayList<>();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
         entries = new ArrayList<>();
         entriesBuilder = new MatchEntryBuilder();
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);
@@ -272,15 +233,11 @@ public class MultipartRequestTableFeaturesTest {
         entriesBuilder.setOxmMatchField(IpEcn.class);
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        entries = new ArrayList<>();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
         tableFeaturesBuilder.setTableFeatureProperties(properties);
         tableFeaturesList.add(tableFeaturesBuilder.build());
@@ -421,16 +378,16 @@ public class MultipartRequestTableFeaturesTest {
         tableFeaturesBuilder.setMaxEntries(65L);
         TableFeaturePropertiesBuilder propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTEXPERIMENTER);
-        ExperimenterIdTableFeaturePropertyBuilder expBuilder = new ExperimenterIdTableFeaturePropertyBuilder();
-        expBuilder.setExperimenter(new ExperimenterId(42L));
-        propBuilder.addAugmentation(ExperimenterIdTableFeatureProperty.class, expBuilder.build());
+        propBuilder.addAugmentation(new ExperimenterIdTableFeaturePropertyBuilder()
+            .setExperimenter(new ExperimenterId(42L))
+            .build());
         List<TableFeatureProperties> properties = new ArrayList<>();
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS);
-        expBuilder = new ExperimenterIdTableFeaturePropertyBuilder();
-        expBuilder.setExperimenter(new ExperimenterId(43L));
-        propBuilder.addAugmentation(ExperimenterIdTableFeatureProperty.class, expBuilder.build());
+        propBuilder.addAugmentation(new ExperimenterIdTableFeaturePropertyBuilder()
+            .setExperimenter(new ExperimenterId(43L))
+            .build());
         properties.add(propBuilder.build());
         tableFeaturesBuilder.setTableFeatureProperties(properties);
         List<TableFeatures> tableFeaturesList = new ArrayList<>();
index c85506daac35448ac00b5b6e0174a02694278ee7..02a52d0ad7bfcdac0a8b318cb6fb61fe717bcda2 100644 (file)
@@ -19,7 +19,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.ta
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.FlowAndStatisticsMapList;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.FlowStatisticsData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.FlowStatisticsDataBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.flow.statistics.FlowStatisticsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
@@ -49,9 +48,7 @@ public class FlowStatsMultipartWriter extends AbstractMultipartWriter<FlowAndSta
         statistics.nonnullFlowAndStatisticsMapList()
             .forEach(stat -> {
                 final FlowBuilder flow = new FlowBuilder(stat)
-                    .addAugmentation(
-                        FlowStatisticsData.class,
-                        new FlowStatisticsDataBuilder()
+                        .addAugmentation(new FlowStatisticsDataBuilder()
                             .setFlowStatistics(new FlowStatisticsBuilder(stat).build())
                             .build());
 
index 331ba90b6390ab8ff29cf50bcd8efb89a599f4d9..8b1b91a62e9ee3e6a4658a808ef197de1038da2b 100644 (file)
@@ -5,13 +5,11 @@
  * 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.impl.datastore.multipart;
 
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceRegistry;
 import org.opendaylight.openflowplugin.api.openflow.device.TxFacade;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.NodeGroupStatistics;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.NodeGroupStatisticsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupDescStatsReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group;
@@ -46,12 +44,11 @@ public class GroupDescMultipartWriter extends AbstractMultipartWriter<GroupDescS
                         .child(Group.class, new GroupKey(stat.getGroupId())),
                     new GroupBuilder(stat)
                         .withKey(new GroupKey(stat.getGroupId()))
-                        .addAugmentation(NodeGroupStatistics.class, new NodeGroupStatisticsBuilder().build())
+                        .addAugmentation(new NodeGroupStatisticsBuilder().build())
                         .build(),
                     withParents);
 
                 registry.getDeviceGroupRegistry().store(stat.getGroupId());
             });
     }
-
 }
index 8dba87b2ff742b836a7b73ea3fb19a7972142ad8..e8e7854babea80aca4fb251b595156d1cda241c6 100644 (file)
@@ -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.impl.datastore.multipart;
 
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceRegistry;
@@ -15,7 +14,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.me
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterStatistics;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterStatisticsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterConfigStatsReply;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -46,12 +44,11 @@ public class MeterConfigMultipartWriter extends AbstractMultipartWriter<MeterCon
                         .child(Meter.class, new MeterKey(stat.getMeterId())),
                     new MeterBuilder(stat)
                         .withKey(new MeterKey(stat.getMeterId()))
-                        .addAugmentation(NodeMeterStatistics.class, new NodeMeterStatisticsBuilder().build())
+                        .addAugmentation(new NodeMeterStatisticsBuilder().build())
                         .build(),
                     withParents);
 
                 registry.getDeviceMeterRegistry().store(stat.getMeterId());
             });
     }
-
 }
index 188c7942e2b92144c579bc1d8a875da22e2fcd0b..2ff312dfb80653b60c6b65b59bb0a0bf1ea7d55d 100644 (file)
@@ -5,14 +5,12 @@
  * 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.impl.datastore.multipart;
 
 import org.opendaylight.openflowplugin.api.openflow.device.TxFacade;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
 import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.multipart.reply.multipart.reply.body.MultipartReplyPortDesc;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
@@ -21,7 +19,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FeaturesReply;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsDataBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Uint32;
@@ -65,15 +62,10 @@ public class PortDescMultipartWriter extends AbstractMultipartWriter<MultipartRe
                         .child(NodeConnector.class, new NodeConnectorKey(id)),
                     new NodeConnectorBuilder()
                         .setId(id)
-                        .addAugmentation(
-                            FlowCapableNodeConnector.class,
-                            new FlowCapableNodeConnectorBuilder(stat).build())
-                        .addAugmentation(
-                            FlowCapableNodeConnectorStatisticsData.class,
-                            new FlowCapableNodeConnectorStatisticsDataBuilder().build())
+                        .addAugmentation(new FlowCapableNodeConnectorBuilder(stat).build())
+                        .addAugmentation(new FlowCapableNodeConnectorStatisticsDataBuilder().build())
                         .build(),
                     withParents);
             });
     }
-
 }
index 9d902e2ac1378b501e0f3515b4a7c2fe4cab3e71..4fdc8f98f002c5e4658cf9995115618d26dac4a1 100644 (file)
@@ -19,7 +19,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FeaturesReply;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.FlowCapableNodeConnectorQueueStatisticsData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.FlowCapableNodeConnectorQueueStatisticsDataBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.QueueIdAndStatisticsMap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.flow.capable.node.connector.queue.statistics.FlowCapableNodeConnectorQueueStatisticsBuilder;
@@ -65,9 +64,7 @@ public class QueueStatsMultipartWriter extends AbstractMultipartWriter<QueueIdAn
                         new QueueBuilder()
                                 .withKey(new QueueKey(stat.getQueueId()))
                                 .setQueueId(stat.getQueueId())
-                                .addAugmentation(
-                                        FlowCapableNodeConnectorQueueStatisticsData.class,
-                                        new FlowCapableNodeConnectorQueueStatisticsDataBuilder()
+                                .addAugmentation(new FlowCapableNodeConnectorQueueStatisticsDataBuilder()
                                                 .setFlowCapableNodeConnectorQueueStatistics(
                                                         new FlowCapableNodeConnectorQueueStatisticsBuilder(stat)
                                                                 .build())
@@ -76,5 +73,4 @@ public class QueueStatsMultipartWriter extends AbstractMultipartWriter<QueueIdAn
                         withParents);
             });
     }
-
 }
index 89d21546e2c731260e1b477b45bedafa7222bf60..698450ab0fad29d0b5c84735d01854190c8f9a5f 100644 (file)
@@ -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.impl.datastore.multipart;
 
 import org.opendaylight.openflowplugin.api.openflow.device.TxFacade;
@@ -13,7 +12,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.FlowTableStatisticsData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.FlowTableStatisticsDataBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableFeatures;
@@ -50,11 +48,9 @@ public class TableFeaturesMultipartWriter extends AbstractMultipartWriter<TableF
                         .child(Table.class, new TableKey(stat.getTableId())),
                     new TableBuilder()
                         .setId(stat.getTableId())
-                        .addAugmentation(FlowTableStatisticsData.class, new FlowTableStatisticsDataBuilder()
-                            .build())
+                        .addAugmentation(new FlowTableStatisticsDataBuilder().build())
                         .build(),
                     withParents);
             });
     }
-
 }
index 80da7d4174e5455b6a64eac00ce3e22d89c1bb01..b675305c38af50a4bbc829d89efbd427ddfd3793 100644 (file)
@@ -96,7 +96,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketIn;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceived;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceivedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsDataBuilder;
 import org.opendaylight.yangtools.util.concurrent.NotificationManager;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
@@ -370,9 +369,8 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
 
                 writeToTransaction(LogicalDatastoreType.OPERATIONAL, iiToNodeConnector, new NodeConnectorBuilder()
                         .withKey(iiToNodeConnector.getKey())
-                        .addAugmentation(FlowCapableNodeConnectorStatisticsData.class, new
-                                FlowCapableNodeConnectorStatisticsDataBuilder().build())
-                        .addAugmentation(FlowCapableNodeConnector.class, flowCapableNodeConnector)
+                        .addAugmentation(new FlowCapableNodeConnectorStatisticsDataBuilder().build())
+                        .addAugmentation(flowCapableNodeConnector)
                         .build());
                 syncSubmitTransaction();
                 if (PortReason.OFPPRDELETE.equals(portStatusMessage.getReason())) {
@@ -727,7 +725,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
     public <T> RequestContext<T> createRequestContext() {
         final Long xid = deviceInfo.reserveXidForDeviceMessage();
 
-        final AbstractRequestContext<T> abstractRequestContext = new AbstractRequestContext<T>(xid) {
+        final AbstractRequestContext<T> abstractRequestContext = new AbstractRequestContext<>(xid) {
             @Override
             public void close() {
                 requestContexts.remove(this);
index 5a1d27313944c4058213a0eea3ac65e98c55d120..811a88889a1e0fb7c239c179af495de3deea0fec 100644 (file)
@@ -41,7 +41,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.CapabilitiesV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsDataBuilder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
@@ -111,20 +110,20 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
                 port.getPortNo(),
                 OpenflowVersion.get(deviceInfo.getVersion()));
 
+            final NodeConnectorBuilder connectorBuilder = new NodeConnectorBuilder()
+                    .setId(nodeConnectorId)
+                    .addAugmentation(new FlowCapableNodeConnectorStatisticsDataBuilder().build());
+            final FlowCapableNodeConnector augment = translator.translate(port, deviceInfo, null);
+            if (augment != null) {
+                connectorBuilder.addAugmentation(augment);
+            }
+
             try {
                 deviceContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL,
                     deviceInfo
                         .getNodeInstanceIdentifier()
                         .child(NodeConnector.class, new NodeConnectorKey(nodeConnectorId)),
-                    new NodeConnectorBuilder()
-                        .setId(nodeConnectorId)
-                        .addAugmentation(
-                            FlowCapableNodeConnector.class,
-                            translator.translate(port, deviceInfo, null))
-                        .addAugmentation(
-                            FlowCapableNodeConnectorStatisticsData.class,
-                            new FlowCapableNodeConnectorStatisticsDataBuilder().build())
-                        .build());
+                        connectorBuilder.build());
             } catch (final Exception e) {
                 LOG.debug("Failed to write node {} to DS ", deviceInfo, e);
             }
index fb8181797a3dde9cef4d0dccacf7b629f17b371d..09a68004246e7b7d057f6083d70fc1c94b1af2d4 100644 (file)
@@ -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.impl.statistics.services.direct;
 
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
@@ -18,7 +17,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511
 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetFlowStatisticsOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.FlowStatisticsData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.FlowStatisticsDataBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.flow.and.statistics.map.list.FlowAndStatisticsMapList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.flow.statistics.FlowStatisticsBuilder;
@@ -48,8 +46,7 @@ public abstract class AbstractFlowDirectStatisticsService<T extends OfHeader>
         final FlowStatisticsDataBuilder flowStatisticsDataBld = new FlowStatisticsDataBuilder()
                 .setFlowStatistics(new FlowStatisticsBuilder(flowStatistics).build());
 
-        final FlowBuilder flowBuilder = new FlowBuilder(flowStatistics)
-                .addAugmentation(FlowStatisticsData.class, flowStatisticsDataBld.build());
+        final FlowBuilder flowBuilder = new FlowBuilder(flowStatistics).addAugmentation(flowStatisticsDataBld.build());
 
         final FlowRegistryKey flowRegistryKey = FlowRegistryKeyFactory.create(getVersion(), flowBuilder.build());
 
index 9fee75d23e8aef990634f4da049c2d41310b0d91..317817d9850cf96c1e8424ca9c81dd10853b9823 100644 (file)
@@ -92,8 +92,7 @@ public class PacketReceivedTranslator implements MessageTranslator<PacketInMessa
                     OpenflowVersion.get(input.getVersion()), MatchPath.PACKET_RECEIVED_MATCH);
 
         if (matchExtensionWrap != null) {
-            matchBuilder.addAugmentation(matchExtensionWrap.getAugmentationClass(),
-                                         matchExtensionWrap.getAugmentationObject());
+            matchBuilder.addAugmentation(matchExtensionWrap.getAugmentationObject());
         }
 
         return matchBuilder.build();
index 551d65a0dabbafbb91c4e001600b8604e69274ac..819674df8062f65bf9f6acc9c69f57ceea577570 100644 (file)
@@ -25,7 +25,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.fl
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.FlowTableStatisticsData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.FlowTableStatisticsDataBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodesBuilder;
@@ -81,9 +80,7 @@ public final class DeviceInitializationUtil {
                             .child(Table.class, new TableKey((short) i)),
                     new TableBuilder()
                             .setId((short) i)
-                            .addAugmentation(
-                                    FlowTableStatisticsData.class,
-                                    new FlowTableStatisticsDataBuilder().build())
+                            .addAugmentation(new FlowTableStatisticsDataBuilder().build())
                             .build());
         }
     }
index ce4f5b7d93c52cd07503b080a203ff3d753b58c0..3b47843270868ee85df09ef80269e0563e6b0826 100644 (file)
@@ -25,14 +25,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowWildcardsV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.v10.grouping.MatchV10Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlowBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlowWriteActionsSetField;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifPacketIn;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifPacketInBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifSwitchFlowRemoved;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifSwitchFlowRemovedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifUpdateFlowStats;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchPacketInMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchPacketInMessageBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.list.grouping.ExtensionList;
 
@@ -47,8 +42,7 @@ public final class MatchUtil {
                 final SetFieldBuilder matchBuilder = new SetFieldBuilder(match);
 
                 resolveExtensions(match).ifPresent(extensionLists -> matchBuilder
-                        .addAugmentation(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class,
-                                new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
+                        .addAugmentation(new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
                                         .setExtensionList(extensionLists)
                                         .build()));
 
@@ -59,8 +53,7 @@ public final class MatchUtil {
                     final MatchBuilder matchBuilder = new MatchBuilder(match);
 
                     resolveExtensions(match).ifPresent(extensionLists -> matchBuilder
-                            .addAugmentation(GeneralAugMatchNotifUpdateFlowStats.class,
-                                    new GeneralAugMatchNodesNodeTableFlowBuilder()
+                            .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
                                             .setExtensionList(extensionLists)
                                             .build()));
 
@@ -73,8 +66,7 @@ public final class MatchUtil {
                             .rev131026.flow.mod.removed.MatchBuilder(match);
 
                     resolveExtensions(match).ifPresent(extensionLists -> matchBuilder
-                            .addAugmentation(GeneralAugMatchNotifSwitchFlowRemoved.class,
-                                    new GeneralAugMatchNotifSwitchFlowRemovedBuilder()
+                            .addAugmentation(new GeneralAugMatchNotifSwitchFlowRemovedBuilder()
                                             .setExtensionList(extensionLists)
                                             .build()));
 
@@ -88,8 +80,7 @@ public final class MatchUtil {
                             .rev130709.packet.received.MatchBuilder(match);
 
                     resolveExtensions(match).ifPresent(extensionLists -> matchBuilder
-                            .addAugmentation(GeneralAugMatchNotifPacketIn.class,
-                                    new GeneralAugMatchNotifPacketInBuilder()
+                            .addAugmentation(new GeneralAugMatchNotifPacketInBuilder()
                                             .setExtensionList(extensionLists)
                                             .build()));
 
@@ -103,8 +94,7 @@ public final class MatchUtil {
                             .rev130709.packet.in.message.MatchBuilder(match);
 
                     resolveExtensions(match).ifPresent(extensionLists -> matchBuilder
-                            .addAugmentation(GeneralAugMatchPacketInMessage.class,
-                                    new GeneralAugMatchPacketInMessageBuilder()
+                            .addAugmentation(new GeneralAugMatchPacketInMessageBuilder()
                                             .setExtensionList(extensionLists)
                                             .build()));
 
index f93a9b5f182c18bd34ec7b0b1d001df8f1d2cadc..7bb6057e1e48286c693f9f39ed1354eb49389381 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.openflowplugin.impl.util;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
 import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorUpdated;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorUpdatedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortReason;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.flow.capable.port.State;
@@ -166,8 +165,7 @@ public abstract class PortTranslatorUtil {
         fcncub.setMaximumSpeed(port.getMaxSpeed());
         fcncub.setName(port.getName());
         fcncub.setPortNumber(OpenflowPortsUtil.getProtocolAgnosticPort(ofVersion, portNumber));
-        builder.addAugmentation(FlowCapableNodeConnectorUpdated.class, fcncub.build());
-        return builder.build();
+        return builder.addAugmentation(fcncub.build()).build();
     }
 
     public static NodeConnectorRemoved translatePortRemoved(final Short version, final Uint64 datapathId,
index afc7db0ca7a19c3f291408fb0dcdbd71abbc346f..d04f9900cb6bf514d798b5fe7bbce447a11f9a7f 100644 (file)
@@ -83,7 +83,7 @@ public final class MatchExtensionHelper {
                     matchEntry, ofVersion, matchPath.name());
         }
 
-        matchBuilder.addAugmentation(GeneralAugMatchNodesNodeTableFlow.class, builder.build());
+        matchBuilder.addAugmentation(builder.build());
     }
 
     /**
@@ -189,7 +189,7 @@ public final class MatchExtensionHelper {
                 ExtensionAugment<? extends Augmentation<Extension>> extensionMatch =
                         convertor.convert(matchEntry, matchPath);
                 ExtensionBuilder extBld = new ExtensionBuilder();
-                extBld.addAugmentation(extensionMatch.getAugmentationClass(), extensionMatch.getAugmentationObject());
+                extBld.addAugmentation(extensionMatch.getAugmentationObject());
 
                 extListBld = new ExtensionListBuilder();
                 extListBld.setExtension(extBld.build());
index bd3c9a1364c84ca85450111ffc047d4f3dbe838c..7e8735faf1bed5f3a7cc1691305d5a12d3786b88 100644 (file)
@@ -23,7 +23,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.Experimenter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.MeterBandHeaders;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.MeterBandHeader;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ExperimenterIdMeterBand;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ExperimenterIdMeterBandBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType;
@@ -119,9 +118,9 @@ public class MeterConvertor extends Convertor<Meter, MeterModInputBuilder, Versi
                         Experimenter experimenter = (Experimenter) meterBandHeader.getBandType();
                         meterBandExperimenterBuilder.setBurstSize(experimenter.getExperimenterBurstSize());
                         meterBandExperimenterBuilder.setRate(experimenter.getExperimenterRate());
-                        ExperimenterIdMeterBandBuilder expBuilder = new ExperimenterIdMeterBandBuilder();
-                        expBuilder.setExperimenter(new ExperimenterId(experimenter.getExperimenter()));
-                        meterBandExperimenterBuilder.addAugmentation(ExperimenterIdMeterBand.class, expBuilder.build());
+                        meterBandExperimenterBuilder.addAugmentation(new ExperimenterIdMeterBandBuilder()
+                            .setExperimenter(new ExperimenterId(experimenter.getExperimenter()))
+                            .build());
                         // TODO - implement / finish experimenter meter band translation
                         MeterBandExperimenterCaseBuilder experimenterCaseBuilder =
                                 new MeterBandExperimenterCaseBuilder();
index c09d1e87b4a3c6ffda9c49955292aa325da4e540..9943c7071eaa904bbb798b23f087e3d9d79c04cd 100644 (file)
@@ -46,9 +46,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeaturePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder;
@@ -518,10 +516,9 @@ public class TableFeaturesConvertor extends Convertor<
             nextTableIdsList.add(nextTableId.build());
         }
 
-        NextTableRelatedTableFeaturePropertyBuilder propBuilder = new NextTableRelatedTableFeaturePropertyBuilder();
-        propBuilder.setNextTableIds(nextTableIdsList);
-        builder.setType(type);
-        builder.addAugmentation(NextTableRelatedTableFeatureProperty.class, propBuilder.build());
+        builder.setType(type).addAugmentation(new NextTableRelatedTableFeaturePropertyBuilder()
+            .setNextTableIds(nextTableIdsList)
+            .build());
     }
 
     private static void setActionTableFeatureProperty(final TableFeaturePropertiesBuilder builder,
@@ -614,10 +611,9 @@ public class TableFeaturesConvertor extends Convertor<
             matchEntriesList.add(matchEntryBuilder.build());
         }
 
-        OxmRelatedTableFeaturePropertyBuilder propBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        propBuilder.setMatchEntry(matchEntriesList);
-        builder.setType(type);
-        builder.addAugmentation(OxmRelatedTableFeatureProperty.class, propBuilder.build());
+        builder.setType(type).addAugmentation(new OxmRelatedTableFeaturePropertyBuilder()
+            .setMatchEntry(matchEntriesList)
+            .build());
     }
 
     private static void setMatchEntry(final MatchEntryBuilder builder,
index 0f61101c08c14a43287b85694d2517ca6ef0a9a9..606cb62597f6b6542a0937e1f1c2aea4e8f7dbc2 100644 (file)
@@ -161,8 +161,7 @@ public class FlowStatsResponseConvertor extends Convertor<List<FlowStats>, List<
                                     data.getMatchPath());
 
                     if (matchExtensionWrap != null) {
-                        matchBuilder.addAugmentation(matchExtensionWrap.getAugmentationClass(),
-                                matchExtensionWrap.getAugmentationObject());
+                        matchBuilder.addAugmentation(matchExtensionWrap.getAugmentationObject());
                     }
 
                     salFlowStatsBuilder.setMatch(matchBuilder.build());
index 61bf949563abc937f0253d43fdc7d3e4141e0d03..e72889f2dd228833c73860c23661f924455af0cd 100644 (file)
@@ -56,7 +56,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.protocol.match.fields.Pbb;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.vlan.match.fields.VlanId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlags;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlagsContainer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlagsContainerBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.oxm.container.match.entry.value.experimenter.id._case.TcpFlagsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder;
@@ -472,7 +471,7 @@ public class MatchConvertor extends Convertor<Match, List<MatchEntry>, VersionCo
             experimenterBuilder.setExperimenter(new ExperimenterId(OFApprovedExperimenterIds.MATCH_TCP_FLAGS_EXP_ID));
             expIdCaseBuilder.setExperimenter(experimenterBuilder.build());
 
-            expIdCaseBuilder.addAugmentation(TcpFlagsContainer.class, tcpFlagsContainerBuilder.build());
+            expIdCaseBuilder.addAugmentation(tcpFlagsContainerBuilder.build());
             matchEntryBuilder.setMatchEntryValue(expIdCaseBuilder.build());
             matchEntryList.add(matchEntryBuilder.build());
         }
index f7ac01471f89a70208d92b9359248b515d30e051..7e927e4284539a03e24c81f026f6e174fa5465e8 100644 (file)
@@ -20,13 +20,9 @@ import org.junit.Test;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;
 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.augments.rev150225.ActionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder;
@@ -191,24 +187,19 @@ public class TableFeaturesResponseConvertorTest {
         TableFeaturePropertiesBuilder propBuilder = new TableFeaturePropertiesBuilder();
 
         propBuilder.setType(TableFeaturesPropType.OFPTFPTNEXTTABLES);
-        NextTableRelatedTableFeaturePropertyBuilder nextPropBuilder =
-                new NextTableRelatedTableFeaturePropertyBuilder();
         List<NextTableIds> nextIds = new ArrayList<>();
         nextIds.add(new NextTableIdsBuilder().setTableId((short) 1).build());
         nextIds.add(new NextTableIdsBuilder().setTableId((short) 2).build());
-        nextPropBuilder.setNextTableIds(nextIds);
-        propBuilder.addAugmentation(NextTableRelatedTableFeatureProperty.class, nextPropBuilder.build());
+        propBuilder.addAugmentation(new NextTableRelatedTableFeaturePropertyBuilder().setNextTableIds(nextIds).build());
 
         List<TableFeatureProperties> properties = new ArrayList<>();
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
 
         propBuilder.setType(TableFeaturesPropType.OFPTFPTNEXTTABLESMISS);
-        nextPropBuilder = new NextTableRelatedTableFeaturePropertyBuilder();
         nextIds = new ArrayList<>();
         nextIds.add(new NextTableIdsBuilder().setTableId((short) 3).build());
-        nextPropBuilder.setNextTableIds(nextIds);
-        propBuilder.addAugmentation(NextTableRelatedTableFeatureProperty.class, nextPropBuilder.build());
+        propBuilder.addAugmentation(new NextTableRelatedTableFeaturePropertyBuilder().setNextTableIds(nextIds).build());
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
 
@@ -241,17 +232,13 @@ public class TableFeaturesResponseConvertorTest {
         insBuilder.setInstructionChoice(gotoCaseBuilder.build());
         insIds.add(insBuilder.build());
 
-        InstructionRelatedTableFeaturePropertyBuilder insPropBuilder =
-                new InstructionRelatedTableFeaturePropertyBuilder();
-        insPropBuilder.setInstruction(insIds);
-        propBuilder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insPropBuilder.build());
+        propBuilder.addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder().setInstruction(insIds).build());
         properties.add(propBuilder.build());
 
          /* -------------------------------------------------- */
 
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTINSTRUCTIONSMISS);
-        insPropBuilder = new InstructionRelatedTableFeaturePropertyBuilder();
         insIds = new ArrayList<>();
         insBuilder = new InstructionBuilder();
         WriteMetadataCaseBuilder writeMetadataCaseBuilder = new WriteMetadataCaseBuilder();
@@ -288,8 +275,7 @@ public class TableFeaturesResponseConvertorTest {
         insBuilder.setInstructionChoice(gotoCaseBuilder2.build());
         insIds.add(insBuilder.build());
 
-        insPropBuilder.setInstruction(insIds);
-        propBuilder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insPropBuilder.build());
+        propBuilder.addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder().setInstruction(insIds).build());
         properties.add(propBuilder.build());
         featuresBuilder.setTableFeatureProperties(properties);
 
@@ -323,16 +309,13 @@ public class TableFeaturesResponseConvertorTest {
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
 
-        OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
         properties.add(propBuilder.build()); //[0]
 
         /* -------------------------------------------------- */
 
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
         entries = new ArrayList<>();
         entriesBuilder = new MatchEntryBuilder();
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);
@@ -344,15 +327,13 @@ public class TableFeaturesResponseConvertorTest {
         entriesBuilder.setOxmMatchField(IpEcn.class);
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
         properties.add(propBuilder.build());//[1]
 
         /* -------------------------------------------------- */
 
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELD);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
         entries = new ArrayList<>();
         entriesBuilder = new MatchEntryBuilder();
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);
@@ -364,15 +345,13 @@ public class TableFeaturesResponseConvertorTest {
         entriesBuilder.setOxmMatchField(VlanVid.class);
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
         properties.add(propBuilder.build());//[2]
 
         /* -------------------------------------------------- */
 
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
         entries = new ArrayList<>();
         entriesBuilder = new MatchEntryBuilder();
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);
@@ -384,15 +363,13 @@ public class TableFeaturesResponseConvertorTest {
         entriesBuilder.setOxmMatchField(TcpSrc.class);
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
         properties.add(propBuilder.build());//[3]
 
         /* -------------------------------------------------- */
 
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
         entries = new ArrayList<>();
         entriesBuilder = new MatchEntryBuilder();
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);
@@ -406,15 +383,13 @@ public class TableFeaturesResponseConvertorTest {
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
 
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
         properties.add(propBuilder.build());//[4]
 
         /* -------------------------------------------------- */
 
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWILDCARDS);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
         entries = new ArrayList<>();
 
         entriesBuilder = new MatchEntryBuilder();
@@ -429,8 +404,7 @@ public class TableFeaturesResponseConvertorTest {
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
 
-        oxmBuilder.setMatchEntry(entries);
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
         properties.add(propBuilder.build());//[5]
 
         /* -------------------------------------------------- */
@@ -451,16 +425,13 @@ public class TableFeaturesResponseConvertorTest {
         actionBuilder.setActionChoice(createSetNwSrcAction());
         actions.add(actionBuilder.build());
 
-        ActionRelatedTableFeaturePropertyBuilder actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
-        actBuilder.setAction(actions);
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(actions).build());
         properties.add(propBuilder.build());//[6]
 
         /* -------------------------------------------------- */
 
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYACTIONSMISS);
-        actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
 
         actions = new ArrayList<>();
         actionBuilder = new ActionBuilder();
@@ -474,14 +445,12 @@ public class TableFeaturesResponseConvertorTest {
         actionBuilder = new ActionBuilder();
         actionBuilder.setActionChoice(createCopyTtlOutCase());
         actions.add(actionBuilder.build());
-        actBuilder.setAction(actions);
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(actions).build());
         properties.add(propBuilder.build());//[7]
 
         /* -------------------------------------------------- */
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITEACTIONS);
-        actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
 
         actions = new ArrayList<>();
         actionBuilder = new ActionBuilder();
@@ -495,16 +464,14 @@ public class TableFeaturesResponseConvertorTest {
         actionBuilder = new ActionBuilder();
         actionBuilder.setActionChoice(pushVlanCase());
         actions.add(actionBuilder.build());
-        actBuilder.setAction(actions);
 
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(actions).build());
         properties.add(propBuilder.build());
 
         /* -------------------------------------------------- */
 
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITEACTIONSMISS);
-        actBuilder = new ActionRelatedTableFeaturePropertyBuilder();
 
         actions = new ArrayList<>();
         actionBuilder = new ActionBuilder();
@@ -518,25 +485,22 @@ public class TableFeaturesResponseConvertorTest {
         actionBuilder = new ActionBuilder();
         actionBuilder.setActionChoice(createEmptySetFieldCase());
         actions.add(actionBuilder.build());
-        actBuilder.setAction(actions);
 
-        propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());
+        propBuilder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(actions).build());
         properties.add(propBuilder.build());
 
         /* -------------------------------------------------- */
 
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTEXPERIMENTER);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
 
         /* -------------------------------------------------- */
 
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS);
-        oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
+        propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().build());
         properties.add(propBuilder.build());
 
         /* -------------------------------------------------- */