Change in vdsm[master]: netinfo: Add shorthand NetInfo.bridges for consistency
Dan Kenigsberg has posted comments on this change. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. Patch Set 3: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d Gerrit-PatchSet: 3 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: Add shorthand NetInfo.bridges for consistency
Dan Kenigsberg has submitted this change and it was merged. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. netinfo: Add shorthand NetInfo.bridges for consistency Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d Signed-off-by: Ondřej Svoboda osvob...@redhat.com Reviewed-on: http://gerrit.ovirt.org/25212 Reviewed-by: Antoni Segura Puimedon asegu...@redhat.com Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M lib/vdsm/netinfo.py M tests/configNetworkTests.py M tests/netmodelsTests.py 3 files changed, 8 insertions(+), 1 deletion(-) 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/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d Gerrit-PatchSet: 4 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: Add shorthand NetInfo.bridges for consistency
Ondřej Svoboda has posted comments on this change.
Change subject: netinfo: Add shorthand NetInfo.bridges for consistency
..
Patch Set 1:
(1 comment)
How minimal can the 'bridges' dictionary be? I don't think the information must
be full-blown in a mere test.
'nics' dictinary degraded into a simple iterable; I propose tu put 'ports' in
the dictionary because there is no more information contained in 'networks' for
the bridges.
http://gerrit.ovirt.org/#/c/25212/1/tests/configNetworkTests.py
File tests/configNetworkTests.py:
Line 87:}
Line 88: },
Line 89: 'nics': ['eth0', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5',
'eth6',
Line 90: 'eth7', 'eth8', 'eth9', 'eth10'],
Line 91: 'bridges': {},
This is not consistent with the rest of the information in _netinfo. fakebr
Is e.g. 'fakebrnet2': {'ports': ['eth7.1']} enough for a bridge record?
Line 92: 'bondings': {'bond00': {'slaves': ['eth5', 'eth6']}}
Line 93: }
Line 94:
Line 95: fakeInfo = netinfo.NetInfo(_netinfo)
--
To view, visit http://gerrit.ovirt.org/25212
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d
Gerrit-PatchSet: 1
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: Add shorthand NetInfo.bridges for consistency
Antoni Segura Puimedon has posted comments on this change.
Change subject: netinfo: Add shorthand NetInfo.bridges for consistency
..
Patch Set 1:
(1 comment)
http://gerrit.ovirt.org/#/c/25212/1/tests/configNetworkTests.py
File tests/configNetworkTests.py:
Line 87:}
Line 88: },
Line 89: 'nics': ['eth0', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5',
'eth6',
Line 90: 'eth7', 'eth8', 'eth9', 'eth10'],
Line 91: 'bridges': {},
Is e.g. 'fakebrnet2': {'ports': ['eth7.1']} enough for a bridge record?
That looks good for now.
Line 92: 'bondings': {'bond00': {'slaves': ['eth5', 'eth6']}}
Line 93: }
Line 94:
Line 95: fakeInfo = netinfo.NetInfo(_netinfo)
--
To view, visit http://gerrit.ovirt.org/25212
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d
Gerrit-PatchSet: 1
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: Add shorthand NetInfo.bridges for consistency
Antoni Segura Puimedon has posted comments on this change. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. Patch Set 2: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d Gerrit-PatchSet: 2 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: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: netinfo: Add shorthand NetInfo.bridges for consistency
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7393/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6600/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7502/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d Gerrit-PatchSet: 2 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: Add shorthand NetInfo.bridges for consistency
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. Patch Set 3: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7400/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6607/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7509/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d Gerrit-PatchSet: 3 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: Add shorthand NetInfo.bridges for consistency
Ondřej Svoboda has posted comments on this change. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. Patch Set 3: Verified+1 Network functional tests pass with the exception of testIPv6ConfigNetwork. -- To view, visit http://gerrit.ovirt.org/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d Gerrit-PatchSet: 3 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: Add shorthand NetInfo.bridges for consistency
Dan Kenigsberg has posted comments on this change. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. Patch Set 1: Code-Review+1 I understand that this is useful for testing in a follow-up patch. -- To view, visit http://gerrit.ovirt.org/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d Gerrit-PatchSet: 1 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: 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: Add shorthand NetInfo.bridges for consistency
Antoni Segura Puimedon has posted comments on this change.
Change subject: netinfo: Add shorthand NetInfo.bridges for consistency
..
Patch Set 1: Code-Review-1
(1 comment)
http://gerrit.ovirt.org/#/c/25212/1/tests/configNetworkTests.py
File tests/configNetworkTests.py:
Line 87:}
Line 88: },
Line 89: 'nics': ['eth0', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5',
'eth6',
Line 90: 'eth7', 'eth8', 'eth9', 'eth10'],
Line 91: 'bridges': {},
This is not consistent with the rest of the information in _netinfo. fakebrnet,
fakebrnet1 and fakebrnet2 are bridged, so those bridges should be here.
Line 92: 'bondings': {'bond00': {'slaves': ['eth5', 'eth6']}}
Line 93: }
Line 94:
Line 95: fakeInfo = netinfo.NetInfo(_netinfo)
--
To view, visit http://gerrit.ovirt.org/25212
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d
Gerrit-PatchSet: 1
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: 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: Add shorthand NetInfo.bridges for consistency
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6587/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7489/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7376/ : FAILURE -- To view, visit http://gerrit.ovirt.org/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d 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: 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: Add shorthand NetInfo.bridges for consistency
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6587/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7489/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7375/ : FAILURE -- To view, visit http://gerrit.ovirt.org/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d 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: 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: Add shorthand NetInfo.bridges for consistency
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6587/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7489/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7377/ : FAILURE -- To view, visit http://gerrit.ovirt.org/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d 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: 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: Add shorthand NetInfo.bridges for consistency
Ondřej Svoboda has uploaded a new change for review.
Change subject: netinfo: Add shorthand NetInfo.bridges for consistency
..
netinfo: Add shorthand NetInfo.bridges for consistency
Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d
Signed-off-by: Ondřej Svoboda osvob...@redhat.com
---
M lib/vdsm/netinfo.py
M tests/configNetworkTests.py
M tests/netmodelsTests.py
3 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/25212/1
diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index 8c21392..9a9c29a 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -747,6 +747,7 @@
self.vlans = _netinfo['vlans']
self.nics = _netinfo['nics']
self.bondings = _netinfo['bondings']
+self.bridges = _netinfo['bridges']
def updateDevices(self):
Updates the object device information while keeping the cached
@@ -756,6 +757,7 @@
self.vlans = _netinfo['vlans']
self.nics = _netinfo['nics']
self.bondings = _netinfo['bondings']
+self.bridges = _netinfo['bridges']
def getNetworksAndVlansForIface(self, iface):
Returns tuples of (bridge/network, vlan) connected to nic/bond
diff --git a/tests/configNetworkTests.py b/tests/configNetworkTests.py
index a72fe96..8e6f37c 100644
--- a/tests/configNetworkTests.py
+++ b/tests/configNetworkTests.py
@@ -88,6 +88,7 @@
},
'nics': ['eth0', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5', 'eth6',
'eth7', 'eth8', 'eth9', 'eth10'],
+'bridges': {},
'bondings': {'bond00': {'slaves': ['eth5', 'eth6']}}
}
diff --git a/tests/netmodelsTests.py b/tests/netmodelsTests.py
index 6181a9e..033b8d85 100644
--- a/tests/netmodelsTests.py
+++ b/tests/netmodelsTests.py
@@ -138,7 +138,7 @@
def testTextualRepr(self):
_netinfo = {'networks': {}, 'vlans': {},
'nics': ['testnic1', 'testnic2'],
-'bondings': {}}
+'bondings': {}, 'bridges': {}}
fakeInfo = netinfo.NetInfo(_netinfo)
nic1 = Nic('testnic1', None, _netinfo=fakeInfo)
nic2 = Nic('testnic2', None, _netinfo=fakeInfo)
--
To view, visit http://gerrit.ovirt.org/25212
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d
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: Add shorthand NetInfo.bridges for consistency
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo: Add shorthand NetInfo.bridges for consistency .. Patch Set 1: Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7374/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6587/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7489/ : FAILURE -- To view, visit http://gerrit.ovirt.org/25212 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf14be0a4db0678b4653512accd48b5ee9a43e1d 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
