Merge lp:~blake-rouse/maas/ip-addr-with-dhclient into lp:~maas-committers/maas/trunk

[Blake Rouse]

Exclusivily use ip addr to get networks from the rack controller. Parse the running dhclient's to get the DHCP addresses assigned to interfaces. Update the discovered IP address for the rack controller interfaces that DHCP.

[Blake Rouse (blake-rouse)]

This is a very large branch because it completely replaced what we where doing with just using all of "ip addr" output. That output was extended as well to get the DHCP IP addresses so the model in the region can be fully complete.

I have QA'd this branch and it is working much better now. All interfaces on machines will appear except for those that are just plain ethernet devices (aka. tun-tap devices). So bridges and bonds all show up. This branch does not create bridged correctly in the MAAS model it just creates them as physical interfaces.

[Blake Rouse (blake-rouse)]

Here is a screenshot showing what my interfaces look like on my desktop. This is every working with network manager running, which is cool.

http://imgur.com/wMcNewW

[Mike Pontillo (mpontillo)]

Nice work. I looked through but didn't do a full review yet. A couple comments:

 - Isn't showing virbr0 somewhat of a regression? That is, in 1.9 I think we skip any bridge interface that isn't bridged to at least one physical interface. (Would we create a fabric for lxcbr0 as well, or is there still code to prevent this somewhere?)

 - It seems like a future branch should validate that rack controllers must have a static address on every managed subnet with a dynamic range, when the user goes to provide DHCP on a subnet.

[Blake Rouse (blake-rouse)]

> Nice work. I looked through but didn't do a full review yet. A couple
> comments:
>
> - Isn't showing virbr0 somewhat of a regression? That is, in 1.9 I think we
> skip any bridge interface that isn't bridged to at least one physical
> interface. (Would we create a fabric for lxcbr0 as well, or is there still
> code to prevent this somewhere?)

No its not a regression its actually an improvement. The bridge are now shown correctly and each are added to its own fabric.

>
> - It seems like a future branch should validate that rack controllers must
> have a static address on every managed subnet with a dynamic range, when the
> user goes to provide DHCP on a subnet.

Actually the rack controller only needs to at least have one IP address in one of the subnets in the VLAN. Even if that subnet does not have a dynamic range that is fine, as DHCPD will do the correct thing with the pool defined in the other subnet on the VLAN. I would hope there is validation already in place to say a rack controller must at least have an IP address on a subnet for that VLAN.

[Mike Pontillo (mpontillo)]

I agree it could be seen as an improvement, but in Seattle I thought we decided that we should not create a new fabric for every LXC bridge; since these can have random subnet assignments, this may lead to creating at least one useless fabric by default for every rack. So we came up with the compromise of only adding bridges that are bridged to the outside world. (This has the drawback that a fully-virtualized MAAS install must be manually configured, though.)

I think this will be less of an issue in MAAS 2.0 since we will have the ability to combine fabrics, but it's still not perfect because MAAS should not auto-create top-level objects like a Fabric without user confirmation.

[Mike Pontillo (mpontillo)]

Nice work. Ship it!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/ip-addr-with-dhclient into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease [95.8 kB]
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Fetched 95.8 kB in 0s (231 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
archdetect-deb is already the newest version (1.114ubuntu3).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.10.3.dfsg.P2-4).
bind9utils is already the newest version (1:9.10.3.dfsg.P2-4).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest version (2.20-0ubuntu3).
dh-systemd is already the newest version (1.28ubuntu2).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.10.3.dfsg.P2-4).
firefox is already the newest version (44.0.2+build1-0ubuntu1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.0-1).
isc-dhcp-common is already the newest version (4.3.3-5ubuntu9).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-jquery-hotkeys is already the newest version (0~20130707+...

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/ip-addr-with-dhclient into lp:maas failed. Below is the output from the failed tests.

Get:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease [95.8 kB]
Hit:2 http://security.ubuntu.com/ubuntu xenial-security InRelease
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Fetched 95.8 kB in 0s (230 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
archdetect-deb is already the newest version (1.114ubuntu3).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.10.3.dfsg.P2-4).
bind9utils is already the newest version (1:9.10.3.dfsg.P2-4).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest version (2.20-0ubuntu3).
dh-systemd is already the newest version (1.28ubuntu2).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.10.3.dfsg.P2-4).
firefox is already the newest version (44.0.2+build1-0ubuntu1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.0-1).
isc-dhcp-common is already the newest version (4.3.3-5ubuntu9).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-jquery-hotkeys is already the newest version (0~20130707+...

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/ip-addr-with-dhclient into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
archdetect-deb is already the newest version (1.114ubuntu3).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.10.3.dfsg.P2-4).
bind9utils is already the newest version (1:9.10.3.dfsg.P2-4).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest version (2.20-0ubuntu3).
dh-systemd is already the newest version (1.28ubuntu2).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.10.3.dfsg.P2-4).
firefox is already the newest version (44.0.2+build1-0ubuntu1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.0-1).
isc-dhcp-common is already the newest version (4.3.3-5ubuntu9).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-jquery-hotkeys is already the newest version (0~20130707+git2d51e3a9+dfsg-2ubuntu1).
libjs-yui3-full...

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-02-28 20:47:48 +0000
+++ src/maasserver/models/node.py	2016-03-01 19:26:45 +0000
@@ -3199,6 +3199,8 @@
 
     def _update_links(self, interface, links, force_vlan=False):
         """Update the links on `interface`."""
+        interface.ip_addresses.filter(
+            alloc_type=IPADDRESS_TYPE.DISCOVERED).delete()
         current_ip_addresses = list(
             interface.ip_addresses.exclude(
                 alloc_type=IPADDRESS_TYPE.DISCOVERED))
@@ -3214,6 +3216,46 @@
                     interface.ip_addresses.add(dhcp_address)
                 else:
                     current_ip_addresses.remove(dhcp_address)
+                if "address" in link:
+                    # DHCP IP address was discovered. Add it as a discovered
+                    # IP address.
+                    ip_network = IPNetwork(link["address"])
+                    ip_addr = str(ip_network.ip)
+
+                    # Get or create the subnet for this link. If created if
+                    # will be added to the VLAN on the interface.
+                    subnet, _ = Subnet.objects.get_or_create(
+                        cidr=str(ip_network.cidr), defaults={
+                            "name": str(ip_network.cidr),
+                            "vlan": interface.vlan,
+                            "space": Space.objects.get_default_space(),
+                        })
+
+                    # Make sure that the subnet is on the same VLAN as the
+                    # interface.
+                    if force_vlan and subnet.vlan_id != interface.vlan_id:
+                        maaslog.error(
+                            "Unable to update IP address '%s' assigned to "
+                            "interface '%s' on rack controller '%s'. "
+                            "Subnet '%s' for IP address is not on "
+                            "VLAN '%s.%d'." % (
+                                ip_addr, interface.name, self.hostname,
+                                subnet.name, subnet.vlan.fabric.name,
+                                subnet.vlan.vid))
+                        continue
+
+                    # Create the DISCOVERED IP address.
+                    ip_address, created = (
+                        StaticIPAddress.objects.get_or_create(
+                            ip=ip_addr, defaults={
+                                "alloc_type": IPADDRESS_TYPE.DISCOVERED,
+                                "subnet": subnet,
+                            }))
+                    if not created:
+                        ip_address.alloc_type = IPADDRESS_TYPE.DISCOVERED
+                        ip_address.subnet = subnet
+                        ip_address.save()
+                    interface.ip_addresses.add(ip_address)
                 updated_ip_addresses.add(dhcp_address)
             elif link["mode"] == "static":
                 ip_network = IPNetwork(link["address"])
@@ -3259,6 +3301,10 @@
                                 "alloc_type": IPADDRESS_TYPE.STICKY,
                                 "subnet": subnet,
                             }))
+                    if not created:
+                        ip_address.alloc_type = IPADDRESS_TYPE.STICKY
+                        ip_address.subnet = subnet
+                        ip_address.save()
                 else:
                     current_ip_addresses.remove(ip_address)
 

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-02-27 02:31:24 +0000
+++ src/maasserver/models/tests/test_node.py	2016-03-01 19:26:45 +0000
@@ -4394,6 +4394,8 @@
 
     def test__new_physical_with_dhcp_link(self):
         rack = self.create_empty_rack_controller()
+        network = factory.make_ip4_or_6_network()
+        ip = factory.pick_ip_in_network(network)
         interfaces = {
             "eth0": {
                 "type": "physical",
@@ -4401,6 +4403,7 @@
                 "parents": [],
                 "links": [{
                     "mode": "dhcp",
+                    "address": "%s/%d" % (str(ip), network.prefixlen),
                 }],
                 "enabled": True,
             },
@@ -4416,13 +4419,31 @@
                 enabled=True,
                 vlan=default_vlan,
             ))
-        eth0_addresses = list(eth0.ip_addresses.all())
-        self.assertThat(eth0_addresses, HasLength(1))
+        dhcp_addresses = list(eth0.ip_addresses.filter(
+            alloc_type=IPADDRESS_TYPE.DHCP))
+        self.assertThat(dhcp_addresses, HasLength(1))
         self.assertThat(
-            eth0_addresses[0], MatchesStructure.byEquality(
+            dhcp_addresses[0], MatchesStructure.byEquality(
                 alloc_type=IPADDRESS_TYPE.DHCP,
                 ip=None,
             ))
+        subnet = Subnet.objects.get(cidr=str(network.cidr))
+        self.assertThat(
+            subnet, MatchesStructure.byEquality(
+                name=str(network.cidr),
+                cidr=str(network.cidr),
+                vlan=default_vlan,
+                space=Space.objects.get_default_space(),
+            ))
+        discovered_addresses = list(eth0.ip_addresses.filter(
+            alloc_type=IPADDRESS_TYPE.DISCOVERED))
+        self.assertThat(discovered_addresses, HasLength(1))
+        self.assertThat(
+            discovered_addresses[0], MatchesStructure.byEquality(
+                alloc_type=IPADDRESS_TYPE.DISCOVERED,
+                ip=ip,
+                subnet=subnet,
+            ))
 
     def test__new_physical_with_multiple_dhcp_link(self):
         rack = self.create_empty_rack_controller()

=== renamed file 'src/provisioningserver/eni.py' => 'src/provisioningserver/networks.py'
--- src/provisioningserver/eni.py	2016-02-26 21:09:21 +0000
+++ src/provisioningserver/networks.py	2016-03-01 19:26:45 +0000
@@ -8,11 +8,11 @@
     "clear_current_interfaces_definition",
 ]
 
-from provisioningserver.utils.network import get_eni_interfaces_definition
+from provisioningserver.utils.network import get_all_interfaces_definition
 
-# Holds the current /etc/network/interfaces definition that the rack
-# controller has processed.
-_current_eni_definition = None
+# Holds the current interfaces definition that the rack controller has
+# processed.
+_current_definition = None
 
 
 def get_interfaces_definition():
@@ -20,20 +20,20 @@
     boolean for it the definition has changed since the last time this method
     was called.
     """
-    global _current_eni_definition
-    if _current_eni_definition is None:
-        _current_eni_definition = get_eni_interfaces_definition()
-        return _current_eni_definition, True
+    global _current_definition
+    if _current_definition is None:
+        _current_definition = get_all_interfaces_definition()
+        return _current_definition, True
     else:
-        new_definition = get_eni_interfaces_definition()
-        if _current_eni_definition != new_definition:
-            _current_eni_definition = new_definition
-            return _current_eni_definition, True
+        new_definition = get_all_interfaces_definition()
+        if _current_definition != new_definition:
+            _current_definition = new_definition
+            return _current_definition, True
         else:
-            return _current_eni_definition, False
+            return _current_definition, False
 
 
 def clear_current_interfaces_definition():
     """Clear the current cached interfaces definition."""
-    global _current_eni_definition
-    _current_eni_definition = None
+    global _current_definition
+    _current_definition = None

=== modified file 'src/provisioningserver/plugin.py'
--- src/provisioningserver/plugin.py	2016-02-26 16:19:41 +0000
+++ src/provisioningserver/plugin.py	2016-03-01 19:26:45 +0000
@@ -124,12 +124,12 @@
         rpc_service.setName("rpc")
         return rpc_service
 
-    def _makeENIMonitoringService(self, rpc_service):
-        from provisioningserver.pserv_services.eni_monitoring_service \
-            import ENIMonitoringService
-        eni_monitor = ENIMonitoringService(rpc_service, reactor)
-        eni_monitor.setName("eni_monitor")
-        return eni_monitor
+    def _makeNetworksMonitoringService(self, rpc_service):
+        from provisioningserver.pserv_services.networks_monitoring_service \
+            import NetworksMonitoringService
+        networks_monitor = NetworksMonitoringService(rpc_service, reactor)
+        networks_monitor.setName("networks_monitor")
+        return networks_monitor
 
     def _makeDHCPProbeService(self, rpc_service):
         from provisioningserver.pserv_services.dhcp_probe_service \
@@ -151,7 +151,7 @@
         rpc_service = self._makeRPCService()
         yield rpc_service
         # Other services that make up the MAAS Region Controller.
-        yield self._makeENIMonitoringService(rpc_service)
+        yield self._makeNetworksMonitoringService(rpc_service)
         yield self._makeDHCPProbeService(rpc_service)
         yield self._makeLeaseSocketService(rpc_service)
         yield self._makeNodePowerMonitorService()

=== renamed file 'src/provisioningserver/pserv_services/eni_monitoring_service.py' => 'src/provisioningserver/pserv_services/networks_monitoring_service.py'
--- src/provisioningserver/pserv_services/eni_monitoring_service.py	2016-02-26 20:37:13 +0000
+++ src/provisioningserver/pserv_services/networks_monitoring_service.py	2016-03-01 19:26:45 +0000
@@ -1,20 +1,20 @@
 # Copyright 2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""/etc/network/interfaces monitoring service."""
+"""Networks monitoring service."""
 
 __all__ = [
-    "ENIMonitoringService",
+    "NetworksMonitoringService",
     ]
 
 
 from datetime import timedelta
 
-from provisioningserver.eni import (
+from provisioningserver.logger.log import get_maas_logger
+from provisioningserver.networks import (
     clear_current_interfaces_definition,
     get_interfaces_definition,
 )
-from provisioningserver.logger.log import get_maas_logger
 from provisioningserver.rpc.exceptions import NoConnectionsAvailable
 from provisioningserver.rpc.region import UpdateInterfaces
 from provisioningserver.utils.twisted import (
@@ -26,10 +26,10 @@
 from twisted.internet.threads import deferToThread
 
 
-maaslog = get_maas_logger("eni.monitor")
-
-
-class ENIMonitoringService(TimerService, object):
+maaslog = get_maas_logger("networks.monitor")
+
+
+class NetworksMonitoringService(TimerService, object):
     """Service to monitor the interfaces definition on the rack controller.
 
     Parsed the "/etc/network/interfaces" and "ip addr show" to update the
@@ -42,7 +42,7 @@
 
     def __init__(self, client_service, reactor):
         # Call self.try_update_interfaces() every self.check_interval.
-        super(ENIMonitoringService, self).__init__(
+        super(NetworksMonitoringService, self).__init__(
             self.check_interval, self.tryUpdateInterfaces)
         self.clock = reactor
         self.client_service = client_service

=== renamed file 'src/provisioningserver/pserv_services/tests/test_eni_monitoring_service.py' => 'src/provisioningserver/pserv_services/tests/test_networks_monitoring_service.py'
--- src/provisioningserver/pserv_services/tests/test_eni_monitoring_service.py	2016-02-26 20:37:13 +0000
+++ src/provisioningserver/pserv_services/tests/test_networks_monitoring_service.py	2016-03-01 19:26:45 +0000
@@ -1,7 +1,7 @@
 # Copyright 2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Tests for /etc/network/interfaces monitor."""
+"""Tests for networks monitor."""
 
 __all__ = []
 
@@ -18,9 +18,9 @@
     Mock,
     sentinel,
 )
-from provisioningserver.pserv_services import eni_monitoring_service
-from provisioningserver.pserv_services.eni_monitoring_service import (
-    ENIMonitoringService,
+from provisioningserver.pserv_services import networks_monitoring_service
+from provisioningserver.pserv_services.networks_monitoring_service import (
+    NetworksMonitoringService,
 )
 from provisioningserver.rpc import (
     getRegionClient,
@@ -32,7 +32,7 @@
 from twisted.internet.task import Clock
 
 
-class TestENIMonitorService(PservTestCase):
+class TestNetworksMonitorService(PservTestCase):
 
     run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)
 
@@ -43,7 +43,7 @@
 
     def test_is_called_every_interval(self):
         clock = Clock()
-        service = ENIMonitoringService(
+        service = NetworksMonitoringService(
             sentinel.service, clock)
 
         # Avoid actually updating.
@@ -74,18 +74,19 @@
     def test_get_interfaces_definition_is_initiated_in_new_thread(self):
         clock = Clock()
         rpc_service = Mock()
-        deferToThread = self.patch(eni_monitoring_service, 'deferToThread')
+        deferToThread = self.patch(
+            networks_monitoring_service, 'deferToThread')
         deferToThread.return_value = defer.succeed(({}, False))
-        service = ENIMonitoringService(rpc_service, clock)
+        service = NetworksMonitoringService(rpc_service, clock)
         service.startService()
         self.assertThat(
             deferToThread, MockCalledOnceWith(
-                eni_monitoring_service.get_interfaces_definition))
+                networks_monitoring_service.get_interfaces_definition))
 
     def test_logs_errors(self):
         clock = Clock()
-        maaslog = self.patch(eni_monitoring_service, 'maaslog')
-        service = ENIMonitoringService(
+        maaslog = self.patch(networks_monitoring_service, 'maaslog')
+        service = NetworksMonitoringService(
             sentinel.service, clock)
         error_message = factory.make_string()
         self.patch(service, 'updateInterfaces').side_effect = Exception(
@@ -101,9 +102,9 @@
     def test_calls_clear_current_interfaces_when_fails_to_send_to_region(self):
         clock = Clock()
         clear_current_interfaces_definition = self.patch(
-            eni_monitoring_service, 'clear_current_interfaces_definition')
+            networks_monitoring_service, 'clear_current_interfaces_definition')
         get_interfaces_definition = self.patch(
-            eni_monitoring_service, 'get_interfaces_definition')
+            networks_monitoring_service, 'get_interfaces_definition')
         get_interfaces_definition.return_value = ({}, True)
 
         protocol, connecting = self.patch_rpc_methods()
@@ -113,7 +114,7 @@
             region.UpdateInterfaces.commandName]
         rpc_service = Mock()
         rpc_service.getClient.return_value = getRegionClient()
-        service = ENIMonitoringService(rpc_service, clock)
+        service = NetworksMonitoringService(rpc_service, clock)
         yield service.startService()
         yield service.stopService()
         self.assertThat(
@@ -126,7 +127,7 @@
         self.addCleanup((yield connecting))
 
         deferToThread = self.patch(
-            eni_monitoring_service, 'deferToThread')
+            networks_monitoring_service, 'deferToThread')
         interfaces = {
             "eth0": {
                 "type": "physical",
@@ -142,7 +143,7 @@
         rpc_service = Mock()
         rpc_service.getClient.return_value = client
 
-        service = ENIMonitoringService(
+        service = NetworksMonitoringService(
             rpc_service, clock)
         yield service.startService()
         yield service.stopService()

=== modified file 'src/provisioningserver/rpc/clusterservice.py'
--- src/provisioningserver/rpc/clusterservice.py	2016-02-26 16:19:41 +0000
+++ src/provisioningserver/rpc/clusterservice.py	2016-03-01 19:26:45 +0000
@@ -34,8 +34,8 @@
 from provisioningserver.drivers.hardware.vmware import probe_vmware_and_enlist
 from provisioningserver.drivers.power import power_drivers_by_name
 from provisioningserver.drivers.power.mscm import probe_and_enlist_mscm
-from provisioningserver.eni import get_interfaces_definition
 from provisioningserver.logger.log import get_maas_logger
+from provisioningserver.networks import get_interfaces_definition
 from provisioningserver.power.change import maybe_change_power_state
 from provisioningserver.power.poweraction import UnknownPowerType
 from provisioningserver.power.query import get_power_state

=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2016-02-26 02:46:38 +0000
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2016-03-01 19:26:45 +0000
@@ -93,7 +93,7 @@
 from provisioningserver.security import set_shared_secret_on_filesystem
 from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.twisted.protocols import amp
-from provisioningserver.utils.network import get_eni_interfaces_definition
+from provisioningserver.utils.network import get_all_interfaces_definition
 from testtools import ExpectedException
 from testtools.deferredruntest import extract_result
 from testtools.matchers import (
@@ -1255,7 +1255,7 @@
     def test_registerRackWithRegion_end_to_end(self):
         maas_url = factory.make_simple_http_url()
         hostname = platform.node().split('.')[0]
-        interfaces = get_eni_interfaces_definition()
+        interfaces = get_all_interfaces_definition()
         self.useFixture(ClusterConfigurationFixture(
             maas_url=maas_url))
         fixture = self.useFixture(MockLiveClusterToRegionRPCFixture())
@@ -1866,7 +1866,7 @@
                 'distro_series': distro_series,
                 'swap_size': swap_size,
                 'architecture': architecture,
-                'interfaces': get_eni_interfaces_definition(),
+                'interfaces': get_all_interfaces_definition(),
             }, response)
 
 

=== renamed file 'src/provisioningserver/tests/test_eni.py' => 'src/provisioningserver/tests/test_networks.py'
--- src/provisioningserver/tests/test_eni.py	2016-02-26 20:37:13 +0000
+++ src/provisioningserver/tests/test_networks.py	2016-03-01 19:26:45 +0000
@@ -1,44 +1,44 @@
 # Copyright 2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Test eni module."""
+"""Test networks module."""
 
 __all__ = [
     ]
 
 from maastesting.testcase import MAASTestCase
 from mock import sentinel
-from provisioningserver import eni
+from provisioningserver import networks
 
 
 class TestGetInterfacesDefinition(MAASTestCase):
     """Tests for `get_interfaces_definition`."""
 
     def test__sets_global_when_None(self):
-        eni._current_eni_definition = None
-        patched_getter = self.patch(eni, "get_eni_interfaces_definition")
+        networks._current_definition = None
+        patched_getter = self.patch(networks, "get_all_interfaces_definition")
         patched_getter.return_value = sentinel.definition
-        expected_value, updated = eni.get_interfaces_definition()
+        expected_value, updated = networks.get_interfaces_definition()
         self.assertEquals(sentinel.definition, expected_value)
-        self.assertEquals(sentinel.definition, eni._current_eni_definition)
+        self.assertEquals(sentinel.definition, networks._current_definition)
         self.assertTrue(updated)
 
     def test__sets_global_when_different(self):
-        eni._current_eni_definition = sentinel.old_definition
-        patched_getter = self.patch(eni, "get_eni_interfaces_definition")
+        networks._current_definition = sentinel.old_definition
+        patched_getter = self.patch(networks, "get_all_interfaces_definition")
         patched_getter.return_value = sentinel.definition
-        expected_value, updated = eni.get_interfaces_definition()
+        expected_value, updated = networks.get_interfaces_definition()
         self.assertEquals(sentinel.definition, expected_value)
-        self.assertEquals(sentinel.definition, eni._current_eni_definition)
+        self.assertEquals(sentinel.definition, networks._current_definition)
         self.assertTrue(updated)
 
     def test__returns_not_changed_if_same(self):
-        eni._current_eni_definition = sentinel.definition
-        patched_getter = self.patch(eni, "get_eni_interfaces_definition")
+        networks._current_definition = sentinel.definition
+        patched_getter = self.patch(networks, "get_all_interfaces_definition")
         patched_getter.return_value = sentinel.definition
-        expected_value, updated = eni.get_interfaces_definition()
+        expected_value, updated = networks.get_interfaces_definition()
         self.assertEquals(sentinel.definition, expected_value)
-        self.assertEquals(sentinel.definition, eni._current_eni_definition)
+        self.assertEquals(sentinel.definition, networks._current_definition)
         self.assertFalse(updated)
 
 
@@ -46,6 +46,6 @@
     """Tests for `clear_current_interfaces_definition`."""
 
     def test__sets_global_to_None(self):
-        eni._current_eni_definition = sentinel.old_definition
-        eni.clear_current_interfaces_definition()
-        self.assertIsNone(eni._current_eni_definition)
+        networks._current_definition = sentinel.old_definition
+        networks.clear_current_interfaces_definition()
+        self.assertIsNone(networks._current_definition)

=== modified file 'src/provisioningserver/tests/test_plugin.py'
--- src/provisioningserver/tests/test_plugin.py	2016-02-26 16:19:41 +0000
+++ src/provisioningserver/tests/test_plugin.py	2016-03-01 19:26:45 +0000
@@ -21,9 +21,6 @@
 from provisioningserver.pserv_services.dhcp_probe_service import (
     DHCPProbeService,
 )
-from provisioningserver.pserv_services.eni_monitoring_service import (
-    ENIMonitoringService,
-)
 from provisioningserver.pserv_services.image import BootImageEndpointService
 from provisioningserver.pserv_services.image_download_service import (
     ImageDownloadService,
@@ -31,6 +28,9 @@
 from provisioningserver.pserv_services.lease_socket_service import (
     LeaseSocketService,
 )
+from provisioningserver.pserv_services.networks_monitoring_service import (
+    NetworksMonitoringService,
+)
 from provisioningserver.pserv_services.node_power_monitor_service import (
     NodePowerMonitorService,
 )
@@ -94,7 +94,7 @@
         service = service_maker.makeService(options)
         self.assertIsInstance(service, MultiService)
         expected_services = [
-            "dhcp_probe", "eni_monitor", "image_download",
+            "dhcp_probe", "networks_monitor", "image_download",
             "lease_socket_service", "node_monitor", "rpc", "tftp",
             "image_service", "service_monitor",
             ]
@@ -127,12 +127,12 @@
         node_monitor = service.getServiceNamed("node_monitor")
         self.assertIsInstance(node_monitor, NodePowerMonitorService)
 
-    def test_eni_monitor_service(self):
+    def test_networks_monitor_service(self):
         options = Options()
         service_maker = ProvisioningServiceMaker("Spike", "Milligan")
         service = service_maker.makeService(options)
-        eni_monitor = service.getServiceNamed("eni_monitor")
-        self.assertIsInstance(eni_monitor, ENIMonitoringService)
+        networks_monitor = service.getServiceNamed("networks_monitor")
+        self.assertIsInstance(networks_monitor, NetworksMonitoringService)
 
     def test_dhcp_probe_service(self):
         options = Options()

=== added file 'src/provisioningserver/utils/dhclient.py'
--- src/provisioningserver/utils/dhclient.py	1970-01-01 00:00:00 +0000
+++ src/provisioningserver/utils/dhclient.py	2016-03-01 19:26:45 +0000
@@ -0,0 +1,67 @@
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Helpers for inspecting dhclient."""
+
+__all__ = [
+    'get_dhclient_info',
+    ]
+
+import os
+import re
+
+from provisioningserver.utils.fs import read_text_file
+from provisioningserver.utils.ps import get_running_pids_with_command
+
+
+re_entry = re.compile(
+    r'''
+    ^\s*              # Ignore leading whitespace on each line.
+    lease             # Look only lease stanzas.
+    \s+{              # Open bracket.
+    ([^}]+)           # Capture the contents of lease.
+    }                 # Close bracket.
+    ''',
+    re.MULTILINE | re.DOTALL | re.VERBOSE)
+
+
+def get_lastest_fixed_address(lease_path):
+    """Return the lastest fixed address assigned in `lease_path`."""
+    try:
+        lease_contents = read_text_file(lease_path)
+    except FileNotFoundError:
+        return None
+
+    matches = re_entry.findall(lease_contents)
+    if len(matches) > 0:
+        # Get the IP address assigned to the interface.
+        last_lease = matches[-1]
+        for line in last_lease.splitlines():
+            line = line.strip()
+            if len(line) > 0:
+                statement, value = line.split(" ", 1)
+                if statement in ["fixed-address", "fixed-address6"]:
+                    return value.split(";", 1)[0].strip()
+    # No matches or unable to identify fixed-address{6} in the last match.
+    return None
+
+
+def get_dhclient_info(proc_path="/proc"):
+    """Return dictionary mapping interfaces to assigned address from
+    dhclient.
+    """
+    dhclient_pids = get_running_pids_with_command(
+        "dhclient", proc_path=proc_path)
+    dhclient_info = {}
+    for pid in dhclient_pids:
+        cmdline = read_text_file(
+            os.path.join(proc_path, str(pid), "cmdline")).split("\x00")
+        if "-lf" in cmdline:
+            idx_lf = cmdline.index("-lf")
+            lease_path = cmdline[idx_lf + 1]  # After '-lf' option.
+            interface_name = cmdline[-2]  # Last argument.
+            ip_address = get_lastest_fixed_address(lease_path)
+            if (ip_address is not None and
+                    len(ip_address) > 0 and not ip_address.isspace()):
+                dhclient_info[interface_name] = ip_address
+    return dhclient_info

=== modified file 'src/provisioningserver/utils/network.py'
--- src/provisioningserver/utils/network.py	2016-02-25 22:05:39 +0000
+++ src/provisioningserver/utils/network.py	2016-03-01 19:26:45 +0000
@@ -16,6 +16,7 @@
     ]
 
 
+from operator import attrgetter
 from socket import (
     AF_INET,
     AF_INET6,
@@ -25,17 +26,14 @@
     getaddrinfo,
 )
 
-from curtin.net import parse_deb_config
 from netaddr import (
     IPAddress,
     IPNetwork,
     IPRange,
 )
 import netifaces
-from provisioningserver.utils.ipaddr import (
-    get_interface_type,
-    parse_ip_addr,
-)
+from provisioningserver.utils.dhclient import get_dhclient_info
+from provisioningserver.utils.ipaddr import get_ip_addr
 from provisioningserver.utils.shell import call_and_check
 
 # Address families in /etc/network/interfaces that MAAS chooses to parse. All
@@ -541,205 +539,116 @@
     return int(value_string, base)
 
 
-def extract_network_from_config(config):
-    """Extract `IPNetwork` from `config`.
-
-    :param config: Configuration entry from an interface definition that was
-        parsed from /etc/network/interfaces.
-    """
-    ip_network = IPNetwork(config["address"])
-    if ip_network.version == 4 and ip_network.prefixlen == 32:
-        # Missing the prefixlen in the address. It is not required for aliases
-        # but it normally will be set.
-        netmask = config.get("netmask", None)
-        if netmask is not None:
-            # The netmask can either be a dotted quad or a prefix length.
-            if "." in netmask:
-                ip_network.prefixlen = IPAddress(netmask).netmask_bits()
-            else:
-                ip_network.prefixlen = int(netmask)
-    elif ip_network.version == 6 and ip_network.prefixlen == 128:
-        # Missing the prefixlen in the address. It is not required for aliases
-        # but it normally will be set.
-        netmask = config.get("netmask", None)
-        if netmask is not None:
-            # In IPv6 the netmask is only the mask.
-            ip_network.prefixlen = int(netmask)
-    return ip_network
-
-
-def get_link_from_config(config):
-    """Return the link definition from `config`.
-
-    :param config: Configuration entry from an interface definition that was
-        parsed from /etc/network/interfaces.
-    """
-    if config["method"] == "dhcp":
-        return {
-            "mode": "dhcp",
-        }
-    elif config["method"] == "static":
-        link = {
-            "mode": "static",
-            "address": str(extract_network_from_config(config)),
-        }
-        if "gateway" in config:
-            link["gateway"] = str(IPAddress(config["gateway"]))
-        return link
-    else:
-        return None
-
-
-def get_primary_link_from_links(links):
-    """Return the primary link out of `links`."""
+def fix_link_addresses(links):
+    """Fix the addresses defined in `links`.
+
+    Some address will have a prefixlen of 32 or 128 depending if IPv4 or IPv6.
+    Fix those address to fall within a subnet that is already defined in
+    another link. The addresses that get fixed will be placed into the smallest
+    subnet defined in `links`.
+    """
+    subnets_v4 = []
+    links_v4 = []
+    subnets_v6 = []
+    links_v6 = []
+
+    # Loop through and build a list of subnets where the prefixlen is not
+    # 32 or 128 for IPv4 and IPv6 respectively.
     for link in links:
-        if link["mode"] == "static":
-            ip_addr = IPNetwork(link["address"])
-            if ip_addr.version == 4 and ip_addr.prefixlen != 32:
-                return link
-            elif ip_addr.version == 6 and ip_addr.prefixlen != 128:
-                return link
-    return None
-
-
-def get_bond_master(config):
-    """Return the name of the bond master for this interface from `config`."""
-    if "bond" in config and "master" in config["bond"]:
-        return config["bond"]["master"]
-    else:
-        return None
-
-
-def get_type_and_parent_from_name_and_config(name, config):
-    """Return the type of interface and parent interface from `config`.
-
-    :param name: Name of the entry in the configuration from
-        /etc/network/interfaces.
-    :param config: Configuration entry from an interface definition that was
-        parsed from /etc/network/interfaces.
-    """
-    if ":" in name:
-        return "alias", name.split(":", 1)[0], None
-    elif "." in name:
-        parent = name.split(".", 1)[0]
-        if "vlan-raw-device" in config:
-            parent = config["vlan-raw-device"]
-        return "vlan", parent, get_bond_master(config)
-    else:
-        if "vlan-raw-device" in config:
-            return "vlan", config["vlan-raw-device"], get_bond_master(config)
-        elif ("bond" in config and
-                "mode" in config["bond"] and
-                "master" not in config["bond"]):
-            # Since bond-mode is set and bond-master is missing then this
-            # is the bond master.
-            return "bond", None, None
-        else:
-            return "physical", None, get_bond_master(config)
-
-
-def get_eni_interfaces_definition(
-        eni_path="/etc/network/interfaces", include_other_interfaces=True):
-    """Return interfaces definition from `eni_path`.
+        ip_addr = IPNetwork(link["address"])
+        if ip_addr.version == 4:
+            if ip_addr.prefixlen == 32:
+                links_v4.append(link)
+            else:
+                subnets_v4.append(ip_addr.cidr)
+        elif ip_addr.version == 6:
+            if ip_addr.prefixlen == 128:
+                links_v6.append(link)
+            else:
+                subnets_v6.append(ip_addr.cidr)
+
+    # Sort the subnets so the smallest prefixlen is first.
+    subnets_v4 = sorted(subnets_v4, key=attrgetter("prefixlen"), reverse=True)
+    subnets_v6 = sorted(subnets_v6, key=attrgetter("prefixlen"), reverse=True)
+
+    # Fix all addresses that have prefixlen of 32 or 128 that fit in inside
+    # one of the already defined subnets.
+    for link in links_v4:
+        ip_addr = IPNetwork(link["address"])
+        for subnet in subnets_v4:
+            if ip_addr.ip in subnet:
+                ip_addr.prefixlen = subnet.prefixlen
+                link["address"] = str(ip_addr)
+                break
+    for link in links_v6:
+        ip_addr = IPNetwork(link["address"])
+        for subnet in subnets_v6:
+            if ip_addr.ip in subnet:
+                ip_addr.prefixlen = subnet.prefixlen
+                link["address"] = str(ip_addr)
+                break
+
+
+def get_all_interfaces_definition():
+    """Return interfaces definition by parsing "ip addr" and the running
+    "dhclient" processes on the machine.
 
     The interfaces definition is defined as a contract between the region and
     the rack controller. The region controller processes this resulting
     dictionary to update the interfaces model for the rack controller.
-    `eni_path` should be `/etc/network/interfaces`.
     """
-    parsed_config = parse_deb_config(eni_path)
-    ipaddr_info = call_and_check(["/sbin/ip", "addr", "show"])
-    ipaddr_info = parse_ip_addr(ipaddr_info)
-
-    # Filter dictionary for address families and interface methods that
-    # MAAS only cares about and interfaces that show up in "ip addr show".
-    parsed_config = {
-        name: config
-        for name, config in parsed_config.items()
-        if ":" in name or (
-            name in ipaddr_info and
-            config["family"] in ENI_PARSED_ADDRESS_FAMILIES and
-            config["method"] in ENI_PARSED_METHODS)
+    interfaces = {}
+    dhclient_info = get_dhclient_info()
+    ipaddr_info = {
+        name: ipaddr
+        for name, ipaddr in get_ip_addr().items()
+        if (ipaddr["type"] not in ["ethernet", "loopback", "ipip"] and
+            not ipaddr["type"].startswith("unknown-"))
     }
+    for name, ipaddr in ipaddr_info.items():
+        iface_type = "physical"
+        parents = []
+        mac_address = None
+        vid = None
+        if ipaddr["type"] == "ethernet.bond":
+            iface_type = "bond"
+            mac_address = ipaddr["mac"]
+            for bond_nic in ipaddr["bonded_interfaces"]:
+                if bond_nic in interfaces or bond_nic in ipaddr_info:
+                    parents.append(bond_nic)
+        elif ipaddr["type"] == "ethernet.vlan":
+            iface_type = "vlan"
+            parents.append(name.split(".", 1)[0])
+            vid = ipaddr["vid"]
+        else:
+            mac_address = ipaddr["mac"]
 
-    # Create all empty interface definitions from /etc/network/interfaces.
-    interfaces = {}
-    for name, _ in parsed_config.items():
-        # Aliases are skipped and performed in the following loop.
-        if ":" in name:
-            continue
-        interfaces[name] = {
+        # Create the interface definition will links for both IPv4 and IPv6.
+        interface = {
+            "type": iface_type,
             "links": [],
-            "enabled": True,
-            "parents": [],
+            "enabled": True if 'UP' in ipaddr['flags'] else False,
+            "parents": parents,
+            "source": "ipaddr",
         }
-
-    # Update the values in each interface dictionary.
-    for name, config in parsed_config.items():
-        iface_type, iface_parent, bond_master = (
-            get_type_and_parent_from_name_and_config(name, config))
-        if iface_type != "alias":
-            # Update the interface definition.
-            interfaces[name]["type"] = iface_type
-            if iface_type == "vlan":
-                interfaces[name]["parents"].append(iface_parent)
-                interfaces[name]["vid"] = int(name.split(".", 1)[1])
-            if iface_type in ["bond", "physical"]:
-                # Only set the MAC address for physical and bond interfaces.
-                # Other interface types it is infered from its relations.
-                interfaces[name]["mac_address"] = ipaddr_info[name]["mac"]
-            if "mtu" in config:
-                interfaces[name]["mtu"] = int(config["mtu"])
-
-            # Set interface as the parent of the bond.
-            if bond_master is not None and bond_master in interfaces:
-                interfaces[bond_master]["parents"].append(name)
-
-            # Add the link for this interface.
-            link = get_link_from_config(config)
-            if link is not None:
-                interfaces[name]["links"].append(link)
-        else:
-            # Add the link to the parent interface as this is an alias.
-            link = get_link_from_config(config)
-            if link is not None:
-                interfaces[iface_parent]["links"].append(link)
-
-    # Fix static mode links on interfaces so the prefixlen is matching. This
-    # occurs because on aliases the prefixlen can be a /32 when IPv4 or
-    # /128 when IPv6.
-    for config in interfaces.values():
-        if len(config["links"]) > 1:
-            # More than one link, fix prefixlen.
-            primary_link = get_primary_link_from_links(config["links"])
-            if primary_link is not None:
-                ip_addr = IPNetwork(primary_link["address"])
-                for link in config["links"]:
-                    if link != primary_link and link["mode"] == "static":
-                        link_addr = IPNetwork(link["address"])
-                        link_addr.prefixlen = ip_addr.prefixlen
-                        link["address"] = str(link_addr)
-
-    # Add the interfaces that are wireless or physical interfaces that are
-    # not represented in the interfaces dictionary. These interfaces are not
-    # enabled since they do not appear in /etc/network/interfaces.
-    if include_other_interfaces:
-        for name, ipaddr in ipaddr_info.items():
-            # Skip interfaces we already know about or those that are aliases.
-            if name in interfaces or ":" in name:
-                continue
-
-            # Only process physical or wireless interfaces.
-            iface_type = get_interface_type(name)
-            if iface_type not in ["ethernet.physical", "ethernet.wireless"]:
-                continue
-
-            interfaces[name] = {
-                "type": "physical",
-                "links": [],
-                "enabled": False,
-                "mac_address": ipaddr["mac"],
-                "parents": [],
-            }
+        if mac_address is not None:
+            interface["mac_address"] = mac_address
+        if vid is not None:
+            interface["vid"] = vid
+        # Add the static and dynamic IP addresses assigned to the interface.
+        dhcp_address = dhclient_info.get(name, None)
+        for address in ipaddr.get("inet", []) + ipaddr.get("inet6", []):
+            if str(IPNetwork(address).ip) == dhcp_address:
+                interface["links"].append({
+                    "mode": "dhcp",
+                    "address": address,
+                })
+            else:
+                interface["links"].append({
+                    "mode": "static",
+                    "address": address,
+                })
+        fix_link_addresses(interface["links"])
+        interfaces[name] = interface
 
     return interfaces

=== added file 'src/provisioningserver/utils/ps.py'
--- src/provisioningserver/utils/ps.py	1970-01-01 00:00:00 +0000
+++ src/provisioningserver/utils/ps.py	2016-03-01 19:26:45 +0000
@@ -0,0 +1,67 @@
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Helpers for inspecting processes."""
+
+__all__ = [
+    'running_in_container',
+    ]
+
+import os
+
+from provisioningserver.utils.fs import read_text_file
+
+
+def is_pid_in_container(pid, proc_path="/proc"):
+    """Return True if the `pid` is running in a container.
+
+    This should only be called when not running in a container itself, because
+    if this process is running in a container than the `pid` process is
+    sure to be running in the container as well.
+    """
+    cgroup_path = os.path.join(proc_path, str(pid), "cgroup")
+    cgroup_info = read_text_file(cgroup_path)
+    for line in cgroup_info.splitlines():
+        id_num, subsytem, hierarchy = line.split(":", 2)
+        if int(id_num) == 1:
+            if "lxc" in hierarchy or "docker" in hierarchy:
+                return True
+    return False
+
+
+def running_in_container(proc_path="/proc"):
+    """Return True if running in an LXC or Docker container."""
+    return is_pid_in_container(1, proc_path=proc_path)
+
+
+def get_running_pids_with_command(
+        command, exclude_container_processes=True, proc_path="/proc"):
+    """Return list of pids that are running the following command.
+
+    :param command: The command to search for. This is only the command as
+        `cat` not the full command line.
+    :param exclude_container_processes: Excludes processes that are running
+        in an LXC container on the host.
+    """
+    running_pids = [pid for pid in os.listdir(proc_path) if pid.isdigit()]
+    pids = []
+    for pid in running_pids:
+        try:
+            pid_command = read_text_file(
+                os.path.join(proc_path, pid, "comm")).strip()
+        except FileNotFoundError:
+            # Process was closed while running.
+            pass
+        else:
+            if pid_command == command:
+                pids.append(int(pid))
+
+    if (exclude_container_processes and
+            not running_in_container(proc_path=proc_path)):
+        return [
+            pid
+            for pid in pids
+            if not is_pid_in_container(pid, proc_path=proc_path)
+        ]
+    else:
+        return pids

=== added file 'src/provisioningserver/utils/tests/test_dhclient.py'
--- src/provisioningserver/utils/tests/test_dhclient.py	1970-01-01 00:00:00 +0000
+++ src/provisioningserver/utils/tests/test_dhclient.py	2016-03-01 19:26:45 +0000
@@ -0,0 +1,113 @@
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for dhclient helpers."""
+
+__all__ = []
+
+import os
+import random
+from textwrap import dedent
+
+from maastesting.factory import factory
+from maastesting.testcase import MAASTestCase
+from provisioningserver.utils import dhclient as dhclient_module
+from provisioningserver.utils.dhclient import (
+    get_dhclient_info,
+    get_lastest_fixed_address,
+)
+from provisioningserver.utils.fs import atomic_write
+
+
+class TestGetLatestFixedAddress(MAASTestCase):
+
+    IPV4_LEASE_FILE = dedent("""\
+        lease {
+          interface "eno1";
+          fixed-address 192.168.1.111;
+        }
+        lease {
+          interface "eno1";
+          fixed-address 192.168.1.112;
+        }
+        lease {
+          interface "eno1";
+          fixed-address 192.168.1.113;
+        }
+        """)
+
+    IPV6_LEASE_FILE = dedent("""\
+        lease {
+          interface "eno1";
+          fixed-address6 2001:db8:a0b:12f0::1;
+        }
+        lease {
+          interface "eno1";
+          fixed-address6 2001:db8:a0b:12f0::2;
+        }
+        lease {
+          interface "eno1";
+          fixed-address6 2001:db8:a0b:12f0::3;
+        }
+        """)
+
+    def test__missing(self):
+        self.assertIsNone(
+            get_lastest_fixed_address(factory.make_name("lease")))
+
+    def test__empty(self):
+        path = self.make_file(contents="")
+        self.assertIsNone(get_lastest_fixed_address(path))
+
+    def test__random(self):
+        path = self.make_file()
+        self.assertIsNone(get_lastest_fixed_address(path))
+
+    def test__ipv4(self):
+        path = self.make_file(contents=self.IPV4_LEASE_FILE)
+        self.assertEquals(
+            "192.168.1.113", get_lastest_fixed_address(path))
+
+    def test__ipv6(self):
+        path = self.make_file(contents=self.IPV6_LEASE_FILE)
+        self.assertEquals(
+            "2001:db8:a0b:12f0::3", get_lastest_fixed_address(path))
+
+
+class TestGetDhclientInfo(MAASTestCase):
+
+    def test__returns_interface_name_with_address(self):
+        proc_path = self.make_dir()
+        leases_path = self.make_dir()
+        running_pids = set(
+            random.randint(2, 999)
+            for _ in range(3)
+        )
+        self.patch(
+            dhclient_module,
+            "get_running_pids_with_command").return_value = running_pids
+        interfaces = {}
+        for pid in running_pids:
+            interface_name = factory.make_name("eth")
+            address = factory.make_ipv4_address()
+            interfaces[interface_name] = address
+            lease_path = os.path.join(leases_path, "%s.lease" % interface_name)
+            lease_data = dedent("""\
+                lease {
+                  interface "%s";
+                  fixed-address %s;
+                }
+                """) % (interface_name, address)
+            atomic_write(lease_data.encode("ascii"), lease_path)
+            cmdline_path = os.path.join(proc_path, str(pid), "cmdline")
+            cmdline = [
+                "/sbin/dhclient", "-d", "-q",
+                "-pf", "/run/dhclient-%s.pid" % interface_name,
+                "-lf", lease_path,
+                "-cf", "/var/lib/dhclient/dhclient-%s.conf" % interface_name,
+                interface_name,
+            ]
+            cmdline = "\x00".join(cmdline) + "\x00"
+            os.mkdir(os.path.join(proc_path, str(pid)))
+            atomic_write(cmdline.encode("ascii"), cmdline_path)
+        self.assertEquals(interfaces, get_dhclient_info(proc_path=proc_path))

=== modified file 'src/provisioningserver/utils/tests/test_network.py'
--- src/provisioningserver/utils/tests/test_network.py	2016-02-25 22:05:39 +0000
+++ src/provisioningserver/utils/tests/test_network.py	2016-03-01 19:26:45 +0000
@@ -11,8 +11,6 @@
     EAI_NONAME,
     gaierror,
 )
-from textwrap import dedent
-from unittest import skipIf
 
 from maastesting.factory import factory
 from maastesting.matchers import MockCalledOnceWith
@@ -37,7 +35,7 @@
     find_mac_via_arp,
     get_all_addresses_for_interface,
     get_all_interface_addresses,
-    get_eni_interfaces_definition,
+    get_all_interfaces_definition,
     inet_ntop,
     intersect_iprange,
     ip_range_within_network,
@@ -763,708 +761,278 @@
         self.assertThat(parse_integer("0b10000000"), Equals(0b10000000))
 
 
-class TestGetENIInterfacesDefinition(MAASTestCase):
-    """Tests for `get_eni_interfaces_definition` and all helper methods."""
-
-    def setUp(self):
-        super(TestGetENIInterfacesDefinition, self).setUp()
-        self.patch(network_module, "call_and_check")
-
-    def patch_parse_ip_addr(self, nic_mapping):
-        # Extract the interface name to MAC address mapping.
-        nic_mapping = {
-            name: {
-                "mac": mac
-            }
-            for name, mac in nic_mapping.items()
-        }
-        self.patch(network_module, "parse_ip_addr").return_value = nic_mapping
-
-    def assertInterfacesResult(
-            self, eni_config, nic_mapping, expected_results,
-            include_other_interfaces=True):
-        file_name = self.make_file(contents=eni_config)
-        self.patch_parse_ip_addr(nic_mapping)
-        observed_result = get_eni_interfaces_definition(
-            eni_path=file_name,
-            include_other_interfaces=include_other_interfaces)
+class TestGetAllInterfacesDefinition(MAASTestCase):
+    """Tests for `get_all_interfaces_definition` and all helper methods."""
+
+    def assertInterfacesResult(self, ip_addr, dhclient_info, expected_results):
+        self.patch(network_module, "get_ip_addr").return_value = ip_addr
+        self.patch(
+            network_module, "get_dhclient_info").return_value = dhclient_info
+        observed_result = get_all_interfaces_definition()
         self.assertThat(observed_result, expected_results)
 
-    def test__includes_interfaces_no_in_eni_as_disabled(self):
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-            "eth1": factory.make_mac_address(),
-            "wlan0": factory.make_mac_address(),
-            "br0": factory.make_mac_address(),
-        }
-        interface_types = {
-            "eth0": "ethernet.physical",
-            "eth1": "ethernet.physical",
-            "wlan0": "ethernet.wireless",
-            "br0": "ethernet.bridge",
-        }
-        self.patch(network_module, "get_interface_type").side_effect = (
-            lambda name: interface_types[name])
-        expected_result = MatchesDict({
-            "eth0": MatchesDict({
-                "type": Equals("physical"),
-                "mac_address": Equals(nic_mapping["eth0"]),
+    def test__ignores_loopback(self):
+        ip_addr = {
+            "vnet": {
+                "type": "loopback",
+                "flags": ["UP"],
+                "inet": ["127.0.0.1/32"],
+                "inet6": ["::1"],
+            },
+        }
+        self.assertInterfacesResult(ip_addr, {}, MatchesDict({}))
+
+    def test__ignores_ethernet(self):
+        ip_addr = {
+            "vnet": {
+                "type": "ethernet",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+                "inet": ["192.168.122.2/24"],
+            },
+        }
+        self.assertInterfacesResult(ip_addr, {}, MatchesDict({}))
+
+    def test__ignores_ipip(self):
+        ip_addr = {
+            "vnet": {
+                "type": "ipip",
+                "flags": ["UP"],
+            },
+        }
+        self.assertInterfacesResult(ip_addr, {}, MatchesDict({}))
+
+    def test__simple(self):
+        ip_addr = {
+            "eth0": {
+                "type": "ethernet.physical",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+                "inet": ["192.168.122.2/24"],
+            },
+        }
+        expected_result = MatchesDict({
+            "eth0": MatchesDict({
+                "type": Equals("physical"),
+                "mac_address": Equals(ip_addr["eth0"]["mac"]),
+                "enabled": Is(True),
+                "parents": Equals([]),
+                "links": Equals([{
+                    "mode": "static",
+                    "address": "192.168.122.2/24",
+                }]),
+                "source": Equals("ipaddr"),
+            }),
+        })
+        self.assertInterfacesResult(ip_addr, {}, expected_result)
+
+    def test__simple_with_dhcp(self):
+        ip_addr = {
+            "eth0": {
+                "type": "ethernet.physical",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+                "inet": ["192.168.122.2/24", "192.168.122.200/32"],
+            },
+        }
+        dhclient_info = {
+            "eth0": "192.168.122.2",
+        }
+        expected_result = MatchesDict({
+            "eth0": MatchesDict({
+                "type": Equals("physical"),
+                "mac_address": Equals(ip_addr["eth0"]["mac"]),
+                "enabled": Is(True),
+                "parents": Equals([]),
+                "links": MatchesSetwise(
+                    MatchesDict({
+                        "mode": Equals("dhcp"),
+                        "address": Equals("192.168.122.2/24"),
+                    }),
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("192.168.122.200/24"),
+                    }),
+                ),
+                "source": Equals("ipaddr"),
+            }),
+        })
+        self.assertInterfacesResult(ip_addr, dhclient_info, expected_result)
+
+    def test__fixing_links(self):
+        ip_addr = {
+            "eth0": {
+                "type": "ethernet.physical",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+                "inet": [
+                    "192.168.122.2/24",
+                    "192.168.122.3/32",
+                    "192.168.123.3/32",
+                ],
+                "inet6": [
+                    "2001:db8:a0b:12f0::1/96",
+                    "2001:db8:a0b:12f0::2/128",
+                ]
+            },
+        }
+        expected_result = MatchesDict({
+            "eth0": MatchesDict({
+                "type": Equals("physical"),
+                "mac_address": Equals(ip_addr["eth0"]["mac"]),
+                "enabled": Is(True),
+                "parents": Equals([]),
+                "links": MatchesSetwise(
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("192.168.122.2/24"),
+                    }),
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("192.168.122.3/24"),
+                    }),
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("192.168.123.3/32"),
+                    }),
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("2001:db8:a0b:12f0::1/96"),
+                    }),
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("2001:db8:a0b:12f0::2/96"),
+                    }),
+                ),
+                "source": Equals("ipaddr"),
+            }),
+        })
+        self.assertInterfacesResult(ip_addr, {}, expected_result)
+
+    def test__complex(self):
+        ip_addr = {
+            "eth0": {
+                "type": "ethernet.physical",
+                "mac": factory.make_mac_address(),
+                "flags": [],
+            },
+            "eth1": {
+                "type": "ethernet.physical",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+            },
+            "eth2": {
+                "type": "ethernet.physical",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+            },
+            "bond0": {
+                "type": "ethernet.bond",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+                "bonded_interfaces": ["eth1", "eth2"],
+                "inet": ["192.168.122.2/24", "192.168.122.3/32"],
+                "inet6": ["2001:db8::3:2:2/96"],
+            },
+            "bond0.10": {
+                "type": "ethernet.vlan",
+                "flags": ["UP"],
+                "vid": 10,
+                "inet": ["192.168.123.2/24", "192.168.123.3/32"],
+            },
+            "wlan0": {
+                "type": "ethernet.wireless",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+            },
+            "br0": {
+                "type": "ethernet.bridge",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+                "inet": ["192.168.124.2/24"],
+            },
+        }
+        expected_result = MatchesDict({
+            "eth0": MatchesDict({
+                "type": Equals("physical"),
+                "mac_address": Equals(ip_addr["eth0"]["mac"]),
                 "enabled": Is(False),
                 "parents": Equals([]),
                 "links": Equals([]),
+                "source": Equals("ipaddr"),
             }),
             "eth1": MatchesDict({
                 "type": Equals("physical"),
-                "mac_address": Equals(nic_mapping["eth1"]),
-                "enabled": Is(False),
-                "parents": Equals([]),
-                "links": Equals([]),
+                "mac_address": Equals(ip_addr["eth1"]["mac"]),
+                "enabled": Is(True),
+                "parents": Equals([]),
+                "links": Equals([]),
+                "source": Equals("ipaddr"),
+            }),
+            "eth2": MatchesDict({
+                "type": Equals("physical"),
+                "mac_address": Equals(ip_addr["eth2"]["mac"]),
+                "enabled": Is(True),
+                "parents": Equals([]),
+                "links": Equals([]),
+                "source": Equals("ipaddr"),
+            }),
+            "bond0": MatchesDict({
+                "type": Equals("bond"),
+                "mac_address": Equals(ip_addr["bond0"]["mac"]),
+                "enabled": Is(True),
+                "parents": Equals(["eth1", "eth2"]),
+                "links": MatchesSetwise(
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("192.168.122.2/24"),
+                    }),
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("192.168.122.3/24"),
+                    }),
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("2001:db8::3:2:2/96"),
+                    }),
+                ),
+                "source": Equals("ipaddr"),
+            }),
+            "bond0.10": MatchesDict({
+                "type": Equals("vlan"),
+                "enabled": Is(True),
+                "parents": Equals(["bond0"]),
+                "vid": Equals(10),
+                "links": MatchesSetwise(
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("192.168.123.2/24"),
+                    }),
+                    MatchesDict({
+                        "mode": Equals("static"),
+                        "address": Equals("192.168.123.3/24"),
+                    }),
+                ),
+                "source": Equals("ipaddr"),
             }),
             "wlan0": MatchesDict({
                 "type": Equals("physical"),
-                "mac_address": Equals(nic_mapping["wlan0"]),
-                "enabled": Is(False),
-                "parents": Equals([]),
-                "links": Equals([]),
-            }),
-        })
-        self.assertInterfacesResult("", nic_mapping, expected_result)
-
-    def test__ignores_inet_loopbacks(self):
-        eni = dedent("""\
-            auto lo
-            iface lo inet loopback
-
-            auto lo2
-            iface lo2 inet loopback
-            """)
-        self.assertInterfacesResult(
-            eni, {}, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_inet_bootp(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 inet bootp
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_inet_tunnel(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 inet tunnel
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_inet_ppp(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 inet ppp
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_inet_wvdial(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 inet wvdial
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_inet_ipv4ll(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 inet ipv4ll
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_ipx_static(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 ipx static
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_ipx_dynamic(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 ipx dynamic
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_inet6_auto(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 inet6 auto
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_inet6_loopback(self):
-        eni = dedent("""\
-            auto lo
-            iface lo inet6 loopback
-
-            auto lo2
-            iface lo2 inet6 loopback
-            """)
-        self.assertInterfacesResult(
-            eni, {}, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_inet6_v4tunnel(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 inet6 v4tunnel
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_inet6_6to4(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 inet6 6to4
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__ignores_can_static(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 can static
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        self.assertInterfacesResult(
-            eni, nic_mapping, MatchesDict({}), include_other_interfaces=False)
-
-    def test__grabs_mtu_on_interface(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 inet static
-             address 192.168.122.2
-             netmask 24
-             gateway 192.168.122.1
-             dns-nameservers 192.168.1.1
-             mtu 1500
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        expected_result = MatchesDict({
-            "eth0": MatchesDict({
-                "type": Equals("physical"),
-                "parents": Equals([]),
-                "mac_address": Equals(nic_mapping["eth0"]),
-                "enabled": Is(True),
-                "mtu": Equals(1500),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.122.2/24"),
-                        "gateway": Equals("192.168.122.1"),
-                    }),
-                ),
-            }),
-        })
-        self.assertInterfacesResult(eni, nic_mapping, expected_result)
-
-    def test__inet_with_netmask_as_prefix_len(self):
-        eni = dedent("""\
-            auto eth0
-            iface eth0 inet static
-             address 192.168.122.2
-             netmask 24
-             gateway 192.168.122.1
-             dns-nameservers 192.168.1.1
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        expected_result = MatchesDict({
-            "eth0": MatchesDict({
-                "type": Equals("physical"),
-                "parents": Equals([]),
-                "mac_address": Equals(nic_mapping["eth0"]),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.122.2/24"),
-                        "gateway": Equals("192.168.122.1"),
-                    }),
-                ),
-            }),
-        })
-        self.assertInterfacesResult(eni, nic_mapping, expected_result)
-
-    def test__inet_simple_with_comments(self):
-        eni = dedent("""\
-            # This file describes the network interfaces available on your
-            # system and how to activate them. For more information,
-            # see interfaces(5).
-
-            # The loopback network interface
-            auto lo
-            iface lo inet loopback
-
-            auto eth0
-            iface eth0 inet static
-             address 192.168.122.2
-             netmask 255.255.255.0
-             gateway 192.168.122.1
-             dns-nameservers 192.168.1.1
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        expected_result = MatchesDict({
-            "eth0": MatchesDict({
-                "type": Equals("physical"),
-                "parents": Equals([]),
-                "mac_address": Equals(nic_mapping["eth0"]),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.122.2/24"),
-                        "gateway": Equals("192.168.122.1"),
-                    }),
-                ),
-            }),
-        })
-        self.assertInterfacesResult(eni, nic_mapping, expected_result)
-
-    def test__inet_simple_with_aliases(self):
-        eni = dedent("""\
-            auto lo
-            iface lo inet loopback
-
-            auto eth0
-            iface eth0 inet static
-             address 192.168.122.2
-             netmask 255.255.255.0
-             gateway 192.168.122.1
-             dns-nameservers 192.168.1.1
-
-            auto eth0:1
-            iface eth0:1 inet static
-             address 192.168.122.3/32
-
-            auto eth0:2
-            iface eth0:2 inet static
-             address 192.168.122.4
-             netmask 255.255.255.255
-
-            auto eth0:3
-            iface eth0:3 inet dhcp
-            """)
-        nic_mapping = {
-            "eth0": factory.make_mac_address(),
-        }
-        expected_result = MatchesDict({
-            "eth0": MatchesDict({
-                "type": Equals("physical"),
-                "parents": Equals([]),
-                "mac_address": Equals(nic_mapping["eth0"]),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.122.2/24"),
-                        "gateway": Equals("192.168.122.1"),
-                    }),
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.122.3/24"),
-                    }),
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.122.4/24"),
-                    }),
-                    MatchesDict({
-                        "mode": Equals("dhcp"),
-                    }),
-                ),
-            }),
-        })
-        self.assertInterfacesResult(eni, nic_mapping, expected_result)
-
-    def test__inet_vlan(self):
-        eni = dedent("""\
-            auto lo
-            iface lo inet loopback
-
-            auto eth0
-            iface eth0 inet static
-             address 192.168.122.2
-             netmask 255.255.255.0
-             gateway 192.168.122.1
-             dns-nameservers 192.168.1.1
-
-            auto eth0.10
-            iface eth0.10 inet static
-             address 192.168.123.2
-             netmask 255.255.255.0
-
-            auto eth0.20
-            iface eth0.20 inet static
-             address 192.168.124.2
-             netmask 255.255.255.0
-
-            auto eth0.30
-            iface eth0.30 inet dhcp
-            """)
-        eth0_mac = factory.make_mac_address()
-        nic_mapping = {
-            "eth0": eth0_mac,
-            "eth0.10": eth0_mac,
-            "eth0.20": eth0_mac,
-            "eth0.30": eth0_mac,
-        }
-        expected_result = MatchesDict({
-            "eth0": MatchesDict({
-                "type": Equals("physical"),
-                "parents": Equals([]),
-                "mac_address": Equals(nic_mapping["eth0"]),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.122.2/24"),
-                        "gateway": Equals("192.168.122.1"),
-                    }),
-                ),
-            }),
-            "eth0.10": MatchesDict({
-                "type": Equals("vlan"),
-                "parents": Equals(["eth0"]),
-                "vid": Equals(10),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.123.2/24"),
-                    }),
-                ),
-            }),
-            "eth0.20": MatchesDict({
-                "type": Equals("vlan"),
-                "parents": Equals(["eth0"]),
-                "vid": Equals(20),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.124.2/24"),
-                    }),
-                ),
-            }),
-            "eth0.30": MatchesDict({
-                "type": Equals("vlan"),
-                "parents": Equals(["eth0"]),
-                "vid": Equals(30),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("dhcp"),
-                    }),
-                ),
-            }),
-        })
-        self.assertInterfacesResult(eni, nic_mapping, expected_result)
-
-    def test__inet_vlan_with_aliases(self):
-        eni = dedent("""\
-            auto lo
-            iface lo inet loopback
-
-            auto eth0
-            iface eth0 inet static
-             address 192.168.122.2
-             netmask 255.255.255.0
-             gateway 192.168.122.1
-             dns-nameservers 192.168.1.1
-
-            auto eth0.10
-            iface eth0.10 inet static
-             address 192.168.123.2
-             netmask 255.255.255.0
-
-            auto eth0.10:1
-            iface eth0.10:1 inet static
-             address 192.168.123.3/32
-
-            auto eth0.10:2
-            iface eth0.10:2 inet static
-             address 192.168.123.4/32
-            """)
-        eth0_mac = factory.make_mac_address()
-        nic_mapping = {
-            "eth0": eth0_mac,
-            "eth0.10": eth0_mac,
-        }
-        expected_result = MatchesDict({
-            "eth0": MatchesDict({
-                "type": Equals("physical"),
-                "parents": Equals([]),
-                "mac_address": Equals(nic_mapping["eth0"]),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.122.2/24"),
-                        "gateway": Equals("192.168.122.1"),
-                    }),
-                ),
-            }),
-            "eth0.10": MatchesDict({
-                "type": Equals("vlan"),
-                "parents": Equals(["eth0"]),
-                "vid": Equals(10),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.123.2/24"),
-                    }),
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.123.3/24"),
-                    }),
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.123.4/24"),
-                    }),
-                ),
-            }),
-        })
-        self.assertInterfacesResult(eni, nic_mapping, expected_result)
-
-    @skipIf(
-        installed_curtin_version < 358,
-        "Update curtin to be newer than bzr358 to support parsing bonds "
-        "in /etc/network/interfaces.")
-    def test__inet_bond_with_vlan_and_aliases(self):
-        eni = dedent("""\
-            auto lo
-            iface lo inet loopback
-
-            auto eth0
-            iface eth0 inet manual
-                bond-master bond0
-                bond-primary eth0
-                bond-mode active-backup
-
-            auto eth1
-            iface eth1 inet manual
-                bond-master bond0
-                bond-primary eth0
-                bond-mode active-backup
-
-            auto bond0
-            iface bond0 inet static
-             address 192.168.122.2
-             netmask 255.255.255.0
-             gateway 192.168.122.1
-             dns-nameservers 192.168.1.1
-             bond-slaves none
-             bond-primary eth0
-             bond-mode active-backup
-             bond-miimon 100
-
-            auto bond0.10
-            iface bond0.10 inet static
-             address 192.168.123.2
-             netmask 255.255.255.0
-
-            auto bond0.10:1
-            iface bond0.10:1 inet static
-             address 192.168.123.3
-             netmask 255.255.255.255
-            """)
-        eth0_mac = factory.make_mac_address()
-        eth0_mac = factory.make_mac_address()
-        nic_mapping = {
-            "eth0": eth0_mac,
-            "eth1": factory.make_mac_address(),
-            "bond0": eth0_mac,
-            "bond0.10": eth0_mac,
-        }
-        expected_result = MatchesDict({
-            "eth0": MatchesDict({
-                "type": Equals("physical"),
-                "mac_address": Equals(nic_mapping["eth0"]),
-                "enabled": Is(True),
-                "links": Equals([]),
-                "parents": Equals([]),
-            }),
-            "eth1": MatchesDict({
-                "type": Equals("physical"),
-                "mac_address": Equals(nic_mapping["eth1"]),
-                "enabled": Is(True),
-                "links": Equals([]),
-                "parents": Equals([]),
-            }),
-            "bond0": MatchesDict({
-                "type": Equals("bond"),
-                "parents": MatchesSetwise(Equals("eth0"), Equals("eth1")),
-                "mac_address": Equals(nic_mapping["eth0"]),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.122.2/24"),
-                        "gateway": Equals("192.168.122.1"),
-                    }),
-                ),
-            }),
-            "bond0.10": MatchesDict({
-                "type": Equals("vlan"),
-                "parents": Equals(["bond0"]),
-                "vid": Equals(10),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.123.2/24"),
-                    }),
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("192.168.123.3/24"),
-                    }),
-                ),
-            }),
-        })
-        self.assertInterfacesResult(eni, nic_mapping, expected_result)
-
-    @skipIf(
-        installed_curtin_version < 358,
-        "Update curtin to be newer than bzr358 to support parsing bonds "
-        "in /etc/network/interfaces.")
-    def test__inet6_bond_with_vlan_and_aliases(self):
-        eni = dedent("""\
-            auto lo
-            iface lo inet6 loopback
-
-            auto eth0
-            iface eth0 inet6 manual
-                bond-master bond0
-                bond-primary eth0
-                bond-mode active-backup
-
-            auto eth1
-            iface eth1 inet6 manual
-                bond-master bond0
-                bond-primary eth0
-                bond-mode active-backup
-
-            auto bond0
-            iface bond0 inet6 static
-             address 2001:db8::3:2:2
-             netmask 96
-             gateway 2001:db8::3:2:1
-             bond-slaves none
-             bond-primary eth0
-             bond-mode active-backup
-             bond-miimon 100
-
-            auto bond0.10
-            iface bond0.10 inet6 static
-             address 2001:db8::4:2:3
-             netmask 96
-
-            auto bond0.10:1
-            iface bond0.10:1 inet6 static
-             address 2001:db8::4:2:4
-             netmask 128
-            """)
-        eth0_mac = factory.make_mac_address()
-        eth0_mac = factory.make_mac_address()
-        nic_mapping = {
-            "eth0": eth0_mac,
-            "eth1": factory.make_mac_address(),
-            "bond0": eth0_mac,
-            "bond0.10": eth0_mac,
-        }
-        expected_result = MatchesDict({
-            "eth0": MatchesDict({
-                "type": Equals("physical"),
-                "mac_address": Equals(nic_mapping["eth0"]),
-                "enabled": Is(True),
-                "links": Equals([]),
-                "parents": Equals([]),
-            }),
-            "eth1": MatchesDict({
-                "type": Equals("physical"),
-                "mac_address": Equals(nic_mapping["eth1"]),
-                "enabled": Is(True),
-                "links": Equals([]),
-                "parents": Equals([]),
-            }),
-            "bond0": MatchesDict({
-                "type": Equals("bond"),
-                "parents": MatchesSetwise(Equals("eth0"), Equals("eth1")),
-                "mac_address": Equals(nic_mapping["eth0"]),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("2001:db8::3:2:2/96"),
-                        "gateway": Equals("2001:db8::3:2:1"),
-                    }),
-                ),
-            }),
-            "bond0.10": MatchesDict({
-                "type": Equals("vlan"),
-                "parents": Equals(["bond0"]),
-                "vid": Equals(10),
-                "enabled": Is(True),
-                "links": MatchesSetwise(
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("2001:db8::4:2:3/96"),
-                    }),
-                    MatchesDict({
-                        "mode": Equals("static"),
-                        "address": Equals("2001:db8::4:2:4/96"),
-                    }),
-                ),
-            }),
-        })
-        self.assertInterfacesResult(eni, nic_mapping, expected_result)
+                "mac_address": Equals(ip_addr["wlan0"]["mac"]),
+                "enabled": Is(True),
+                "parents": Equals([]),
+                "links": Equals([]),
+                "source": Equals("ipaddr"),
+            }),
+            "br0": MatchesDict({
+                "type": Equals("physical"),
+                "mac_address": Equals(ip_addr["br0"]["mac"]),
+                "enabled": Is(True),
+                "parents": Equals([]),
+                "links": Equals([{
+                    "mode": "static",
+                    "address": "192.168.124.2/24",
+                }]),
+                "source": Equals("ipaddr"),
+            }),
+        })
+        self.assertInterfacesResult(ip_addr, {}, expected_result)

=== added file 'src/provisioningserver/utils/tests/test_ps.py'
--- src/provisioningserver/utils/tests/test_ps.py	1970-01-01 00:00:00 +0000
+++ src/provisioningserver/utils/tests/test_ps.py	2016-03-01 19:26:45 +0000
@@ -0,0 +1,191 @@
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for process helpers."""
+
+__all__ = []
+
+import os
+import random
+from textwrap import dedent
+
+from maastesting.factory import factory
+from maastesting.testcase import MAASTestCase
+from provisioningserver.utils.fs import atomic_write
+from provisioningserver.utils.ps import (
+    get_running_pids_with_command,
+    is_pid_in_container,
+    running_in_container,
+)
+
+
+NOT_IN_CONTAINER = dedent("""\
+    11:freezer:/
+    10:perf_event:/
+    9:cpuset:/
+    8:net_cls,net_prio:/init.scope
+    7:devices:/init.scope
+    6:blkio:/init.scope
+    5:memory:/init.scope
+    4:cpu,cpuacct:/init.scope
+    3:pids:/init.scope
+    2:hugetlb:/
+    1:name=systemd:/init.scope
+    """)
+
+IN_DOCKER_CONTAINER = dedent("""\
+    11:freezer:/system.slice/docker-8467.scope
+    10:perf_event:/
+    9:cpuset:/system.slice/docker-8467.scope
+    8:net_cls,net_prio:/init.scope
+    7:devices:/init.scope/system.slice/docker-8467.scope
+    6:blkio:/system.slice/docker-8467.scope
+    5:memory:/system.slice/docker-8467.scope
+    4:cpu,cpuacct:/system.slice/docker-8467.scope
+    3:pids:/system.slice/docker-8467.scopeatomic_write
+    2:hugetlb:/
+    1:name=systemd:/system.slice/docker-8467.scope
+    """)
+
+IN_LXC_CONTAINER = dedent("""\
+    11:freezer:/lxc/maas
+    10:perf_event:/lxc/maas
+    9:cpuset:/lxc/maas
+    8:net_cls,net_prio:/lxc/maas
+    7:devices:/lxc/maas/init.scope
+    6:blkio:/lxc/maas
+    5:memory:/lxc/maas
+    4:cpu,cpuacct:/lxc/maas
+    3:pids:/lxc/maas/init.scope
+    2:hugetlb:/lxc/maas
+    1:name=systemd:/lxc/maas/init.scope
+    """)
+
+
+class TestIsPIDInContainer(MAASTestCase):
+
+    scenarios = (
+        ("not_in_container", {
+            "result": False,
+            "cgroup": NOT_IN_CONTAINER,
+        }),
+        ("in_docker_container", {
+            "result": True,
+            "cgroup": IN_DOCKER_CONTAINER,
+        }),
+        ("in_lxc_container", {
+            "result": True,
+            "cgroup": IN_LXC_CONTAINER,
+        }),
+    )
+
+    def test__result(self):
+        proc_path = self.make_dir()
+        pid = random.randint(1, 1000)
+        pid_path = os.path.join(proc_path, str(pid))
+        os.mkdir(pid_path)
+        atomic_write(
+            self.cgroup.encode("ascii"),
+            os.path.join(pid_path, "cgroup"))
+        self.assertEqual(
+            self.result, is_pid_in_container(pid, proc_path=proc_path))
+
+
+class TestRunningInContainer(MAASTestCase):
+
+    scenarios = (
+        ("not_in_container", {
+            "result": False,
+            "cgroup": NOT_IN_CONTAINER,
+        }),
+        ("in_docker_container", {
+            "result": True,
+            "cgroup": IN_DOCKER_CONTAINER,
+        }),
+        ("in_lxc_container", {
+            "result": True,
+            "cgroup": IN_LXC_CONTAINER,
+        }),
+    )
+
+    def test__result(self):
+        proc_path = self.make_dir()
+        pid_path = os.path.join(proc_path, "1")
+        os.mkdir(pid_path)
+        atomic_write(
+            self.cgroup.encode("ascii"),
+            os.path.join(pid_path, "cgroup"))
+        self.assertEqual(
+            self.result, running_in_container(proc_path=proc_path))
+
+
+class TestGetRunningPIDsWithCommand(MAASTestCase):
+
+    def make_process(self, proc_path, pid, in_container=False, command=None):
+        cgroup = NOT_IN_CONTAINER
+        if in_container:
+            cgroup = random.choice([IN_DOCKER_CONTAINER, IN_LXC_CONTAINER])
+        pid_path = os.path.join(proc_path, str(pid))
+        os.mkdir(pid_path)
+        atomic_write(
+            cgroup.encode("ascii"),
+            os.path.join(pid_path, "cgroup"))
+        if command is not None:
+            atomic_write(
+                command.encode("ascii"),
+                os.path.join(pid_path, "comm"))
+
+    def make_init_process(self, proc_path, in_container=False):
+        self.make_process(proc_path, 1, in_container=in_container)
+
+    def test_returns_processes_running_on_host_not_container(self):
+        proc_path = self.make_dir()
+        self.make_init_process(proc_path)
+        command = factory.make_name("command")
+        pids_running_command = set(
+            random.randint(2, 999)
+            for _ in range(3)
+        )
+        for pid in pids_running_command:
+            self.make_process(proc_path, pid, command=command)
+        pids_not_running_command = set(
+            random.randint(1000, 1999)
+            for _ in range(3)
+        )
+        for pid in pids_not_running_command:
+            self.make_process(
+                proc_path, pid, command=factory.make_name("command"))
+        pids_running_command_in_container = set(
+            random.randint(2000, 2999)
+            for _ in range(3)
+        )
+        for pid in pids_running_command_in_container:
+            self.make_process(
+                proc_path, pid,
+                in_container=True, command=command)
+        self.assertItemsEqual(
+            pids_running_command,
+            get_running_pids_with_command(command, proc_path=proc_path))
+
+    def test_returns_processes_when_running_in_container(self):
+        proc_path = self.make_dir()
+        self.make_init_process(proc_path, in_container=True)
+        command = factory.make_name("command")
+        pids_running_command = set(
+            random.randint(2, 999)
+            for _ in range(3)
+        )
+        for pid in pids_running_command:
+            self.make_process(
+                proc_path, pid, in_container=True, command=command)
+        pids_not_running_command = set(
+            random.randint(1000, 1999)
+            for _ in range(3)
+        )
+        for pid in pids_not_running_command:
+            self.make_process(
+                proc_path, pid,
+                in_container=True, command=factory.make_name("command"))
+        self.assertItemsEqual(
+            pids_running_command,
+            get_running_pids_with_command(command, proc_path=proc_path))