Merge lp:~abentley/juju-ci-tools/fake-series into lp:juju-ci-tools

[Aaron Bentley]

Add dummy series to machines in fake.

This branch adds a 'series' field to FakeBackend's status output.

This is useful to Hammer Time, because it checks the series of a machine when deciding which operations it can perform. (Windows machines don't have iptables, for example.)

At this stage, we don't need the field to be configurable-- we just need it to exist and not start with "win". Should that change, I envision storing a dict of machine_id_to_series, similar to FakeEnvironmentState.machine_host_names.

[lp:~abentley/juju-ci-tools/fake-series]

1942. By Aaron Bentley on 2017-03-17

Remove machine_series partial implementation.

[Curtis Hovey (sinzui)]

Thank you. And Thank your for using angsty to be clear that we put that series there.

review: Approve (code)

=== modified file 'jujupy/fake.py'
--- jujupy/fake.py	2017-03-16 19:36:04 +0000
+++ jujupy/fake.py	2017-03-17 20:43:28 +0000
@@ -249,7 +249,10 @@
     def get_status_dict(self):
         machines = {}
         for machine_id in self.machines:
-            machine_dict = {'juju-status': {'current': 'idle'}}
+            machine_dict = {
+                'juju-status': {'current': 'idle'},
+                'series': 'angsty',
+                }
             hostname = self.machine_host_names.get(machine_id)
             machine_dict['instance-id'] = machine_id
             if hostname is not None:
@@ -258,7 +261,8 @@
             if machine_id in self.state_servers:
                 machine_dict['controller-member-status'] = 'has-vote'
         for host, containers in self.containers.items():
-            container_dict = dict((c, {}) for c in containers)
+            container_dict = dict((c, {'series': 'angsty'})
+                                  for c in containers)
             for container, subdict in container_dict.items():
                 subdict.update({'juju-status': {'current': 'idle'}})
                 dns_name = self.machine_host_names.get(container)

=== added file 'jujupy/tests/test_fake.py'
--- jujupy/tests/test_fake.py	1970-01-01 00:00:00 +0000
+++ jujupy/tests/test_fake.py	2017-03-17 20:43:28 +0000
@@ -0,0 +1,14 @@
+from jujupy.fake import FakeEnvironmentState
+from tests import TestCase
+
+
+class TestEnvironmentState(TestCase):
+
+    def test_get_status_dict_series(self):
+        state = FakeEnvironmentState()
+        state.add_container('lxd')
+        status_dict = state.get_status_dict()
+        machine_0 = status_dict['machines']['0']
+        self.assertEqual(machine_0['series'], 'angsty')
+        lxd_0 = machine_0['containers']['0/lxd/0']
+        self.assertEqual(lxd_0['series'], 'angsty')

=== modified file 'tests/test_assess_mixed_images.py'
--- tests/test_assess_mixed_images.py	2017-02-25 06:09:40 +0000
+++ tests/test_assess_mixed_images.py	2017-03-17 20:43:28 +0000
@@ -85,6 +85,11 @@
         mock_client = fake_juju_client()
         mock_client.bootstrap()
         assess_mixed_images(mock_client)
+        # The series are 'angsty' instead of 'centos7' and 'trusty', because
+        # local_charm_path drops the series information.  When JUJU_REPOSITORY
+        # is not defined, there is no way to know what series is intended from
+        # path.  In real-world use, the series is determined from the charm
+        # metadata, but these tests don't have access to it.
         expected = {
             'model': {'name': 'name'},
             'machines': {
@@ -92,11 +97,13 @@
                     'dns-name': '0.example.com',
                     'instance-id': '0',
                     'juju-status': {'current': 'idle'},
+                    'series': 'angsty',
                     },
                 '1': {
                     'dns-name': '1.example.com',
                     'instance-id': '1',
                     'juju-status': {'current': 'idle'},
+                    'series': 'angsty',
                     },
                 },
             'applications': {