diff options
Diffstat (limited to 'os_net_config/tests')
| -rw-r--r-- | os_net_config/tests/test_impl_eni.py | 6 | ||||
| -rw-r--r-- | os_net_config/tests/test_impl_ifcfg.py | 100 | ||||
| -rw-r--r-- | os_net_config/tests/test_objects.py | 55 |
3 files changed, 161 insertions, 0 deletions
diff --git a/os_net_config/tests/test_impl_eni.py b/os_net_config/tests/test_impl_eni.py index e0e009d..7f909ff 100644 --- a/os_net_config/tests/test_impl_eni.py +++ b/os_net_config/tests/test_impl_eni.py @@ -221,6 +221,12 @@ class TestENINetConfig(base.TestCase): self.provider.add_vlan(vlan) self.assertEqual(_VLAN_NO_IP, self.get_interface_config('vlan5')) + def test_vlan_mtu_1500(self): + vlan = objects.Vlan('eth0', 5, mtu=1500) + self.provider.add_vlan(vlan) + expected = _VLAN_NO_IP + ' mtu 1500\n' + self.assertEqual(expected, self.get_interface_config('vlan5')) + def test_vlan_ovs_bridge_int_port(self): vlan = objects.Vlan('eth0', 5) bridge = objects.OvsBridge('br0', use_dhcp=True, diff --git a/os_net_config/tests/test_impl_ifcfg.py b/os_net_config/tests/test_impl_ifcfg.py index c914ea2..3500e4c 100644 --- a/os_net_config/tests/test_impl_ifcfg.py +++ b/os_net_config/tests/test_impl_ifcfg.py @@ -39,6 +39,14 @@ IPADDR=192.168.1.2 NETMASK=255.255.255.0 """ +_V4_V6_IFCFG = _BASE_IFCFG + """IPV6INIT=yes +BOOTPROTO=static +IPADDR=192.168.1.2 +NETMASK=255.255.255.0 +IPV6_AUTOCONF=no +IPV6ADDR=2001:abc:a::/64 +""" + _IFCFG_VLAN = """# This file is autogenerated by os-net-config DEVICE=em1.120 ONBOOT=yes @@ -75,6 +83,11 @@ _ROUTES = """default via 192.168.1.1 dev em1 172.19.0.0/24 via 192.168.1.1 dev em1 """ +_ROUTES_V6 = """default via 2001:db8::1 dev em1 +2001:db8:dead:beef:cafe::/56 via fd00:fd00:2000::1 dev em1 +""" + + _OVS_INTERFACE = _BASE_IFCFG + """DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=br-ctlplane @@ -165,6 +178,11 @@ OVS_OPTIONS="tag=5" BOOTPROTO=none """ +_VLAN_LINUX_BRIDGE = _BASE_VLAN_OVS + """VLAN=yes +BRIDGE=br-ctlplane +BOOTPROTO=none +""" + _OVS_BOND_DHCP = """# This file is autogenerated by os-net-config DEVICE=bond0 @@ -187,6 +205,34 @@ BOOTPROTO=dhcp """ +_IVS_UPLINK = """# This file is autogenerated by os-net-config +DEVICE=em1 +ONBOOT=yes +HOTPLUG=no +NM_CONTROLLED=no +DEVICETYPE=ivs +IVS_BRIDGE=ivs +BOOTPROTO=none +""" + +_IVS_INTERFACE = """# This file is autogenerated by os-net-config +DEVICE=storage5 +ONBOOT=yes +HOTPLUG=no +NM_CONTROLLED=no +TYPE=IVSIntPort +DEVICETYPE=ivs +IVS_BRIDGE=ivs +MTU=1500 +BOOTPROTO=static +IPADDR=172.16.2.7 +NETMASK=255.255.255.0 +""" + +_IVS_CONFIG = ('DAEMON_ARGS=\"--hitless --certificate /etc/ivs ' + '--inband-vlan 4092 -u em1 --internal-port=storage5\"') + + class TestIfcfgNetConfig(base.TestCase): def setUp(self): @@ -203,6 +249,9 @@ class TestIfcfgNetConfig(base.TestCase): def get_route_config(self, name='em1'): return self.provider.route_data.get(name, '') + def get_route6_config(self, name='em1'): + return self.provider.route6_data.get(name, '') + def test_add_base_interface(self): interface = objects.Interface('em1') self.provider.add_interface(interface) @@ -276,6 +325,20 @@ class TestIfcfgNetConfig(base.TestCase): self.assertEqual(_V4_IFCFG, self.get_interface_config()) self.assertEqual(_ROUTES, self.get_route_config()) + def test_network_with_ipv6_routes(self): + route1 = objects.Route('192.168.1.1', default=True) + route2 = objects.Route('192.168.1.1', '172.19.0.0/24') + route3 = objects.Route('2001:db8::1', default=True) + route4 = objects.Route('fd00:fd00:2000::1', + '2001:db8:dead:beef:cafe::/56') + v4_addr = objects.Address('192.168.1.2/24') + v6_addr = objects.Address('2001:abc:a::/64') + interface = objects.Interface('em1', addresses=[v4_addr, v6_addr], + routes=[route1, route2, route3, route4]) + self.provider.add_interface(interface) + self.assertEqual(_V4_V6_IFCFG, self.get_interface_config()) + self.assertEqual(_ROUTES_V6, self.get_route6_config()) + def test_network_ovs_bridge_with_dhcp(self): interface = objects.Interface('em1') bridge = objects.OvsBridge('br-ctlplane', use_dhcp=True, @@ -348,6 +411,22 @@ class TestIfcfgNetConfig(base.TestCase): self.assertEqual(_OVS_BRIDGE_DHCP_OVS_EXTRA, self.provider.bridge_data['br-ctlplane']) + def test_network_ivs_with_uplink_and_interface(self): + interface = objects.Interface('em1') + v4_addr = objects.Address('172.16.2.7/24') + ivs_interface = objects.IvsInterface(vlan_id=5, + name='storage', + addresses=[v4_addr]) + bridge = objects.IvsBridge(members=[interface, ivs_interface]) + self.provider.add_interface(interface) + self.provider.add_ivs_interface(ivs_interface) + self.provider.add_bridge(bridge) + self.assertEqual(_IVS_UPLINK, self.get_interface_config()) + self.assertEqual(_IVS_INTERFACE, + self.provider.ivsinterface_data[ivs_interface.name]) + data = self.provider.generate_ivs_config(['em1'], ['storage5']) + self.assertEqual(_IVS_CONFIG, data) + def test_add_vlan(self): vlan = objects.Vlan('em1', 5) self.provider.add_vlan(vlan) @@ -359,6 +438,12 @@ class TestIfcfgNetConfig(base.TestCase): self.provider.add_vlan(vlan) self.assertEqual(_VLAN_OVS, self.get_interface_config('vlan5')) + def test_add_vlan_mtu_1500(self): + vlan = objects.Vlan('em1', 5, mtu=1500) + self.provider.add_vlan(vlan) + expected = _VLAN_NO_IP + 'MTU=1500\n' + self.assertEqual(expected, self.get_interface_config('vlan5')) + def test_add_ovs_bridge_with_vlan(self): vlan = objects.Vlan('em1', 5) bridge = objects.OvsBridge('br-ctlplane', use_dhcp=True, @@ -367,6 +452,15 @@ class TestIfcfgNetConfig(base.TestCase): self.provider.add_bridge(bridge) self.assertEqual(_VLAN_OVS_BRIDGE, self.get_interface_config('vlan5')) + def test_add_linux_bridge_with_vlan(self): + vlan = objects.Vlan(None, 5) + bridge = objects.LinuxBridge('br-ctlplane', use_dhcp=True, + members=[vlan]) + self.provider.add_vlan(vlan) + self.provider.add_bridge(bridge) + self.assertEqual(_VLAN_LINUX_BRIDGE, + self.get_interface_config('vlan5')) + def test_ovs_bond(self): interface1 = objects.Interface('em1') interface2 = objects.Interface('em2') @@ -468,6 +562,7 @@ class TestIfcfgNetConfigApply(base.TestCase): super(TestIfcfgNetConfigApply, self).setUp() self.temp_ifcfg_file = tempfile.NamedTemporaryFile() self.temp_route_file = tempfile.NamedTemporaryFile() + self.temp_route6_file = tempfile.NamedTemporaryFile() self.temp_bridge_file = tempfile.NamedTemporaryFile() self.temp_cleanup_file = tempfile.NamedTemporaryFile(delete=False) self.ifup_interface_names = [] @@ -481,6 +576,10 @@ class TestIfcfgNetConfigApply(base.TestCase): return self.temp_route_file.name self.stubs.Set(impl_ifcfg, 'route_config_path', test_routes_path) + def test_routes6_path(name): + return self.temp_route6_file.name + self.stubs.Set(impl_ifcfg, 'route6_config_path', test_routes6_path) + def test_bridge_path(name): return self.temp_bridge_file.name self.stubs.Set(impl_ifcfg, 'bridge_config_path', test_bridge_path) @@ -502,6 +601,7 @@ class TestIfcfgNetConfigApply(base.TestCase): def tearDown(self): self.temp_ifcfg_file.close() self.temp_route_file.close() + self.temp_route6_file.close() self.temp_bridge_file.close() if os.path.exists(self.temp_cleanup_file.name): self.temp_cleanup_file.close() diff --git a/os_net_config/tests/test_objects.py b/os_net_config/tests/test_objects.py index f01612d..b49c393 100644 --- a/os_net_config/tests/test_objects.py +++ b/os_net_config/tests/test_objects.py @@ -343,6 +343,61 @@ class TestLinuxBridge(base.TestCase): self.assertEqual("br-foo", interface2.linux_bridge_name) +class TestIvsBridge(base.TestCase): + + def test_interface_from_json(self): + data = """{ +"type": "ivs_bridge", +"members": [{ + "type": "interface", + "name": "nic2" +}] +} +""" + bridge = objects.object_from_json(json.loads(data)) + self.assertEqual("ivs", bridge.name) + interface1 = bridge.members[0] + self.assertEqual("nic2", interface1.name) + self.assertEqual(False, interface1.ovs_port) + self.assertEqual("ivs", interface1.ivs_bridge_name) + + def test_ivs_interface_from_json(self): + data = """{ +"type": "ivs_bridge", +"members": [{ + "type": "ivs_interface", + "name": "storage", + "vlan_id": 202 +}] +} +""" + bridge = objects.object_from_json(json.loads(data)) + self.assertEqual("ivs", bridge.name) + interface1 = bridge.members[0] + self.assertEqual("storage202", interface1.name) + self.assertEqual(False, interface1.ovs_port) + self.assertEqual("ivs", interface1.ivs_bridge_name) + + def test_bond_interface_from_json(self): + data = """{ +"type": "ivs_bridge", +"members": [{ + "type": "linux_bond", + "name": "bond1", + "members": [ + {"type": "interface", "name": "nic2"}, + {"type": "interface", "name": "nic3"} + ] +}] +} +""" + err = self.assertRaises(objects.InvalidConfigException, + objects.IvsBridge.from_json, + json.loads(data)) + expected = 'IVS does not support bond interfaces.' + self.assertIn(expected, err) + + class TestBond(base.TestCase): def test_from_json_dhcp(self): |