x/vmware-nsx
Code Issues Proposed changes

Do not require sudo/rootwrap to check for dnsmasq version

Browse Source 
The dnsmasq version check does not need root privileges
to run as with low privs it works just fine. As a side
effect, the use of the rootwrapper was causing unit tests
to hung because the execute call in check_version was not
being stubbed out. Weirdly enough this wasn't caught in
a previous Gerrit run; there must be a passwordless sudo
lurking around somewhere in the Gerrit infrastructure.

Fixes bug #1178800

Change-Id: I4d0bd218768eec2439d3907587682ff35884a262
This commit is contained in:
armando-migliaccio 2013-05-10 13:10:02 -07:00
parent 21575de9d3
commit 91b56e41ee
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/quantum/rootwrap.d/dhcp.filters
View File

@ -11,9 +11,7 @@
# dhcp-agent
ip_exec_dnsmasq: DnsmasqNetnsFilter, /sbin/ip, root
dnsmasq: DnsmasqFilter, /sbin/dnsmasq, root
dnsmasq_ver: DnsmasqVersionFilter, /sbin/dnsmasq, root
dnsmasq_usr: DnsmasqFilter, /usr/sbin/dnsmasq, root
dnsmasq_usr_ver: DnsmasqVersionFilter, /usr/sbin/dnsmasq, root
# dhcp-agent uses kill as well, that's handled by the generic KillFilter
# it looks like these are the only signals needed, per
# quantum/agent/linux/dhcp.py

2
quantum/agent/dhcp_agent.py
View File

@ -80,7 +80,7 @@ class DhcpAgent(manager.Manager):
self.device_manager = DeviceManager(self.conf, self.plugin_rpc)
self.lease_relay = DhcpLeaseRelay(self.update_lease)
self.dhcp_driver_cls.check_version(self.root_helper)
self.dhcp_driver_cls.check_version()
self._populate_networks_cache()
def _populate_networks_cache(self):

8
quantum/agent/linux/dhcp.py
View File

@ -101,7 +101,7 @@ class DhcpBase(object):
raise NotImplementedError
@classmethod
def check_version(cls, root_helper):
def check_version(cls):
"""Execute version checks on DHCP server."""
raise NotImplementedError
@ -224,11 +224,11 @@ class Dnsmasq(DhcpLocalProcess):
MINIMUM_VERSION = 2.59
@classmethod
def check_version(cls, root_helper):
def check_version(cls):
is_valid_version = None
try:
cmd = ['dnsmasq', '--version']
out = utils.execute(cmd, root_helper)
out = utils.execute(cmd)
ver = re.findall("\d+.\d+", out)[0]
is_valid_version = float(ver) >= cls.MINIMUM_VERSION
if not is_valid_version:
@ -236,7 +236,7 @@ class Dnsmasq(DhcpLocalProcess):
'DHCP AGENT MAY NOT RUN CORRECTLY! '
'Please ensure that its version is %s '
'or above!'), cls.MINIMUM_VERSION)
except (RuntimeError, IndexError, ValueError):
except (OSError, RuntimeError, IndexError, ValueError):
LOG.warning(_('Unable to determine dnsmasq version. '
'Please ensure that its version is %s '
'or above!'), cls.MINIMUM_VERSION)

6
quantum/rootwrap/filters.py
View File

@ -171,12 +171,6 @@ class DnsmasqFilter(CommandFilter):
return env
class DnsmasqVersionFilter(CommandFilter):
"""Specific filter to check dnsmasq version."""
def match(self, userargs):
return userargs[0] == "dnsmasq" and userargs[1] == "--version"
class DnsmasqNetnsFilter(DnsmasqFilter):
"""Specific filter for the dnsmasq call (which includes env)."""

4
quantum/tests/unit/test_linux_dhcp.py
View File

@ -142,7 +142,7 @@ class TestDhcpBase(base.BaseTestCase):
def test_check_version_abstract_error(self):
self.assertRaises(NotImplementedError,
dhcp.DhcpBase.check_version, None)
dhcp.DhcpBase.check_version)
def test_base_abc_error(self):
self.assertRaises(TypeError, dhcp.DhcpBase, None)
@ -720,7 +720,7 @@ tag:tag1,option:classless-static-route,%s,%s""".lstrip() % (fake_v6,
def _check_version(self, cmd_out, expected_value):
with mock.patch('quantum.agent.linux.utils.execute') as cmd:
cmd.return_value = cmd_out
result = dhcp.Dnsmasq.check_version('sudo')
result = dhcp.Dnsmasq.check_version()
self.assertEqual(result, expected_value)
def test_check_minimum_version(self):