Fix ARP Responder Actions

Fixes bug 1980

Change-Id: Iac673f7022b4059399b93e21ed4d1ce73d4ff99d
Signed-off-by: Dave Tucker <djt@redhat.com>

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderService.java
index afdbd48af82ffdc9d4783eb5a5424cc1682a8569..9543a567f654fbeb0275f0684a1310516f70b861 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderService.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ArpResponderService.java
@@ -72,7 +72,7 @@ public class ArpResponderService extends AbstractServiceInstance implements ArpP
         MatchUtils.createEtherTypeMatch(matchBuilder, new EtherType(Constants.ARP_ETHERTYPE));
 
         // Move Eth Src to Eth Dst
-        InstructionUtils.applyActionIns(ActionUtils.nxMoveEthSrcToEthDstAction());
+        ib.setInstruction(InstructionUtils.applyActionIns(ActionUtils.nxMoveEthSrcToEthDstAction()));
         ib.setOrder(0);
         ib.setKey(new InstructionKey(0));
         instructions.add(ib.build());
@@ -84,37 +84,37 @@ public class ArpResponderService extends AbstractServiceInstance implements ArpP
         instructions.add(ib.build());
 
         // Set ARP OP
-        InstructionUtils.applyActionIns(ActionUtils.nxLoadArpOpAction(BigInteger.valueOf(0x02L)));
+        ib.setInstruction(InstructionUtils.applyActionIns(ActionUtils.nxLoadArpOpAction(BigInteger.valueOf(0x02L))));
         ib.setOrder(2);
         ib.setKey(new InstructionKey(2));
         instructions.add(ib.build());
 
         // Move ARP SHA to ARP THA
-        InstructionUtils.applyActionIns(ActionUtils.nxMoveArpShaToArpThaAction());
+        ib.setInstruction(InstructionUtils.applyActionIns(ActionUtils.nxMoveArpShaToArpThaAction()));
         ib.setOrder(3);
         ib.setKey(new InstructionKey(3));
         instructions.add(ib.build());
 
         // Move ARP SPA to ARP TPA
-        InstructionUtils.applyActionIns(ActionUtils.nxMoveArpSpaToArpTpaAction());
+        ib.setInstruction(InstructionUtils.applyActionIns(ActionUtils.nxMoveArpSpaToArpTpaAction()));
         ib.setOrder(4);
         ib.setKey(new InstructionKey(4));
         instructions.add(ib.build());
 
         // Load Mac to ARP SHA
-        InstructionUtils.applyActionIns(ActionUtils.nxLoadArpShaAction(new BigInteger(macAddress)));
+        ib.setInstruction(InstructionUtils.applyActionIns(ActionUtils.nxLoadArpShaAction(new BigInteger(macAddress))));
         ib.setOrder(5);
         ib.setKey(new InstructionKey(5));
         instructions.add(ib.build());
 
         // Load IP to ARP SPA
-        InstructionUtils.applyActionIns(ActionUtils.nxLoadArpSpaAction(ipAddress.getHostAddress()));
+        ib.setInstruction(InstructionUtils.applyActionIns(ActionUtils.nxLoadArpSpaAction(ipAddress.getHostAddress())));
         ib.setOrder(6);
         ib.setKey(new InstructionKey(6));
         instructions.add(ib.build());
 
         // Output of InPort
-        InstructionUtils.applyActionIns(ActionUtils.outputAction(new NodeConnectorId(nodeName + ":INPORT")));
+        ib.setInstruction(InstructionUtils.applyActionIns(ActionUtils.outputAction(new NodeConnectorId(nodeName + ":INPORT"))));
         ib.setOrder(7);
         ib.setKey(new InstructionKey(7));
         instructions.add(ib.build());