Using nonNull API's in ELAN

[netvirt.git] / elanmanager / impl / src / test / java / org / opendaylight / netvirt / elanmanager / tests / ElanServiceTestBase.java

diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java
index 6ca6dba0b40538cdc46806f8b373be5eb985572b..01c423f0f14f5a8dde6c23e605f4bd90f1bbdc0b 100644 (file)
--- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java
+++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java
@@ -287,7 +287,7 @@ public class ElanServiceTestBase {
         Instructions instructions = flowBuilder.getInstructions();
         InstructionsBuilder builder = new InstructionsBuilder();
         InstructionBuilder instructionBuilder = new InstructionBuilder(
-                new ArrayList<Instruction>(instructions.getInstruction().values()).get(0));
+                new ArrayList<Instruction>(instructions.nonnullInstruction().values()).get(0));
         instructionBuilder.setInstruction(sortActions(instructionBuilder.getInstruction()));
         builder.setInstruction(Lists.newArrayList(instructionBuilder.build()));
         return flowBuilder.setInstructions(builder.build()).build();
@@ -297,7 +297,7 @@ public class ElanServiceTestBase {
         sortActions(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction input) {
         if (input instanceof  ApplyActionsCase) {
             List<Action> action = new ArrayList<Action>(((ApplyActionsCase)input)
-                    .getApplyActions().getAction().values());
+                    .getApplyActions().nonnullAction().values());
             action.sort(Comparator.comparing(Ordered::getOrder));
 
             ApplyActions actions = new ApplyActionsBuilder().setAction(action).build();