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

2014-03-04 Thread danken
Dan Kenigsberg has posted comments on this change.

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


Patch Set 12: Code-Review+2

-- 
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: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-04 Thread danken
Dan Kenigsberg has submitted this change and it was merged.

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


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

testSetupNetworksAddDelDhcp verifies the new property.

Legacy BOOTPROTO parameter is set in a network's or iface's
['cfg'] dictionary to mimic information from ifcfg files
which may be missing in current setups.

Change-Id: Iaef31f93da978a5793fceae28763ceafedb8d3b6
Bug-Url: https://bugzilla.redhat.com/987813
Signed-off-by: Ondřej Svoboda osvob...@redhat.com
Reviewed-on: http://gerrit.ovirt.org/25170
Reviewed-by: Antoni Segura Puimedon asegu...@redhat.com
Reviewed-by: Dan Kenigsberg dan...@redhat.com
---
M lib/vdsm/netinfo.py
M tests/functional/dhcp.py
M tests/functional/networkTests.py
3 files changed, 40 insertions(+), 6 deletions(-)

Approvals:
  Ondřej Svoboda: Verified
  Antoni Segura Puimedon: Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaef31f93da978a5793fceae28763ceafedb8d3b6
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-03 Thread danken
Dan Kenigsberg has posted comments on this change.

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


Patch Set 9: Code-Review-1

(1 comment)

http://gerrit.ovirt.org/#/c/25170/9//COMMIT_MSG
Commit Message:

Line 10: 
Line 11: Legacy BOOTPROTO parameter is set in a network's or iface's
Line 12: ['cfg'] dictionary to mimic information from ifcfg files
Line 13: which may be missing in current setups.
Line 14: 
Please add a reference to

Bug-Url: https://bugzilla.redhat.com/987813
Line 15: Change-Id: Iaef31f93da978a5793fceae28763ceafedb8d3b6


-- 
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: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-03 Thread asegurap
Antoni Segura Puimedon has posted comments on this change.

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


Patch Set 9:

(1 comment)

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

Line 678: 
Line 679: if dev:
Line 680: dev['cfg']['BOOTPROTO'] = netInfo['bootproto4']
Line 681: break
Line 682: 
 Indeed, I was thinking about a helper function but somehow decided this cod
Fine, you can make it operate on the dictionary, but in a helper method ;-)
Line 683: return d
Line 684: 
Line 685: 
Line 686: def isVlanned(dev):


-- 
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: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-03 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 10:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7389/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6596/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7498/ : FAILURE

-- 
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: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-03 Thread asegurap
Antoni Segura Puimedon has posted comments on this change.

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


Patch Set 10: Code-Review+1

-- 
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: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-03 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 11:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7392/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6599/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7501/ : SUCCESS

-- 
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: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-03 Thread danken
Dan Kenigsberg has posted comments on this change.

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


Patch Set 11: Code-Review-1

(1 comment)

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

Line 1710: 
Line 1711: if bridged:
Line 1712: self.assertEqual(net['cfg']['BOOTPROTO'], 'dhcp')
Line 1713: 
Line 1714: bridges = self.vdsm_net.netinfo.bridges
I am so sorry, but this now collides with bridges from 
http://gerrit.ovirt.org/25203. Please rename your local variable.
Line 1715: self.assertIn(NETWORK_NAME, bridges)
Line 1716: 
self.assertEqual(bridges[NETWORK_NAME]['cfg']['BOOTPROTO'],
Line 1717:  'dhcp')
Line 1718: 


-- 
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: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-03 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 12:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7399/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6606/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7508/ : SUCCESS

-- 
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: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-03 Thread osvoboda
Ondřej Svoboda has posted comments on this change.

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


Patch Set 12: Verified+1

Network functional tests pass with the exception of testIPv6ConfigNetwork.

-- 
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: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-03 Thread asegurap
Antoni Segura Puimedon has posted comments on this change.

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


Patch Set 12: Code-Review+1

-- 
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: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-02 Thread asegurap
Antoni Segura Puimedon has posted comments on this change.

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


Patch Set 9:

(2 comments)

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

Line 668: elif dev.isVLAN():
Line 669: d['vlans'][dev.name] = _vlaninfo(dev, ipaddrs)
Line 670: 
Line 671: # Older Engines use BOOTPROTO=dhcp/none from ifcfg files; stay 
compatible
Line 672: for netInfo in d['networks'].itervalues():
can we use netAttrs instead of netInfo. Too many things are netinfo NetInfo and 
netInfo in this module and I find it very confusing.
Line 673: if netInfo['bridged']:
Line 674: netInfo['cfg']['BOOTPROTO'] = netInfo['bootproto4']
Line 675: 
Line 676: for devType in ('bondings', 'bridges', 'nics', 'vlans'):


Line 678: 
Line 679: if dev:
Line 680: dev['cfg']['BOOTPROTO'] = netInfo['bootproto4']
Line 681: break
Line 682: 
I think this whole block should be moved to a helper method.

def _cfgBootprotoCompat(nets, *devDicts):
Set network 'cfg' 'BOOTPROTO' for backwards engine compatibility.
for netAttrs in nets.itervalues():
if netAttrs['bridged']:
netAttrs['cfg']['BOOTPROTO'] = netAttrs['bootproto4']

for dev, devAttrs in ((dev, devAttrs) for (dev, devAttrs) in chain(
*[devDict.iteritems() for devDict in devDicts])):
if dev == netAttrs['iface']:
devAttrs['cfg']['BOOTPROTO'] = netAttrs['bootproto4']
break

Which could be called like:
_cfgBootprotoCompat(d['networks'], d['bridges'], d['vlans'], d['bondings'],
d['nics'])
Line 683: return d
Line 684: 
Line 685: 
Line 686: def isVlanned(dev):


-- 
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: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-02 Thread danken
Dan Kenigsberg has posted comments on this change.

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


Patch Set 9: -Code-Review

(1 comment)

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

Line 678: 
Line 679: if dev:
Line 680: dev['cfg']['BOOTPROTO'] = netInfo['bootproto4']
Line 681: break
Line 682: 
 I think this whole block should be moved to a helper method.
I share Toni's sentiment: a properly-named helper function is better than 
having a comment on a long function.
Line 683: return d
Line 684: 
Line 685: 
Line 686: def isVlanned(dev):


-- 
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: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-03-02 Thread osvoboda
Ondřej Svoboda has posted comments on this change.

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


Patch Set 9:

(1 comment)

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

Line 678: 
Line 679: if dev:
Line 680: dev['cfg']['BOOTPROTO'] = netInfo['bootproto4']
Line 681: break
Line 682: 
 I share Toni's sentiment: a properly-named helper function is better than h
Indeed, I was thinking about a helper function but somehow decided this code 
would be temporary. But that does not mean it would not stay around for quite 
long, so I am for moving the code out.

I would however vote for keeping the whole loop the way it is, while renaming 
netInfo to netAttrs of course. I find Toni's proposal more complex mostly in 
terms of readability (maybe if in chain was on the second line, it would be 
easier to understand). Yes, I mean passing the whole dictionary to the helper.
Line 683: return d
Line 684: 
Line 685: 
Line 686: def isVlanned(dev):


-- 
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: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 3:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7352/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6568/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7470/ : SUCCESS

-- 
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: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 5: Verified-1

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7367/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6581/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7483/ : SUCCESS

-- 
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: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread danken
Dan Kenigsberg has posted comments on this change.

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


Patch Set 5: Code-Review-1

(1 comment)

Please change the test to reflect the (annoying) current api.

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

Line 695: for netInfo in d['networks'].itervalues():
Line 696: if netInfo['bridged']:
Line 697: netInfo['cfg']['BOOTPROTO'] = netInfo['bootproto4']
Line 698: 
Line 699: else:
You should drop the else. Bridged networks has cfg both in the network AND in 
the bridge device.
Line 700: for devType in ('bondings', 'bridges', 'nics', 'vlans'):
Line 701: dev = d[devType].get(netInfo['iface'])
Line 702: 
Line 703: if dev:


-- 
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: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread osvoboda
Ondřej Svoboda has posted comments on this change.

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


Patch Set 5:

(1 comment)

OK, I will change the test the same way.

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

Line 695: for netInfo in d['networks'].itervalues():
Line 696: if netInfo['bridged']:
Line 697: netInfo['cfg']['BOOTPROTO'] = netInfo['bootproto4']
Line 698: 
Line 699: else:
 You should drop the else. Bridged networks has cfg both in the network AN
Aaah, my bad, of course, the former comes from _getNetInfo() and the latter 
from _devinfo() through _bridgeinfo()...
Line 700: for devType in ('bondings', 'bridges', 'nics', 'vlans'):
Line 701: dev = d[devType].get(netInfo['iface'])
Line 702: 
Line 703: if dev:


-- 
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: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 6: Verified-1

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7369/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6582/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7484/ : SUCCESS

-- 
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: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 7: Verified-1

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7370/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6583/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7485/ : FAILURE

-- 
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: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread danken
Dan Kenigsberg has posted comments on this change.

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


Patch Set 7: Code-Review+2

-- 
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: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 8: Verified-1

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7372/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6585/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7487/ : FAILURE

-- 
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: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 9: Verified-1

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7373/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6586/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7488/ : SUCCESS

-- 
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: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread osvoboda
Ondřej Svoboda has posted comments on this change.

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


Patch Set 9: Verified+1

Only functional network testIPv6ConfigNetwork fails, regardless of the patches 
applied.

  File /usr/share/vdsm/tests/functional/networkTests.py, line 1641, in 
testIPv6ConfigNetwork
self.vdsm_net.netinfo.networks[network]['ipv6addrs'])
  File /usr/share/vdsm/tests/testrunner.py, line 190, in assertIn
raise self.failureException(msg)
AssertionError: 'fdb3:84e5:4ff4:55e3::1/64' not found in []

-- 
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: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-28 Thread osvoboda
Ondřej Svoboda has posted comments on this change.

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


Patch Set 9:

To be clear... This patch includes an important fix which avoids overwriting 
/etc/resolv.conf with bogus nameserver (triggered by testDhclientLeases).

But indeed, alone testIPv6ConfigNetwork fails for the same reason in both cases.

-- 
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: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-27 Thread osvoboda
Ondřej Svoboda has uploaded a new change for review.

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

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

testSetupNetworksAddDelDhcp verifies the new property.

Change-Id: Iaef31f93da978a5793fceae28763ceafedb8d3b6
Signed-off-by: Ondřej Svoboda osvob...@redhat.com
---
M lib/vdsm/netinfo.py
M tests/functional/networkTests.py
2 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/25170/1

diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index d7eccc6..510ac85 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -500,9 +500,11 @@
 Raises a KeyError if the iface does not exist.'''
 data = {}
 try:
+bootproto4 = 'dhcp' if iface in dhcp4 else 'none'
 if bridged:
 data.update({'ports': ports(iface), 'stp': bridge_stp_state(iface),
  'cfg': getIfaceCfg(iface)})
+data['cfg']['BOOTPROTO'] = bootproto4
 else:
 # ovirt-engine-3.1 expects to see the interface attribute iff the
 # network is bridgeless. Please remove the attribute and this
@@ -512,7 +514,7 @@
 ipv4addr, ipv4netmask, ipv6addrs = getIpInfo(iface, ipaddrs)
 data.update({'iface': iface, 'bridged': bridged,
  'addr': ipv4addr, 'netmask': ipv4netmask,
- 'bootproto4': iface in dhcp4,
+ 'bootproto4': bootproto4,
  'gateway': getgateway(gateways, iface),
  'ipv6addrs': ipv6addrs,
  'ipv6gateway': ipv6routes.get(iface, '::'),
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 695a29f..ec4fb1c 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -1661,12 +1661,15 @@
 veth.setLinkUp(left)
 with dnsmasqDhcp(left):
 network = {NETWORK_NAME: {'nic': right, 'bridged': False,
-  'bootprot': 'dhcp'}}
+  'bootproto': 'dhcp'}}
 
 status, msg = self.vdsm_net.setupNetworks(network, {}, NOCHK)
 self.assertEqual(status, SUCCESS, msg)
 self.assertNetworkExists(NETWORK_NAME)
 
+net = self.vdsm_net.netinfo.networks[NETWORK_NAME]
+self.assertEqual(net['bootproto4'], 'dhcp')
+
 network = {NETWORK_NAME: {'remove': True}}
 status, msg = self.vdsm_net.setupNetworks(network, {}, NOCHK)
 self.assertEqual(status, SUCCESS, msg)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaef31f93da978a5793fceae28763ceafedb8d3b6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-27 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 1:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7331/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6547/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7449/ : SUCCESS

-- 
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 osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-27 Thread osvoboda
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 osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-27 Thread danken
Dan Kenigsberg 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)

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 'bo
oh dear. this explains a lot - in particular, why slaves lost their 
connectivity.

Passing

  --port=0

to dnsmasq should avoid that.
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)


Line 1667: self.assertEqual(status, SUCCESS, msg)
Line 1668: self.assertNetworkExists(NETWORK_NAME)
Line 1669: 
Line 1670: net = self.vdsm_net.netinfo.networks[NETWORK_NAME]
Line 1671: self.assertEqual(net['bootproto4'], 'dhcp')
please add an asserion for the legacy ['cfg'][BOOTPROTO] report.
Line 1672: 
Line 1673: network = {NETWORK_NAME: {'remove': True}}
Line 1674: status, msg = self.vdsm_net.setupNetworks(network, 
{}, NOCHK)
Line 1675: self.assertEqual(status, SUCCESS, msg)


-- 
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 osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-27 Thread osvoboda
Ondřej Svoboda has posted comments on this change.

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


Patch Set 1:

(2 comments)

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'}}
 oh dear. this explains a lot - in particular, why slaves lost their connect
It is already there, in dhcp.py :-/
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)


Line 1667: self.assertEqual(status, SUCCESS, msg)
Line 1668: self.assertNetworkExists(NETWORK_NAME)
Line 1669: 
Line 1670: net = self.vdsm_net.netinfo.networks[NETWORK_NAME]
Line 1671: self.assertEqual(net['bootproto4'], 'dhcp')
 please add an asserion for the legacy ['cfg'][BOOTPROTO] report.
Along with 'bridged': True, added (I had it here prepared).
Line 1672: 
Line 1673: network = {NETWORK_NAME: {'remove': True}}
Line 1674: status, msg = self.vdsm_net.setupNetworks(network, 
{}, NOCHK)
Line 1675: self.assertEqual(status, SUCCESS, msg)


-- 
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 osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches


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

2014-02-27 Thread oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 2:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7343/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6559/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7461/ : SUCCESS

-- 
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: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches