ONOS-7887 Rename action profile-related entities
Members can exist outside of a group. Previous naming was ambiguous
about this.
Action group -> action profile group
Action group member -> action profile member
Change-Id: I5097e92253353d355b864e689f9653df2d318230
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
index 6753fae..2730c38 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
@@ -29,7 +29,6 @@
import org.onlab.util.HexString;
import org.onlab.util.ImmutableByteSequence;
import org.onosproject.codec.CodecContext;
-import org.onosproject.net.flow.ExtensionTreatmentCodec;
import org.onosproject.core.GroupId;
import org.onosproject.net.ChannelSpacing;
import org.onosproject.net.Device;
@@ -39,6 +38,7 @@
import org.onosproject.net.OduSignalId;
import org.onosproject.net.PortNumber;
import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.flow.ExtensionTreatmentCodec;
import org.onosproject.net.flow.StatTriggerField;
import org.onosproject.net.flow.StatTriggerFlag;
import org.onosproject.net.flow.instructions.ExtensionTreatment;
@@ -53,9 +53,9 @@
import org.onosproject.net.pi.model.PiActionId;
import org.onosproject.net.pi.model.PiActionParamId;
import org.onosproject.net.pi.runtime.PiAction;
-import org.onosproject.net.pi.runtime.PiActionGroupId;
-import org.onosproject.net.pi.runtime.PiActionGroupMemberId;
import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.net.pi.runtime.PiActionProfileGroupId;
+import org.onosproject.net.pi.runtime.PiActionProfileMemberId;
import org.onosproject.net.pi.runtime.PiTableAction;
import org.slf4j.Logger;
@@ -306,18 +306,18 @@
}
return Instructions.piTableAction(builder.withId(piActionId).build());
- } else if (subType.equals(PiTableAction.Type.ACTION_GROUP_ID.name())) {
- PiActionGroupId piActionGroupId = PiActionGroupId.of(nullIsIllegal(
- json.get(InstructionCodec.PI_ACTION_GROUP_ID),
- InstructionCodec.PI_ACTION_GROUP_ID + InstructionCodec.MISSING_MEMBER_MESSAGE).asInt());
+ } else if (subType.equals(PiTableAction.Type.ACTION_PROFILE_GROUP_ID.name())) {
+ PiActionProfileGroupId piActionGroupId = PiActionProfileGroupId.of(nullIsIllegal(
+ json.get(InstructionCodec.PI_ACTION_PROFILE_GROUP_ID),
+ InstructionCodec.PI_ACTION_PROFILE_GROUP_ID + InstructionCodec.MISSING_MEMBER_MESSAGE).asInt());
return Instructions.piTableAction(piActionGroupId);
- } else if (subType.equals(PiTableAction.Type.GROUP_MEMBER_ID.name())) {
- PiActionGroupMemberId piActionGroupMemberId = PiActionGroupMemberId.of(nullIsIllegal(
- json.get(InstructionCodec.PI_ACTION_GROUP_MEMBER_ID),
- InstructionCodec.PI_ACTION_GROUP_MEMBER_ID + InstructionCodec.MISSING_MEMBER_MESSAGE).asInt());
+ } else if (subType.equals(PiTableAction.Type.ACTION_PROFILE_MEMBER_ID.name())) {
+ PiActionProfileMemberId piActionProfileMemberId = PiActionProfileMemberId.of(nullIsIllegal(
+ json.get(InstructionCodec.PI_ACTION_PROFILE_MEMBER_ID),
+ InstructionCodec.PI_ACTION_PROFILE_MEMBER_ID + InstructionCodec.MISSING_MEMBER_MESSAGE).asInt());
- return Instructions.piTableAction(piActionGroupMemberId);
+ return Instructions.piTableAction(piActionProfileMemberId);
}
throw new IllegalArgumentException("Protocol-independent Instruction subtype "
+ subType + " is not supported");
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
index 7e2f2df..0f3c125 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
@@ -20,12 +20,12 @@
import org.onlab.osgi.ServiceDirectory;
import org.onlab.util.HexString;
import org.onosproject.codec.CodecContext;
-import org.onosproject.net.flow.ExtensionTreatmentCodec;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.OchSignal;
import org.onosproject.net.OduSignalId;
import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.flow.ExtensionTreatmentCodec;
import org.onosproject.net.flow.instructions.Instruction;
import org.onosproject.net.flow.instructions.Instructions;
import org.onosproject.net.flow.instructions.L0ModificationInstruction;
@@ -35,9 +35,9 @@
import org.onosproject.net.flow.instructions.L4ModificationInstruction;
import org.onosproject.net.flow.instructions.PiInstruction;
import org.onosproject.net.pi.runtime.PiAction;
-import org.onosproject.net.pi.runtime.PiActionGroupId;
-import org.onosproject.net.pi.runtime.PiActionGroupMemberId;
import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.net.pi.runtime.PiActionProfileGroupId;
+import org.onosproject.net.pi.runtime.PiActionProfileMemberId;
import org.slf4j.Logger;
import static org.onlab.util.Tools.toHexWithPrefix;
@@ -264,13 +264,13 @@
}
result.set(InstructionCodec.PI_ACTION_PARAMS, jsonActionParams);
break;
- case ACTION_GROUP_ID:
- final PiActionGroupId piActionGroupId = (PiActionGroupId) piInstruction.action();
- result.put(InstructionCodec.PI_ACTION_GROUP_ID, piActionGroupId.id());
+ case ACTION_PROFILE_GROUP_ID:
+ final PiActionProfileGroupId groupId = (PiActionProfileGroupId) piInstruction.action();
+ result.put(InstructionCodec.PI_ACTION_PROFILE_GROUP_ID, groupId.id());
break;
- case GROUP_MEMBER_ID:
- final PiActionGroupMemberId piActionGroupMemberId = (PiActionGroupMemberId) piInstruction.action();
- result.put(InstructionCodec.PI_ACTION_GROUP_MEMBER_ID, piActionGroupMemberId.id());
+ case ACTION_PROFILE_MEMBER_ID:
+ final PiActionProfileMemberId memberId = (PiActionProfileMemberId) piInstruction.action();
+ result.put(InstructionCodec.PI_ACTION_PROFILE_MEMBER_ID, memberId.id());
break;
default:
throw new IllegalArgumentException("Cannot convert protocol-independent subtype of" +
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
index 75192a0..df7ff1c 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
@@ -66,8 +66,8 @@
static final String STAT_DURATION = "duration";
static final String PI_ACTION_ID = "actionId";
- static final String PI_ACTION_GROUP_ID = "groupId";
- static final String PI_ACTION_GROUP_MEMBER_ID = "memberId";
+ static final String PI_ACTION_PROFILE_GROUP_ID = "groupId";
+ static final String PI_ACTION_PROFILE_MEMBER_ID = "memberId";
static final String PI_ACTION_PARAMS = "actionParams";
static final String MISSING_MEMBER_MESSAGE =