From: Gary Kotton <gkotton@redhat.com>
Date: Tue, 11 Sep 2012 06:32:12 +0000 (+0000)
Subject: Ensures that the Linux Bridge Plugin runs with L3 agent
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=93c7147bdb677e30a5564088c18c4b763fd588c4;p=openstack-build%2Fneutron-build.git

Ensures that the Linux Bridge Plugin runs with L3 agent

Fixes bug 1048968

1. The external interface for the linux bridge will be created at run time.
The configuration parameter external_network_bridge should be set as empty.
That is, "external_network_bridge = ". The link between the network and
the physical interface should be done via the provider network parameters.
2. The plug operation for the linux bridge replaces the interface name
prefix with tap. We need to ensure that the prefix length is 3 characters.

Change-Id: Ib8e26bc1f603a1aff9560b4a40110a6824db5921
---

diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py
index 96fe5b402..bff54f834 100644
--- a/quantum/agent/l3_agent.py
+++ b/quantum/agent/l3_agent.py
@@ -37,7 +37,7 @@ from quantumclient.v2_0 import client
 LOG = logging.getLogger(__name__)
 NS_PREFIX = 'qrouter-'
 INTERNAL_DEV_PREFIX = 'qr-'
-EXTERNAL_DEV_PREFIX = 'qgw-'
+EXTERNAL_DEV_PREFIX = 'qg-'
 
 
 class RouterInfo(object):
@@ -116,7 +116,8 @@ class L3NATAgent(object):
 
         self.polling_interval = conf.polling_interval
 
-        if not ip_lib.device_exists(self.conf.external_network_bridge):
+        if (self.conf.external_network_bridge and
+            not ip_lib.device_exists(self.conf.external_network_bridge)):
             raise Exception("external network bridge '%s' does not exist"
                             % self.conf.external_network_bridge)