Ryan Barry has uploaded a new change for review. Change subject: Fix up so they pass again ......................................................................
Fix up so they pass again nm_controlled setting broke nose. Fix it. Change-Id: Ib91adb67296c22f4683faacaeb9328c9e9c9418b Signed-off-by: Ryan Barry <[email protected]> --- M tests/nose/network_config.py 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/37/28337/1 diff --git a/tests/nose/network_config.py b/tests/nose/network_config.py index d033d5c..58db17b 100644 --- a/tests/nose/network_config.py +++ b/tests/nose/network_config.py @@ -110,6 +110,7 @@ [('BRIDGE', 'breth0'), ('DEVICE', 'eth0'), ('HWADDR', 'th:em:ac:ad:dr'), + ('NM_CONTROLLED', 'no'), ('ONBOOT', 'yes')]) assert ifcfg_has_items("breth0", [('BOOTPROTO', 'dhcp'), @@ -144,6 +145,7 @@ [('BRIDGE', 'brens1'), ('DEVICE', 'ens1'), ('HWADDR', 'th:em:ac:ad:dr'), + ('NM_CONTROLLED', 'no'), ('ONBOOT', 'yes')]) assert ifcfg_has_items("brens1", [('DELAY', '0'), @@ -191,6 +193,7 @@ [('BOOTPROTO', 'dhcp'), ('DEVICE', 'eth0'), ('HWADDR', 'th:em:ac:ad:dr'), + ('NM_CONTROLLED', 'no'), ('ONBOOT', 'yes'), ('PEERNTP', 'yes')]) @@ -218,6 +221,7 @@ assert ifcfg_has_items("eth0", [('DEVICE', 'eth0'), ('HWADDR', 'th:em:ac:ad:dr'), + ('NM_CONTROLLED', 'no'), ('ONBOOT', 'yes')]) assert ifcfg_has_items("eth0.42", @@ -255,6 +259,7 @@ ('HWADDR', 'th:em:ac:ad:dr'), ('IPADDR', '192.168.122.42'), ('NETMASK', '255.255.255.0'), + ('NM_CONTROLLED', 'no'), ('ONBOOT', 'yes'), ('PEERNTP', 'yes')]) @@ -318,6 +323,7 @@ [('BONDING_OPTS', 'mode=4'), ('BOOTPROTO', 'dhcp'), ('DEVICE', 'bond0'), + ('NM_CONTROLLED', 'no'), ('ONBOOT', 'yes'), ('PEERNTP', 'yes'), ('TYPE', 'Bond')]) @@ -368,6 +374,7 @@ [('BONDING_OPTS', 'mode=4'), ('BRIDGE', 'brbond0'), ('DEVICE', 'bond0'), + ('NM_CONTROLLED', 'no'), ('ONBOOT', 'yes'), ('TYPE', 'Bond')]) @@ -425,6 +432,7 @@ assert ifcfg_has_items("bond0", [('BONDING_OPTS', 'mode=4'), ('DEVICE', 'bond0'), + ('NM_CONTROLLED', 'no'), ('ONBOOT', 'yes'), ('TYPE', 'Bond')]) -- To view, visit http://gerrit.ovirt.org/28337 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib91adb67296c22f4683faacaeb9328c9e9c9418b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Ryan Barry <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
