Merge lp:~free.ekanayaka/charms/trusty/landscape-client/machine-id-charm-info into lp:charms/trusty/landscape-client

[Free Ekanayaka]

This branch adds the machine ID to the Juju info json file, so it can be grabbed by the client and sent to the server at registration. See also:

https://code.launchpad.net/~free.ekanayaka/landscape-client/juju-machine-registration/+merge/232531

and

https://code.launchpad.net/~free.ekanayaka/landscape/handle-machine-id-registration/+merge/232535

[Alberto Donato (ack)]

Looks good, +1

#1:
+ return match[(len(pattern) - 1):].replace("-", "/")

Please add a comment for this line, it took me a bit to understand the reason for the replace.

review: Approve

[Adam Collard (adam-collard)]

N/F because of the glob() usage in dpkg -i

review: Needs Fixing

[Adam Collard (adam-collard)]

N/F because of the glob() usage in dpkg -i

review: Needs Fixing

[Free Ekanayaka (free.ekanayaka)]

#1

Fixed.

Adam: should be all fixed/replied.

[lp:~free.ekanayaka/charms/trusty/landscape-client/machine-id-charm-info]

46. By Free Ekanayaka on 2014-09-01

Address review comments

[Adam Collard (adam-collard)]

Free: replied inline.

[lp:~free.ekanayaka/charms/trusty/landscape-client/machine-id-charm-info]

47. By Free Ekanayaka on 2014-09-02

Fix formatting

[Adam Collard (adam-collard)]

Typo in the comment, otherwise +1

review: Approve

[lp:~free.ekanayaka/charms/trusty/landscape-client/machine-id-charm-info]

48. By Free Ekanayaka on 2014-09-02

Fix typo

Unmerged revisions

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-08-28 09:54:11 +0000
+++ hooks/common.py	2014-09-02 09:16:56 +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.
+
+        # Snif 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")

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-08-28 09:54:11 +0000
+++ hooks/hooks.py	2014-09-02 09:16:56 +0000
@@ -77,6 +77,7 @@
     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")}
 

=== modified file 'hooks/install.py'
--- hooks/install.py	2014-08-28 10:09:11 +0000
+++ hooks/install.py	2014-09-02 09:16:56 +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-02 09:16:56 +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]
@@ -99,6 +102,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"}
@@ -184,6 +188,7 @@
         juju_info = json.loads(read_file(juju_info_path))
         self.assertEqual(
             {"environment-uuid": "uuid1",
+             "machine-id": "1",
              "unit-name": "unit/0",
              "api-addresses": "10.0.0.1:1234",
              "private-address": "10.0.0.99"},