diff options
-rw-r--r-- | os_net_config/impl_eni.py | 4 | ||||
-rw-r--r-- | os_net_config/tests/test_impl_ifcfg.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/os_net_config/impl_eni.py b/os_net_config/impl_eni.py index 3dea6c0..87d45da 100644 --- a/os_net_config/impl_eni.py +++ b/os_net_config/impl_eni.py @@ -95,8 +95,8 @@ class ENINetConfig(os_net_config.NetConfig): data += " pre-up ip addr flush dev %s\n" % mem.name if interface.primary_interface_name: mac = utils.interface_mac(interface.primary_interface_name) - ovs_extra.append ("set bridge %s other-config:hwaddr=%s" % - (interface.name, mac)) + ovs_extra.append("set bridge %s other-config:hwaddr=%s" % + (interface.name, mac)) ovs_extra.extend(interface.ovs_extra) elif interface.ovs_port: if isinstance(interface, objects.Vlan): diff --git a/os_net_config/tests/test_impl_ifcfg.py b/os_net_config/tests/test_impl_ifcfg.py index 841260a..405f71e 100644 --- a/os_net_config/tests/test_impl_ifcfg.py +++ b/os_net_config/tests/test_impl_ifcfg.py @@ -181,7 +181,6 @@ class TestIfcfgNetConfig(base.TestCase): self.assertEqual(_OVS_BRIDGE_DHCP_PRIMARY_INTERFACE, self.provider.bridges['br-ctlplane']) - def test_network_ovs_bridge_with_dhcp_primary_interface_with_extra(self): def test_interface_mac(name): return "a1:b2:c3:d4:e5" @@ -198,7 +197,6 @@ class TestIfcfgNetConfig(base.TestCase): self.assertEqual(_OVS_BRIDGE_DHCP_OVS_EXTRA, self.provider.bridges['br-ctlplane']) - def test_add_vlan(self): vlan = objects.Vlan('em1', 5) self.provider.add_vlan(vlan) |