From: Josh <jhershbe@redhat.com>
Date: Thu, 18 Aug 2016 12:52:15 +0000 (+0200)
Subject: No need to create br-ex any more. br-ex(it) ;)
X-Git-Tag: release/carbon~879^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=1a2d5a99e340e5a71c60f01ab30b5f092f90ae98;p=netvirt.git

No need to create br-ex any more. br-ex(it) ;)

devstack no longer checks for it and we
do not use it.

Change-Id: I4f72331e321e5094ffb7b378cbee894932001dbf
Signed-off-by: Josh <jhershbe@redhat.com>
---

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
index e98fd8fea3..4873994b1a 100644
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
@@ -34,7 +34,6 @@ public class ElanBridgeManager {
 
     public static final String PROVIDER_MAPPINGS_KEY = "provider_mappings";
     private static final String INTEGRATION_BRIDGE = "br-int";
-    private static final String EXTERNAL_BRIDGE = "br-ex";
     private static final String INT_SIDE_PATCH_PORT_SUFFIX = "-expatch";
     private static final String EX_SIDE_PATCH_PORT_SUFFIX = "-patch";
 
@@ -176,8 +175,6 @@ public class ElanBridgeManager {
 
         try {
             createIntegrationBridge(ovsdbNode, generateIntBridgeMac);
-            //TODO: Get rid of this:
-            createExternalBridge(ovsdbNode);
         } catch (Exception e) {
             LOG.error("Error creating bridge on " + ovsdbNode, e);
         }
@@ -193,15 +190,6 @@ public class ElanBridgeManager {
         return true;
     }
 
-    private boolean createExternalBridge(Node ovsdbNode) {
-        LOG.debug("ElanBridgeManager.createExternalBridge, skipping if exists");
-        if (!addBridge(ovsdbNode, EXTERNAL_BRIDGE, null)) {
-            LOG.warn("External Bridge Creation failed");
-            return false;
-        }
-        return true;
-    }
-
     /**
      * Add a bridge to the OVSDB node but check that it does not exist in the
      * CONFIGURATION or OPERATIONAL md-sals first.