commit ba5c52f2b3f7998df9812c70b5cb8c06130531ea
author pingping-lin <pingping@onlab.us> Tue Feb 11 16:52:01 2014 -0800
committer Gerrit Code Review <gerrit2@onos-services> Thu Mar 13 17:20:45 2014 -0700
tree e00e4096e4e885fe06763ddcc25e31cbda21e175
parent 417fe02c4b39d587c8329fef7b2efe92f4aa9824

Cherry-pick from https://gerrit.onos.onlab.us/#/c/335/

Move to FlowManager & Running SDN-IP on multiple onos instances (ONOS-668)

Make DISCARD_FIRST_HOP_ENTRY, KEEP_ONLY_FIRST_HOP_ENTRY accessible

Add a new type of BroadcastPacketOutNotification without inSwitch/inPort

Send Arp Request to all ONOS instances, not just to the local one

Get rid of BgpProxyArpManager.java

Improvements patch (ONOS-668)

change FlowPathFlag from private to public

delete BroadcastPacketOutNotification with no dpid/port

sendPacketOutNotification to specific out-dpid/our-port

Conflicts:

	src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java
	src/main/java/net/onrc/onos/ofcontroller/proxyarp/BgpProxyArpManager.java

NOTE: The above conflicts have been resolved by hand.

Change-Id: I449717d2289d14c2655af10ae7f628ea62187c63

src/main/java/net/onrc/onos/ofcontroller/util/FlowPathFlags.java

diff --git a/src/main/java/net/onrc/onos/ofcontroller/util/FlowPathFlags.java b/src/main/java/net/onrc/onos/ofcontroller/util/FlowPathFlags.java
index 595eb5f..3c6ffc4 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/util/FlowPathFlags.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/util/FlowPathFlags.java
@@ -9,10 +9,10 @@
     private long flags;
 
     // Discard the first-hop Flow Entry
-    private static final long DISCARD_FIRST_HOP_ENTRY   = (1 << 0);
+    public static final long DISCARD_FIRST_HOP_ENTRY   = (1 << 0);
 
     // Keep only the first-hop Flow Entry
-    private static final long KEEP_ONLY_FIRST_HOP_ENTRY = (1 << 1);
+    public static final long KEEP_ONLY_FIRST_HOP_ENTRY = (1 << 1);
 
     /**
      * Default constructor.
@@ -125,4 +125,5 @@
 
 	return ret;
     }
+
 }