initial flow rule provider
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java
index 9d31631..ca22c4f 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java
@@ -17,6 +17,15 @@
*/
void applyFlowRule(FlowRule... flowRules);
+ /**
+ * Instructs the provider to remove the specified flow rules to their
+ * respective devices.
+ * @param flowRules one or more flow rules
+ * throws SomeKindOfException that indicates which ones were applied and
+ * which ones failed
+ */
+ void removeFlowRule(FlowRule... flowRules);
+
/**
* Returns the collection of flow entries currently applied on the given
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/package-info.java b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/package-info.java
new file mode 100644
index 0000000..82eb210
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Traffic selection criteria model.
+ */
+package org.onlab.onos.net.flow.criteria;
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/package-info.java b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/package-info.java
new file mode 100644
index 0000000..01b68ad
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Traffic treatment model.
+ */
+package org.onlab.onos.net.flow.instructions;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/flow/impl/SimpleFlowRuleManager.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/flow/impl/SimpleFlowRuleManager.java
new file mode 100644
index 0000000..267af5b
--- /dev/null
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/flow/impl/SimpleFlowRuleManager.java
@@ -0,0 +1,132 @@
+package org.onlab.onos.net.trivial.flow.impl;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.Service;
+import org.onlab.onos.event.AbstractListenerRegistry;
+import org.onlab.onos.event.EventDeliveryService;
+import org.onlab.onos.net.Device;
+import org.onlab.onos.net.DeviceId;
+import org.onlab.onos.net.device.DeviceService;
+import org.onlab.onos.net.flow.FlowEntry;
+import org.onlab.onos.net.flow.FlowRule;
+import org.onlab.onos.net.flow.FlowRuleEvent;
+import org.onlab.onos.net.flow.FlowRuleListener;
+import org.onlab.onos.net.flow.FlowRuleProvider;
+import org.onlab.onos.net.flow.FlowRuleProviderRegistry;
+import org.onlab.onos.net.flow.FlowRuleProviderService;
+import org.onlab.onos.net.flow.FlowRuleService;
+import org.onlab.onos.net.provider.AbstractProviderRegistry;
+import org.onlab.onos.net.provider.AbstractProviderService;
+import org.slf4j.Logger;
+
+@Component(immediate = true)
+@Service
+public class SimpleFlowRuleManager
+extends AbstractProviderRegistry<FlowRuleProvider, FlowRuleProviderService>
+implements FlowRuleService, FlowRuleProviderRegistry {
+
+ private final Logger log = getLogger(getClass());
+
+ private final AbstractListenerRegistry<FlowRuleEvent, FlowRuleListener>
+ listenerRegistry = new AbstractListenerRegistry<>();
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ private EventDeliveryService eventDispatcher;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ private DeviceService deviceService;
+
+ @Activate
+ public void activate() {
+ eventDispatcher.addSink(FlowRuleEvent.class, listenerRegistry);
+ log.info("Started");
+ }
+
+ @Deactivate
+ public void deactivate() {
+ eventDispatcher.removeSink(FlowRuleEvent.class);
+ log.info("Stopped");
+ }
+
+ @Override
+ public Iterable<FlowEntry> getFlowEntries(DeviceId deviceId) {
+ //TODO: store rules somewhere and return them here
+ return null;
+ }
+
+ @Override
+ public void applyFlowRules(FlowRule... flowRules) {
+ for (int i = 0; i < flowRules.length; i++) {
+ FlowRule f = flowRules[0];
+ final Device device = deviceService.getDevice(f.deviceId());
+ final FlowRuleProvider frp = getProvider(device.providerId());
+ //TODO: store rules somewhere
+ frp.applyFlowRule(f);
+ }
+
+
+ }
+
+ @Override
+ public void removeFlowRules(FlowRule... flowRules) {
+ for (int i = 0; i < flowRules.length; i++) {
+ FlowRule f = flowRules[0];
+ final Device device = deviceService.getDevice(f.deviceId());
+ final FlowRuleProvider frp = getProvider(device.providerId());
+ //TODO: remove stored rules from wherever they are
+ frp.removeFlowRule(f);
+ }
+
+ }
+
+ @Override
+ public void addListener(FlowRuleListener listener) {
+ listenerRegistry.addListener(listener);
+ }
+
+ @Override
+ public void removeListener(FlowRuleListener listener) {
+ listenerRegistry.removeListener(listener);
+ }
+
+ @Override
+ protected FlowRuleProviderService createProviderService(
+ FlowRuleProvider provider) {
+ return new InternalFlowRuleProviderService(provider);
+ }
+
+ private class InternalFlowRuleProviderService
+ extends AbstractProviderService<FlowRuleProvider>
+ implements FlowRuleProviderService {
+
+ protected InternalFlowRuleProviderService(FlowRuleProvider provider) {
+ super(provider);
+ }
+
+ @Override
+ public void flowRemoved(FlowRule flowRule) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void flowMissing(FlowRule flowRule) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void flowAdded(FlowRule flowRule) {
+ // TODO Auto-generated method stub
+
+ }
+
+ }
+
+}
diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowSwitchEvent.java b/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowSwitchEvent.java
deleted file mode 100644
index 281d505..0000000
--- a/of/api/src/main/java/org/onlab/onos/of/controller/OpenFlowSwitchEvent.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.onlab.onos.of.controller;
-
-/**
- * Meta events that can happen at a switch.
- *
- */
-public enum OpenFlowSwitchEvent {
- /**
- * The switch connected.
- */
- SWITCH_CONNECTED,
-
- /**
- * The switch disconnected.
- */
- SWITCH_DISCONNECTED
-}
diff --git a/providers/of/pom.xml b/providers/of/pom.xml
index 901cdd6..d8677d9 100644
--- a/providers/of/pom.xml
+++ b/providers/of/pom.xml
@@ -21,6 +21,7 @@
<module>link</module>
<module>host</module>
<module>packet</module>
+ <module>flow</module>
</modules>
<dependencies>