diff options
Diffstat (limited to 'os_net_config/tests/test_impl_ifcfg.py')
| -rw-r--r-- | os_net_config/tests/test_impl_ifcfg.py | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/os_net_config/tests/test_impl_ifcfg.py b/os_net_config/tests/test_impl_ifcfg.py index cb2e881..db61795 100644 --- a/os_net_config/tests/test_impl_ifcfg.py +++ b/os_net_config/tests/test_impl_ifcfg.py @@ -60,6 +60,7 @@ _OVS_IFCFG = _BASE_IFCFG + "DEVICETYPE=ovs\nBOOTPROTO=none\n" _OVS_BRIDGE_IFCFG = _BASE_IFCFG + "DEVICETYPE=ovs\n" +_LINUX_BRIDGE_IFCFG = _BASE_IFCFG + "BRIDGE=br-ctlplane\nBOOTPROTO=none\n" _ROUTES = """default via 192.168.1.1 dev em1 172.19.0.0/24 via 192.168.1.1 dev em1 @@ -82,6 +83,16 @@ OVSBOOTPROTO=dhcp OVSDHCPINTERFACES="em1" """ +_LINUX_BRIDGE_DHCP = """# This file is autogenerated by os-net-config +DEVICE=br-ctlplane +ONBOOT=yes +HOTPLUG=no +NM_CONTROLLED=no +TYPE=Bridge +DELAY=0 +BOOTPROTO=dhcp +""" + _OVS_BRIDGE_STATIC = """# This file is autogenerated by os-net-config DEVICE=br-ctlplane ONBOOT=yes @@ -94,6 +105,18 @@ IPADDR=192.168.1.2 NETMASK=255.255.255.0 """ +_LINUX_BRIDGE_STATIC = """# This file is autogenerated by os-net-config +DEVICE=br-ctlplane +ONBOOT=yes +HOTPLUG=no +NM_CONTROLLED=no +TYPE=Bridge +DELAY=0 +BOOTPROTO=static +IPADDR=192.168.1.2 +NETMASK=255.255.255.0 +""" + _OVS_BRIDGE_DHCP_PRIMARY_INTERFACE = _OVS_BRIDGE_DHCP + \ "OVS_EXTRA=\"set bridge br-ctlplane other-config:hwaddr=a1:b2:c3:d4:e5\"\n" @@ -249,6 +272,16 @@ class TestIfcfgNetConfig(base.TestCase): self.assertEqual(_OVS_BRIDGE_DHCP, self.provider.bridge_data['br-ctlplane']) + def test_network_linux_bridge_with_dhcp(self): + interface = objects.Interface('em1') + bridge = objects.LinuxBridge('br-ctlplane', use_dhcp=True, + members=[interface]) + self.provider.add_linux_bridge(bridge) + self.provider.add_interface(interface) + self.assertEqual(_LINUX_BRIDGE_IFCFG, self.get_interface_config()) + self.assertEqual(_LINUX_BRIDGE_DHCP, + self.provider.linuxbridge_data['br-ctlplane']) + def test_network_ovs_bridge_static(self): v4_addr = objects.Address('192.168.1.2/24') interface = objects.Interface('em1') @@ -260,6 +293,17 @@ class TestIfcfgNetConfig(base.TestCase): self.assertEqual(_OVS_BRIDGE_STATIC, self.provider.bridge_data['br-ctlplane']) + def test_network_linux_bridge_static(self): + v4_addr = objects.Address('192.168.1.2/24') + interface = objects.Interface('em1') + bridge = objects.LinuxBridge('br-ctlplane', members=[interface], + addresses=[v4_addr]) + self.provider.add_interface(interface) + self.provider.add_bridge(bridge) + self.assertEqual(_LINUX_BRIDGE_IFCFG, self.get_interface_config()) + self.assertEqual(_LINUX_BRIDGE_STATIC, + self.provider.bridge_data['br-ctlplane']) + def test_network_ovs_bridge_with_dhcp_primary_interface(self): def test_interface_mac(name): return "a1:b2:c3:d4:e5" |