From: Terry Wilson <twilson@redhat.com>
Date: Thu, 22 Jan 2015 07:43:09 +0000 (-0600)
Subject: Use proper capitalization for OVS table names
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8200f8004afbd99235e5dbc9c5ac7f155f9f7bda;p=openstack-build%2Fneutron-build.git

Use proper capitalization for OVS table names

ovs-vsctl will convert the names for you, but native OVSDB won't.
It's always better to match case correctly when possible.

Partially-implemnts: blueprint vsctl-to-ovsdb
Change-Id: Ic782856446449a0296564cb6a0e6cf20d7ccfa7d
---

diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py
index ac4b17491..740a72984 100644
--- a/neutron/agent/linux/ovs_lib.py
+++ b/neutron/agent/linux/ovs_lib.py
@@ -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):
diff --git a/neutron/plugins/ibm/agent/sdnve_neutron_agent.py b/neutron/plugins/ibm/agent/sdnve_neutron_agent.py
index 03be7ccf3..ff417fbdd 100644
--- a/neutron/plugins/ibm/agent/sdnve_neutron_agent.py
+++ b/neutron/plugins/ibm/agent/sdnve_neutron_agent.py
@@ -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
diff --git a/neutron/tests/unit/agent/linux/test_ovs_lib.py b/neutron/tests/unit/agent/linux/test_ovs_lib.py
index 6df0c3044..303d3265a 100644
--- a/neutron/tests/unit/agent/linux/test_ovs_lib.py
+++ b/neutron/tests/unit/agent/linux/test_ovs_lib.py
@@ -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):