Merge lp:~abentley/juju-ci-tools/iter-new-machines-containers into lp:juju-ci-tools

[Aaron Bentley]

Optionally include containers when iterating through new machines.

This branch adds the ability to list new containers.

It updates iter_new_machines with a 'containers' flag that is passed through to iter_machines. It also changes the way old machines are determined, so that it also uses iter_machines.

As a driveby, it improves the fake's handling of containers so that they have a 'juju-status' field, like normal machines do. This is sufficient to get client.wait_for_started working when the fake has containers.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'jujupy/client.py'
--- jujupy/client.py	2017-02-28 20:34:53 +0000
+++ jujupy/client.py	2017-02-28 21:43:44 +0000
@@ -881,9 +881,10 @@
                 for contained, unit in machine.get('containers', {}).items():
                     yield contained, unit
 
-    def iter_new_machines(self, old_status):
-        for machine, data in self.iter_machines():
-            if machine in old_status.status['machines']:
+    def iter_new_machines(self, old_status, containers=False):
+        old = dict(old_status.iter_machines(containers=containers))
+        for machine, data in self.iter_machines(containers=containers):
+            if machine in old:
                 continue
             yield machine, data
 

=== modified file 'jujupy/fake.py'
--- jujupy/fake.py	2017-02-23 17:28:46 +0000
+++ jujupy/fake.py	2017-02-28 21:43:44 +0000
@@ -259,10 +259,11 @@
                 machine_dict['controller-member-status'] = 'has-vote'
         for host, containers in self.containers.items():
             container_dict = dict((c, {}) for c in containers)
-            for container in containers:
+            for container, subdict in container_dict.items():
+                subdict.update({'juju-status': {'current': 'idle'}})
                 dns_name = self.machine_host_names.get(container)
                 if dns_name is not None:
-                    container_dict[container]['dns-name'] = dns_name
+                    subdict['dns-name'] = dns_name
 
             machines[host]['containers'] = container_dict
         services = {}

=== modified file 'jujupy/tests/test_client.py'
--- jujupy/tests/test_client.py	2017-02-28 20:34:53 +0000
+++ jujupy/tests/test_client.py	2017-02-28 21:43:44 +0000
@@ -4589,6 +4589,42 @@
         self.assertItemsEqual(new_status.iter_new_machines(old_status),
                               [('foo', 'foo_info')])
 
+    def test_iter_new_machines_no_containers(self):
+        bar_info = {'containers': {'bar/lxd/1': {}}}
+        old_status = Status({
+            'machines': {
+                'bar': bar_info,
+            }
+        }, '')
+        foo_info = {'containers': {'foo/lxd/1': {}}}
+        new_status = Status({
+            'machines': {
+                'foo': foo_info,
+                'bar': bar_info,
+            }
+        }, '')
+        self.assertItemsEqual(new_status.iter_new_machines(old_status,
+                                                           containers=False),
+                              [('foo', foo_info)])
+
+    def test_iter_new_machines_with_containers(self):
+        bar_info = {'containers': {'bar/lxd/1': {}}}
+        old_status = Status({
+            'machines': {
+                'bar': bar_info,
+            }
+        }, '')
+        foo_info = {'containers': {'foo/lxd/1': {}}}
+        new_status = Status({
+            'machines': {
+                'foo': foo_info,
+                'bar': bar_info,
+            }
+        }, '')
+        self.assertItemsEqual(new_status.iter_new_machines(old_status,
+                                                           containers=True),
+                              [('foo', foo_info), ('foo/lxd/1', {})])
+
     def test_get_instance_id(self):
         status = Status({
             'machines': {