Browse Source

OSP-302 Arista rebranding

Changes logs and descrptions from bcf to ccf

Change-Id: Ibda2ef6cb5326a1fb028a4f4ba3ab12c7f44aeb9
changes/45/783745/2 15.0.1
Weifan Fu 3 weeks ago
parent
commit
02b7c648b9
10 changed files with 28 additions and 29 deletions
  1. +2
    -2
      README.rst
  2. +2
    -2
      networking_bigswitch/plugins/bigswitch/README
  3. +1
    -1
      networking_bigswitch/plugins/bigswitch/bsn_service_plugin.py
  4. +6
    -7
      networking_bigswitch/plugins/bigswitch/config.py
  5. +2
    -2
      networking_bigswitch/plugins/bigswitch/plugin.py
  6. +6
    -6
      networking_bigswitch/plugins/bigswitch/servermanager.py
  7. +1
    -1
      networking_bigswitch/plugins/bigswitch/state_syncer.py
  8. +2
    -2
      networking_bigswitch/plugins/ml2/drivers/mech_bigswitch/driver.py
  9. +2
    -2
      networking_bigswitch/tests/unit/bigswitch/test_servermanager.py
  10. +4
    -4
      setup.cfg

+ 2
- 2
README.rst View File

@ -2,7 +2,7 @@ Welcome!
========
This library contains the components required to integrate an
OpenStack deployment with a Big Switch Networks fabric.
OpenStack deployment with an Arista Networks Converged Cloud Fabric.
* Source: https://opendev.org/x/networking-bigswitch
* Bugs: https://bugs.launchpad.net/networking-bigswitch
@ -11,4 +11,4 @@ OpenStack deployment with a Big Switch Networks fabric.
External Resources:
===================
Big Switch Networks Website: http://www.bigswitch.com
Arista Networks Website: http://www.arista.com

+ 2
- 2
networking_bigswitch/plugins/bigswitch/README View File

@ -1,4 +1,4 @@
# Neuron REST Proxy Plug-in for Big Switch and FloodLight Controllers
# Neuron REST Proxy Plug-in for Arista Converged Cloud Fabric Controllers
This module provides a generic neutron plugin 'NeutronRestProxy' that
translates neutron function calls to authenticated REST requests (JSON supported)
@ -7,7 +7,7 @@ to a set of redundant external network controllers.
It also keeps a local persistent store of neutron state that has been
setup using that API.
Currently the FloodLight Openflow Controller or the Big Switch Networks Controller
Currently the Converged Cloud Fabric or the Big Cloud Fabric Controller
can be configured as external network controllers for this plugin.
For more details on this plugin, please refer to the following link:


+ 1
- 1
networking_bigswitch/plugins/bigswitch/bsn_service_plugin.py View File

@ -59,7 +59,7 @@ class BSNServicePlugin(service_base.ServicePluginBase,
return 'bsn_service_extension'
def get_plugin_description(self):
return "BSN Service Plugin"
return "Arista CCF Service Plugin"
# public CRUD methods for network templates
def get_networktemplates(self, context, filters=None, fields=None,


+ 6
- 7
networking_bigswitch/plugins/bigswitch/config.py View File

@ -24,15 +24,15 @@ from oslo_config import cfg
restproxy_opts = [
cfg.ListOpt('servers', default=['localhost:8800'],
help=_("A comma separated list of Big Switch or Floodlight "
help=_("A comma separated list of Arista CCF "
"servers and port numbers. The plugin proxies the "
"requests to the Big Switch/Floodlight server, "
"requests to the CCF 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', secret=True,
help=_("The username and password for authenticating against "
" the Big Switch or Floodlight controller.")),
" the CCF controller.")),
cfg.BoolOpt('server_ssl', default=True,
help=_("If True, Use SSL when connecting to the Big Switch or "
"Floodlight controller.")),
@ -81,12 +81,11 @@ restproxy_opts = [
help=_("Sync security group info to Big Cloud Fabric for "
"enhanced Testpath visibility.")),
cfg.BoolOpt('naming_scheme_unicode', default=True,
help=_("Configure whether or not to configure BCF "
"with unicode display-name. Applicable to BCF 5.0 "
"onwards.")),
help=_("Configure whether or not to configure CCF "
"with unicode display-name.")),
cfg.IntOpt('state_sync_interval', default=300,
help=_("Configure how often the OSP plugin should update "
"cluster information on BCF"))
"cluster information on CCF"))
]
router_opts = [
cfg.MultiStrOpt('tenant_default_router_rule', default=['*:any:any:permit'],


+ 2
- 2
networking_bigswitch/plugins/bigswitch/plugin.py View File

@ -490,7 +490,7 @@ class NeutronRestProxyV2Base(db_base_plugin_v2.NeutronDbPluginV2,
def _send_create_network(self, network, context=None):
tenant_id = network['tenant_id']
if self._skip_bcf_network_event(network):
LOG.info('Skipping BCF segment create for Network: %(name)s',
LOG.info('Skipping CCF segment create for Network: %(name)s',
{'name': network.get('name')})
return
@ -521,7 +521,7 @@ class NeutronRestProxyV2Base(db_base_plugin_v2.NeutronDbPluginV2,
net_id = network['id']
tenant_id = network['tenant_id']
if self._skip_bcf_network_event(network):
LOG.info('Skipping BCF segment update for Network: %(name)s',
LOG.info('Skipping CCF segment update for Network: %(name)s',
{'name': network.get('name')})
return


+ 6
- 6
networking_bigswitch/plugins/bigswitch/servermanager.py View File

@ -164,7 +164,7 @@ class NetworkNameChangeError(exceptions.NeutronException):
class RemoteRestError(exceptions.NeutronException):
message = _("Error in REST call to BCF "
message = _("Error in REST call to CCF "
"controller: %(reason)s")
status = None
@ -430,7 +430,7 @@ class ServerProxy(object):
respstr = response.read()
respdata = respstr
bcf_response_time = time.time()
LOG.debug("Time waited to get response from BCF %.2fsecs",
LOG.debug("Time waited to get response from CCF %.2fsecs",
(bcf_response_time - bcf_request_time))
if response.status in self.success_codes:
try:
@ -634,7 +634,7 @@ class ServerPool(object):
self.state_sync_interval)
LOG.info('Orchestrator State Sync is enabled.')
else:
LOG.info('BCF does not support orchestrator-state-sync, '
LOG.info('CCF does not support orchestrator-state-sync, '
'disabled it.')
else:
LOG.info('Orchestrator State Sync is disabled.')
@ -701,7 +701,7 @@ class ServerPool(object):
# unicode enabled, but not supported by controller
else:
LOG.warning('naming_scheme_unicode is set to True,'
' but BCF does not support it.'
' but CCF does not support it.'
' Unicode names Disabled')
def is_unicode_enabled(self):
@ -712,7 +712,7 @@ class ServerPool(object):
"""
LOG.debug('Current Capabilities: %s', self.get_capabilities())
if not self.get_capabilities():
msg = 'Capabilities unknown! Please check BCF controller status.'
msg = 'Capabilities unknown! Please check CCF controller status.'
raise RemoteRestError(reason=msg)
if self.cfg_unicode_enabled and 'display-name' in \
@ -1245,7 +1245,7 @@ class ServerPool(object):
# that is wrong, we need to raise an exception
raise Exception(_("TOPO_SYNC: failed to retrieve data."))
LOG.debug("TOPO_SYNC: data received from OSP, sending "
"request to BCF.")
"request to CCF.")
errstr = _("Unable to perform forced topology_sync: %s")
return True, self.rest_action('POST', TOPOLOGY_PATH, data, errstr)
except Exception as e:


+ 1
- 1
networking_bigswitch/plugins/bigswitch/state_syncer.py View File

@ -313,7 +313,7 @@ class StateSyncer(object):
post_data['bridge-mapping'] = bridge_mapping_list
# post to BCF
LOG.debug('OSP cluster info json sent to BCF is %s', post_data)
LOG.debug('OSP cluster info json sent to CCF is %s', post_data)
self.serverpool.rest_update_osp_cluster_info(post_data)
except Exception as e:


+ 2
- 2
networking_bigswitch/plugins/ml2/drivers/mech_bigswitch/driver.py View File

@ -164,11 +164,11 @@ class BigSwitchMechanismDriver(plugin.NeutronRestProxyV2Base,
self.bsn_create_security_group(sg_id=sg_id, context=context)
def bsn_delete_sg_rule(self, sg_rule, context):
LOG.debug("Deleting security group rule from BCF: %s", sg_rule)
LOG.debug("Deleting security group rule from CCF: %s", sg_rule)
if not context:
LOG.error(_LE(
"Context missing when trying to delete security group rule. "
"Please force-bcf-sync to ensure consistency with BCF."))
"Please force-ccf-sync to ensure consistency with CCF."))
sg_id = sg_rule['security_group_id']
# we over write the sg on bcf controller instead of deleting
try:


+ 2
- 2
networking_bigswitch/tests/unit/bigswitch/test_servermanager.py View File

@ -401,7 +401,7 @@ class ServerManagerTests(test_rp.BigSwitchProxyPluginV2TestCase):
pl.servers.rest_action,
**{'action': 'DELETE', 'resource': '/',
'data': '',
'errstr': "Unable to DELETE query to BCF: %s",
'errstr': "Unable to DELETE query to CCF: %s",
'ignore_codes': []})
topo_mock.assert_called_once_with(**{'check_ts': True})
@ -419,7 +419,7 @@ class ServerManagerTests(test_rp.BigSwitchProxyPluginV2TestCase):
self.assertRaises(servermanager.RemoteRestError,
pl.servers.rest_action,
**{'action': 'POST', 'resource': '/', 'data': '',
'errstr': "Unable to POST query to BCF: %s",
'errstr': "Unable to POST query to CCF: %s",
'ignore_codes': []})
topo_mock.assert_called_once_with(**{'check_ts': True})


+ 4
- 4
setup.cfg View File

@ -1,11 +1,11 @@
[metadata]
name = networking-bigswitch
summary = Big Switch Networks Plugins for OpenStack Networking
summary = Arista Networks CCF Plugin for OpenStack Networking
description-file =
README.rst
author = Big Switch Networks
author-email = support@bigswitch.com
home-page = http://www.bigswitch.com/
author = Arista Networks
author-email = support@arista.com
home-page = http://www.arista.com/
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology


Loading…
Cancel
Save