openstack
/
neutron
Code Issues Proposed changes

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
This commit is contained in:
Kanzhe Jiang 2014-03-28 11:31:56 -07:00 committed by kanzhe
parent 721830c541
commit 408ef55d4e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/plugins/bigswitch/config.py
View File

@ -30,17 +30,17 @@ from neutron.extensions import portbindings
restproxy_opts = [ restproxy_opts = [
cfg.ListOpt('servers', default=['localhost:8800'], 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 " "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" "which performs the networking configuration. Only one"
"server is needed per deployment, but you may wish to" "server is needed per deployment, but you may wish to"
"deploy multiple servers to support failover.")), "deploy multiple servers to support failover.")),
cfg.StrOpt('server_auth', default=None, secret=True, cfg.StrOpt('server_auth', default=None, secret=True,
help=_("The username and password for authenticating against " 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, 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.")), "Floodlight controller.")),
cfg.BoolOpt('ssl_sticky', default=True, cfg.BoolOpt('ssl_sticky', default=True,
help=_("Trust and store the first certificate received for " help=_("Trust and store the first certificate received for "
@ -59,8 +59,8 @@ restproxy_opts = [
cfg.BoolOpt('auto_sync_on_failure', default=True, cfg.BoolOpt('auto_sync_on_failure', default=True,
help=_("If neutron fails to create a resource because " help=_("If neutron fails to create a resource because "
"the backend controller doesn't know of a dependency, " "the backend controller doesn't know of a dependency, "
"automatically trigger a full data synchronization " "the plugin automatically triggers a full data "
"to the controller.")), "synchronization to the controller.")),
cfg.IntOpt('consistency_interval', default=60, cfg.IntOpt('consistency_interval', default=60,
help=_("Time between verifications that the backend controller " help=_("Time between verifications that the backend controller "
"database is consistent with Neutron")), "database is consistent with Neutron")),

2
neutron/plugins/bigswitch/plugin.py
View File

@ -472,7 +472,7 @@ class NeutronRestProxyV2(NeutronRestProxyV2Base,
pl_config.register_config() pl_config.register_config()
self.evpool = eventlet.GreenPool(cfg.CONF.RESTPROXY.thread_pool_size) 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__) neutron_extensions.append_api_extensions_path(extensions.__path__)
self.add_meta_server_route = cfg.CONF.RESTPROXY.add_meta_server_route self.add_meta_server_route = cfg.CONF.RESTPROXY.add_meta_server_route