openstack
/
neutron
Code Issues Proposed changes

Update metering driver to load interface driver 

Currently the metering iptables driver is using the old method
to load the interface driver. This patch allows it to load
interface driver via stevedore aliases.

Change-Id: I9e3027c1ec695ec3a09db0c53a0388e406e4ced6
Related-Bug: #1504536
(cherry picked from commit 38309ca4dc)
This commit is contained in:
Hongbin Lu 2018-08-09 21:02:01 +00:00 committed by Nate Johnston
parent 7acefb0c7f
commit 75b86f8790
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/services/metering/drivers/iptables/iptables_driver.py
View File

@ -15,9 +15,8 @@
from oslo_config import cfg from oslo_config import cfg
from oslo_log import helpers as log_helpers from oslo_log import helpers as log_helpers
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import importutils
from neutron._i18n import _ from neutron.agent.common import utils as common_utils
from neutron.agent.l3 import dvr_snat_ns from neutron.agent.l3 import dvr_snat_ns
from neutron.agent.l3 import namespaces from neutron.agent.l3 import namespaces
from neutron.agent.linux import ip_lib from neutron.agent.linux import ip_lib
@ -107,11 +106,7 @@ class IptablesMeteringDriver(abstract_driver.MeteringAbstractDriver):
self.conf = conf or cfg.CONF self.conf = conf or cfg.CONF
self.routers = {} self.routers = {}
if not self.conf.interface_driver: self.driver = common_utils.load_interface_driver(self.conf)
raise SystemExit(_('An interface driver must be specified'))
LOG.info("Loading interface driver %s", self.conf.interface_driver)
self.driver = importutils.import_object(self.conf.interface_driver,
self.conf)
def _update_router(self, router): def _update_router(self, router):
r = self.routers.get(router['id'], r = self.routers.get(router['id'],

7
releasenotes/notes/metering-iptables-driver-load-interface-driver-ca397f1db40ec643.yaml Normal file
View File

@ -0,0 +1,7 @@
---
other:
- |
The metering agent iptables driver can now load its interface driver by
using a stevedore alias in the ``metering_agent.ini`` file. For example,
``interface_driver = openvswitch`` instead of
``interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver``