← Back to branch summary

~ubuntu-branches/ubuntu/saucy/neutron/saucy

« back to all changes in this revision

Viewing changes to neutron/plugins/ml2/drivers/mech_arista/mechanism_arista.py

  • Committer: Package Import Robot
  • Author(s): James Page, Yolanda Robla, Chuck Short, James Page
  • Date: 2013-10-03 15:18:04 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20131003151804-ho3t21wv16l8402y
Tags: 1:2013.2~rc1-0ubuntu1
[ Yolanda Robla ]
* debian/tests: added testing agents

[ Chuck Short ]
* debian/patches/disable-udev-tests.patch: Refreshed.
* debian/patches/disable-ml2-notification-tests.patch: Refreshed.
* debian/control:
  - Dropped python-setuptools-git python-netifaces, and python-nose from
    build dependencies.
  - Dropped python-configobj, python-gflags from binary dependencies.
  - Added build python-requests python-six, and python-jinja2 build
    dependencies.
  - Added versioned dependencies for python-amqplib,
    python-pbr, python-novaclient, python-cliff,
    python-testtools, and python-eventlet.
  - Bumped versioned depends for python-stevedore, pyhton-novaclient,
    python-oslo.config, and testrepository

[ James Page ]
* New upstream release candidate:
  - d/patches: Refreshed.
* d/rules: unpatch/patch neutron.conf around test execution to ensure that
  as many tests as possible actually pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/plugins/ml2/drivers/mech_arista/mechanism_arista.py
1
 
# Copyright (c) 2013 OpenStack, LLC.
 
1
# Copyright (c) 2013 OpenStack Foundation
2
2
#
3
3
# Licensed under the Apache License, Version 2.0 (the "License");
4
4
# you may not use this file except in compliance with the License.
27
27
 
28
28
LOG = logging.getLogger(__name__)
29
29
 
30
 
EOS_UNREACHABLE_MSG = 'Unable to reach EOS'
 
30
EOS_UNREACHABLE_MSG = _('Unable to reach EOS')
31
31
 
32
32
 
33
33
class AristaRPCWrapper(object):
235
235
            ret = ret[len(command_start):-len(command_end)]
236
236
        except Exception as error:
237
237
            host = cfg.CONF.ml2_arista.eapi_host
238
 
            msg = ('Error %s while trying to execute commands %s on EOS %s' %
239
 
                   (error, full_command, host))
240
 
            LOG.exception(_("%s"), msg)
 
238
            msg = (_('Error %(err)s while trying to execute '
 
239
                     'commands %(cmd)s on EOS %(host)s') %
 
240
                   {'err': error, 'cmd': full_command, 'host': host})
 
241
            LOG.exception(msg)
241
242
            raise arista_exc.AristaRpcError(msg=msg)
242
243
 
243
244
        return ret
275
276
    def synchronize(self):
276
277
        """Sends data to EOS which differs from neutron DB."""
277
278
 
278
 
        LOG.info('Syncing Neutron  <-> EOS')
 
279
        LOG.info(_('Syncing Neutron <-> EOS'))
279
280
        try:
280
281
            eos_tenants = self._rpc.get_tenants()
281
282
        except arista_exc.AristaRpcError: