From: Kanzhe Jiang <kanzhe@gmail.com>
Date: Fri, 28 Mar 2014 18:31:56 +0000 (-0700)
Subject: Update BigSwitch Name to its correct name
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8a901fd0ee6ec056184d36eca709799e6ab2e837;p=openstack-build%2Fneutron-build.git

Update BigSwitch Name to its correct name

Update Neutron documentation and code comments to replace
"BigSwitch" name to "Big Switch"

Closes-Bug: #1299145
Change-Id: I7c14f6170871b361c8929898ee6af5d1a1f41714
(cherry picked from commit 408ef55d4ef1a9d246571511203ab337ba5346c6)
---

diff --git a/neutron/plugins/bigswitch/config.py b/neutron/plugins/bigswitch/config.py
index 10a44a249..231d856a5 100644
--- a/neutron/plugins/bigswitch/config.py
+++ b/neutron/plugins/bigswitch/config.py
@@ -30,17 +30,17 @@ from neutron.extensions import portbindings
 
 restproxy_opts = [
     cfg.ListOpt('servers', default=['localhost:8800'],
-                help=_("A comma separated list of BigSwitch or Floodlight "
+                help=_("A comma separated list of Big Switch or Floodlight "
                        "servers and port numbers. The plugin proxies the "
-                       "requests to the BigSwitch/Floodlight server, "
+                       "requests to the Big Switch/Floodlight server, "
                        "which performs the networking configuration. Only one"
                        "server is needed per deployment, but you may wish to"
                        "deploy multiple servers to support failover.")),
     cfg.StrOpt('server_auth', default=None, secret=True,
                help=_("The username and password for authenticating against "
-                      " the BigSwitch or Floodlight controller.")),
+                      " the Big Switch or Floodlight controller.")),
     cfg.BoolOpt('server_ssl', default=True,
-                help=_("If True, Use SSL when connecting to the BigSwitch or "
+                help=_("If True, Use SSL when connecting to the Big Switch or "
                        "Floodlight controller.")),
     cfg.BoolOpt('ssl_sticky', default=True,
                 help=_("Trust and store the first certificate received for "
@@ -59,8 +59,8 @@ restproxy_opts = [
     cfg.BoolOpt('auto_sync_on_failure', default=True,
                 help=_("If neutron fails to create a resource because "
                        "the backend controller doesn't know of a dependency, "
-                       "automatically trigger a full data synchronization "
-                       "to the controller.")),
+                       "the plugin automatically triggers a full data "
+                       "synchronization to the controller.")),
     cfg.IntOpt('consistency_interval', default=60,
                help=_("Time between verifications that the backend controller "
                       "database is consistent with Neutron")),
diff --git a/neutron/plugins/bigswitch/plugin.py b/neutron/plugins/bigswitch/plugin.py
index 161b71f8d..dbf58e0fd 100644
--- a/neutron/plugins/bigswitch/plugin.py
+++ b/neutron/plugins/bigswitch/plugin.py
@@ -474,7 +474,7 @@ class NeutronRestProxyV2(NeutronRestProxyV2Base,
         pl_config.register_config()
         self.evpool = eventlet.GreenPool(cfg.CONF.RESTPROXY.thread_pool_size)
 
-        # Include the BigSwitch Extensions path in the api_extensions
+        # Include the Big Switch Extensions path in the api_extensions
         neutron_extensions.append_api_extensions_path(extensions.__path__)
 
         self.add_meta_server_route = cfg.CONF.RESTPROXY.add_meta_server_route