Change in vdsm[master]: netinfo: bootproto4 is now 'dhcp'/'none' instead of a boolean

osvoboda at redhat.com osvoboda at redhat.com
Thu Feb 27 15:43:16 UTC 2014


Ondřej Svoboda has posted comments on this change.

Change subject: netinfo: bootproto4 is now 'dhcp'/'none' instead of a boolean
......................................................................


Patch Set 1: Code-Review-1

(2 comments)

The functional test was fixed and extended to become actually usable but it breaks /etc/resolv.conf.

http://gerrit.ovirt.org/#/c/25170/1/lib/vdsm/netinfo.py
File lib/vdsm/netinfo.py:

Line 503:         bootproto4 = 'dhcp' if iface in dhcp4 else 'none'
Line 504:         if bridged:
Line 505:             data.update({'ports': ports(iface), 'stp': bridge_stp_state(iface),
Line 506:                          'cfg': getIfaceCfg(iface)})
Line 507:             data['cfg']['BOOTPROTO'] = bootproto4
Backwards compatibility was omitted in the original patch.
Line 508:         else:
Line 509:             # ovirt-engine-3.1 expects to see the "interface" attribute iff the
Line 510:             # network is bridgeless. Please remove the attribute and this
Line 511:             # comment when the version is no longer supported.


http://gerrit.ovirt.org/#/c/25170/1/tests/functional/networkTests.py
File tests/functional/networkTests.py:

Line 1660:             veth.setIP(left, IP_ADDRESS, IP_CIDR)
Line 1661:             veth.setLinkUp(left)
Line 1662:             with dnsmasqDhcp(left):
Line 1663:                 network = {NETWORK_NAME: {'nic': right, 'bridged': False,
Line 1664:                                           'bootproto': 'dhcp'}}
I decided to use this test becase it was not testing out much even with 'bootproto' fixed.

Unfortunately, it causes /etc/resolv.conf to be rewritten:

; generated by /sbin/dhclient-script
nameserver 240.0.0.1
Line 1665: 
Line 1666:                 status, msg = self.vdsm_net.setupNetworks(network, {}, NOCHK)
Line 1667:                 self.assertEqual(status, SUCCESS, msg)
Line 1668:                 self.assertNetworkExists(NETWORK_NAME)


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iaef31f93da978a5793fceae28763ceafedb8d3b6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Ondřej Svoboda <osvoboda at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes


More information about the vdsm-patches mailing list