Dan Kenigsberg has posted comments on this change. Change subject: netinfo: Retrieve bonding options differing from defaults ......................................................................
Patch Set 8: (2 comments) http://gerrit.ovirt.org/#/c/24456/8/lib/vdsm/netinfo.py File lib/vdsm/netinfo.py: Line 581: # Actual options in /sys are multi-valued and again, separated by a space, Line 582: # including 'mode' which reads: 'balance-rr 0' Line 583: # For compatibility with older Engines we should return 'mode' as a number Line 584: # and never handle "other" multi-valued options Line 585: opts = ' '.join((k + '=' + ','.join(v) for (k, v) in opts.iteritems())) > k + '=' + v[-1] if v yeah, "slaves" should not be reported in BONDING_OPTS. Line 586: info['cfg']['BONDING_OPTS'] = opts Line 587: Line 588: return info Line 589: http://gerrit.ovirt.org/#/c/24456/8/tests/functional/networkTests.py File tests/functional/networkTests.py: Line 1188: {'nics': nics[1:], Line 1189: 'options': 'mode=4 miimon=9'}) Line 1190: Line 1191: # Check that only the 'miimon' option is different from default Line 1192: self.assertIn(BONDING_NAME, self.vdsm_net.netinfo.bondings) This is not the assertion I requested. You need to verify that [BONDING_ NAME][cfg][BONDING_OPTS] is as expected. Line 1193: opts = self.vdsm_net.netinfo.bondings[BONDING_NAME]['options'] Line 1194: self.assertEqual(opts, {'miimon': ['9']}) Line 1195: Line 1196: # cleanup -- To view, visit http://gerrit.ovirt.org/24456 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ief6d366b1b761627c7203cf236b75ef538af3e26 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <[email protected]> Gerrit-Reviewer: Antoni Segura Puimedon <[email protected]> Gerrit-Reviewer: Assaf Muller <[email protected]> Gerrit-Reviewer: Dan Kenigsberg <[email protected]> Gerrit-Reviewer: Ondřej Svoboda <[email protected]> Gerrit-HasComments: Yes _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
