Change in vdsm[master]: networkTests: Fix operator precedence so a parameter to dnsm...

osvoboda at redhat.com osvoboda at redhat.com
Thu Dec 4 01:54:23 UTC 2014


Ondřej Svoboda has uploaded a new change for review.

Change subject: networkTests: Fix operator precedence so a parameter to dnsmasq is not empty
......................................................................

networkTests: Fix operator precedence so a parameter to dnsmasq is not empty

--dhcp-option=3 (with the missing ,<router> part) forces dnsmasq not to pass
any gateway to DHCP clients, in contrast to sending the gateway of the system
dnsmasq is running on, when this parameter is not used.

No tests employ this functionality nowadays (they did before source route
testing) but let's be correct.

Change-Id: I04e2e1910fc527652f7e1767d48318686fb844b3
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
---
M tests/functional/dhcp.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/35861/1

diff --git a/tests/functional/dhcp.py b/tests/functional/dhcp.py
index da6cd4c..81b8aaf 100644
--- a/tests/functional/dhcp.py
+++ b/tests/functional/dhcp.py
@@ -54,7 +54,7 @@
             _DNSMASQ_BINARY.cmd, '--dhcp-authoritative',
             '-p', '0', '--dhcp-range=' + dhcpRangeFrom + ',' +
             dhcpRangeTo + ',2m',
-            '--dhcp-option=3' + ',%s' % (router,) if router else '',
+            '--dhcp-option=3' + (',{0}'.format(router) if router else ''),
             '-O', '6',
             '-i', interface, '-I', 'lo', '-d',
             '--bind-interfaces'], sync=False)


-- 
To view, visit http://gerrit.ovirt.org/35861
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04e2e1910fc527652f7e1767d48318686fb844b3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>


More information about the vdsm-patches mailing list