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/api/src/main/java/org/onosproject/net/flow/instructions/PiInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/PiInstruction.java
index 180a521..87542bd 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/PiInstruction.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/PiInstruction.java
@@ -19,8 +19,8 @@
import com.google.common.annotations.Beta;
import com.google.common.base.Objects;
-import org.onosproject.net.pi.runtime.PiActionGroupId;
-import org.onosproject.net.pi.runtime.PiActionGroupMemberId;
+import org.onosproject.net.pi.runtime.PiActionProfileGroupId;
+import org.onosproject.net.pi.runtime.PiActionProfileMemberId;
import org.onosproject.net.pi.runtime.PiTableAction;
/**
@@ -74,10 +74,10 @@
@Override
public String toString() {
switch (tableAction.type()) {
- case ACTION_GROUP_ID:
- return "GROUP:0x" + Integer.toHexString(((PiActionGroupId) tableAction).id());
- case GROUP_MEMBER_ID:
- return "GROUP_MEMBER:0x" + Integer.toHexString(((PiActionGroupMemberId) tableAction).id());
+ case ACTION_PROFILE_GROUP_ID:
+ return "GROUP:0x" + Integer.toHexString(((PiActionProfileGroupId) tableAction).id());
+ case ACTION_PROFILE_MEMBER_ID:
+ return "GROUP_MEMBER:0x" + Integer.toHexString(((PiActionProfileMemberId) tableAction).id());
default:
return tableAction.toString();
}