Change in vdsm[master]: net: netinfo: report switch type as legacy
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 12: * #1195208::Update tracker: OK * Set MODIFIED::bug 1195208#1195208IGNORE, not all related patches are closed, check 52336 -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
Dan Kenigsberg has submitted this change and it was merged. Change subject: net: netinfo: report switch type as legacy .. net: netinfo: report switch type as legacy This patch sets the API foundation for reporting the switch type, future patches will check and report actual switch type. Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Signed-off-by: Petr HoráčekBug-Url: https://bugzilla.redhat.com/1195208 Reviewed-on: https://gerrit.ovirt.org/55810 Reviewed-by: Edward Haas Continuous-Integration: Dan Kenigsberg Reviewed-by: Dan Kenigsberg --- M lib/vdsm/kernelconfig.py M lib/vdsm/netinfo/cache.py 2 files changed, 15 insertions(+), 10 deletions(-) Approvals: Petr Horáček: Verified Dan Kenigsberg: Looks good to me, approved; Passed CI tests Edward Haas: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
Dan Kenigsberg has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
Dan Kenigsberg has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 11: Continuous-Integration+1 http://jenkins.ovirt.org/job/vdsm_master_check-patch-fc23-x86_64/5139/consoleText Ends with Success, but is not reported as such on gerrit. -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
Petr Horáček has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 11: Verified+1 'switch' is reported on nets and bonds in caps. passed network tests -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 11: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 10: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 9: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 8: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
Edward Haas has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 7: Code-Review+1 https://gerrit.ovirt.org/#/c/55952 should be merged first. -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 7: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 6: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 5: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type as legacy
Petr Horáček has posted comments on this change. Change subject: net: netinfo: report switch type as legacy .. Patch Set 4: -Verified (3 comments) https://gerrit.ovirt.org/#/c/55810/4//COMMIT_MSG Commit Message: Line 3: AuthorDate: 2016-04-07 14:38:51 +0200 Line 4: Commit: Petr HoráčekLine 5: CommitDate: 2016-04-07 16:24:10 +0200 Line 6: Line 7: net: netinfo: report switch type > .. as legacy Done Line 8: Line 9: We report all networks with switch type 'legacy'. It has to be changed Line 10: to 'ovs' in OVS capabilities handling. Line 11: PS4, Line 9: It has to be changed : to 'ovs' in OVS capabilities handling. : : This (and the whole OVS relying on running config) should be replaced : with reporting of the actual system state. > It was a bit confusing for me, what about: Done https://gerrit.ovirt.org/#/c/55810/4/lib/vdsm/kernelconfig.py File lib/vdsm/kernelconfig.py: Line 236 Line 237 Line 238 Line 239 Line 240 > I think we cannot drop this normalization. Done -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type
Edward Haas has posted comments on this change. Change subject: net: netinfo: report switch type .. Patch Set 4: Code-Review-1 (4 comments) I would expect for some tests to fail, especially when trying to compare an old persistent config with the new 'switch' type report. We better test this somehow. https://gerrit.ovirt.org/#/c/55810/4//COMMIT_MSG Commit Message: Line 3: AuthorDate: 2016-04-07 14:38:51 +0200 Line 4: Commit: Petr HoráčekLine 5: CommitDate: 2016-04-07 16:24:10 +0200 Line 6: Line 7: net: netinfo: report switch type .. as legacy Line 8: Line 9: We report all networks with switch type 'legacy'. It has to be changed Line 10: to 'ovs' in OVS capabilities handling. Line 11: PS4, Line 9: It has to be changed : to 'ovs' in OVS capabilities handling. : : This (and the whole OVS relying on running config) should be replaced : with reporting of the actual system state. It was a bit confusing for me, what about: This patch sets the API foundation for reporting the switch type, future patches will check and report actual switch type. (Or something similar) https://gerrit.ovirt.org/#/c/55810/4/lib/vdsm/kernelconfig.py File lib/vdsm/kernelconfig.py: Line 236 Line 237 Line 238 Line 239 Line 240 I think we cannot drop this normalization. We need to support an upgrade from an older version where the key 'switch' was not persisted. If the key is there, we should do nothing, if the key is missing, we should assume the default value ('legacy'). https://gerrit.ovirt.org/#/c/55810/4/vdsm_hooks/ovs/ovs_after_get_caps.py File vdsm_hooks/ovs/ovs_after_get_caps.py: If we can avoid touching the hook in this patch, it will be better. Line 1: #!/usr/bin/env python Line 2: # Copyright 2015 Red Hat, Inc. Line 3: # Line 4: # This program is free software; you can redistribute it and/or modify -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type
Petr Horáček has posted comments on this change. Change subject: net: netinfo: report switch type .. Patch Set 4: Verified+1 Passed functional network tests. -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type .. Patch Set 4: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type .. Patch Set 3: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type .. Patch Set 2: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type
Petr Horáček has uploaded a new change for review. Change subject: net: netinfo: report switch type .. net: netinfo: report switch type Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Signed-off-by: Petr HoráčekBug-Url: https://bugzilla.redhat.com/1195208 --- M lib/vdsm/kernelconfig.py M lib/vdsm/netinfo/__init__.py 2 files changed, 8 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/55810/1 diff --git a/lib/vdsm/kernelconfig.py b/lib/vdsm/kernelconfig.py index 1c97ed2..295e8a2 100644 --- a/lib/vdsm/kernelconfig.py +++ b/lib/vdsm/kernelconfig.py @@ -65,7 +65,6 @@ _normalize_bonding_nics(config_copy) _normalize_address(config_copy) _normalize_ifcfg_keys(config_copy) -_normalize_switch_types(config_copy) return config_copy @@ -83,6 +82,7 @@ _translate_nics(attributes, nics) _translate_ipaddr(attributes, net_attr) _translate_hostqos(attributes, net_attr) +_translate_switch_type(attributes, net_attr) return attributes @@ -139,7 +139,8 @@ def _translate_netinfo_bond(bond_attr): return { 'nics': sorted(bond_attr['slaves']), -'options': bonding.bondOptsForIfcfg(bond_attr['opts']) +'options': bonding.bondOptsForIfcfg(bond_attr['opts']), +'switch': bond_attr['switch'] } @@ -147,6 +148,10 @@ if net_attr.get('hostQos'): attributes['hostQos'] = _remove_zero_values_in_net_qos( net_attr['hostQos']) + + +def _translate_switch_type(attributes, net_attr): +attributes['switch'] = net_attr['switch'] def _remove_zero_values_in_net_qos(net_qos): @@ -235,14 +240,6 @@ for k in net_attr.keys(): if unsupported(k): net_attr.pop(k) - - -def _normalize_switch_types(config_copy): -# Hide switch type as it is not reported by netinfo and cannot be compared. -for data in config_copy.networks, config_copy.bonds: -for attrs in six.itervalues(data): -attrs.pop('switch', None) -return config_copy def _parse_bond_options(opts): diff --git a/lib/vdsm/netinfo/__init__.py b/lib/vdsm/netinfo/__init__.py index 941113a..d91ec98 100644 --- a/lib/vdsm/netinfo/__init__.py +++ b/lib/vdsm/netinfo/__init__.py @@ -54,6 +54,7 @@ if interface is not None: nets[netname]['iface'] = interface.get('dev') nets[netname]['bridged'] = False +# based on interface, virtualport type=?openvswitch else: nets[netname]['bridge'] = xml.find('.//bridge').get('name') nets[netname]['bridged'] = True -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: netinfo: report switch type
gerrit-hooks has posted comments on this change. Change subject: net: netinfo: report switch type .. Patch Set 1: * #1195208::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1195208::OK, public bug * Check Product::#1195208::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/55810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I00c1267bee9c3a8fb45b72a483e0999139abaa8d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr HoráčekGerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches