Removed the optimization that was preventing the flows to be programmed on nodes... 28/4928/1
authorMadhu Venugopal <mavenugo@gmail.com>
Mon, 27 Jan 2014 20:38:31 +0000 (12:38 -0800)
committerMadhu Venugopal <mavenugo@gmail.com>
Mon, 27 Jan 2014 20:38:31 +0000 (12:38 -0800)
But, since we dont have the replay fix which can look back at all the nodes and reinstall the existing VM Macs,
we have to remove this optimziation.

We can reintroduce this fix, once we have the replay functionality in place.

Change-Id: I6baaa180a91f7188d472b34ef609ea95b2fac653
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13ProviderManager.java

index 4068414af12c1b85d308d4b9884cec6bafd7014b..08ab0ce3c6afc8597c53de86383e1df920e87bfa 100644 (file)
@@ -490,11 +490,9 @@ class OF13ProviderManager extends ProviderNetworkManager {
         this.programLocalRules(tunnelType, tunnelKey, srcNode, intf);
 
         for (Node dstNode : nodes) {
-            Status status = getTunnelReadinessStatus(dstNode, tunnelKey);
-            if (!status.isSuccess()) continue;
             InetAddress src = AdminConfigManager.getManager().getTunnelEndPoint(srcNode);
             InetAddress dst = AdminConfigManager.getManager().getTunnelEndPoint(dstNode);
-            status = addTunnelPort(srcNode, tunnelType, src, dst);
+            Status status = addTunnelPort(srcNode, tunnelType, src, dst);
             if (status.isSuccess()) {
                 this.programTunnelRules(tunnelType, tunnelKey, dst, srcNode, intf, true);
             }