x/vmware-nsx
Code Issues Proposed changes

Merge "Ensures that the Linux Bridge Plugin runs with L3 agent"

Browse Source
This commit is contained in:
Jenkins 2012-09-11 08:46:09 +00:00 committed by Gerrit Code Review
commit 16a943c063
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
quantum/agent/l3_agent.py
View File

@ -37,7 +37,7 @@ from quantumclient.v2_0 import client
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
NS_PREFIX = 'qrouter-' NS_PREFIX = 'qrouter-'
INTERNAL_DEV_PREFIX = 'qr-' INTERNAL_DEV_PREFIX = 'qr-'
EXTERNAL_DEV_PREFIX = 'qgw-' EXTERNAL_DEV_PREFIX = 'qg-'
class RouterInfo(object): class RouterInfo(object):
@ -116,7 +116,8 @@ class L3NATAgent(object):
self.polling_interval = conf.polling_interval 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" raise Exception("external network bridge '%s' does not exist"
% self.conf.external_network_bridge) % self.conf.external_network_bridge)