← Back to branch summary

~harlowja/cloud-init/cloud-init-net-refactor

« back to all changes in this revision

Viewing changes to cloudinit/net/__init__.py

Enable flake8 and fix a large amount of reported issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
cloudinit/net/__init__.py
26
26
import shlex
27
27
 
28
28
from cloudinit import log as logging
 
29
from cloudinit.net import network_state
 
30
from cloudinit.net.udev import generate_udev_rule
29
31
from cloudinit import util
30
 
from .udev import generate_udev_rule
31
 
from . import network_state
32
32
 
33
33
LOG = logging.getLogger(__name__)
34
34
 
40
40
    "pointtopoint", "media", "mtu", "hostname", "leasehours", "leasetime",
41
41
    "vendor", "client", "bootfile", "server", "hwaddr", "provider", "frame",
42
42
    "netnum", "endpoint", "local", "ttl",
43
 
    ]
 
43
]
44
44
 
45
45
NET_CONFIG_COMMANDS = [
46
46
    "pre-up", "up", "post-up", "down", "pre-down", "post-down",
47
 
    ]
 
47
]
48
48
 
49
49
NET_CONFIG_BRIDGE_OPTIONS = [
50
50
    "bridge_ageing", "bridge_bridgeprio", "bridge_fd", "bridge_gcinit",
51
51
    "bridge_hello", "bridge_maxage", "bridge_maxwait", "bridge_stp",
52
 
    ]
 
52
]
53
53
 
54
54
DEFAULT_PRIMARY_INTERFACE = 'eth0'
55
55
 
399
399
 
400
400
 
401
401
def render_persistent_net(network_state):
402
 
    ''' Given state, emit udev rules to map
403
 
        mac to ifname
404
 
    '''
 
402
    '''Given state, emit udev rules to map mac to ifname.'''
405
403
    content = ""
406
404
    interfaces = network_state.get('interfaces')
407
405
    for iface in interfaces.values():
465
463
 
466
464
 
467
465
def render_route(route, indent=""):
468
 
    """ When rendering routes for an iface, in some cases applying a route
 
466
    """When rendering routes for an iface, in some cases applying a route
469
467
    may result in the route command returning non-zero which produces
470
468
    some confusing output for users manually using ifup/ifdown[1].  To
471
469
    that end, we will optionally include an '|| true' postfix to each
530
528
 
531
529
 
532
530
def render_interfaces(network_state):
533
 
    ''' Given state, emit etc/network/interfaces content '''
 
531
    '''Given state, emit etc/network/interfaces content.'''
534
532
 
535
533
    content = ""
536
534
    interfaces = network_state.get('interfaces')