Merge lp:~free.ekanayaka/charms/trusty/landscape-client/drop-unit-name-from-juju-info into lp:charms/trusty/landscape-client

[Free Ekanayaka]

This branch drops the unit-name field from the content of the juju info file, and changes the code to generate a single json file as opposed to one per principal unit, since we now only need the machine->computer association.

[lp:~free.ekanayaka/charms/trusty/landscape-client/drop-unit-name-from-juju-info]

47. By Free Ekanayaka on 2014-09-25

Drop private-address from juju-info

Unmerged revisions

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-08-28 09:54:11 +0000
+++ hooks/common.py	2014-09-24 07:49:01 +0000
@@ -30,6 +30,19 @@
         """Get relation configuration from Juju."""
         return self._run_juju_tool("relation-get")
 
+    def get_machine_id(self):
+        """Return the Juju machine ID of this unit."""
+        # XXX once #1359714 is fixed this method can be dropped and we can use
+        # the JUJU_MACHINE_ID environment variable.
+
+        # Sniff the value of the machine ID by looking at the name of the
+        # directory where hooks live. It will be something like
+        # 'machine-0-lxc-1'.
+        pattern = "../../machine-*"
+        match = glob(pattern)[0]
+        dirname = os.path.basename(match)
+        return dirname.lstrip("machine-").replace("-", "/")
+
     def get_service_config(self):
         """Get service configuration from Juju."""
         return self._run_juju_tool("config-get")
@@ -88,7 +101,7 @@
         is_configured_enough = all([
             self.config.get("account_name"),
             self.config.get("computer_title"),
-            get_juju_info_filenames(self.juju_directory)])
+            os.path.exists(self.juju_filename)])
         if not try_to_register:
             # We don't need to further check the configuration if we are
             # deleting it.
@@ -102,11 +115,11 @@
             return 0
 
     @property
-    def juju_directory(self):
+    def juju_filename(self):
         try:
-            return self.config.juju_directory
+            return self.config.juju_filename
         except AttributeError:  # older landscape-client versions
-            return os.path.join(self.config.data_path, "juju-info.d")
+            return os.path.join(self.config.data_path, "juju-info.json")
 
     def clear_registration(self):
         """
@@ -187,7 +200,3 @@
     """Dump content in JSON format to the specified file."""
     with open(filename, "w") as dumpfile:
         json.dump(content, dumpfile)
-
-
-def get_juju_info_filenames(juju_directory):
-    return glob("%s/*.json" % juju_directory)

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-08-28 09:54:11 +0000
+++ hooks/hooks.py	2014-09-24 07:49:01 +0000
@@ -11,8 +11,7 @@
 from subprocess import CalledProcessError
 
 from common import (
-    write_json_file, JujuBroker, LandscapeBroker, chown,
-    get_juju_info_filenames)
+    write_json_file, JujuBroker, LandscapeBroker, chown)
 from ceph import (
     get_ceph_client_path, write_ceph_client_keyring, write_ceph_client_config)
 
@@ -71,29 +70,15 @@
                     "" % landscape_broker.local_unit)
     landscape_broker.config.reload()
     relation_conf = juju_broker.get_relation_config()
-    remote_unit_name = juju_broker.environment.get("JUJU_REMOTE_UNIT")
     # We use the remote unit for the unit name, since we want to associate this
     # client with the unit it's managing, not its own unit.
     juju_info = {
         "environment-uuid": juju_broker.environment.get("JUJU_ENV_UUID"),
-        "unit-name": remote_unit_name,
+        "machine-id": juju_broker.get_machine_id(),
         "api-addresses": juju_broker.environment.get("JUJU_API_ADDRESSES"),
         "private-address": relation_conf.get("private-address")}
 
-    # Let's not use any "/" in a filename.
-    unit_name = remote_unit_name.replace("/", "-")
-    juju_file = "%s.json" % unit_name
-
-    juju_info_dir = landscape_broker.juju_directory
-
-    try:
-        os.mkdir(juju_info_dir)
-    except OSError:
-        pass  # The file already exists.
-
-    juju_info_file = os.path.join(juju_info_dir, juju_file)
-
-    write_json_file(juju_info_file, juju_info)
+    write_json_file(landscape_broker.juju_filename, juju_info)
     exit_code = landscape_broker.update_client_config(
         {"computer-title": socket.gethostname()})
 
@@ -111,9 +96,8 @@
     landscape_broker.clear_registration()
 
     # Delete all of the juju-info files.
-    files_to_delete = get_juju_info_filenames(landscape_broker.juju_directory)
-    for to_delete in files_to_delete:
-        os.remove(to_delete)
+    if os.path.exists(landscape_broker.juju_filename):
+        os.remove(landscape_broker.juju_filename)
     landscape_broker.update_client_config(
         {"computer-title": ""}, try_to_register=False)
 

=== modified file 'hooks/install.py'
--- hooks/install.py	2014-08-28 10:09:11 +0000
+++ hooks/install.py	2014-09-24 07:49:01 +0000
@@ -8,6 +8,9 @@
 import os
 import subprocess
 import sys
+
+from glob import glob
+
 from charmhelpers.core.hookenv import (
     Hooks, UnregisteredHookError, log)
 from charmhelpers.fetch import (
@@ -43,6 +46,7 @@
             data_path])
 
 
+
 def build_from_launchpad(url):
     """The charm will install the code from the passed lp branch.
     """
@@ -55,8 +59,8 @@
     subprocess.check_call(["make", "package"], env=env)
     #TODO: The following call should be retried (potential race condition to
     # acquire the dpkg lock).
-    subprocess.call(["dpkg", "-i", "../landscape-client_*.deb",
-                     "../landscape-common_*.deb"])
+    subprocess.call(["dpkg", "-i", glob("../landscape-client_*.deb")[0],
+                     glob("../landscape-common_*.deb")[0]])
     # The _run_apt_command will ensure the command is retried in case we cannot
     # acquire the lock for some reason.
     _run_apt_command(["apt-get", "-f", "install"], fatal=True)

=== modified file 'hooks/test_hooks.py'
--- hooks/test_hooks.py	2014-08-28 09:54:11 +0000
+++ hooks/test_hooks.py	2014-09-24 07:49:01 +0000
@@ -30,6 +30,9 @@
     def log(self, message):
         self.logs.append(message)
 
+    def get_machine_id(self):
+        return "1"
+
     def _run_juju_tool(self, command):
         """Override _run_juju_tool not not execute any commands."""
         return self.commands[command]
@@ -64,12 +67,8 @@
         self.landscape_broker.config.write()
         self.juju_broker = FakeJujuBroker()
 
-    def touch_example_juju_info_file(self):
-        if not os.path.exists(self.landscape_broker.juju_directory):
-            os.mkdir(self.landscape_broker.juju_directory)
-        filename = os.path.join(self.landscape_broker.juju_directory,
-                                "whatever.json")
-        write_json_file(filename=filename, content={})
+    def touch_juju_info_file(self):
+        write_json_file(self.landscape_broker.juju_filename, content={})
 
     def mkdtemp(self):
         directory = mkdtemp(prefix=self.__class__.__name__)
@@ -99,6 +98,7 @@
         single JSON file.
         """
         juju_info = {"juju-env-uuid": "0afcd28d-6263-43fb-8131-afa696a984f8",
+                     "juju-machine-id": "1",
                      "juju-unit-name": "postgresql/0",
                      "juju-api-addresses": "10.0.3.1:17070",
                      "juju-private-address": "10.0.3.205"}
@@ -171,20 +171,17 @@
         """
         self.juju_broker.environment.update({
             "JUJU_ENV_UUID": "uuid1",
-            "JUJU_REMOTE_UNIT": "unit/0",
             "JUJU_API_ADDRESSES": "10.0.0.1:1234"})
         self.juju_broker.commands["relation-get"] = {
             "private-address": "10.0.0.99"}
         hooks.container_relation_joined(juju_broker=self.juju_broker,
                                         landscape_broker=self.landscape_broker)
 
-        juju_info_path = os.path.join(
-            self.landscape_broker.juju_directory, "unit-0.json")
-
+        juju_info_path = self.landscape_broker.juju_filename
         juju_info = json.loads(read_file(juju_info_path))
         self.assertEqual(
             {"environment-uuid": "uuid1",
-             "unit-name": "unit/0",
+             "machine-id": "1",
              "api-addresses": "10.0.0.1:1234",
              "private-address": "10.0.0.99"},
             juju_info)
@@ -198,9 +195,7 @@
         registration_attempts = []
 
         def record_registration_attempt():
-            juju_directory = self.landscape_broker.juju_directory
-            juju_file_list = glob("%s/*.json" % juju_directory)
-            for _ in juju_file_list:
+            if os.path.exists(self.landscape_broker.juju_filename):
                 registration_attempts.append(True)
 
         self.landscape_broker.try_to_register = record_registration_attempt
@@ -249,14 +244,8 @@
         since it contains information about the remove unit (which is
         now gone).
         """
-        juju_info_path = os.path.join(
-            self.landscape_broker.juju_directory, "unit-0.json")
-
-        if not os.path.exists(self.landscape_broker.juju_directory):
-            os.mkdir(self.landscape_broker.juju_directory)
-
+        juju_info_path = self.landscape_broker.juju_filename
         juju_info = {"environment-uuid": "uuid1",
-                     "unit-name": "unit/0",
                      "api-addresses": "10.0.0.1:1234",
                      "private-address": "10.0.0.99"}
         write_json_file(juju_info_path, juju_info)
@@ -406,7 +395,7 @@
         super(ConfigChangedTest, self).setUp()
         self.landscape_broker.config.account_name = "account1"
         self.landscape_broker.config.computer_title = "title"
-        self.touch_example_juju_info_file()
+        self.touch_juju_info_file()
         self.addCleanup(setattr, hooks, "CERT_FILE", hooks.CERT_FILE)
         tmp_dir = self.mkdtemp()
         hooks.CERT_FILE = "%s/cert" % tmp_dir
@@ -435,7 +424,7 @@
         super(RegistrationRelationJoinedTest, self).setUp()
         self.landscape_broker.config.account_name = "account1"
         self.landscape_broker.config.computer_title = "title"
-        self.touch_example_juju_info_file()
+        self.touch_juju_info_file()
         self.addCleanup(setattr, hooks, "CERT_FILE", hooks.CERT_FILE)
         tmp_dir = self.mkdtemp()
         hooks.CERT_FILE = "%s/cert" % tmp_dir