X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=test-provider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Ftest%2FOpenflowPluginBulkTransactionProvider.java;h=58637d97be4f9f19d842a15f6b1de8e4376aaf33;hb=53ed4faac4fbc33d16a7db92689653009579cef0;hp=01d9413155aca36b1a1e2ecc453c458b4ad64bad;hpb=864f9b901d0afa8267f8d91de83ebca978fb3553;p=openflowplugin.git diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java index 01d9413155..58637d97be 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java @@ -8,9 +8,10 @@ package org.opendaylight.openflowplugin.test; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; @@ -19,13 +20,9 @@ import org.eclipse.osgi.framework.console.CommandProvider; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.controller.sal.binding.api.NotificationService; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6FlowLabel; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; 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.action.types.rev131112.action.action.ControllerActionCaseBuilder; @@ -89,7 +86,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; -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.inventory.rev130819.nodes.NodeBuilder; @@ -111,39 +107,30 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4MatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6MatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.node.error.service.rev140410.NodeErrorListener; -import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -//import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.M - +@SuppressWarnings("checkstyle:MethodName") public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static final Logger LOG = LoggerFactory.getLogger(OpenflowPluginBulkTransactionProvider.class); - private DataBroker dataBroker; + private final DataBroker dataBroker; private final BundleContext ctx; - private NodeBuilder testNode; - private ProviderContext pc; - private FlowBuilder testFlow; private final String originalFlowName = "Foo"; private final NodeErrorListener nodeErrorListener = new NodeErrorListenerLoggingImpl(); - private Registration listener1Reg; - private Registration listener2Reg; - private Node testNode12; - private final String originalGroupName = "Foo"; - private static NotificationService notificationService; + private final NotificationService notificationService; - public OpenflowPluginBulkTransactionProvider(BundleContext ctx) { + public OpenflowPluginBulkTransactionProvider(DataBroker dataBroker, NotificationService notificationService, + BundleContext ctx) { + this.dataBroker = dataBroker; + this.notificationService = notificationService; this.ctx = ctx; } - public void onSessionInitiated(ProviderContext session) { - pc = session; - notificationService = session.getSALService(NotificationService.class); - listener2Reg = notificationService.registerNotificationListener(nodeErrorListener); - dataBroker = session.getSALService(DataBroker.class); + public void init() { + notificationService.registerNotificationListener(nodeErrorListener); ctx.registerService(CommandProvider.class.getName(), this, null); createTestFlow(createTestNode(null), null, null); } @@ -152,21 +139,12 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { if (nodeId == null) { nodeId = OpenflowpluginTestActivator.NODE_ID; } - NodeRef nodeOne = createNodeRef(nodeId); NodeBuilder builder = new NodeBuilder(); builder.setId(new NodeId(nodeId)); - builder.setKey(new NodeKey(builder.getId())); - testNode = builder; + builder.withKey(new NodeKey(builder.getId())); return builder; } - private static NodeRef createNodeRef(String string) { - NodeKey key = new NodeKey(new NodeId(string)); - InstanceIdentifier path = InstanceIdentifier.create(Nodes.class).child(Node.class, key); - - return new NodeRef(path); - } - @Override public String getHelp() { return "No help"; @@ -413,7 +391,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { LOG.warn("flow type not understood: {}", flowType); } - FlowKey key = new FlowKey(new FlowId(Long.toString(id))); if (null == flow.isBarrier()) { flow.setBarrier(Boolean.FALSE); } @@ -435,18 +412,22 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // flow flow.setOutPort(outputPort); - flow.setKey(key); + FlowKey key = new FlowKey(new FlowId(Long.toString(id))); + flow.withKey(key); flow.setPriority(2); flow.setFlowName(originalFlowName + "X" + flowType); - testFlow = flow; return flow; } private short getTableId(String tableId) { short table = 2; + if (tableId == null) { + return table; + } + try { table = Short.parseShort(tableId); - } catch (Exception ex) { + } catch (NumberFormatException ex) { // ignore exception and continue with default value } @@ -454,14 +435,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { } - private void createTestNode() { - NodeRef nodeOne = createNodeRef(OpenflowpluginTestActivator.NODE_ID); - NodeBuilder builder = new NodeBuilder(); - builder.setId(new NodeId(OpenflowpluginTestActivator.NODE_ID)); - builder.setKey(new NodeKey(builder.getId())); - testNode12 = builder.build(); - } - public void _addFlows(CommandInterpreter ci) { NodeBuilder tn = createTestNode(ci.nextArgument()); String flowtype = ci.nextArgument(); @@ -516,7 +489,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { } private InstanceIdentifier nodeBuilderToInstanceId(NodeBuilder node) { - return InstanceIdentifier.create(Nodes.class).child(Node.class, node.getKey()); + return InstanceIdentifier.create(Nodes.class).child(Node.class, node.key()); } public void _modifyFlows(CommandInterpreter ci) { @@ -648,37 +621,39 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { tf2 = createTestFlow(tn, "f900", "9"); tf3 = createTestFlow(tn, "f1000", "10"); break; + default: + throw new IllegalArgumentException("Invalid flowtype: " + flowtype); } - InstanceIdentifier path1 = InstanceIdentifier.create(Nodes.class).child(Node.class, tn.getKey()) + InstanceIdentifier path1 = InstanceIdentifier.create(Nodes.class).child(Node.class, tn.key()) .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(tf.getTableId())) - .child(Flow.class, tf.getKey()); + .child(Flow.class, tf.key()); modification.delete(LogicalDatastoreType.OPERATIONAL, path1); modification.delete(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(tn)); modification.delete(LogicalDatastoreType.CONFIGURATION, path1); - InstanceIdentifier path2 = InstanceIdentifier.create(Nodes.class).child(Node.class, tn.getKey()) + InstanceIdentifier path2 = InstanceIdentifier.create(Nodes.class).child(Node.class, tn.key()) .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(tf1.getTableId())) - .child(Flow.class, tf1.getKey()); + .child(Flow.class, tf1.key()); modification.delete(LogicalDatastoreType.OPERATIONAL, path2); modification.delete(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(tn)); modification.delete(LogicalDatastoreType.CONFIGURATION, path2); - InstanceIdentifier path3 = InstanceIdentifier.create(Nodes.class).child(Node.class, tn.getKey()) + InstanceIdentifier path3 = InstanceIdentifier.create(Nodes.class).child(Node.class, tn.key()) .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(tf2.getTableId())) - .child(Flow.class, tf2.getKey()); + .child(Flow.class, tf2.key()); modification.delete(LogicalDatastoreType.OPERATIONAL, path3); modification.delete(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(tn)); modification.delete(LogicalDatastoreType.CONFIGURATION, path3); - InstanceIdentifier path4 = InstanceIdentifier.create(Nodes.class).child(Node.class, tn.getKey()) + InstanceIdentifier path4 = InstanceIdentifier.create(Nodes.class).child(Node.class, tn.key()) .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(tf3.getTableId())) - .child(Flow.class, tf3.getKey()); + .child(Flow.class, tf3.key()); modification.delete(LogicalDatastoreType.OPERATIONAL, path4); modification.delete(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(tn)); modification.delete(LogicalDatastoreType.CONFIGURATION, path4); - CheckedFuture commitFuture = modification.submit(); + ListenableFuture commitFuture = modification.submit(); Futures.addCallback(commitFuture, new FutureCallback() { @Override - public void onSuccess(Void aVoid) { + public void onSuccess(Void notUsed) { ci.println("Status of Group Data Loaded Transaction: success."); } @@ -687,7 +662,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { LOG.error(throwable.getMessage(), throwable); ci.println(String.format("Status of Group Data Loaded Transaction : failure. Reason : %s", throwable)); } - }); + }, MoreExecutors.directExecutor()); } @@ -695,39 +670,47 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { FlowBuilder flow3, NodeBuilder nodeBuilder) { ReadWriteTransaction modification = dataBroker.newReadWriteTransaction(); InstanceIdentifier path1 = InstanceIdentifier.create(Nodes.class) - .child(Node.class, nodeBuilder.getKey()).augmentation(FlowCapableNode.class) - .child(Table.class, new TableKey(flow.getTableId())).child(Flow.class, flow.getKey()); - modification.merge(LogicalDatastoreType.OPERATIONAL, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), true); + .child(Node.class, nodeBuilder.key()).augmentation(FlowCapableNode.class) + .child(Table.class, new TableKey(flow.getTableId())).child(Flow.class, flow.key()); + modification.merge(LogicalDatastoreType.OPERATIONAL, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), + true); modification.merge(LogicalDatastoreType.OPERATIONAL, path1, flow.build(), true); - modification.merge(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), true); + modification.merge(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(nodeBuilder), + nodeBuilder.build(), true); modification.merge(LogicalDatastoreType.CONFIGURATION, path1, flow.build(), true); InstanceIdentifier path2 = InstanceIdentifier.create(Nodes.class) - .child(Node.class, nodeBuilder.getKey()).augmentation(FlowCapableNode.class) - .child(Table.class, new TableKey(flow1.getTableId())).child(Flow.class, flow1.getKey()); - modification.merge(LogicalDatastoreType.OPERATIONAL, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), true); + .child(Node.class, nodeBuilder.key()).augmentation(FlowCapableNode.class) + .child(Table.class, new TableKey(flow1.getTableId())).child(Flow.class, flow1.key()); + modification.merge(LogicalDatastoreType.OPERATIONAL, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), + true); modification.merge(LogicalDatastoreType.OPERATIONAL, path2, flow1.build(), true); - modification.merge(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), true); + modification.merge(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(nodeBuilder), + nodeBuilder.build(), true); modification.merge(LogicalDatastoreType.CONFIGURATION, path2, flow1.build(), true); InstanceIdentifier path3 = InstanceIdentifier.create(Nodes.class) - .child(Node.class, nodeBuilder.getKey()).augmentation(FlowCapableNode.class) - .child(Table.class, new TableKey(flow2.getTableId())).child(Flow.class, flow2.getKey()); - modification.merge(LogicalDatastoreType.OPERATIONAL, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), true); + .child(Node.class, nodeBuilder.key()).augmentation(FlowCapableNode.class) + .child(Table.class, new TableKey(flow2.getTableId())).child(Flow.class, flow2.key()); + modification.merge(LogicalDatastoreType.OPERATIONAL, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), + true); modification.merge(LogicalDatastoreType.OPERATIONAL, path3, flow2.build(), true); - modification.merge(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), true); + modification.merge(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(nodeBuilder), + nodeBuilder.build(), true); modification.merge(LogicalDatastoreType.CONFIGURATION, path3, flow2.build(), true); InstanceIdentifier path4 = InstanceIdentifier.create(Nodes.class) - .child(Node.class, nodeBuilder.getKey()).augmentation(FlowCapableNode.class) - .child(Table.class, new TableKey(flow3.getTableId())).child(Flow.class, flow3.getKey()); - modification.merge(LogicalDatastoreType.OPERATIONAL, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), true); + .child(Node.class, nodeBuilder.key()).augmentation(FlowCapableNode.class) + .child(Table.class, new TableKey(flow3.getTableId())).child(Flow.class, flow3.key()); + modification.merge(LogicalDatastoreType.OPERATIONAL, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), + true); modification.merge(LogicalDatastoreType.OPERATIONAL, path4, flow3.build(), true); - modification.merge(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build(), true); + modification.merge(LogicalDatastoreType.CONFIGURATION, nodeBuilderToInstanceId(nodeBuilder), + nodeBuilder.build(), true); modification.merge(LogicalDatastoreType.CONFIGURATION, path4, flow3.build(), true); - CheckedFuture commitFuture = modification.submit(); + ListenableFuture commitFuture = modification.submit(); Futures.addCallback(commitFuture, new FutureCallback() { @Override - public void onSuccess(Void aVoid) { + public void onSuccess(Void notUsed) { ci.println("Status of Group Data Loaded Transaction: success."); } @@ -736,12 +719,9 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { LOG.error(throwable.getMessage(), throwable); ci.println(String.format("Status of Group Data Loaded Transaction : failure. Reason : %s", throwable)); } - }); + }, MoreExecutors.directExecutor()); } - /** - * @return - */ private static InstructionsBuilder createDecNwTtlInstructions() { DecNwTtlBuilder ta = new DecNwTtlBuilder(); DecNwTtl decNwTtl = ta.build(); @@ -749,7 +729,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { ab.setAction(new DecNwTtlCaseBuilder().setDecNwTtl(decNwTtl).build()); // Add our drop action to a list - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); actionList.add(ab.build()); // Create an Apply Action @@ -759,20 +739,17 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Wrap our Apply Action in an Instruction InstructionBuilder ib = new InstructionBuilder(); ib.setInstruction(new ApplyActionsCaseBuilder().setApplyActions(aab.build()).build()); - ib.setKey(new InstructionKey(0)); + ib.withKey(new InstructionKey(0)); ib.setOrder(0); // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; } - /** - * @return - */ private static InstructionsBuilder createMeterInstructions() { MeterBuilder aab = new MeterBuilder(); @@ -783,7 +760,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -799,7 +776,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -812,7 +789,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { ab.setAction(new DropActionCaseBuilder().setDropAction(dropAction).build()); // Add our drop action to a list - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); actionList.add(ab.build()); // Create an Apply Action @@ -825,7 +802,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -833,7 +810,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static InstructionsBuilder createAppyActionInstruction() { - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionBuilder ab = new ActionBuilder(); ControllerActionBuilder controller = new ControllerActionBuilder(); controller.setMaxLength(5); @@ -849,14 +826,13 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; } private static InstructionsBuilder createSentToControllerInstructions() { - List actionList = new ArrayList(); ActionBuilder ab = new ActionBuilder(); OutputActionBuilder output = new OutputActionBuilder(); @@ -865,7 +841,9 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { output.setOutputNodeConnector(value); ab.setAction(new OutputActionCaseBuilder().setOutputAction(output.build()).build()); ab.setOrder(0); - ab.setKey(new ActionKey(0)); + ab.withKey(new ActionKey(0)); + + List actionList = new ArrayList<>(); actionList.add(ab.build()); // Create an Apply Action ApplyActionsBuilder aab = new ApplyActionsBuilder(); @@ -875,11 +853,11 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { InstructionBuilder ib = new InstructionBuilder(); ib.setInstruction(new ApplyActionsCaseBuilder().setApplyActions(aab.build()).build()); ib.setOrder(0); - ib.setKey(new InstructionKey(0)); + ib.withKey(new InstructionKey(0)); // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -887,7 +865,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static InstructionsBuilder createAppyActionInstruction2() { - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionBuilder ab = new ActionBuilder(); PushMplsActionBuilder push = new PushMplsActionBuilder(); @@ -904,7 +882,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -912,7 +890,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static InstructionsBuilder createAppyActionInstruction3() { - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionBuilder ab = new ActionBuilder(); PushPbbActionBuilder pbb = new PushPbbActionBuilder(); @@ -929,7 +907,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -937,7 +915,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static InstructionsBuilder createAppyActionInstruction6() { - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionBuilder ab = new ActionBuilder(); SetDlSrcActionBuilder src = new SetDlSrcActionBuilder(); @@ -955,7 +933,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -963,12 +941,12 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static InstructionsBuilder createAppyActionInstruction7() { - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionBuilder ab = new ActionBuilder(); SetVlanIdActionBuilder vl = new SetVlanIdActionBuilder(); - VlanId a = new VlanId(4012); - vl.setVlanId(a); + VlanId vlanId = new VlanId(4012); + vl.setVlanId(vlanId); ab.setAction(new SetVlanIdActionCaseBuilder().setSetVlanIdAction(vl.build()).build()); actionList.add(ab.build()); // Create an Apply Action @@ -981,7 +959,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -989,7 +967,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static InstructionsBuilder createAppyActionInstruction8() { - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionBuilder ab = new ActionBuilder(); SetVlanPcpActionBuilder pcp = new SetVlanPcpActionBuilder(); @@ -1007,7 +985,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -1015,7 +993,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static InstructionsBuilder createAppyActionInstruction9() { - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionBuilder ab = new ActionBuilder(); CopyTtlInBuilder ttlin = new CopyTtlInBuilder(); @@ -1031,21 +1009,21 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; } private static InstructionsBuilder createAppyActionInstruction16() { - - List actionList = new ArrayList(); ActionBuilder ab = new ActionBuilder(); GroupActionBuilder groupActionB = new GroupActionBuilder(); groupActionB.setGroupId(1L); groupActionB.setGroup("0"); ab.setAction(new GroupActionCaseBuilder().setGroupAction(groupActionB.build()).build()); + + List actionList = new ArrayList<>(); actionList.add(ab.build()); // Create an Apply Action @@ -1058,7 +1036,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -1066,7 +1044,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static InstructionsBuilder createAppyActionInstruction160() { - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionBuilder ab = new ActionBuilder(); FloodAllActionBuilder fldall = new FloodAllActionBuilder(); @@ -1082,15 +1060,13 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; } private static InstructionsBuilder createAppyActionInstruction26() { - - List actionList = new ArrayList(); ActionBuilder ab = new ActionBuilder(); SetNwDstActionBuilder setNwDstActionBuilder = new SetNwDstActionBuilder(); @@ -1099,6 +1075,8 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { ipdst.setIpv4Address(prefixdst); setNwDstActionBuilder.setAddress(ipdst.build()); ab.setAction(new SetNwDstActionCaseBuilder().setSetNwDstAction(setNwDstActionBuilder.build()).build()); + + List actionList = new ArrayList<>(); actionList.add(ab.build()); // Create an Apply Action @@ -1111,15 +1089,13 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; } private static InstructionsBuilder createAppyActionInstruction27() { - - List actionList = new ArrayList(); ActionBuilder ab = new ActionBuilder(); SetNwSrcActionBuilder setNwsrcActionBuilder = new SetNwSrcActionBuilder(); @@ -1128,6 +1104,8 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { ipsrc.setIpv4Address(prefixsrc); setNwsrcActionBuilder.setAddress(ipsrc.build()); ab.setAction(new SetNwSrcActionCaseBuilder().setSetNwSrcAction(setNwsrcActionBuilder.build()).build()); + + List actionList = new ArrayList<>(); actionList.add(ab.build()); // Create an Apply Action @@ -1140,7 +1118,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -1148,7 +1126,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static InstructionsBuilder createAppyActionInstruction28() { - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionBuilder ab = new ActionBuilder(); SetNwTosActionBuilder setNwTosActionBuilder = new SetNwTosActionBuilder(); @@ -1165,7 +1143,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -1173,7 +1151,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { private static InstructionsBuilder createAppyActionInstruction34() { - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionBuilder ab = new ActionBuilder(); SwPathActionBuilder swPathAction = new SwPathActionBuilder(); @@ -1190,7 +1168,7 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // Put our Instruction in a list of Instructions InstructionsBuilder isb = new InstructionsBuilder(); - List instructions = new ArrayList(); + List instructions = new ArrayList<>(); instructions.add(ib.build()); isb.setInstruction(instructions); return isb; @@ -1206,9 +1184,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { return match; } - /** - * @return - */ private static MatchBuilder createMatch1() { MatchBuilder match = new MatchBuilder(); Ipv4MatchBuilder ipv4Match = new Ipv4MatchBuilder(); @@ -1241,9 +1216,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { return match; } - /** - * @return - */ private static MatchBuilder createMatch2() { MatchBuilder match = new MatchBuilder(); Ipv4MatchBuilder ipv4Match = new Ipv4MatchBuilder(); @@ -1260,9 +1232,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { return match; } - /** - * @return - */ private static MatchBuilder createMatch3() { MatchBuilder match = new MatchBuilder(); EthernetMatchBuilder ethernetMatch = new EthernetMatchBuilder(); @@ -1274,23 +1243,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { return match; } - private static MatchBuilder createMatch33() { - - MatchBuilder match = new MatchBuilder(); - Ipv4MatchBuilder ipv4Match = new Ipv4MatchBuilder(); - Ipv4Prefix prefix = new Ipv4Prefix("10.0.0.10"); - ipv4Match.setIpv4Source(prefix); - Ipv4Match i4m = ipv4Match.build(); - match.setLayer3Match(i4m); - - EthernetMatchBuilder eth = new EthernetMatchBuilder(); - EthernetTypeBuilder ethTypeBuilder = new EthernetTypeBuilder(); - ethTypeBuilder.setType(new EtherType(0xfffeL)); - eth.setEthernetType(ethTypeBuilder.build()); - match.setEthernetMatch(eth.build()); - return match; - } - private static MatchBuilder createInphyportMatch(NodeId nodeId) { MatchBuilder match = new MatchBuilder(); match.setInPort(new NodeConnectorId(nodeId + ":202")); @@ -1299,11 +1251,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { } private static MatchBuilder createEthernetMatch() { - MatchBuilder match = new MatchBuilder(); - - byte[] mask1 = new byte[]{(byte) -1, (byte) -1, 0, 0, 0, 0}; - byte[] mask2 = new byte[]{(byte) -1, (byte) -1, (byte) -1, 0, 0, 0}; - EthernetMatchBuilder ethmatch = new EthernetMatchBuilder(); // ethernettype // match EthernetTypeBuilder ethtype = new EthernetTypeBuilder(); @@ -1325,14 +1272,13 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // ethsrc.setMask(mask2); ethmatch.setEthernetSource(ethsrc.build()); + + MatchBuilder match = new MatchBuilder(); match.setEthernetMatch(ethmatch.build()); return match; } - /** - * @return - */ private static MatchBuilder createL3IPv6Match() { MatchBuilder match = new MatchBuilder(); @@ -1342,11 +1288,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { eth.setEthernetType(ethTypeBuilder.build()); match.setEthernetMatch(eth.build()); - Ipv6Prefix dstip6 = new Ipv6Prefix("2002::2/64"); - Ipv6Prefix srcip6 = new Ipv6Prefix("2001:0:0:0:0:0:0:1/56"); - Ipv6Address ndtarget = new Ipv6Address("2001:db8:0:1:fd97:f9f0:a810:782e"); - MacAddress ndsll = new MacAddress("c2:00:54:f5:00:00"); - MacAddress ndtll = new MacAddress("00:0c:29:0e:4c:67"); Ipv6ExtHeaderBuilder nextheader = new Ipv6ExtHeaderBuilder(); nextheader.setIpv6Exthdr(58); Ipv6LabelBuilder ipv6label = new Ipv6LabelBuilder(); @@ -1364,8 +1305,9 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { // ipv6match.setIpv6Source(srcip6); // ipv6match.setIpv6Destination(dstip6); // ipv6match.setIpv6ExtHeader(nextheader.build()); - ipv6match.setIpv6NdSll(ndsll); - ipv6match.setIpv6NdTll(ndtll); + + ipv6match.setIpv6NdSll(new MacAddress("c2:00:54:f5:00:00")); + ipv6match.setIpv6NdTll(new MacAddress("00:0c:29:0e:4c:67")); // ipv6match.setIpv6NdTarget(ndtarget); ipv6match.setIpv6Label(ipv6label.build()); @@ -1374,9 +1316,6 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { return match; } - /** - * @return - */ private static MatchBuilder createICMPv6Match() { MatchBuilder match = new MatchBuilder(); @@ -1399,12 +1338,8 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { return match; } - /** - * @return - */ private static MatchBuilder createMetadataMatch() { MatchBuilder match = new MatchBuilder(); - byte[] metamask = new byte[]{(byte) -1, (byte) -1, (byte) -1, 0, 0, 0, (byte) 1, (byte) 1}; MetadataBuilder metadata = new MetadataBuilder(); // metadata match metadata.setMetadata(BigInteger.valueOf(500L)); // metadata.setMetadataMask(metamask); @@ -1412,5 +1347,4 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider { return match; } - }