Merge remote-tracking branch 'origin/master'

@@ -5,6 +5,9 @@ package org.onlab.onos.net.flow;
  */
 public interface FlowEntry extends FlowRule {
 
+
+    FlowId id();
+
     /**
      * Returns the number of milliseconds this flow rule has been applied.
      *

+package org.onlab.onos.net.flow;
+
+/**
+ * Representation of a Flow ID.
+ */
+public final class FlowId {
+
+    private final int flowid;
+
+    private FlowId(int id) {
+        this.flowid = id;
+    }
+
+    public FlowId valueOf(int id) {
+        return new FlowId(id);
+    }
+
+    public int value() {
+        return flowid;
+    }
+}