Change in vdsm[master]: netinfoTests: add a test for getNicsVlanAndBondingForNetwork

osvoboda at redhat.com osvoboda at redhat.com
Wed Aug 19 16:56:39 UTC 2015


Ondřej Svoboda has uploaded a new change for review.

Change subject: netinfoTests: add a test for getNicsVlanAndBondingForNetwork
......................................................................

netinfoTests: add a test for getNicsVlanAndBondingForNetwork

Change-Id: Ie196879ef7fd8ea54816cd090dead569c04c7f5b
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
---
M tests/netinfoTests.py
1 file changed, 93 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/45112/1

diff --git a/tests/netinfoTests.py b/tests/netinfoTests.py
index 94bf924..b3e4330 100644
--- a/tests/netinfoTests.py
+++ b/tests/netinfoTests.py
@@ -336,3 +336,96 @@
         self.assertEqual(gateway, '12.34.56.1')
         gateway = netinfo._get_gateway(DUPLICATED_GATEWAY, TEST_IFACE)
         self.assertEqual(gateway, '12.34.56.1')
+
+    def test_getNicsVlanAndBondingForNetwork(self):
+        FAKE_NETINFO = {
+            'networks': {
+                'just-nic': {
+                    'bridged': False,
+                    'iface': 'eth0',
+
+                    '_expected_nics': ['eth0'],
+                    '_expected_vlan': None,
+                    '_expected_vlan_id': None,
+                    '_expected_bond': None,
+                },
+                'bond': {
+                    'bridged': False,
+                    'iface': 'bond0',
+
+                    '_expected_nics': ['eth1', 'eth2'],
+                    '_expected_vlan': None,
+                    '_expected_vlan_id': None,
+                    '_expected_bond': 'bond0',
+                },
+                'vlan': {
+                    'bridged': False,
+                    'iface': 'eth0.123',
+
+                    '_expected_nics': ['eth0'],
+                    '_expected_vlan': 'eth0.123',
+                    '_expected_vlan_id': '123',
+                    '_expected_bond': None,
+                },
+                'vlan-bond': {
+                    'bridged': False,
+                    'iface': 'bond0.99',
+
+                    '_expected_nics': ['eth1', 'eth2'],
+                    '_expected_vlan': 'bond0.99',
+                    '_expected_vlan_id': '99',
+                    '_expected_bond': 'bond0',
+                },
+            },
+            'vlans': {
+                'eth0.123': {
+                    'iface': 'eth0',
+                    'vlanid': '123',
+                },
+                'bond0.99': {
+                    'iface': 'bond0',
+                    'vlanid': '99',
+                },
+            },
+            'bondings': {
+                'bond0': {
+                    'slaves': ['eth1', 'eth2'],
+                },
+            },
+            'nics': {
+                'eth0': {},
+                'eth1': {},
+                'eth2': {},
+                'vnet0': {},  # TUN device of a running VM
+            },
+            'bridges': {'not necessary': 'for the test'},
+        }
+
+        def _test():
+            fake_netinfo = NetInfo(FAKE_NETINFO)
+
+            for network, netdict in FAKE_NETINFO['networks'].iteritems():
+                nics, vlan, vlan_id, bond = (
+                    fake_netinfo.getNicsVlanAndBondingForNetwork(network))
+                self.assertEqual(nics, netdict['_expected_nics'])
+                self.assertEqual(vlan, netdict['_expected_vlan'])
+                self.assertEqual(vlan_id, netdict['_expected_vlan_id'])
+                self.assertEqual(bond, netdict['_expected_bond'])
+
+        def _convert_to_bridged():
+            for network, netdict in FAKE_NETINFO['networks'].iteritems():
+                netdict['bridged'] = True
+                netdict['ports'] = [netdict['iface']]
+                del netdict['iface']
+
+        def _add_vnet0():
+            for network, netdict in FAKE_NETINFO['networks'].iteritems():
+                if netdict['bridged']:
+                    netdict['ports'].append('vnet0')
+                    netdict['_expected_nics'].append('vnet0')
+
+        _test()
+        _convert_to_bridged()
+        _test()
+        _add_vnet0()
+        _test()


-- 
To view, visit https://gerrit.ovirt.org/45112
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie196879ef7fd8ea54816cd090dead569c04c7f5b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>


More information about the vdsm-patches mailing list