diff --git a/src/main/java/net/floodlightcontroller/util/InstructionUtils.java b/src/main/java/net/floodlightcontroller/util/InstructionUtils.java index 013c87d36073f4b7d8f189822f4779a39d0d1882..d17864efdbbfeb7fd8108cd4dba07b82cf140ce8 100644 --- a/src/main/java/net/floodlightcontroller/util/InstructionUtils.java +++ b/src/main/java/net/floodlightcontroller/util/InstructionUtils.java @@ -3,6 +3,8 @@ package net.floodlightcontroller.util; import java.util.ArrayList; import java.util.List; +import net.floodlightcontroller.staticflowentry.HeaderFieldsException; + import org.projectfloodlight.openflow.protocol.OFFactories; import org.projectfloodlight.openflow.protocol.OFFlowMod; import org.projectfloodlight.openflow.protocol.instruction.OFInstruction; @@ -29,12 +31,12 @@ import sun.reflect.generics.reflectiveObjects.NotImplementedException; */ public class InstructionUtils { public static final String STR_GOTO_TABLE = "goto_table"; - public static final String STR_WRITE_METADATA = "instruction_write_metadata"; - public static final String STR_WRITE_ACTIONS = "instruction_write_actions"; - public static final String STR_APPLY_ACTIONS = "instruction_apply_actions"; - public static final String STR_CLEAR_ACTIONS = "instruction_clear_actions"; - public static final String STR_GOTO_METER = "instruction_goto_meter"; - public static final String STR_EXPERIMENTER = "instruction_experimenter"; + public static final String STR_WRITE_METADATA = "write_metadata"; + public static final String STR_WRITE_ACTIONS = "write_actions"; + public static final String STR_APPLY_ACTIONS = "apply_actions"; + public static final String STR_CLEAR_ACTIONS = "clear_actions"; + public static final String STR_GOTO_METER = "goto_meter"; + public static final String STR_EXPERIMENTER = "experimenter"; private static final String STR_SUB_WRITE_METADATA_METADATA = "metadata"; private static final String STR_SUB_WRITE_METADATA_MASK = "mask"; @@ -169,7 +171,7 @@ public class InstructionUtils { * @param log * @return */ - public static String writeActionsToString(OFInstructionWriteActions inst, Logger log) { + public static String writeActionsToString(OFInstructionWriteActions inst, Logger log) throws HeaderFieldsException { return ActionUtils.actionsToString(inst.getActions(), log); } @@ -200,8 +202,8 @@ public class InstructionUtils { * @param log * @return */ - public static String applyActionsToString(OFInstructionApplyActions inst, Logger log) { - return ActionUtils.actionsToString(inst.getActions(), log); + public static String applyActionsToString(OFInstructionApplyActions inst, Logger log) throws HeaderFieldsException{ + return ActionUtils.actionsToString(inst.getActions(), log); } /**