diff options
Diffstat (limited to 'os_net_config/tests')
| -rw-r--r-- | os_net_config/tests/test_impl_ifcfg.py | 97 |
1 files changed, 77 insertions, 20 deletions
diff --git a/os_net_config/tests/test_impl_ifcfg.py b/os_net_config/tests/test_impl_ifcfg.py index a383a56..e0df5b4 100644 --- a/os_net_config/tests/test_impl_ifcfg.py +++ b/os_net_config/tests/test_impl_ifcfg.py @@ -26,6 +26,8 @@ ONBOOT=yes HOTPLUG=no """ +_NO_IP = _BASE_IFCFG + "BOOTPROTO=none\n" + _V4_IFCFG = _BASE_IFCFG + """BOOTPROTO=static IPADDR=192.168.1.2 NETMASK=255.255.255.0 @@ -36,7 +38,7 @@ IPV6_AUTOCONF=no IPV6ADDR=2001:abc:a:: """ -_OVS_IFCFG = _BASE_IFCFG + "DEVICETYPE=ovs\n" +_OVS_IFCFG = _BASE_IFCFG + "DEVICETYPE=ovs\nBOOTPROTO=none\n" _OVS_BRIDGE_IFCFG = _BASE_IFCFG + "DEVICETYPE=ovs\n" @@ -46,27 +48,30 @@ _ROUTES = """default via 192.168.1.1 dev em1 172.19.0.0/24 via 192.168.1.1 dev em1 """ +_OVS_INTERFACE = _BASE_IFCFG + """DEVICETYPE=ovs +TYPE=OVSPort +OVS_BRIDGE=br-ctlplane +BOOTPROTO=none +""" + +_OVS_BRIDGE_DHCP = """DEVICE=br-ctlplane +ONBOOT=yes +HOTPLUG=no +DEVICETYPE=ovs +TYPE=OVSBridge +OVSBOOTPROTO=dhcp +OVSDHCPINTERFACES=em1 +""" + class TestIfcfgNetConfig(base.TestCase): def setUp(self): super(TestIfcfgNetConfig, self).setUp() - self.temp_ifcfg_file = tempfile.NamedTemporaryFile() - self.temp_route_file = tempfile.NamedTemporaryFile() - - def test_ifcfg_path(name): - return self.temp_ifcfg_file.name - self.stubs.Set(impl_ifcfg, 'ifcfg_config_path', test_ifcfg_path) - - def test_routes_path(name): - return self.temp_route_file.name - self.stubs.Set(impl_ifcfg, 'route_config_path', test_routes_path) self.provider = impl_ifcfg.IfcfgNetConfig() def tearDown(self): - self.temp_ifcfg_file.close() - self.temp_route_file.close() super(TestIfcfgNetConfig, self).tearDown() def get_interface_config(self): @@ -78,11 +83,11 @@ class TestIfcfgNetConfig(base.TestCase): def test_add_base_interface(self): interface = objects.Interface('em1') self.provider.addInterface(interface) - self.assertEqual(_BASE_IFCFG, self.get_interface_config()) + self.assertEqual(_NO_IP, self.get_interface_config()) def test_add_ovs_interface(self): interface = objects.Interface('em1') - interface.type = 'ovs' + interface.type = 'ovs_port' self.provider.addInterface(interface) self.assertEqual(_OVS_IFCFG, self.get_interface_config()) @@ -107,7 +112,50 @@ class TestIfcfgNetConfig(base.TestCase): self.assertEqual(_V4_IFCFG, self.get_interface_config()) self.assertEqual(_ROUTES, self.get_route_config()) - def test_apply(self): + def test_network_ovs_bridge_with_dhcp(self): + interface = objects.Interface('em1') + bridge = objects.OvsBridge('br-ctlplane', use_dhcp=True, + members=[interface]) + self.provider.addInterface(interface) + self.provider.addBridge(bridge) + self.assertEqual(_OVS_INTERFACE, self.get_interface_config()) + self.assertEqual(_OVS_BRIDGE_DHCP, + self.provider.bridges['br-ctlplane']) + + +class TestIfcfgNetConfigApply(base.TestCase): + + def setUp(self): + super(TestIfcfgNetConfigApply, self).setUp() + self.temp_ifcfg_file = tempfile.NamedTemporaryFile() + self.temp_route_file = tempfile.NamedTemporaryFile() + self.temp_bridge_file = tempfile.NamedTemporaryFile() + + def test_ifcfg_path(name): + return self.temp_ifcfg_file.name + self.stubs.Set(impl_ifcfg, 'ifcfg_config_path', test_ifcfg_path) + + def test_routes_path(name): + return self.temp_route_file.name + self.stubs.Set(impl_ifcfg, 'route_config_path', test_routes_path) + + def test_bridge_path(name): + return self.temp_bridge_file.name + self.stubs.Set(impl_ifcfg, 'bridge_config_path', test_bridge_path) + + def test_execute(*args, **kwargs): + pass + self.stubs.Set(processutils, 'execute', test_execute) + + self.provider = impl_ifcfg.IfcfgNetConfig() + + def tearDown(self): + self.temp_ifcfg_file.close() + self.temp_route_file.close() + self.temp_bridge_file.close() + super(TestIfcfgNetConfigApply, self).tearDown() + + def test_network_apply(self): route1 = objects.Route('192.168.1.1', default=True) route2 = objects.Route('192.168.1.1', '172.19.0.0/24') v4_addr = objects.Address('192.168.1.2/24') @@ -115,13 +163,22 @@ class TestIfcfgNetConfig(base.TestCase): routes=[route1, route2]) self.provider.addInterface(interface) - def test_execute(*args, **kwargs): - pass - self.stubs.Set(processutils, 'execute', test_execute) - self.provider.apply() ifcfg_data = utils.get_file_data(self.temp_ifcfg_file.name) self.assertEqual(_V4_IFCFG, ifcfg_data) route_data = utils.get_file_data(self.temp_route_file.name) self.assertEqual(_ROUTES, route_data) + + def test_dhcp_ovs_bridge_network_apply(self): + interface = objects.Interface('em1') + bridge = objects.OvsBridge('br-ctlplane', use_dhcp=True, + members=[interface]) + self.provider.addInterface(interface) + self.provider.addBridge(bridge) + self.provider.apply() + + ifcfg_data = utils.get_file_data(self.temp_ifcfg_file.name) + self.assertEqual(_OVS_INTERFACE, ifcfg_data) + bridge_data = utils.get_file_data(self.temp_bridge_file.name) + self.assertEqual(_OVS_BRIDGE_DHCP, bridge_data) |