Refactor UPF entities to have consistent naming and string representations
Also, add slice ID into applications and interfaces entities
Change-Id: I159bcf04af1504b4e5c7210aa1402218fae3eb8f
(cherry picked from commit de1f1f7806716ac6e368e55eaf0b887ab89530d4)
diff --git a/core/api/src/main/java/org/onosproject/net/behaviour/upf/UpfTerminationDownlink.java b/core/api/src/main/java/org/onosproject/net/behaviour/upf/UpfTerminationDownlink.java
index cbb601b..edab0ac 100644
--- a/core/api/src/main/java/org/onosproject/net/behaviour/upf/UpfTerminationDownlink.java
+++ b/core/api/src/main/java/org/onosproject/net/behaviour/upf/UpfTerminationDownlink.java
@@ -153,7 +153,7 @@
@Override
public String toString() {
- return "TerminationDL{" + matchString() + " -> " + actionString() + "}";
+ return "UpfTerminationDL(" + matchString() + " -> " + actionString() + ")";
}
private String matchString() {
@@ -165,11 +165,11 @@
if (this.needsDropping()) {
fwd = "DROP";
}
- return "(" + fwd +
- ", TEID=" + this.teid() +
- ", CTR_ID=" + this.counterId() +
- ", QFI=" + this.qfi() +
- ", TC=" + this.trafficClass() +
+ return "Action(" + fwd +
+ ", teid=" + this.teid() +
+ ", ctr_id=" + this.counterId() +
+ ", qfi=" + this.qfi() +
+ ", tc=" + this.trafficClass() +
")";
}