Moving Tunnel Out to the appropriate place and cleaned up some logs.

Change-Id: I3cc8a8654f85cae2d823114aedd605ee1505241f
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/MDSALConsumer.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/MDSALConsumer.java
index a1031066bf2f24edb6bb2a0d15637805007c7e48..560aece98c247247002501aa575047407f86a68b 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/MDSALConsumer.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/MDSALConsumer.java
@@ -12,8 +12,8 @@ package org.opendaylight.ovsdb.neutron;
 import org.apache.felix.dm.Component;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext;
-import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
 import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer;
+import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,7 +38,7 @@ public class MDSALConsumer implements BindingAwareConsumer, IMDSALConsumer {
 
     void init(Component c) {
         this.ctx = c.getDependencyManager().getBundleContext();
-        logger.info("****** OVSDB Neutron Registered with MD-SAL ******");
+        logger.info("OVSDB Neutron Registered with MD-SAL");
         broker.registerConsumer(this, this.ctx);
     }
 
@@ -60,7 +60,7 @@ public class MDSALConsumer implements BindingAwareConsumer, IMDSALConsumer {
     public void onSessionInitialized(ConsumerContext session) {
         this.consumerContext = session;
         dataBrokerService = session.getSALService(DataBrokerService.class);
-        logger.info("****** OVSDB Neutron Session Initilized with CONSUMER CONTEXT {} ******", session.toString());
+        logger.info("OVSDB Neutron Session Initilized with CONSUMER CONTEXT {}", session.toString());
     }
 
     @Override

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13ProviderManager.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13ProviderManager.java
index 0355678c36c32986b0698d0273c47c673de86728..2577eb178b473daabb9154503500db333a6135f4 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13ProviderManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13ProviderManager.java
@@ -312,6 +312,19 @@ class OF13ProviderManager extends ProviderNetworkManager {
          */
 
          writeTunnelIn(dpid, TABLE_0_DEFAULT_INGRESS, TABLE_2_LOCAL_FORWARD, segmentationId, tunnelOFPort);
+
+         /*
+          * Table(1) Rule #2
+          * ----------------
+          * Match: Match Tunnel ID and L2 ::::FF:FF Flooding
+          * Action: Flood to selected destination TEPs
+          * -------------------------------------------
+          * table=1,priority=16384,tun_id=0x5,dl_dst=ff:ff:ff:ff:ff:ff \
+          * actions=output:10,output:11,goto_table:2
+          */
+
+         writeTunnelFloodOut(dpid, TABLE_1_ISOLATE_TENANT, TABLE_2_LOCAL_FORWARD, segmentationId, tunnelOFPort);
+
     }
 
     private void programRemoteEgressTunnelBridgeRules(Node node, Long dpid, String segmentationId, String attachedMac, long tunnelOFPort, long localPort) {
@@ -326,18 +339,6 @@ class OF13ProviderManager extends ProviderNetworkManager {
          */
 
         writeTunnelOut(dpid, TABLE_1_ISOLATE_TENANT, TABLE_2_LOCAL_FORWARD, segmentationId, tunnelOFPort, attachedMac);
-
-        /*
-         * Table(1) Rule #2
-         * ----------------
-         * Match: Match Tunnel ID and L2 ::::FF:FF Flooding
-         * Action: Flood to selected destination TEPs
-         * -------------------------------------------
-         * table=1,priority=16384,tun_id=0x5,dl_dst=ff:ff:ff:ff:ff:ff \
-         * actions=output:10,output:11,goto_table:2
-         */
-
-        writeTunnelFloodOut(dpid, TABLE_1_ISOLATE_TENANT, TABLE_2_LOCAL_FORWARD, segmentationId, tunnelOFPort);
     }
 
     private Long getIntegrationBridgeOFDPID (Node node) {
@@ -469,7 +470,7 @@ class OF13ProviderManager extends ProviderNetworkManager {
             if (ofNodes != null) {
                 for (Node ofNode : ofNodes) {
                     if (ofNode.toString().contains(dpid+"")) {
-                        logger.info("Identified the Openflow node via toString {}", ofNode);
+                        logger.debug("Identified the Openflow node via toString {}", ofNode);
                         ofNodeFound = true;
                         break;
                     }

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
index 17bfa81dfcb29829266d3f0dee11776f00a54f42..e195f1a825059d9313d5ccfe9ee192da23d930c7 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
@@ -189,7 +189,8 @@ public class InventoryService implements IPluginInInventoryService, InventorySer
                         // Clear on that. From a user/manageability standpoint, it is easier
                         // to handle Bridge names compared to dpids.
                         // Updating the Openflow bridge name via the SAL Description update.
-                        updateOFBridgeName(n, (Bridge)newRow);
+
+                        // updateOFBridgeName(n, (Bridge)newRow);
                     }
                     if ((oldRow == null) && (inventoryListener != null)) {
                         inventoryListener.rowAdded(n, name.getName(), uuid, newRow);