openstack
/
neutron
Code Issues Proposed changes

Merge "Use proper capitalization for OVS table names"

This commit is contained in:
Jenkins 2015-02-09 22:52:30 +00:00 committed by Gerrit Code Review
parent 444ee1f70e 8200f8004a
commit 596db61cf9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/linux/ovs_lib.py
View File

@ -155,7 +155,7 @@ class OVSBridge(BaseOVS):
check_error=True)
def set_protocols(self, protocols):
self.set_db_attribute('bridge', self.br_name, 'protocols', protocols,
self.set_db_attribute('Bridge', self.br_name, 'protocols', protocols,
check_error=True)
def create(self):

4
neutron/plugins/ibm/agent/sdnve_neutron_agent.py
View File

@ -146,7 +146,7 @@ class SdnveNeutronAgent(object):
if out_of_band:
LOG.debug("info_update received. New controller"
"is set to be out of band")
self.int_br.set_db_attribute("controller",
self.int_br.set_db_attribute("Controller",
self.int_bridge_name,
"connection-mode",
"out-of-band")
@ -175,7 +175,7 @@ class SdnveNeutronAgent(object):
if controller_ip:
int_br.set_controller(["tcp:" + controller_ip])
if out_of_band:
int_br.set_db_attribute("controller", bridge_name,
int_br.set_db_attribute("Controller", bridge_name,
"connection-mode", "out-of-band")
return int_br

2
neutron/tests/unit/agent/linux/test_ovs_lib.py
View File

@ -126,7 +126,7 @@ class OVS_Lib_Test(base.BaseTestCase):
def test_set_protocols(self):
protocols = 'OpenFlow13'
self.br.set_protocols(protocols)
self._verify_vsctl_mock('set', 'bridge', self.BR_NAME,
self._verify_vsctl_mock('set', 'Bridge', self.BR_NAME,
"protocols=%s" % protocols)
def test_create(self):