Modify MPLS/VLAN query
- ONOS-3507 VlanQuery to return available VLAN IDs
- ONOS-3508 MplsQuery to return available MPLS Labels
- Advertise that VLAN and MPLS resources are available on OVS
Change-Id: I74cd05393c8919b4823d0666348008adb93c9290
diff --git a/drivers/src/main/java/org/onosproject/driver/query/FullMplsAvailable.java b/drivers/src/main/java/org/onosproject/driver/query/FullMplsAvailable.java
new file mode 100644
index 0000000..efe1912
--- /dev/null
+++ b/drivers/src/main/java/org/onosproject/driver/query/FullMplsAvailable.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015 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.driver.query;
+
+import java.util.Set;
+import java.util.stream.IntStream;
+
+import org.onlab.packet.MplsLabel;
+import org.onlab.util.GuavaCollectors;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.behaviour.MplsQuery;
+import org.onosproject.net.driver.AbstractHandlerBehaviour;
+
+/**
+ * Driver which always responds that all MPLS Labels are available for the Device.
+ */
+public class FullMplsAvailable
+ extends AbstractHandlerBehaviour
+ implements MplsQuery {
+
+ // Ref: http://www.iana.org/assignments/mpls-label-values/mpls-label-values.xhtml
+ // Smallest non-reserved MPLS label
+ private static final int MIN_UNRESERVED_LABEL = 0x10;
+ // Max non-reserved MPLS label = 239
+ private static final int MAX_UNRESERVED_LABEL = 0xEF;
+ private static final Set<MplsLabel> ENTIRE_MPLS_LABELS = getEntireMplsLabels();
+
+
+ @Override
+ public Set<MplsLabel> queryMplsLabels(PortNumber port) {
+ return ENTIRE_MPLS_LABELS;
+ }
+
+ private static Set<MplsLabel> getEntireMplsLabels() {
+ return IntStream.range(MIN_UNRESERVED_LABEL, MAX_UNRESERVED_LABEL + 1)
+ .mapToObj(MplsLabel::mplsLabel)
+ .collect(GuavaCollectors.toImmutableSet());
+ }
+
+}
diff --git a/drivers/src/main/java/org/onosproject/driver/query/FullVlanAvailable.java b/drivers/src/main/java/org/onosproject/driver/query/FullVlanAvailable.java
new file mode 100644
index 0000000..292192a
--- /dev/null
+++ b/drivers/src/main/java/org/onosproject/driver/query/FullVlanAvailable.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015 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.driver.query;
+
+import java.util.Set;
+import java.util.stream.IntStream;
+
+import org.onlab.packet.VlanId;
+import org.onlab.util.GuavaCollectors;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.behaviour.VlanQuery;
+import org.onosproject.net.driver.AbstractHandlerBehaviour;
+
+import com.google.common.annotations.Beta;
+
+/**
+ * Driver which always responds that all VLAN IDs are available for the Device.
+ */
+@Beta
+public class FullVlanAvailable
+ extends AbstractHandlerBehaviour
+ implements VlanQuery {
+
+ private static final int MAX_VLAN_ID = VlanId.MAX_VLAN;
+ private static final Set<VlanId> ENTIRE_VLAN = getEntireVlans();
+
+ @Override
+ public Set<VlanId> queryVlanIds(PortNumber port) {
+ return ENTIRE_VLAN;
+ }
+
+ private static Set<VlanId> getEntireVlans() {
+ return IntStream.range(0, MAX_VLAN_ID)
+ .mapToObj(x -> VlanId.vlanId((short) x))
+ .collect(GuavaCollectors.toImmutableSet());
+ }
+
+}
diff --git a/drivers/src/main/java/org/onosproject/driver/query/package-info.java b/drivers/src/main/java/org/onosproject/driver/query/package-info.java
new file mode 100644
index 0000000..643192b
--- /dev/null
+++ b/drivers/src/main/java/org/onosproject/driver/query/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2015 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.
+ */
+
+/**
+ * Implementations of the query driver behaviours.
+ */
+package org.onosproject.driver.query;