[ONOS-4513] decouple optical-model from CLI
- core/cli is now optical-model clean
- Add command for pretty printing optical-ports
Change-Id: I2926ef6d52971d1a7f6642dfe4098d7ed2422363
diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java
index 2c038c8..7db003d 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOtuPort.java
@@ -16,9 +16,11 @@
package org.onosproject.net.optical.impl;
import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onosproject.net.optical.device.OtuPortHelper.stripHandledAnnotations;
import java.util.Objects;
+import org.onosproject.net.Annotations;
import org.onosproject.net.OtuSignalType;
import org.onosproject.net.Port;
import org.onosproject.net.optical.OtuPort;
@@ -57,6 +59,11 @@
// }
@Override
+ public Annotations unhandledAnnotations() {
+ return stripHandledAnnotations(super.annotations());
+ }
+
+ @Override
public OtuSignalType signalType() {
return signalType;
}
@@ -86,6 +93,7 @@
public String toString() {
return super.toStringHelper()
.add("signalType", signalType())
+ .add("annotations", unhandledAnnotations())
.toString();
}