Merge lp:~adam-collard/landscape-client-charm/juju-2-support into lp:landscape-client-charm

[Adam Collard]

Add support for Juju 2.0's changed environment variable name.

Add support for Juju 2.0's changed environment variable name.

Note that I have uploaded this to cs:~adam-collard/trusty/landscape-client-3 and cs:~adam-collard/xenial/landscape-client-1 in the development channel

Testing instructions:
 * Deploy charm with Juju 2.0 and check that landscape-client registers

[Alberto Donato (ack)]

+1 looks good

review: Approve

[Bogdana Vereha (bogdana)]

+1

review: Approve

[lp:~adam-collard/landscape-client-charm/juju-2-support]

62. By Adam Collard on 2016-05-26

Fix lint

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-03-30 20:04:13 +0000
+++ hooks/hooks.py	2016-05-26 08:23:18 +0000
@@ -71,8 +71,10 @@
     landscape_broker.config.reload()
     # 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.
+    model_uuid = juju_broker.environment.get(
+        "JUJU_MODEL_UUID", juju_broker.environment.get("JUJU_ENV_UUID"))
     juju_info = {
-        "environment-uuid": juju_broker.environment.get("JUJU_ENV_UUID"),
+        "environment-uuid": model_uuid,
         "machine-id": juju_broker.get_machine_id(),
         "api-addresses": juju_broker.environment.get("JUJU_API_ADDRESSES")}
 

=== modified file 'hooks/install.py'
--- hooks/install.py	2016-05-02 08:59:58 +0000
+++ hooks/install.py	2016-05-26 08:23:18 +0000
@@ -56,7 +56,7 @@
     subprocess.check_call("/usr/lib/pbuilder/pbuilder-satisfydepends")
     env = {"DEBUILD_OPTS": "-uc -us"}
     subprocess.check_call(["make", "package"], env=env)
-    #TODO: The following call should be retried (potential race condition to
+    # TODO: The following call should be retried (potential race condition to
     # acquire the dpkg lock).
     subprocess.call(["dpkg", "-i", glob("../landscape-client_*.deb")[0],
                      glob("../landscape-common_*.deb")[0]])

=== modified file 'hooks/test_hooks.py'
--- hooks/test_hooks.py	2016-04-15 08:51:31 +0000
+++ hooks/test_hooks.py	2016-05-26 08:23:18 +0000
@@ -23,7 +23,7 @@
         self.commands = {"relation-get": {}, "config-get": {}}
         self.environment = {
             "JUJU_ENV_UUID": str(uuid4()),
-            "JUJU_API_ADRESSES": "juju.example.com:12345"}
+            "JUJU_API_ADDRESSES": "juju.example.com:12345"}
         self.logs = []
 
     def log(self, message):
@@ -168,12 +168,12 @@
         self.landscape_broker.config.account_name = "account1"
         self.landscape_broker.config.write()
 
-    def test_writes_juju_json(self):
+    def test_writes_juju_1_json(self):
         """
-        When the hook runs, the environment UUID, which unit the client
-        is managed, the Juju API addresses, and the unit's private
-        address are written to the juju-info.json file inside the
-        client's data path.
+        When the hook runs in Juju 1, the environment UUID, which unit the
+        client is managed, the Juju API addresses, and the unit's
+        private address are written to the juju-info.json file inside
+        the client's data path.
         """
         self.juju_broker.environment.update({
             "JUJU_ENV_UUID": "uuid1",
@@ -184,9 +184,30 @@
         juju_info_path = self.landscape_broker.juju_filename
         juju_info = json.loads(read_file(juju_info_path))
         self.assertEqual(
-            {"environment-uuid": "uuid1",
-             "machine-id": "1",
-             "api-addresses": "10.0.0.1:1234"},
+            {u"environment-uuid": u"uuid1",
+             u"machine-id": u"1",
+             u"api-addresses": u"10.0.0.1:1234"},
+            juju_info)
+
+    def test_writes_juju_2_json(self):
+        """
+        When the hook runs in Juju 2, the model UUID, which unit the
+        client is managed, the Juju API addresses, and the unit's
+        private address are written to the juju-info.json file inside
+        the client's data path.
+        """
+        self.juju_broker.environment.update({
+            "JUJU_MODEL_UUID": "uuid2",
+            "JUJU_API_ADDRESSES": "10.0.0.1:1234"})
+        hooks.container_relation_joined(juju_broker=self.juju_broker,
+                                        landscape_broker=self.landscape_broker)
+
+        juju_info_path = self.landscape_broker.juju_filename
+        juju_info = json.loads(read_file(juju_info_path))
+        self.assertEqual(
+            {u"environment-uuid": u"uuid2",
+             u"machine-id": u"1",
+             u"api-addresses": u"10.0.0.1:1234"},
             juju_info)
 
     def test_registers_after_juju_info_is_written(self):
@@ -474,7 +495,6 @@
             "mykey", self.landscape_broker.config.registration_key)
         self.assertEqual(
             "http://127.0.0.1", self.landscape_broker.config.ping_url)
-        
 
 
 class RegistrationRelationJoinedTest(HookTestCase):