Bug 2008 - Local Instance rules are failed to get programmed in L2FwdService table...

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

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/Column.java b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/Column.java
index ad0b2492a0696b3611827706d3a8483b775c10ac..fb24d9bf64032d499d9f32a5712bcac86dddd241 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/Column.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/Column.java
@@ -51,7 +51,7 @@ public class Column<E extends TableSchema<E>, D> {
 
     @Override
     public String toString() {
-        return "Column [schema=" + schema + ", data=" + data + "]";
+        return "["+schema.getName() + "=" + data + "]";
     }
 
     @Override

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java
index 843ae064655262945d48492f0481a5df7550ab07..8e6d0f8ff90d21902d24983ae37ea1e795ea867e 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java
@@ -840,7 +840,7 @@ public class OF13Provider implements NetworkingProvider {
                 egressAclProvider.programPortSecurityACL(node, dpid, segmentationId, attachedMac, localPort,
                         securityGroupInPort);
             }
-            else if (networkType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE) ||
+            if (networkType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE) ||
                     networkType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN)) {
                 logger.debug("Program local bridge rules for interface {}", intf.getName());
                 programLocalBridgeRules(node, dpid, segmentationId, attachedMac, localPort);