Change in vdsm[master]: networkTests: Reorganize parameters to dnsmasq and improve c...

osvoboda at redhat.com osvoboda at redhat.com
Thu Dec 4 02:25:42 UTC 2014


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

Change subject: networkTests: Reorganize parameters to dnsmasq and improve comments
......................................................................

networkTests: Reorganize parameters to dnsmasq and improve comments

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


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/35862/1

diff --git a/tests/functional/dhcp.py b/tests/functional/dhcp.py
index 81b8aaf..078d763 100644
--- a/tests/functional/dhcp.py
+++ b/tests/functional/dhcp.py
@@ -46,16 +46,16 @@
         self.proc = None
 
     def start(self, interface, dhcpRangeFrom, dhcpRangeTo, router=None):
-        # --dhcp-option=3,<router> advertise specific router (can be None)
-        # -O 6            don't reply with any DNS servers either
-        # -d              do not daemonize and log to stderr
-        # -p 0            disable all the dnsmasq dns functionality
+        # -p 0                      don't act as a DNS server
+        # --dhcp-option=3,<router>  advertise a specific gateway (or None)
+        # --dhcp-option=6           don't reply with any DNS servers
+        # -d                        don't daemonize and log to stderr
         self.proc = execCmd([
             _DNSMASQ_BINARY.cmd, '--dhcp-authoritative',
-            '-p', '0', '--dhcp-range=' + dhcpRangeFrom + ',' +
-            dhcpRangeTo + ',2m',
+            '-p', '0',
+            '--dhcp-range={0},{1},2m'.format(dhcpRangeFrom, dhcpRangeTo),
             '--dhcp-option=3' + (',{0}'.format(router) if router else ''),
-            '-O', '6',
+            '--dhcp-option=6',
             '-i', interface, '-I', 'lo', '-d',
             '--bind-interfaces'], sync=False)
         sleep(_START_CHECK_TIMEOUT)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44127247bc4881ec5e9c7e6d9c1a48e1f254b2d8
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