[node-patches] Change in ovirt-node[master]: network: Set type on bond masters

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: network: Set type on bond masters
......................................................................

network: Set type on bond masters

This is needed so NetworkManager is recognizing the configuration as a
bond master. Otherwise the bond device will not come up on Fedora 19.

Change-Id: Ia5907547058d9a08c8f06e70254b45a0fb4d7e42
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/config/defaults.py
M tests/nose/network_config.py
2 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/34/17834/1

diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
index 213a676..eef9e9c 100644
--- a/src/ovirt/node/config/defaults.py
+++ b/src/ovirt/node/config/defaults.py
@@ -538,6 +538,7 @@
                     cfg = NicConfig(bond["name"])
                     cfg.device = bond["name"]
                     cfg.onboot = "yes"
+                    cfg.type = "Bond"
                     cfg.bonding_opts = bond["options"]
 
                     cfg.save()
diff --git a/tests/nose/network_config.py b/tests/nose/network_config.py
index 4cfae0c..d033d5c 100644
--- a/tests/nose/network_config.py
+++ b/tests/nose/network_config.py
@@ -319,7 +319,8 @@
                                 ('BOOTPROTO', 'dhcp'),
                                 ('DEVICE', 'bond0'),
                                 ('ONBOOT', 'yes'),
-                                ('PEERNTP', 'yes')])
+                                ('PEERNTP', 'yes'),
+                                ('TYPE', 'Bond')])
 
     def test_direct_dhcp_discovery(self, *args, **kwargs):
         self.test_direct_dhcp()
@@ -367,7 +368,8 @@
                                [('BONDING_OPTS', 'mode=4'),
                                 ('BRIDGE', 'brbond0'),
                                 ('DEVICE', 'bond0'),
-                                ('ONBOOT', 'yes')])
+                                ('ONBOOT', 'yes'),
+                                ('TYPE', 'Bond')])
 
         assert ifcfg_has_items("brbond0",
                                [('BOOTPROTO', 'dhcp'),
@@ -423,7 +425,8 @@
         assert ifcfg_has_items("bond0",
                                [('BONDING_OPTS', 'mode=4'),
                                 ('DEVICE', 'bond0'),
-                                ('ONBOOT', 'yes')])
+                                ('ONBOOT', 'yes'),
+                                ('TYPE', 'Bond')])
 
         assert ifcfg_has_items("bond0.42",
                                [('BRIDGE', 'brbond0'),


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5907547058d9a08c8f06e70254b45a0fb4d7e42
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>