Change in vdsm[master]: upgrade_unified: fix for nicless and bridges with vnics

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

Change subject: upgrade_unified: fix for nicless and bridges with vnics
..


Patch Set 2:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9754/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8817/ : SUCCESS

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon 
Gerrit-Reviewer: Antoni Segura Puimedon 
Gerrit-Reviewer: Assaf Muller 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: David Caro 
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]: upgrade_unified: fix for nicless and bridges with vnics

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

Change subject: upgrade_unified: fix for nicless and bridges with vnics
..


Patch Set 3:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged/1399/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon 
Gerrit-Reviewer: Antoni Segura Puimedon 
Gerrit-Reviewer: Assaf Muller 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: David Caro 
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]: upgrade_unified: fix for nicless and bridges with vnics

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

Change subject: upgrade_unified: fix for nicless and bridges with vnics
..


upgrade_unified: fix for nicless and bridges with vnics

The upgrade script had a mistake when dealing with bridged networks
that made it not consider bridgeless networks nor bridges that had
vnics on them.

This bug would have made that a bridge with nic eth2 and several
vnics would have setup a network targetting:
'eth2vnet0vnet1'

Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Signed-off-by: Antoni S. Puimedon 
Reviewed-on: http://gerrit.ovirt.org/28354
Reviewed-by: Dan Kenigsberg 
---
M lib/vdsm/tool/unified_persistence.py
1 file changed, 17 insertions(+), 5 deletions(-)

Approvals:
  Antoni Segura Puimedon: Verified
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon 
Gerrit-Reviewer: Antoni Segura Puimedon 
Gerrit-Reviewer: Assaf Muller 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: David Caro 
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]: upgrade_unified: fix for nicless and bridges with vnics

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

Change subject: upgrade_unified: fix for nicless and bridges with vnics
..


Patch Set 2: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon 
Gerrit-Reviewer: Antoni Segura Puimedon 
Gerrit-Reviewer: Assaf Muller 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: David Caro 
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]: upgrade_unified: fix for nicless and bridges with vnics

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

Change subject: upgrade_unified: fix for nicless and bridges with vnics
..


Patch Set 2: Verified+1

Copying score.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon 
Gerrit-Reviewer: Antoni Segura Puimedon 
Gerrit-Reviewer: Assaf Muller 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: David Caro 
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]: upgrade_unified: fix for nicless and bridges with vnics

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

Change subject: upgrade_unified: fix for nicless and bridges with vnics
..


Patch Set 1:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9690/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8757/ : SUCCESS

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon 
Gerrit-Reviewer: Antoni Segura Puimedon 
Gerrit-Reviewer: Dan Kenigsberg 
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]: upgrade_unified: fix for nicless and bridges with vnics

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

Change subject: upgrade_unified: fix for nicless and bridges with vnics
..


Patch Set 1:

Verified manually trying several network configurations:

Add nicless net
toniel602 ~ # vdsClient -s 0 addNetwork bridge=nicless nics= bootproto=none 
  
Done
Add bridged, vlanned, bonded network
toniel602 ~ # vdsClient -s 0 addNetwork bridge=bar nics=eth3,eth4 
bonding=bond0 vlan=15
Done
Add another port to the bridge (simulates having a vnet device)
toniel602 ~ # ip link add vnet0 link eth1 type macvlan
toniel602 ~ # brctl addif bar vnet0

Check that the vnet is not reported and that the nicless network does not
report a value-less nic key.
In [36]: unified_persistence._getNetInfo()
Out[36]: 
({'bar': {'bonding': 'bond0',
  'bridged': True,
  'defaultRoute': False,
  'mtu': 1500,
  'stp': False,
  'vlan': '15'},
  'nicless': {'bridged': True,
  'defaultRoute': False,
  'mtu': 1500,
  'stp': False}},
 {'bond0': {'nics': ['eth3', 'eth4'], 'options': 'mode=802.3ad 
miimon=150'}})

Try with simple brided and bridgeless networks over a nic:

toniel602 ~ # vdsClient -s 0 addNetwork bridge=other nics=eth3 
bootproto=none
Done
toniel602 ~ # vdsClient -s 0 addNetwork bridge=otherbrless nics=eth4 
bootproto=none bridged=False   
Done

In [18]: unified_persistence._getNetInfo()
Out[18]: 
({'other': {'bridged': True,
'defaultRoute': False,
'mtu': 1500,
'nic': 'eth3',
'stp': False},
  'otherbrless': {'bridged': False,
  'defaultRoute': False,
  'mtu': 1500,
  'nic': u'eth4'}},
 {})

Then a bridged vlanned:
toniel602 ~ # vdsClient -s 0 addNetwork bridge=bar nics=eth3 vlan=15
Done
In [24]: unified_persistence._getNetInfo()
Out[24]: 
({'bar': {'bridged': True,
  'defaultRoute': False,
  'mtu': 1500,
  'nic': 'eth3',
  'stp': False,
  'vlan': '15'}},
{})

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon 
Gerrit-Reviewer: Antoni Segura Puimedon 
Gerrit-Reviewer: Dan Kenigsberg 
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]: upgrade_unified: fix for nicless and bridges with vnics

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

Change subject: upgrade_unified: fix for nicless and bridges with vnics
..


Patch Set 1: Verified+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon 
Gerrit-Reviewer: Antoni Segura Puimedon 
Gerrit-Reviewer: Dan Kenigsberg 
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]: upgrade_unified: fix for nicless and bridges with vnics

2014-06-04 Thread asegurap 
Antoni Segura Puimedon has uploaded a new change for review.

Change subject: upgrade_unified: fix for nicless and bridges with vnics
..

upgrade_unified: fix for nicless and bridges with vnics

The upgrade script had a mistake when dealing with bridged networks
that made it not consider bridgeless networks nor bridges that had
vnics on them.

This bug would have made that a bridge with nic eth2 and several
vnics would have setup a network targetting:
'eth2vnet0vnet1'

Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Signed-off-by: Antoni S. Puimedon 
---
M lib/vdsm/tool/unified_persistence.py
1 file changed, 15 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/28354/1

diff --git a/lib/vdsm/tool/unified_persistence.py 
b/lib/vdsm/tool/unified_persistence.py
index 46bf8e2..d4222e6 100644
--- a/lib/vdsm/tool/unified_persistence.py
+++ b/lib/vdsm/tool/unified_persistence.py
@@ -64,10 +64,20 @@
 networks[network]['bridged'] = netParams['bridged']
 
 # Determine devices: nic/bond -> vlan -> bridge
-physicalDevice = "".join(netParams['ports']) if \
-netParams.get('ports') else netParams.get('interface')
-topLevelDevice = netParams['iface'] if \
-netParams['bridged'] else physicalDevice
+topLevelDevice = netParams['iface']
+if netParams['bridged']:
+devices = (netinfo.nics.keys() + netinfo.vlans.keys() +
+   netinfo.bondings.keys())
+nonVnicPorts = [dev for dev in netParams['ports'] if
+dev in devices]
+# A network should only ever have (at most) an underlying
+# device hierarchy
+if nonVnicPorts:
+physicalDevice, = nonVnicPorts
+else:
+physicalDevice = None  # vdsm allows nicless VM nets
+else:
+physicalDevice = topLevelDevice
 
 # Copy ip addressing information
 bootproto = str(getIfaceCfg(topLevelDevice).get('BOOTPROTO'))
@@ -96,7 +106,7 @@
 # Is the physical device a bond or a nic?
 if physicalDevice in netinfo.bondings:
 networks[network]['bonding'] = physicalDevice
-else:
+elif physicalDevice in netinfo.nics:
 networks[network]['nic'] = physicalDevice
 
 return networks


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I979ad260e86865fc7ca9760d58765e4bf0c14c3c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches