Removed all the static string usage for network types vxlan, gre, vlan and replaced...

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

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
index 97dfeaeb8ac18f0f2deef9b18163a8052586d71b..cc433d9bf50da8bd097552b3620122ad878ed26e 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
@@ -298,7 +298,7 @@ public class InternalNetworkManager {
             }
 
             /* For vlan network types add physical port to br-net. */
-            if (network.getProviderNetworkType().equalsIgnoreCase("vlan")) {
+            if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
                 String phyNetName = AdminConfigManager.getManager().getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
                 status = addPortToBridge(node, brNet, phyNetName);
                 if (!status.isSuccess()) {
@@ -315,7 +315,7 @@ public class InternalNetworkManager {
             }
 
             /* For vlan network types add physical port to br-int. */
-            if (network.getProviderNetworkType().equalsIgnoreCase("vlan")) {
+            if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
                 String phyNetName = AdminConfigManager.getManager().getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
                 status = addPortToBridge(node, brInt, phyNetName);
                 if (!status.isSuccess()) {
@@ -495,7 +495,7 @@ public class InternalNetworkManager {
      */
     public boolean checkAndCreateNetwork (Node node, NeutronNetwork network) {
         boolean isCreated = false;
-        if (network.getProviderNetworkType().equalsIgnoreCase("vlan")) {
+        if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
             if (!InternalNetworkManager.getManager().isInternalNetworkVlanReady(node, network)) {
                 try {
                     isCreated = InternalNetworkManager.getManager().createNetNetwork(node, network);
@@ -505,8 +505,8 @@ public class InternalNetworkManager {
             } else {
                 isCreated = true;
             }
-        } else if (network.getProviderNetworkType().equalsIgnoreCase("vxlan") ||
-                network.getProviderNetworkType().equalsIgnoreCase("gre")) {
+        } else if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN) ||
+                network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)) {
             if (!InternalNetworkManager.getManager().isInternalNetworkTunnelReady(node)) {
                 try {
                     isCreated = InternalNetworkManager.getManager().createNetNetwork(node, network);

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
index 40097c8d20a25b6f6e378d5160315112ab9c5aba..16ef633bfdf5e3bf0ae74e883056a556bf26e2bc 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
@@ -31,6 +31,11 @@ import org.slf4j.LoggerFactory;
  */
 public class NetworkHandler extends BaseHandler
                             implements INeutronNetworkAware {
+
+    public static final String NETWORK_TYPE_VXLAN = "vxlan";
+    public static final String NETWORK_TYPE_GRE = "gre";
+    public static final String NETWORK_TYPE_VLAN = "vlan";
+
     /**
      * Logger instance.
      */
@@ -144,7 +149,7 @@ public class NetworkHandler extends BaseHandler
                             for (String intfUUID : interfaces.keySet()) {
                                 Interface intf = (Interface) interfaces.get(intfUUID);
                                 String intfType = intf.getType();
-                                if (intfType.equalsIgnoreCase("vxlan") || intfType.equalsIgnoreCase("gre")) {
+                                if (intfType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN) || intfType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)) {
                                     /* delete tunnel ports on this node */
                                     logger.trace("Delete tunnel intf {}", intf);
                                     inventoryListener.rowRemoved(node, Interface.NAME.getName(), intfUUID,

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java
index a722fd61522f21f5db6f9a1f448b1ba71b899c0d..776e6cd4e22b0933c0b4a41ef29455a3eaebcde4 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java
@@ -177,8 +177,8 @@ public class SouthboundHandler extends BaseHandler implements OVSDBInventoryList
                     network = (NeutronNetwork)context;
                 }
                 logger.info("Delete interface " + deletedIntf.getName());
-                if (deletedIntf.getType().equalsIgnoreCase("vxlan") ||
-                    deletedIntf.getType().equalsIgnoreCase("gre")) {
+                if (deletedIntf.getType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN) ||
+                    deletedIntf.getType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)) {
                     /* delete tunnel interfaces */
                     this.handleInterfaceDelete(node, uuid, deletedIntf, false, null);
                 } else if (network != null && !network.getRouterExternal()) {
@@ -265,11 +265,11 @@ public class SouthboundHandler extends BaseHandler implements OVSDBInventoryList
         logger.debug("handleInterfaceDelete: node: {}, uuid: {}, isLastInstanceOnNode: {}, interface: {}",
                 node, uuid, isLastInstanceOnNode, intf);
 
-        if (intf.getType().equalsIgnoreCase("vxlan") || intf.getType().equalsIgnoreCase("gre")) {
+        if (intf.getType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN) || intf.getType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)) {
             /* delete tunnel interfaces */
             ProviderNetworkManager.getManager().handleInterfaceDelete(intf.getType(), null, node, intf, isLastInstanceOnNode);
         } else if (network != null) {
-            if (!network.getProviderNetworkType().equalsIgnoreCase("vlan")) { /* vlan doesn't need a tunnel endpoint */
+            if (!network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) { /* vlan doesn't need a tunnel endpoint */
                 if (AdminConfigManager.getManager().getTunnelEndPoint(node) == null) {
                     logger.error("Tunnel end-point configuration missing. Please configure it in Open_vSwitch Table");
                     return;

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10ProviderManager.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10ProviderManager.java
index c5050e344bd82d928ae2daaf3c3eb619f53e51b9..4ec1a513ba3e4ad4ff9a7ffe49f3d752868adc49 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10ProviderManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10ProviderManager.java
@@ -37,6 +37,7 @@ import org.opendaylight.ovsdb.lib.table.Port;
 import org.opendaylight.ovsdb.lib.table.internal.Table;
 import org.opendaylight.ovsdb.neutron.AdminConfigManager;
 import org.opendaylight.ovsdb.neutron.InternalNetworkManager;
+import org.opendaylight.ovsdb.neutron.NetworkHandler;
 import org.opendaylight.ovsdb.neutron.TenantNetworkManager;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
 import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
@@ -749,7 +750,7 @@ class OF10ProviderManager extends ProviderNetworkManager {
         logger.debug("handleInterfaceUpdate: networkType: {}, segmentationId: {}, srcNode: {}, intf: {}",
                      network.getProviderNetworkType(), network.getProviderSegmentationID(), srcNode, intf.getName());
 
-        if (network.getProviderNetworkType().equalsIgnoreCase("vlan")) {
+        if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
             Status status = getVlanReadinessStatus(srcNode, network.getProviderSegmentationID());
             if (!status.isSuccess()) {
                 return status;
@@ -757,8 +758,8 @@ class OF10ProviderManager extends ProviderNetworkManager {
                 this.programVlanRules(network, srcNode, intf);
                 return new Status(StatusCode.SUCCESS);
             }
-        } else if (network.getProviderNetworkType().equalsIgnoreCase("vxlan") ||
-                   network.getProviderNetworkType().equalsIgnoreCase("gre")) {
+        } else if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN) ||
+                   network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)) {
             Status status = getTunnelReadinessStatus(srcNode, network.getProviderSegmentationID());
             if (!status.isSuccess()) return status;
 
@@ -792,11 +793,11 @@ class OF10ProviderManager extends ProviderNetworkManager {
                 srcNode, (network != null) ? network.getProviderNetworkType() : "",
                 intf.getName(), intf.getType(), isLastInstanceOnNode);
 
-        if ((network != null) && network.getProviderNetworkType().equalsIgnoreCase("vlan")) {
+        if ((network != null) && network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
             if (isLastInstanceOnNode) {
                 this.removeVlanRules(network, srcNode, intf);
             }
-        } else if (intf.getType().equalsIgnoreCase("vxlan") || intf.getType().equalsIgnoreCase("gre")) {
+        } else if (intf.getType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN) || intf.getType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)) {
             /* Delete tunnel port */
             try {
                 OvsDBMap<String, String> options = intf.getOptions();

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 084adf08c0b1d5956d266d3906e880dc3881e60b..f2e4646a4e7f57cea4aa51dfb6347a6141ab299a 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
@@ -37,6 +37,7 @@ import org.opendaylight.ovsdb.lib.table.Port;
 import org.opendaylight.ovsdb.neutron.AdminConfigManager;
 import org.opendaylight.ovsdb.neutron.IMDSALConsumer;
 import org.opendaylight.ovsdb.neutron.InternalNetworkManager;
+import org.opendaylight.ovsdb.neutron.NetworkHandler;
 import org.opendaylight.ovsdb.neutron.TenantNetworkManager;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
 import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
@@ -581,8 +582,8 @@ class OF13ProviderManager extends ProviderNetworkManager {
             }
 
             /* Program local rules based on network type */
-            if (networkType.equalsIgnoreCase("gre") ||
-              networkType.equalsIgnoreCase("vxlan")) {
+            if (networkType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE) ||
+              networkType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN)) {
                 logger.debug("Remove local bridge rules for interface {}", intf.getName());
                 removeLocalBridgeRules(node, dpid, segmentationId, attachedMac, localPort);
             }
@@ -805,7 +806,7 @@ class OF13ProviderManager extends ProviderNetworkManager {
         nodes.remove(srcNode);
 
         logger.info("Delete intf " + intf.getName() + " isLastInstanceOnNode " + isLastInstanceOnNode);
-        if (intf.getType().equalsIgnoreCase("vxlan") || intf.getType().equalsIgnoreCase("gre")) {
+        if (intf.getType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN) || intf.getType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)) {
         /* Delete tunnel port */
             try {
                 OvsDBMap<String, String> options = intf.getOptions();
@@ -820,8 +821,8 @@ class OF13ProviderManager extends ProviderNetworkManager {
             this.removeLocalRules(tunnelType, network.getProviderSegmentationID(),
                                   srcNode, intf);
 
-            if (tunnelType.equalsIgnoreCase("gre")
-                 || tunnelType.equalsIgnoreCase("vxlan")) {
+            if (tunnelType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)
+                 || tunnelType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN)) {
                 for (Node dstNode : nodes) {
                     InetAddress src = AdminConfigManager.getManager().getTunnelEndPoint(srcNode);
                     InetAddress dst = AdminConfigManager.getManager().getTunnelEndPoint(dstNode);