flow specification.
Change-Id: Iacb8eae8fe7cce769a019ecffa6073c015ff80d1
diff --git a/drivers/flowspec/BUCK b/drivers/flowspec/BUCK
new file mode 100644
index 0000000..c62d3a3
--- /dev/null
+++ b/drivers/flowspec/BUCK
@@ -0,0 +1,26 @@
+COMPILE_DEPS = [
+ '//lib:CORE_DEPS',
+ '//drivers/default:onos-drivers-default',
+ '//apps/flowspec-api/flowapi:onos-apps-flowspec-api-flowapi',
+]
+
+TEST_DEPS = [
+ '//lib:TEST_ADAPTERS',
+ '//core/api:onos-api-tests',
+]
+
+osgi_jar_with_tests (
+ deps = COMPILE_DEPS,
+ test_deps = TEST_DEPS,
+ resources_root = 'src/main/resources',
+ resources = glob(['src/main/resources/**']),
+)
+
+onos_app (
+ app_name = 'org.onosproject.drivers.flowspec',
+ title = 'Flow specification Device Drivers',
+ category = 'Drivers',
+ url = 'http://onosproject.org',
+ description = 'ONOS flow specification device drivers application.',
+ required_apps = [ 'org.onosproject.drivers'],
+)
diff --git a/drivers/flowspec/pom.xml b/drivers/flowspec/pom.xml
new file mode 100644
index 0000000..5745169
--- /dev/null
+++ b/drivers/flowspec/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2017-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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>onos-drivers-general</artifactId>
+ <groupId>org.onosproject</groupId>
+ <version>1.9.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>onos-drivers-flowspec</artifactId>
+ <packaging>bundle</packaging>
+
+ <description>Other flow specification device drivers</description>
+
+ <properties>
+ <onos.app.name>org.onosproject.drivers.flowspec</onos.app.name>
+ <onos.app.origin>ON.Lab</onos.app.origin>
+ <onos.app.category>Drivers</onos.app.category>
+ <onos.app.title>Flow specification Device Drivers</onos.app.title>
+ <onos.app.url>http://onosproject.org</onos.app.url>
+ <onos.app.requires>
+ org.onosproject.drivers
+ </onos.app.requires>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-app-flowspec-api-flowapi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-drivers</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onlab-misc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>19.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/drivers/flowspec/src/main/java/org/onosproject/driver/flowspec/extensions/ExtMatchExtension.java b/drivers/flowspec/src/main/java/org/onosproject/driver/flowspec/extensions/ExtMatchExtension.java
new file mode 100644
index 0000000..6cdbd3a
--- /dev/null
+++ b/drivers/flowspec/src/main/java/org/onosproject/driver/flowspec/extensions/ExtMatchExtension.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017-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.driver.flowspec.extensions;
+
+import org.onlab.util.KryoNamespace;
+import org.onosproject.flowapi.ExtFlowContainer;
+import org.onosproject.net.flow.AbstractExtension;
+import org.onosproject.net.flow.criteria.ExtensionSelector;
+import org.onosproject.net.flow.criteria.ExtensionSelectorType;
+
+import java.util.Objects;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+
+ /**
+ * Implementation of extension selector for multi value.
+ */
+ public final class ExtMatchExtension extends AbstractExtension implements ExtensionSelector {
+ private ExtFlowContainer container;
+ private final KryoNamespace appKryo = new KryoNamespace.Builder().register(ExtMatchExtension.class).build();
+
+ /**
+ * Creates an object of ExtMatchExtension.
+ */
+ public ExtMatchExtension() {
+ this.container = null;
+ }
+ /**
+ * Returns the container.
+ *
+ * @return the container to match
+ */
+ public ExtFlowContainer container() {
+ return container;
+ }
+
+ @Override
+ public ExtensionSelectorType type() {
+ return ExtensionSelectorType.ExtensionSelectorTypes.EXT_MATCH_FLOW_TYPE.type();
+ }
+
+ @Override
+ public byte[] serialize() {
+ return appKryo.serialize(container);
+ }
+
+ @Override
+ public void deserialize(byte[] data) {
+ container = ExtFlowContainer.of(appKryo.deserialize(data));
+ }
+
+ @Override
+ public String toString() {
+ return toStringHelper(type().toString())
+ .add("container", container)
+ .toString();
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(type(), container);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj instanceof ExtMatchExtension) {
+ ExtMatchExtension that = (ExtMatchExtension) obj;
+ return Objects.equals(container, that.container) &&
+ Objects.equals(this.type(), that.type());
+ }
+ return false;
+ }
+ }
diff --git a/drivers/flowspec/src/main/java/org/onosproject/driver/flowspec/extensions/MultiExtensionSelectorInterpreter.java b/drivers/flowspec/src/main/java/org/onosproject/driver/flowspec/extensions/MultiExtensionSelectorInterpreter.java
new file mode 100644
index 0000000..ee50d01
--- /dev/null
+++ b/drivers/flowspec/src/main/java/org/onosproject/driver/flowspec/extensions/MultiExtensionSelectorInterpreter.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017-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.driver.flowspec.extensions;
+
+import org.onosproject.net.behaviour.ExtensionSelectorResolver;
+import org.onosproject.net.driver.AbstractHandlerBehaviour;
+import org.onosproject.net.flow.criteria.ExtensionSelector;
+import org.onosproject.net.flow.criteria.ExtensionSelectorType;
+
+ /**
+ * Interpreter for multi flow rule selector extensions.
+ */
+ public class MultiExtensionSelectorInterpreter
+ extends AbstractHandlerBehaviour
+ implements ExtensionSelectorResolver {
+
+ @Override
+ public ExtensionSelector getExtensionSelector(ExtensionSelectorType type) {
+ if (type.equals(ExtensionSelectorType.ExtensionSelectorTypes.EXT_MATCH_FLOW_TYPE.type())) {
+ return new ExtMatchExtension();
+ }
+ return null;
+ }
+ }
diff --git a/drivers/flowspec/src/main/java/org/onosproject/driver/flowspec/extensions/package-info.java b/drivers/flowspec/src/main/java/org/onosproject/driver/flowspec/extensions/package-info.java
new file mode 100644
index 0000000..fe9ecd0
--- /dev/null
+++ b/drivers/flowspec/src/main/java/org/onosproject/driver/flowspec/extensions/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017-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.
+ */
+/**
+ * Implementations of extension behaviours for legacy devices.
+ */
+package org.onosproject.driver.flowspec.extensions;
diff --git a/drivers/flowspec/src/main/java/org/onosproject/drivers/flowspec/FlowSpecDriversLoader.java b/drivers/flowspec/src/main/java/org/onosproject/drivers/flowspec/FlowSpecDriversLoader.java
new file mode 100644
index 0000000..ba6aca7
--- /dev/null
+++ b/drivers/flowspec/src/main/java/org/onosproject/drivers/flowspec/FlowSpecDriversLoader.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017-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.drivers.flowspec;
+
+import org.apache.felix.scr.annotations.Component;
+import org.onosproject.net.driver.AbstractDriverLoader;
+
+/**
+ * Loader for legacy device drivers.
+ */
+@Component(immediate = true)
+public class FlowSpecDriversLoader extends AbstractDriverLoader {
+
+ public FlowSpecDriversLoader() {
+ super("/flowspec-drivers.xml");
+ }
+}
diff --git a/drivers/flowspec/src/main/java/org/onosproject/drivers/flowspec/package-info.java b/drivers/flowspec/src/main/java/org/onosproject/drivers/flowspec/package-info.java
new file mode 100644
index 0000000..0b6a2cb
--- /dev/null
+++ b/drivers/flowspec/src/main/java/org/onosproject/drivers/flowspec/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017-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 for legacy device drivers.
+ */
+package org.onosproject.drivers.flowspec;
diff --git a/drivers/flowspec/src/main/resources/flowspec-drivers.xml b/drivers/flowspec/src/main/resources/flowspec-drivers.xml
new file mode 100644
index 0000000..17195c2
--- /dev/null
+++ b/drivers/flowspec/src/main/resources/flowspec-drivers.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2017-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.
+ -->
+<drivers>
+ <driver name="flowspec" extends="default" manufacturer="" hwVersion="1.0.0" swVersion="1.0.0">
+ <behaviour api="org.onosproject.net.behaviour.ExtensionSelectorResolver"
+ impl="org.onosproject.driver.flowspec.extensions.MultiExtensionSelectorInterpreter" />
+ </driver>
+</drivers>
+
diff --git a/drivers/flowspec/src/test/java/org/onosproject/drivers/flowspec/FlowSpecDriversLoaderTest.java b/drivers/flowspec/src/test/java/org/onosproject/drivers/flowspec/FlowSpecDriversLoaderTest.java
new file mode 100644
index 0000000..e3e4310
--- /dev/null
+++ b/drivers/flowspec/src/test/java/org/onosproject/drivers/flowspec/FlowSpecDriversLoaderTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017-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.drivers.flowspec;
+
+import org.junit.Before;
+import org.onosproject.net.driver.AbstractDriverLoaderTest;
+
+/**
+ * Legacy device drivers loader test.
+ */
+public class FlowSpecDriversLoaderTest extends AbstractDriverLoaderTest {
+
+ @Before
+ public void setUp() {
+ loader = new FlowSpecDriversLoader();
+ }
+}
diff --git a/drivers/pom.xml b/drivers/pom.xml
index 1be923c..5e73f4c 100644
--- a/drivers/pom.xml
+++ b/drivers/pom.xml
@@ -47,6 +47,7 @@
<module>arista</module>
<module>juniper</module>
<module>lisp</module>
+ <module>flowspec</module>
</modules>
<!--<properties>