[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/device/FilteredAnnotation.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/FilteredAnnotation.java
new file mode 100644
index 0000000..915e441
--- /dev/null
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/FilteredAnnotation.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.net.optical.device;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.onosproject.net.Annotations;
+
+import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+
+/**
+ * Filtered {@link Annotations} view.
+ */
+@Beta
+public class FilteredAnnotation implements Annotations {
+
+ private final Annotations delegate;
+ private final Set<String> filtered;
+
+ /**
+ * Creates filtered {@link Annotations} view based on {@code delegate}.
+ *
+ * @param delegate input {@link Annotations}
+ * @param keys to filter-out
+ */
+ public FilteredAnnotation(Annotations delegate, Set<String> keys) {
+ this.delegate = checkNotNull(delegate);
+ this.filtered = ImmutableSet.copyOf(keys);
+ }
+
+ @Override
+ public String value(String key) {
+ if (filtered.contains(key)) {
+ return null;
+ }
+ return delegate.value(key);
+ }
+
+ @Override
+ public Set<String> keys() {
+ return Sets.difference(delegate.keys(), filtered);
+ }
+
+ @Override
+ public String toString() {
+ Map<String, String> mapView = new HashMap<>();
+ keys().forEach(key -> mapView.put(key, delegate.value(key)));
+ return mapView.toString();
+ }
+}
diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java
index 50dc98c..20bcb25 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java
@@ -38,6 +38,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableSet;
/**
* OCh port related helpers.
@@ -151,6 +152,16 @@
}
}
+ /**
+ * Returns {@link Annotations} not used by the port type projection.
+ *
+ * @param input {@link Annotations}
+ * @return filtered view of given {@link Annotations}
+ */
+ public static Annotations stripHandledAnnotations(Annotations input) {
+ return new FilteredAnnotation(input, ImmutableSet.of(SIGNAL_TYPE, TUNABLE, LAMBDA));
+ }
+
// not meant to be instantiated
private OchPortHelper() {}
}
diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OduCltPortHelper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OduCltPortHelper.java
index efda401..380b8fe 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OduCltPortHelper.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OduCltPortHelper.java
@@ -33,6 +33,7 @@
import org.slf4j.Logger;
import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableSet;
/**
* ODU client port related helpers.
@@ -122,6 +123,16 @@
}
}
+ /**
+ * Returns {@link Annotations} not used by the port type projection.
+ *
+ * @param input {@link Annotations}
+ * @return filtered view of given {@link Annotations}
+ */
+ public static Annotations stripHandledAnnotations(Annotations input) {
+ return new FilteredAnnotation(input, ImmutableSet.of(SIGNAL_TYPE));
+ }
+
// not meant to be instantiated
private OduCltPortHelper() {}
}
diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OmsPortHelper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OmsPortHelper.java
index 2c99c53..f0d878d 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OmsPortHelper.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OmsPortHelper.java
@@ -33,6 +33,7 @@
import org.slf4j.Logger;
import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableSet;
/**
* OMS port related helpers.
@@ -142,6 +143,16 @@
}
}
+ /**
+ * Returns {@link Annotations} not used by the port type projection.
+ *
+ * @param input {@link Annotations}
+ * @return filtered view of given {@link Annotations}
+ */
+ public static Annotations stripHandledAnnotations(Annotations input) {
+ return new FilteredAnnotation(input, ImmutableSet.of(MIN_FREQ_HZ, MAX_FREQ_HZ, GRID_HZ));
+ }
+
// not meant to be instantiated
private OmsPortHelper() {}
}
diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OtuPortHelper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OtuPortHelper.java
index aeac4f9..968dd6b 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OtuPortHelper.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OtuPortHelper.java
@@ -33,6 +33,7 @@
import org.slf4j.Logger;
import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableSet;
/**
* OTU port related helpers.
@@ -122,6 +123,15 @@
}
}
+ /**
+ * Returns {@link Annotations} not used by the port type projection.
+ *
+ * @param input {@link Annotations}
+ * @return filtered view of given {@link Annotations}
+ */
+ public static Annotations stripHandledAnnotations(Annotations input) {
+ return new FilteredAnnotation(input, ImmutableSet.of(SIGNAL_TYPE));
+ }
// not meant to be instantiated
private OtuPortHelper() {}