Merge lp:~therve/landscape-client/juju-env-info-2 into lp:~landscape/landscape-client/trunk

[Thomas Herve]

Here's another try: making it part of a plugin instead of registration means that the data will be used *after* the computer is registered, instead during registration where I may not have a computer yet. I'll write the server branch right away to make sure it's better.

[Chris Glass (tribaal)]

Nice! +1

[nitpick]
+ fd = open(juju_info, "w")
+ fd.write(json.dumps({"JUJU_ENV_UUID": "uuid1",
+ "JUJU_UNIT_NAME": "unit/0"}))
+ fd.close()

Would probably benefit from a context instead, just in case:

with open(juju_info, "w") as fd:
    fd.write(juju.dumps({...}))

But yeah, nitpick, feel free to ignore.

review: Approve

[Alberto Donato (ack)]

Looks good! +1

review: Approve

=== modified file 'landscape/message_schemas.py'
--- landscape/message_schemas.py	2013-01-17 08:52:48 +0000
+++ landscape/message_schemas.py	2013-01-17 09:24:03 +0000
@@ -68,10 +68,13 @@
     "computer-info",
     {"hostname": utf8,
      "total-memory": Int(),
-     "total-swap": Int()},
+     "total-swap": Int(),
+     "juju-env-uuid": utf8,
+     "juju-unit-name": utf8},
     # Not sure why these are all optional, but it's explicitly tested
     # in the server
-    optional=["hostname", "total-memory", "total-swap"])
+    optional=["hostname", "total-memory", "total-swap", "juju-env-uuid",
+              "juju-unit-name"])
 
 DISTRIBUTION_INFO = Message(
     "distribution-info",

=== modified file 'landscape/monitor/computerinfo.py'
--- landscape/monitor/computerinfo.py	2011-06-11 00:32:22 +0000
+++ landscape/monitor/computerinfo.py	2013-01-17 09:24:03 +0000
@@ -1,3 +1,5 @@
+import os
+import json
 import logging
 
 from landscape.lib.lsb_release import LSB_RELEASE_FILENAME, parse_lsb_release
@@ -25,6 +27,8 @@
 
     def register(self, registry):
         super(ComputerInfo, self).register(registry)
+        self._juju_info_path = os.path.join(registry.config.data_path,
+                                            "juju-info")
         self.call_on_accepted("computer-info",
                               self.send_computer_message, True)
         self.call_on_accepted("distribution-info",
@@ -59,6 +63,21 @@
         self._add_if_new(message, "total-memory",
                          total_memory)
         self._add_if_new(message, "total-swap", total_swap)
+        if os.path.exists(self._juju_info_path):
+            fd = None
+            try:
+                fd = open(self._juju_info_path)
+                data = fd.read()
+                juju_info = json.loads(data)
+                env_uuid = juju_info.get("JUJU_ENV_UUID")
+                unit_name = juju_info.get("JUJU_UNIT_NAME")
+                self._add_if_new(message, "juju-env-uuid", env_uuid)
+                self._add_if_new(message, "juju-unit-name", unit_name)
+            except Exception:
+                pass
+            finally:
+                if fd is not None:
+                    fd.close()
         return message
 
     def _add_if_new(self, message, key, value):

=== modified file 'landscape/monitor/tests/test_computerinfo.py'
--- landscape/monitor/tests/test_computerinfo.py	2011-07-05 05:09:11 +0000
+++ landscape/monitor/tests/test_computerinfo.py	2013-01-17 09:24:03 +0000
@@ -1,3 +1,5 @@
+import os
+import json
 import re
 
 from landscape.monitor.computerinfo import ComputerInfo
@@ -325,3 +327,41 @@
 
         self.mstore.set_accepted_types(["distribution-info", "computer-info"])
         self.assertMessages(list(self.mstore.get_pending_messages()), [])
+
+    def test_juju_info(self):
+        """
+        L{ComputerInfo} sends data from the juju environment if the juju info
+        file is present.
+        """
+        juju_info = os.path.join(self.monitor.config.data_path, "juju-info")
+        fd = open(juju_info, "w")
+        fd.write(json.dumps({"JUJU_ENV_UUID": "uuid1",
+                             "JUJU_UNIT_NAME": "unit/0"}))
+        fd.close()
+        self.mstore.set_accepted_types(["computer-info"])
+
+        plugin = ComputerInfo()
+        self.monitor.add(plugin)
+        plugin.exchange()
+        messages = self.mstore.get_pending_messages()
+        self.assertEqual(1, len(messages))
+        self.assertEqual("uuid1", messages[0]["juju-env-uuid"])
+        self.assertEqual("unit/0", messages[0]["juju-unit-name"])
+
+    def test_juju_info_error(self):
+        """
+        L{ComputerInfo} is resilient to issues reading the juju info file.
+        """
+        juju_info = os.path.join(self.monitor.config.data_path, "juju-info")
+        fd = open(juju_info, "w")
+        fd.write("foo")
+        fd.close()
+        os.chmod(juju_info, 0)
+        self.mstore.set_accepted_types(["computer-info"])
+
+        plugin = ComputerInfo()
+        self.monitor.add(plugin)
+        plugin.exchange()
+        messages = self.mstore.get_pending_messages()
+        self.assertEqual(1, len(messages))
+        self.assertNotIn("juju-env-uuid", messages[0])