x
/
vmware-nsx
Code Issues Proposed changes

NSXv BGP driver: Add missing log expansion variable 

And few more nits regarding logging and log message

Change-Id: I860d6dcded27a61b7de25eac8515df02845dbb8b
This commit is contained in:
Roey Chen 2017-04-16 02:32:46 -07:00 committed by garyk
parent a7ba4590f5
commit 60d7c01c75
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vmware_nsx/services/dynamic_routing/bgp_plugin.py
View File

@ -14,8 +14,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from neutron.callbacks import events
from neutron.callbacks import registry
from neutron.callbacks import resources
@ -31,7 +29,6 @@ from vmware_nsx.extensions import edge_service_gateway_bgp_peer as ext_esg
from vmware_nsx.services.dynamic_routing.nsx_v import driver as nsxv_driver
PLUGIN_NAME = bgp_ext.BGP_EXT_ALIAS + '_nsx_svc_plugin'
LOG = logging.getLogger(__name__)
class NSXvBgpPlugin(service_base.ServicePluginBase, bgp_db.BgpDbMixin):

10
vmware_nsx/services/dynamic_routing/nsx_v/driver.py
View File

@ -201,7 +201,7 @@ class NSXvBgpDriver(object):
self._nsxv.update_routing_redistribution(edge_id,
new_enabled_state)
except vcns_exc.VcnsApiException:
LOG.warning("Failed to update BGP on edge %s.", edge_id)
LOG.warning("Failed to update BGP on edge '%s'.", edge_id)
def delete_bgp_speaker(self, context, bgp_speaker_id):
bgp_bindings = nsxv_db.get_nsxv_bgp_speaker_bindings(
@ -366,7 +366,7 @@ class NSXvBgpDriver(object):
advertise_static_routes)
except vcns_exc.VcnsApiException:
LOG.error("Failed to configure BGP speaker %s on edge '%s'.",
bgp_speaker_id)
bgp_speaker_id, edge_id)
else:
nbr = gw_bgp_neighbour(bgp_identifier, speaker['local_as'],
self._edge_password)
@ -397,7 +397,7 @@ class NSXvBgpDriver(object):
redis_rules)
except vcns_exc.VcnsApiException:
with excutils.save_and_reraise_exception():
LOG.error("Failed to configure BGP speaker %s on edge '%s'.",
LOG.error("Failed to configure BGP speaker '%s' on edge '%s'.",
speaker['id'], edge_id)
else:
nsxv_db.add_nsxv_bgp_speaker_binding(context.session, edge_id,
@ -411,8 +411,8 @@ class NSXvBgpDriver(object):
try:
self._nsxv.delete_bgp_speaker_config(edge_id)
except vcns_exc.VcnsApiException:
LOG.error("Failed to delete BGP speaker %s config on edge "
"%s.", speaker_id, edge_id)
LOG.error("Failed to delete BGP speaker '%s' config on edge "
"'%s'.", speaker_id, edge_id)
else:
nsxv_db.delete_nsxv_bgp_speaker_binding(context.session,
edge_id)