Bug-3425 : Cont. minor changes to incorporate the code review from Sam

Change-Id: I859864631f2842af48ad044ff7305ceeec5bf9ff
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

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 6cc8a34b1eda01df6d4a3c62d98c6e0fd2e57ff4..efe8aafd05a02f3031efc0ca7bc1b8dbad87b8b6 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
@@ -829,7 +829,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                 return;
             }
 
-            OvsdbTerminationPointAugmentation tunnelPort= southbound.getTerminationPointsOfBridge(node,getTunnelName(tunnelType, dst));
+            OvsdbTerminationPointAugmentation tunnelPort= southbound.getTerminationPointOfBridge(node, getTunnelName(tunnelType, dst));
             if(tunnelPort != null){
                 long tunnelOFPort = southbound.getOFPort(tunnelPort);
                 if (tunnelOFPort == 0) {
@@ -889,7 +889,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
             for (OvsdbTerminationPointAugmentation tunIntf : intfs) {
                 if (tunIntf.getName().equals(getTunnelName(tunnelType, dst))) {
                     long tunnelOFPort = southbound.getOFPort(tunIntf);
-                    if (tunnelOFPort == -1) {
+                    if (tunnelOFPort == 0) {
                         logger.error("Could not Identify Tunnel port {} -> OF ({}) on {}",
                                 tunIntf.getName(), tunnelOFPort, node);
                         return;

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/Southbound.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/Southbound.java
index d1fc11fbd1052c186a511478bdac81ff6105f86c..2ae2e134d15e4a252ba2b8f0c40ed076bb730279 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/Southbound.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/Southbound.java
@@ -50,7 +50,7 @@ public interface Southbound {
     List<Node> getAllBridgesOnOvsdbNode(Node node);
     OvsdbNodeAugmentation extractNodeAugmentation(Node node);
     List<OvsdbTerminationPointAugmentation> getTerminationPointsOfBridge(Node node);
-    OvsdbTerminationPointAugmentation getTerminationPointsOfBridge(Node node, String terminationPoint);
+    OvsdbTerminationPointAugmentation getTerminationPointOfBridge(Node node, String terminationPoint);
     OvsdbTerminationPointAugmentation extractTerminationPointAugmentation(Node bridgeNode, String portName);
     List<TerminationPoint> extractTerminationPoints(Node node);
     List<OvsdbTerminationPointAugmentation> extractTerminationPointAugmentations(Node node);

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SouthboundImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SouthboundImpl.java
index 383e0c55dee7a2c4ae83318e68bd1891e67ece7c..13a71c3b9f778df7c66132a30dee76feaa2129ca 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SouthboundImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SouthboundImpl.java
@@ -383,7 +383,7 @@ public class SouthboundImpl implements Southbound {
         return tpAugmentations;
     }
 
-    public OvsdbTerminationPointAugmentation getTerminationPointsOfBridge(Node node, String portName) {
+    public OvsdbTerminationPointAugmentation getTerminationPointOfBridge(Node node, String portName) {
         OvsdbTerminationPointAugmentation tpAugmentation = extractTerminationPointAugmentation(node,portName);
         if(tpAugmentation == null){
             List<OvsdbTerminationPointAugmentation> tpAugmentations = readTerminationPointAugmentations(node);
@@ -399,17 +399,11 @@ public class SouthboundImpl implements Southbound {
     }
 
     public OvsdbTerminationPointAugmentation extractTerminationPointAugmentation(Node bridgeNode, String portName) {
-        OvsdbBridgeAugmentation ovsdbBridgeAugmentation = bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class);
-        if (ovsdbBridgeAugmentation != null) {
-            List<TerminationPoint> terminationPoints = bridgeNode.getTerminationPoint();
-            if(terminationPoints != null){
-                for(TerminationPoint terminationPoint : terminationPoints) {
-                    OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation =
-                            terminationPoint.getAugmentation( OvsdbTerminationPointAugmentation.class);
-                    if (ovsdbTerminationPointAugmentation != null
-                            && ovsdbTerminationPointAugmentation.getName().equals(portName)) {
-                        return ovsdbTerminationPointAugmentation;
-                    }
+        if (bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class) != null) {
+            List<OvsdbTerminationPointAugmentation> tpAugmentations = extractTerminationPointAugmentations(bridgeNode);
+            for (OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation : tpAugmentations) {
+                if (ovsdbTerminationPointAugmentation.getName().equals(portName)) {
+                    return ovsdbTerminationPointAugmentation;
                 }
             }
         }
@@ -430,7 +424,11 @@ public class SouthboundImpl implements Southbound {
         List<TerminationPoint> terminationPoints = node.getTerminationPoint();
         if(terminationPoints != null && !terminationPoints.isEmpty()){
             for(TerminationPoint tp : terminationPoints){
-                tpAugmentations.add(tp.getAugmentation(OvsdbTerminationPointAugmentation.class));
+                OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation =
+                        tp.getAugmentation(OvsdbTerminationPointAugmentation.class);
+                if (ovsdbTerminationPointAugmentation != null) {
+                    tpAugmentations.add(ovsdbTerminationPointAugmentation);
+                }
             }
         }
         return tpAugmentations;