openstack
/
os-net-config
Code Issues Proposed changes

Merge "Add support for enabling hotplug on interfaces" into stable/newton

This commit is contained in:
Jenkins 2017-04-11 19:03:50 +00:00 committed by Gerrit Code Review
parent 3cb1fc32f4 2ce1f4e52e
commit c975651037
10 changed files with 77 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/os-net-config/samples/ib_interface.json
View File

@ -20,7 +20,7 @@
"type": "ib_interface",
"name": "ib1",
"use_dhcp": true,
"defroute": no
"defroute": false
}
]
}

2
etc/os-net-config/samples/ib_interface.yaml
View File

@ -15,4 +15,4 @@ network_config:
type: interface
name: ib1
use_dhcp: true
defroute: no
defroute: false

8
etc/os-net-config/samples/interface.json
View File

@ -20,7 +20,13 @@
"type": "interface",
"name": "em2",
"use_dhcp": true,
"defroute": no
"defroute": false
},
{
"type": "interface",
"name": "em3",
"use_dhcp": true,
"hotplug": true
}
]
}

7
etc/os-net-config/samples/interface.yaml
View File

@ -15,4 +15,9 @@ network_config:
type: interface
name: em2
use_dhcp: true
defroute: no
defroute: false
-
type: interface
name: em3
use_dhcp: true
hotplug: true

5
os_net_config/impl_eni.py
View File

@ -127,7 +127,10 @@ class ENINetConfig(os_net_config.NetConfig):
data += address_data
data += " vlan-raw-device %s\n" % interface.device
else:
data += "auto %s\n" % interface.name
if isinstance(interface, objects.Interface) and interface.hotplug:
data += "allow-hotplug %s\n" % interface.name
else:
data += "auto %s\n" % interface.name
data += _iface
data += address_data
if interface.mtu:

5
os_net_config/impl_ifcfg.py
View File

@ -138,7 +138,10 @@ class IfcfgNetConfig(os_net_config.NetConfig):
data = "# This file is autogenerated by os-net-config\n"
data += "DEVICE=%s\n" % base_opt.name
data += "ONBOOT=yes\n"
data += "HOTPLUG=no\n"
if isinstance(base_opt, objects.Interface) and base_opt.hotplug:
data += "HOTPLUG=yes\n"
else:
data += "HOTPLUG=no\n"
data += "NM_CONTROLLED=no\n"
if not base_opt.dns_servers and not base_opt.use_dhcp:
data += "PEERDNS=no\n"

6
os_net_config/objects.py
View File

@ -284,7 +284,7 @@ class Interface(_BaseOpts):
def __init__(self, name, use_dhcp=False, use_dhcpv6=False, addresses=None,
routes=None, mtu=None, primary=False, nic_mapping=None,
persist_mapping=False, defroute=True, dhclient_args=None,
dns_servers=None):
dns_servers=None, hotplug=False):
addresses = addresses or []
routes = routes or []
dns_servers = dns_servers or []
@ -292,12 +292,14 @@ class Interface(_BaseOpts):
routes, mtu, primary, nic_mapping,
persist_mapping, defroute,
dhclient_args, dns_servers)
self.hotplug = hotplug
@staticmethod
def from_json(json):
name = _get_required_field(json, 'name', 'Interface')
hotplug = strutils.bool_from_string(str(json.get('hotplug', False)))
opts = _BaseOpts.base_opts_from_json(json)
return Interface(name, *opts)
return Interface(name, *opts, hotplug=hotplug)
class Vlan(_BaseOpts):

17
os_net_config/tests/test_impl_eni.py
View File

@ -32,6 +32,12 @@ _V4_IFACE_STATIC_IP = _AUTO + """iface eth0 inet static
netmask 255.255.255.0
"""
_IFACE_HOTPLUG = """allow-hotplug eth0
iface eth0 inet static
address 192.168.1.2
netmask 255.255.255.0
"""
_V4_IFACE_STATIC_IP_MULTIPLE = (_V4_IFACE_STATIC_IP + _AUTO +
"""iface eth0 inet static
address 10.0.0.2
@ -115,8 +121,9 @@ class TestENINetConfig(base.TestCase):
def get_route_config(self):
return self.provider.routes[self.if_name]
def _default_interface(self, addr=[], rts=[]):
return objects.Interface(self.if_name, addresses=addr, routes=rts)
def _default_interface(self, addr=[], rts=[], hotplug=False):
return objects.Interface(self.if_name, addresses=addr, routes=rts,
hotplug=hotplug)
def test_interface_no_ip(self):
interface = self._default_interface()
@ -129,6 +136,12 @@ class TestENINetConfig(base.TestCase):
self.provider.add_interface(interface)
self.assertEqual(_V4_IFACE_STATIC_IP, self.get_interface_config())
def test_add_interface_with_hotplug(self):
v4_addr = objects.Address('192.168.1.2/24')
interface = self._default_interface(addr=[v4_addr], hotplug=True)
self.provider.add_interface(interface)
self.assertEqual(_IFACE_HOTPLUG, self.get_interface_config())
def test_add_interface_with_v4_multiple(self):
v4_addresses = [objects.Address('192.168.1.2/24'),
objects.Address('10.0.0.2/8')]

14
os_net_config/tests/test_impl_ifcfg.py
View File

@ -34,6 +34,15 @@ NM_CONTROLLED=no
PEERDNS=no
"""
_HOTPLUG = """# This file is autogenerated by os-net-config
DEVICE=em1
ONBOOT=yes
HOTPLUG=yes
NM_CONTROLLED=no
PEERDNS=no
BOOTPROTO=none
"""
_NO_IP = _BASE_IFCFG + "BOOTPROTO=none\n"
_V4_IFCFG = _BASE_IFCFG + """BOOTPROTO=static
@ -385,6 +394,11 @@ class TestIfcfgNetConfig(base.TestCase):
self.provider.add_interface(interface)
self.assertEqual(_NO_IP, self.get_interface_config())
def test_add_interface_with_hotplug(self):
interface = objects.Interface('em1', hotplug=True)
self.provider.add_interface(interface)
self.assertEqual(_HOTPLUG, self.get_interface_config())
def test_add_base_interface_vlan(self):
interface = objects.Interface('em1.120')
self.provider.add_interface(interface)

21
os_net_config/tests/test_objects.py
View File

@ -94,6 +94,27 @@ class TestInterface(base.TestCase):
self.assertEqual("em1", interface.name)
self.assertTrue(interface.use_dhcp)
def test_from_json_hotplug(self):
data = """{
"type": "interface",
"name": "em1",
"hotplug": true
}
"""
interface = objects.object_from_json(json.loads(data))
self.assertEqual("em1", interface.name)
self.assertTrue(interface.hotplug)
def test_from_json_hotplug_off_by_default(self):
data = """{
"type": "interface",
"name": "em1"
}
"""
interface = objects.object_from_json(json.loads(data))
self.assertEqual("em1", interface.name)
self.assertFalse(interface.hotplug)
def test_from_json_defroute(self):
data = '{"type": "interface", "name": "em1", "use_dhcp": true}'
interface1 = objects.object_from_json(json.loads(data))