Enable support for configuring bonded interfaces

This patch adds support for passing in links with type: bond, these
links can either be a network link themselves or be the parent of vlan
network links.

Change-Id: I30ce988fdb9459267b565b67e8bbce136fcd0249

glean/cmd.py

@@ -40,7 +40,7 @@ def _exists_rh_interface(name):
     return os.path.exists(file_to_check)
 
 
-def _write_rh_interface(name, interface, has_vlan):
+def _write_rh_interface(name, interface):
     files_to_write = dict()
     results = """# Automatically generated, do not edit
 DEVICE={name}
@@ -57,7 +57,7 @@ NM_CONTROLLED=no
         netmask=interface['netmask'],
 
     )
-    if has_vlan:
+    if 'vlan_id' in interface:
         results += "VLAN=yes\n"
     routes = []
     for route in interface['routes']:
@@ -82,7 +82,7 @@ NM_CONTROLLED=no
     return files_to_write
 
 
-def _write_rh_dhcp(name, hwaddr, has_vlan):
+def _write_rh_dhcp(name, interface):
     filename = '/etc/sysconfig/network-scripts/ifcfg-{name}'.format(name=name)
     results = """# Automatically generated, do not edit
 DEVICE={name}
@@ -91,12 +91,30 @@ HWADDR={hwaddr}
 ONBOOT=yes
 NM_CONTROLLED=no
 TYPE=Ethernet
-""".format(name=name, hwaddr=hwaddr)
-    if has_vlan:
+""".format(name=name, hwaddr=interface['mac_address'])
+    if 'vlan_id' in interface:
         results += "VLAN=yes\n"
     return {filename: results}
 
 
+def _write_rh_manual(name, interface):
+    filename = '/etc/sysconfig/network-scripts/ifcfg-{name}'.format(name=name)
+    results = """# Automatically generated, do not edit
+DEVICE={name}
+BOOTPROTO=none
+HWADDR={hwaddr}
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+""".format(name=name, hwaddr=interface['mac_address'])
+    if 'vlan_id' in interface:
+        results += "VLAN=yes\n"
+    if 'bond_master' in interface:
+        results += "SLAVE=yes\n"
+        results += "MASTER={0}\n".format(interface['bond_master'])
+    return {filename: results}
+
+
 def write_redhat_interfaces(interfaces, sys_interfaces):
     files_to_write = dict()
     # Sort the interfaces by id so that we'll have consistent output order
@@ -104,26 +122,32 @@ def write_redhat_interfaces(interfaces, sys_interfaces):
             interfaces.items(), key=lambda x: x[1]['id']):
         if interface['type'] == 'ipv6':
             continue
-        raw_mac = interface.get('link_mac', interface['mac_address'])
-        if raw_mac not in sys_interfaces:
+        raw_macs = interface.get('raw_macs', [interface['mac_address']])
+        for mac in raw_macs:
+            if mac not in sys_interfaces:
                 continue
 
-        has_vlan = False
         if 'vlan_id' in interface:
-            vlan_raw_device = sys_interfaces[interface['link_mac']]
+            if len(raw_macs) == 1:
+                vlan_raw_device = sys_interfaces.get(raw_macs[0])
+            else:
+                vlan_raw_device = interface['vlan_link']
             interface_name = "{0}.{1}".format(
                 vlan_raw_device, interface['vlan_id'])
-            has_vlan = True
+        elif 'bond_mode' in interface:
+            interface_name = iname
         else:
             interface_name = sys_interfaces[interface['mac_address']]
 
         if interface['type'] == 'ipv4':
             files_to_write.update(
-                _write_rh_interface(interface_name, interface, has_vlan))
+                _write_rh_interface(interface_name, interface))
         if interface['type'] == 'ipv4_dhcp':
             files_to_write.update(
-                _write_rh_dhcp(
-                    interface_name, interface['mac_address'], has_vlan))
+                _write_rh_dhcp(interface_name, interface))
+        if interface['type'] == 'manual':
+            files_to_write.update(
+                _write_rh_manual(interface_name, interface))
     for mac, iname in sorted(
             sys_interfaces.items(), key=lambda x: x[1]):
         if _exists_rh_interface(iname):
@@ -137,7 +161,7 @@ def write_redhat_interfaces(interfaces, sys_interfaces):
             # We have a config drive config, move on
             log.debug("%s configured via config-drive" % mac)
             continue
-        files_to_write.update(_write_rh_dhcp(iname, mac, False))
+        files_to_write.update(_write_rh_dhcp(iname, {'mac_address': mac}))
     return files_to_write
 
 
@@ -193,11 +217,21 @@ mac_{name}="{hwaddr}\"\n""".format(
                     # routes='\n'.join(str(route) for route in routes)
                 )
                 results += '\n'
+        elif interface['type'] == 'manual':
+            results += """config_{name}="null"
+mac_{name}="{hwaddr}"
+""".format(name=iname, hwaddr=interface['mac_address'])
+            _enable_gentoo_interface(iname)
         else:
             results += """config_{name}="dhcp"
 mac_{name}="{hwaddr}"
 """.format(name=iname, hwaddr=interface['mac_address'])
             _enable_gentoo_interface(iname)
+        if 'bond_mode' in interface:
+            slaves = ' '.join(interface['slaves'])
+            results += """slaves_{name}="{slaves}"
+mode_{name}="{mode}"
+""".format(name=iname, slaves=slaves, mode=interface['bond_mode'])
 
     full_results = "# Automatically generated, do not edit\n"
     if vlans:
@@ -218,6 +252,8 @@ def _setup_gentoo_network_init(sys_interface, interfaces):
                 vlan=interface['vlan_id'])
             log.debug('vlan {vlan} found, interface named {name}'.
                       format(vlan=interface['vlan_id'], name=interface_name))
+        if 'bond_master' in interface:
+            continue
         _create_gentoo_net_symlink_and_enable(interface_name)
     if not interfaces:
         _create_gentoo_net_symlink_and_enable(sys_interface)
@@ -241,24 +277,35 @@ def write_gentoo_interfaces(interfaces, sys_interfaces):
             interfaces.items(), key=lambda x: x[1]['id']):
         if interface['type'] == 'ipv6':
             continue
-        raw_mac = interface.get('link_mac', interface['mac_address'])
-        if raw_mac not in sys_interfaces:
+        raw_macs = interface.get('raw_macs', [interface['mac_address']])
+        for mac in raw_macs:
+            if mac not in sys_interfaces:
                 continue
 
-        if 'vlan_id' in interface:
-            if interface['link_mac'] not in gen_intfs:
-                gen_intfs[interface['link_mac']] = []
-            gen_intfs[interface['link_mac']].append(interface)
-        else:
-            if interface['mac_address'] not in gen_intfs:
-                gen_intfs[interface['mac_address']] = []
-            gen_intfs[interface['mac_address']].append(interface)
+        if 'bond_mode' in interface:
+            interface['slaves'] = [
+                sys_interfaces[mac] for mac in interface['raw_macs']]
 
-    for raw_mac, interfaces in gen_intfs.items():
-        interface_name = sys_interfaces[raw_mac]
+        if 'raw_macs' in interface:
+            key = tuple(interface['raw_macs'])
+            if key not in gen_intfs:
+                gen_intfs[key] = []
+            gen_intfs[key].append(interface)
+        else:
+            key = (interface['mac_address'],)
+            if key not in gen_intfs:
+                gen_intfs[key] = []
+            gen_intfs[key].append(interface)
+
+    for raw_macs, interfs in gen_intfs.items():
+        if len(raw_macs) == 1:
+            interface_name = sys_interfaces[raw_macs[0]]
+        else:
+            interface_name = next(
+                intf['id'] for intf in interfs if 'bond_mode' in intf)
         files_to_write.update(
-            _write_gentoo_interface(interface_name, interfaces))
-        _setup_gentoo_network_init(interface_name, interfaces)
+            _write_gentoo_interface(interface_name, interfs))
+        _setup_gentoo_network_init(interface_name, interfs)
 
     for mac, iname in sorted(
             sys_interfaces.items(), key=lambda x: x[1]):
@@ -266,7 +313,7 @@ def write_gentoo_interfaces(interfaces, sys_interfaces):
             # This interface already has a config file, move on
             log.debug("%s already has config file, skipping" % iname)
             continue
-        if mac in gen_intfs:
+        if (mac,) in gen_intfs:
             # We have a config drive config, move on
             log.debug("%s configured via config-drive" % mac)
             continue
@@ -301,15 +348,21 @@ def write_debian_interfaces(interfaces, sys_interfaces):
     files_to_write[eni_path] += "source /etc/network/interfaces.d/*.cfg\n"
     # Sort the interfaces by id so that we'll have consistent output order
     for iname, interface in interfaces.items():
-        raw_mac = interface.get('link_mac', interface['mac_address'])
-        if raw_mac not in sys_interfaces:
+        raw_macs = interface.get('raw_macs', [interface['mac_address']])
+        for mac in raw_macs:
+            if mac not in sys_interfaces:
                 continue
 
         vlan_raw_device = None
         if 'vlan_id' in interface:
-            vlan_raw_device = sys_interfaces[interface['link_mac']]
+            if len(raw_macs) == 1:
+                vlan_raw_device = sys_interfaces.get(raw_macs[0])
+            else:
+                vlan_raw_device = interface['vlan_link']
             interface_name = "{0}.{1}".format(vlan_raw_device,
                                               interface['vlan_id'])
+        elif 'bond_mode' in interface:
+            interface_name = iname
         else:
             interface_name = sys_interfaces[interface['mac_address']]
 
@@ -325,12 +378,45 @@ def write_debian_interfaces(interfaces, sys_interfaces):
                 result += "    vlan-raw-device {0}\n".format(vlan_raw_device)
                 result += "    hw-mac-address {0}\n".format(
                     interface['mac_address'])
+            if 'bond_mode' in interface:
+                if interface['mac_address']:
+                    result += "    hwaddress {0}\n".format(
+                        interface['mac_address'])
+                result += "    bond-mode {0}\n".format(interface['bond_mode'])
+                result += "    bond-miimon {0}\n".format(
+                    interface['bond_miimon'])
+                slave_devices = [sys_interfaces[mac]
+                                 for mac in interface['raw_macs']]
+                slaves = ' '.join(slave_devices)
+                result += "    bond-slaves {0}\n".format(slaves)
             files_to_write[iface_path] = result
             continue
+
+        if interface['type'] == 'manual':
+            result = "auto {0}\n".format(interface_name)
+            result += "iface {0} inet manual\n".format(interface_name)
+            if 'bond_master' in interface:
+                result += "    bond-master {0}\n".format(
+                    interface['bond_master'])
+            if 'bond_mode' in interface:
+                if interface['mac_address']:
+                    result += "    hwaddress {0}\n".format(
+                        interface['mac_address'])
+                result += "    bond-mode {0}\n".format(interface['bond_mode'])
+                result += "    bond-miimon {0}\n".format(
+                    interface['bond_miimon'])
+                slave_devices = [sys_interfaces[mac]
+                                 for mac in interface['raw_macs']]
+                slaves = ' '.join(slave_devices)
+                result += "    bond-slaves {0}\n".format(slaves)
+            files_to_write[iface_path] = result
+            continue
+
         if interface['type'] == 'ipv6':
             link_type = "inet6"
         elif interface['type'] == 'ipv4':
             link_type = "inet"
+
         # We do not know this type of entry
         if not link_type:
             continue
@@ -353,6 +439,7 @@ def write_debian_interfaces(interfaces, sys_interfaces):
                     net=route['network'], mask=route['netmask'],
                     gw=route['gateway'])
         files_to_write[iface_path] = result
+
     for mac, iname in sorted(
             sys_interfaces.items(), key=lambda x: x[1]):
         if _exists_debian_interface(iname):
@@ -402,20 +489,41 @@ def get_config_drive_interfaces(net):
     for link in vlans.values():
         if link['vlan_link'] in phys:
             vlan_link = phys[link['vlan_link']]
+            link['raw_macs'] = [vlan_link['ethernet_mac_address'].lower()]
         elif link['vlan_link'] in bonds:
             vlan_link = bonds[link['vlan_link']]
-        link['link_mac'] = vlan_link['ethernet_mac_address'].lower()
-        link['mac_address'] = link.get(
+            link['raw_macs'] = []
+            for phy in vlan_link['bond_links']:
+                link['raw_macs'].append(
+                    phys[phy]['ethernet_mac_address'].lower())
+        link['mac_address'] = link.pop(
             'vlan_mac_address', vlan_link['ethernet_mac_address']).lower()
 
+    for link in bonds.values():
+        phy_macs = []
+        for phy in link.pop('bond_links'):
+            phy_link = phys[phy]
+            phy_link['bond_master'] = link['id']
+            if phy in phys:
+                phy_macs.append(phy_link['ethernet_mac_address'].lower())
+        link['raw_macs'] = phy_macs
+        link['mac_address'] = link.pop('ethernet_mac_address').lower()
+        if link['id'] not in networks:
+            link['type'] = 'manual'
+            interfaces[link['id']] = link
+
     for link in phys.values():
-        link['mac_address'] = link.get('ethernet_mac_address').lower()
+        link['mac_address'] = link.pop('ethernet_mac_address').lower()
+        if link['id'] not in networks:
+            link['type'] = 'manual'
+            interfaces[link['id']] = link
 
     for i, network in networks.items():
         link = vlans.get(i, phys.get(i, bonds.get(i)))
         if not link:
             continue
         link.update(network)
+        link['id'] = i
         interfaces[i] = link
 
     return interfaces
@@ -676,11 +784,13 @@ def set_hostname_from_config_drive(args):
         network_info = get_network_info(args)
         if network_info:
             interfaces = get_config_drive_interfaces(network_info)
-            key = sorted(interfaces.keys())[0]
-            interface = interfaces[key]
+            keys = sorted(interfaces.keys())
 
+            for key in keys:
+                interface = interfaces[key]
                 if interface and 'ip_address' in interface:
                     hostname_ip = interface['ip_address']
+                    break
 
         # check short hostname and generate list for hosts
         hosts_to_add[hostname] = hostname_ip

glean/tests/fixtures/liberty/mnt/config/openstack/latest/network_info.json

@@ -77,6 +77,18 @@
       "type": "ipv4_dhcp",
       "link": "vlan1",
       "id": "network5"
+    },
+    {
+      "network_id": "66666666-6666-6666-6666-666666666666",
+      "type": "ipv4_dhcp",
+      "link": "bond0",
+      "id": "network6"
+    },
+    {
+      "network_id": "77777777-7777-7777-7777-777777777777",
+      "type": "ipv4_dhcp",
+      "link": "vlan2",
+      "id": "network7"
     }
   ],
   "links": [
@@ -101,6 +113,30 @@
       "id": "tap234ab34c-f1",
       "vif_id": "acdb875a-87da-76cb-984c-acd9a75dbca7"
     },
+    {
+      "ethernet_mac_address": "BC:76:4E:05:7B:13",
+      "mtu": 1500,
+      "type": "phy",
+      "id": "tap234ab34c-f5"
+    },
+    {
+      "ethernet_mac_address": "BC:76:4E:05:7B:14",
+      "mtu": 1500,
+      "type": "phy",
+      "id": "tap234ab34c-f6"
+    },
+    {
+      "ethernet_mac_address": "BC:76:4E:05:7B:15",
+      "mtu": 1500,
+      "type": "phy",
+      "id": "tap234ab34c-f7"
+    },
+    {
+      "ethernet_mac_address": "BC:76:4E:05:7B:16",
+      "mtu": 1500,
+      "type": "phy",
+      "id": "tap234ab34c-f8"
+    },
     {
       "ethernet_mac_address": "BC:76:4E:12:a4:bb",
       "mtu": 1500,
@@ -127,6 +163,37 @@
       "vlan_link": "ethwithvlan",
       "vlan_id": 26,
       "vlan_mac_address": "BC:76:4E:12:a4:bd"
+    },
+    {
+      "id": "bond0",
+      "type": "bond",
+      "ethernet_mac_address": "BC:76:4E:05:7B:13",
+      "bond_mode": "802.3ad",
+      "bond_miimon": 100,
+      "bond_xmit_hash_policy": "layer3+4",
+      "bond_links": [
+        "tap234ab34c-f5",
+        "tap234ab34c-f6"
+      ]
+    },
+    {
+      "id": "bond1",
+      "type": "bond",
+      "ethernet_mac_address": "BC:76:4E:05:7B:15",
+      "bond_mode": "802.3ad",
+      "bond_miimon": 100,
+      "bond_xmit_hash_policy": "layer3+4",
+      "bond_links": [
+        "tap234ab34c-f7",
+        "tap234ab34c-f8"
+      ]
+    },
+    {
+      "id": "vlan2",
+      "type": "vlan",
+      "vlan_link": "bond1",
+      "vlan_id": 27,
+      "vlan_mac_address": "BC:76:4E:12:a4:be"
     }
   ]
 }

glean/tests/fixtures/liberty/sys/class/net/eth5/addr_assign_type

@@ -0,0 +1 @@
+0

glean/tests/fixtures/liberty/sys/class/net/eth5/address

@@ -0,0 +1 @@
+bc:76:4e:05:7b:13

glean/tests/fixtures/liberty/sys/class/net/eth5/carrier

@@ -0,0 +1 @@
+1

glean/tests/fixtures/liberty/sys/class/net/eth6/addr_assign_type

@@ -0,0 +1 @@
+0

glean/tests/fixtures/liberty/sys/class/net/eth6/address

@@ -0,0 +1 @@
+bc:76:4e:05:7b:14

glean/tests/fixtures/liberty/sys/class/net/eth6/carrier

@@ -0,0 +1 @@
+1

glean/tests/fixtures/liberty/sys/class/net/eth7/addr_assign_type

@@ -0,0 +1 @@
+0

glean/tests/fixtures/liberty/sys/class/net/eth7/address

@@ -0,0 +1 @@
+bc:76:4e:05:7b:15

glean/tests/fixtures/liberty/sys/class/net/eth7/carrier

@@ -0,0 +1 @@
+1

glean/tests/fixtures/liberty/sys/class/net/eth8/addr_assign_type

@@ -0,0 +1 @@
+0

glean/tests/fixtures/liberty/sys/class/net/eth8/address

@@ -0,0 +1 @@
+bc:76:4e:05:7b:16

glean/tests/fixtures/liberty/sys/class/net/eth8/carrier

@@ -0,0 +1 @@
+1

glean/tests/fixtures/test/liberty.centos.network.out

@@ -54,3 +54,68 @@ GATEWAY0=10.208.160.1
 ADDRESS1=10.208.0.0
 NETMASK1=255.240.0.0
 GATEWAY1=10.208.160.1
+### Write /etc/sysconfig/network-scripts/ifcfg-eth5
+# Automatically generated, do not edit
+DEVICE=eth5
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:13
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond0
+### Write /etc/sysconfig/network-scripts/ifcfg-eth6
+# Automatically generated, do not edit
+DEVICE=eth6
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:14
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond0
+### Write /etc/sysconfig/network-scripts/ifcfg-bond0
+# Automatically generated, do not edit
+DEVICE=bond0
+BOOTPROTO=dhcp
+HWADDR=bc:76:4e:05:7b:13
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+### Write /etc/sysconfig/network-scripts/ifcfg-eth7
+# Automatically generated, do not edit
+DEVICE=eth7
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:15
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond1
+### Write /etc/sysconfig/network-scripts/ifcfg-eth8
+# Automatically generated, do not edit
+DEVICE=eth8
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:16
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond1
+### Write /etc/sysconfig/network-scripts/ifcfg-bond1
+# Automatically generated, do not edit
+DEVICE=bond1
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:15
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+### Write /etc/sysconfig/network-scripts/ifcfg-bond1.27
+# Automatically generated, do not edit
+DEVICE=bond1.27
+BOOTPROTO=dhcp
+HWADDR=bc:76:4e:12:a4:be
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+VLAN=yes

glean/tests/fixtures/test/liberty.debian.network.out

@@ -30,6 +30,41 @@ auto eth4.26
 iface eth4.26 inet dhcp
     vlan-raw-device eth4
     hw-mac-address bc:76:4e:12:a4:bd
+### Write /etc/network/interfaces.d/eth5.cfg
+auto eth5
+iface eth5 inet manual
+    bond-master bond0
+### Write /etc/network/interfaces.d/eth6.cfg
+auto eth6
+iface eth6 inet manual
+    bond-master bond0
+### Write /etc/network/interfaces.d/bond0.cfg
+auto bond0
+iface bond0 inet dhcp
+    hwaddress bc:76:4e:05:7b:13
+    bond-mode 802.3ad
+    bond-miimon 100
+    bond-slaves eth5 eth6
+### Write /etc/network/interfaces.d/eth7.cfg
+auto eth7
+iface eth7 inet manual
+    bond-master bond1
+### Write /etc/network/interfaces.d/eth8.cfg
+auto eth8
+iface eth8 inet manual
+    bond-master bond1
+### Write /etc/network/interfaces.d/bond1.cfg
+auto bond1
+iface bond1 inet manual
+    hwaddress bc:76:4e:05:7b:15
+    bond-mode 802.3ad
+    bond-miimon 100
+    bond-slaves eth7 eth8
+### Write /etc/network/interfaces.d/bond1.27.cfg
+auto bond1.27
+iface bond1.27 inet dhcp
+    vlan-raw-device bond1
+    hw-mac-address bc:76:4e:12:a4:be
 ### Write /etc/resolv.conf
 nameserver 72.3.128.241
 nameserver 72.3.128.240

glean/tests/fixtures/test/liberty.fedora.network.out

@@ -47,6 +47,71 @@ ONBOOT=yes
 NM_CONTROLLED=no
 TYPE=Ethernet
 VLAN=yes
+### Write /etc/sysconfig/network-scripts/ifcfg-eth5
+# Automatically generated, do not edit
+DEVICE=eth5
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:13
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond0
+### Write /etc/sysconfig/network-scripts/ifcfg-eth6
+# Automatically generated, do not edit
+DEVICE=eth6
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:14
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond0
+### Write /etc/sysconfig/network-scripts/ifcfg-bond0
+# Automatically generated, do not edit
+DEVICE=bond0
+BOOTPROTO=dhcp
+HWADDR=bc:76:4e:05:7b:13
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+### Write /etc/sysconfig/network-scripts/ifcfg-eth7
+# Automatically generated, do not edit
+DEVICE=eth7
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:15
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond1
+### Write /etc/sysconfig/network-scripts/ifcfg-eth8
+# Automatically generated, do not edit
+DEVICE=eth8
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:16
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond1
+### Write /etc/sysconfig/network-scripts/ifcfg-bond1
+# Automatically generated, do not edit
+DEVICE=bond1
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:15
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+### Write /etc/sysconfig/network-scripts/ifcfg-bond1.27
+# Automatically generated, do not edit
+DEVICE=bond1.27
+BOOTPROTO=dhcp
+HWADDR=bc:76:4e:12:a4:be
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+VLAN=yes
 ### Write /etc/sysconfig/network-scripts/route-eth1
 ADDRESS0=10.176.0.0
 NETMASK0=255.240.0.0

glean/tests/fixtures/test/liberty.gentoo.network.out

@@ -19,7 +19,40 @@ mac_eth3="bc:76:4e:12:a4:bb"
 ### Write /etc/conf.d/net.eth4
 # Automatically generated, do not edit
 vlans_eth4="25 26"
+config_eth4="null"
+mac_eth4="bc:76:4e:12:a4:bc"
 config_eth4_25="dhcp"
 mac_eth4_25="bc:76:4e:12:a4:bc"
 config_eth4_26="dhcp"
 mac_eth4_26="bc:76:4e:12:a4:bd"
+### Write /etc/conf.d/net.eth5
+# Automatically generated, do not edit
+config_eth5="null"
+mac_eth5="bc:76:4e:05:7b:13"
+### Write /etc/conf.d/net.eth6
+# Automatically generated, do not edit
+config_eth6="null"
+mac_eth6="bc:76:4e:05:7b:14"
+### Write /etc/conf.d/net.bond0
+# Automatically generated, do not edit
+config_bond0="dhcp"
+mac_bond0="bc:76:4e:05:7b:13"
+slaves_bond0="eth5 eth6"
+mode_bond0="802.3ad"
+### Write /etc/conf.d/net.eth7
+# Automatically generated, do not edit
+config_eth7="null"
+mac_eth7="bc:76:4e:05:7b:15"
+### Write /etc/conf.d/net.eth8
+# Automatically generated, do not edit
+config_eth8="null"
+mac_eth8="bc:76:4e:05:7b:16"
+### Write /etc/conf.d/net.bond1
+# Automatically generated, do not edit
+vlans_bond1="27"
+config_bond1="null"
+mac_bond1="bc:76:4e:05:7b:15"
+slaves_bond1="eth7 eth8"
+mode_bond1="802.3ad"
+config_bond1_27="dhcp"
+mac_bond1_27="bc:76:4e:12:a4:be"

glean/tests/fixtures/test/liberty.redhat.network.out

@@ -54,3 +54,68 @@ GATEWAY0=10.208.160.1
 ADDRESS1=10.208.0.0
 NETMASK1=255.240.0.0
 GATEWAY1=10.208.160.1
+### Write /etc/sysconfig/network-scripts/ifcfg-eth5
+# Automatically generated, do not edit
+DEVICE=eth5
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:13
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond0
+### Write /etc/sysconfig/network-scripts/ifcfg-eth6
+# Automatically generated, do not edit
+DEVICE=eth6
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:14
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond0
+### Write /etc/sysconfig/network-scripts/ifcfg-bond0
+# Automatically generated, do not edit
+DEVICE=bond0
+BOOTPROTO=dhcp
+HWADDR=bc:76:4e:05:7b:13
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+### Write /etc/sysconfig/network-scripts/ifcfg-eth7
+# Automatically generated, do not edit
+DEVICE=eth7
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:15
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond1
+### Write /etc/sysconfig/network-scripts/ifcfg-eth8
+# Automatically generated, do not edit
+DEVICE=eth8
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:16
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+SLAVE=yes
+MASTER=bond1
+### Write /etc/sysconfig/network-scripts/ifcfg-bond1
+# Automatically generated, do not edit
+DEVICE=bond1
+BOOTPROTO=none
+HWADDR=bc:76:4e:05:7b:15
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+### Write /etc/sysconfig/network-scripts/ifcfg-bond1.27
+# Automatically generated, do not edit
+DEVICE=bond1.27
+BOOTPROTO=dhcp
+HWADDR=bc:76:4e:12:a4:be
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+VLAN=yes

glean/tests/fixtures/test/liberty.ubuntu.network.out

@@ -30,6 +30,41 @@ auto eth4.26
 iface eth4.26 inet dhcp
     vlan-raw-device eth4
     hw-mac-address bc:76:4e:12:a4:bd
+### Write /etc/network/interfaces.d/eth5.cfg
+auto eth5
+iface eth5 inet manual
+    bond-master bond0
+### Write /etc/network/interfaces.d/eth6.cfg
+auto eth6
+iface eth6 inet manual
+    bond-master bond0
+### Write /etc/network/interfaces.d/bond0.cfg
+auto bond0
+iface bond0 inet dhcp
+    hwaddress bc:76:4e:05:7b:13
+    bond-mode 802.3ad
+    bond-miimon 100
+    bond-slaves eth5 eth6
+### Write /etc/network/interfaces.d/eth7.cfg
+auto eth7
+iface eth7 inet manual
+    bond-master bond1
+### Write /etc/network/interfaces.d/eth8.cfg
+auto eth8
+iface eth8 inet manual
+    bond-master bond1
+### Write /etc/network/interfaces.d/bond1.cfg
+auto bond1
+iface bond1 inet manual
+    hwaddress bc:76:4e:05:7b:15
+    bond-mode 802.3ad
+    bond-miimon 100
+    bond-slaves eth7 eth8
+### Write /etc/network/interfaces.d/bond1.27.cfg
+auto bond1.27
+iface bond1.27 inet dhcp
+    vlan-raw-device bond1
+    hw-mac-address bc:76:4e:12:a4:be
 ### Write /etc/resolv.conf
 nameserver 72.3.128.241
 nameserver 72.3.128.240