Merge lp:~free.ekanayaka/landscape-client/drop-juju-info-list into lp:~landscape/landscape-client/trunk

[Free Ekanayaka]

Drop the code that sends the legacy juju-info-list message/field,
which we don't use anymore in the server.

Drop the code that sends the legacy juju-info-list message/field,
which we don't use anymore in the server.

[Geoff Teale (tealeg)]

+1 Approve.

review: Approve

[Alberto Donato (ack)]

LGTM, +1

review: Approve

=== modified file 'landscape/broker/registration.py'
--- landscape/broker/registration.py	2014-09-01 13:16:02 +0000
+++ landscape/broker/registration.py	2014-09-17 15:29:16 +0000
@@ -199,9 +199,6 @@
         if self._juju_data and is_version_higher(server_api, "3.3"):
             juju_info_list, juju_info = self._juju_data
             message["juju-info"] = juju_info
-            # XXX the juju-info-list field will be dropped once the migration
-            # to computer-machine association is complete
-            message["juju-info-list"] = juju_info_list
 
         # The computer is a normal computer, possibly a container.
         with_word = "with" if bool(registration_key) else "without"

=== modified file 'landscape/broker/tests/test_registration.py'
--- landscape/broker/tests/test_registration.py	2014-09-01 13:16:02 +0000
+++ landscape/broker/tests/test_registration.py	2014-09-17 15:29:16 +0000
@@ -521,59 +521,6 @@
              "api-addresses": ["10.0.3.1:17070"]},
             messages[0]["juju-info"])
 
-    def test_juju_info_list_added_when_present(self):
-        """
-        When Juju information is found in $data_dir/juju-info.d/*.json,
-        key parts of it are sent in the registration message.
-        """
-        self.mstore.set_accepted_types(["register"])
-        self.mstore.set_server_api("3.3")
-        self.config.account_name = "account_name"
-        self.reactor.fire("run")
-        self.reactor.fire("pre-exchange")
-
-        messages = self.mstore.get_pending_messages()
-        expected = {"environment-uuid": "DEAD-BEEF",
-                    "api-addresses": ["10.0.3.1:17070"],
-                    "unit-name": "service/0"}
-        self.assertEqual(expected, messages[0]["juju-info-list"][0])
-
-    def test_multiple_juju_information_added_when_present(self):
-        """
-        When Juju information is found in $data_dir/juju-info.json,
-        key parts of it are sent in the registration message.
-        """
-        # Write a second file in the config directory
-        contents = json.dumps({"environment-uuid": "DEAD-BEEF",
-                               "machine-id": "1",
-                               "unit-name": "service-2/0",
-                               "api-addresses": "10.0.3.2:17070",
-                               "private-address": "127.0.0.1"})
-        self.makeFile(
-            contents,
-            dirname=self.config.juju_directory, suffix=".json")
-
-        self.mstore.set_accepted_types(["register"])
-        self.mstore.set_server_api("3.3")
-        self.config.account_name = "account_name"
-        self.reactor.fire("run")
-        self.reactor.fire("pre-exchange")
-
-        messages = self.mstore.get_pending_messages()
-        juju_info = messages[0]["juju-info-list"]
-        self.assertEqual(2, len(juju_info))
-
-        expected1 = {"environment-uuid": "DEAD-BEEF",
-                     "api-addresses": ["10.0.3.1:17070"],
-                     "unit-name": "service/0"}
-        self.assertIn(expected1, juju_info)
-
-        expected2 = {"environment-uuid": "DEAD-BEEF",
-                     "api-addresses": ["10.0.3.2:17070"],
-                     "unit-name": "service-2/0",
-                     "private-address": "127.0.0.1"}
-        self.assertIn(expected2, juju_info)
-
     def test_juju_info_skipped_with_old_server(self):
         """
         If a server doesn't speak at least 3.3, the juju-info field is

=== modified file 'landscape/message_schemas.py'
--- landscape/message_schemas.py	2014-09-01 13:16:02 +0000
+++ landscape/message_schemas.py	2014-09-17 15:29:16 +0000
@@ -204,13 +204,10 @@
      "juju-info": KeyDict({"environment-uuid": Unicode(),
                            "api-addresses": List(Unicode()),
                            "machine-id": Unicode()}),
-     # XXX temporary field with unit info, will be dropped when we complete
-     # the migration to machine info.
-     "juju-info-list": List(KeyDict(juju_data, optional=["private-address"])),
      "access_group": Unicode()},
     api="3.3",
     optional=["registration_password", "hostname", "tags", "vm-info",
-              "container-info", "access_group", "juju-info", "juju-info-list"])
+              "container-info", "access_group", "juju-info"])
 
 
 # XXX The register-provisioned-machine message is obsolete, it's kept around

=== modified file 'landscape/monitor/config.py'
--- landscape/monitor/config.py	2014-05-16 13:28:44 +0000
+++ landscape/monitor/config.py	2014-09-17 15:29:16 +0000
@@ -6,7 +6,7 @@
                "Temperature", "PackageMonitor", "UserMonitor",
                "RebootRequired", "AptPreferences", "NetworkActivity",
                "NetworkDevice", "UpdateManager", "CPUUsage", "SwiftUsage",
-               "CephUsage", "JujuInfo"]
+               "CephUsage"]
 
 
 class MonitorConfiguration(Configuration):

=== removed file 'landscape/monitor/jujuinfo.py'
--- landscape/monitor/jujuinfo.py	2014-08-28 09:47:21 +0000
+++ landscape/monitor/jujuinfo.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-import logging
-
-from landscape.lib.juju import get_juju_info
-from landscape.monitor.plugin import MonitorPlugin
-
-
-class JujuInfo(MonitorPlugin):
-    """Plugin for reporting Juju information.
-
-    XXX this plugin is going to be dropped when the transition from
-    unit-computer association to machine-computer association is
-    completed on the server.
-    """
-
-    persist_name = "juju-info"
-    scope = "juju"
-    run_interval = 30
-
-    # Need persist to be setup so have to wait C{run_interval} seconds
-    run_immediately = False
-
-    def run(self):
-        broker = self.registry.broker
-        broker.call_if_accepted("juju-units-info", self.send_juju_message)
-
-    def send_juju_message(self):
-        message = self._create_juju_info_message()
-        if message:
-            logging.info("Queuing message with updated juju info.")
-            self.registry.broker.send_message(message, self._session_id,
-                                              urgent=True)
-
-    def _create_juju_info_message(self):
-        """Return a "juju-units-info" message if the juju info gathered from
-        the JSON files living in juju-info.d/ has changed.
-
-        The message is of the form:
-            {"type": "juju-units-info",
-             "juju-info-list": [{<juju-info dict>}, {<juju-info dict>}]}
-        """
-        juju_info = get_juju_info(self.registry.config)
-
-        if juju_info:
-            juju_info = juju_info[0]
-
-        if juju_info != self._persist.get("juju-info"):
-            self._persist.set("juju-info", juju_info)
-            message = {"type": "juju-units-info",
-                       "juju-info-list": juju_info}
-            return message
-
-        return None

=== removed file 'landscape/monitor/tests/test_jujuinfo.py'
--- landscape/monitor/tests/test_jujuinfo.py	2014-08-28 09:47:21 +0000
+++ landscape/monitor/tests/test_jujuinfo.py	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-import json
-import os
-
-from landscape.monitor.jujuinfo import JujuInfo
-from landscape.tests.helpers import LandscapeTest, MonitorHelper
-
-
-SAMPLE_JUJU_INFO = json.dumps({"environment-uuid": "DEAD-BEEF",
-                               "machine-id": "1",
-                               "unit-name": "juju-unit-name",
-                               "api-addresses": "10.0.3.1:17070",
-                               "private-address": "127.0.0.1"})
-
-SAMPLE_JUJU_FILE = "juju-unit-name.json"
-
-
-class JujuInfoTest(LandscapeTest):
-
-    helpers = [MonitorHelper]
-
-    def setUp(self):
-        super(JujuInfoTest, self).setUp()
-        self.mstore.set_accepted_types(["juju-units-info"])
-        self.plugin = JujuInfo()
-        self.monitor.add(self.plugin)
-
-        if not os.path.exists(self.config.juju_directory):
-            os.mkdir(self.config.juju_directory)
-
-        self.filepath = os.path.join(self.config.juju_directory,
-                                     SAMPLE_JUJU_FILE)
-        self.makeFile(SAMPLE_JUJU_INFO, path=self.filepath)
-
-    def test_get_sample_juju_info(self):
-        """
-        Sample data is used to ensure that expected values end up in
-        the Juju data reported by the plugin.
-        """
-        self.plugin.run()
-        message = self.mstore.get_pending_messages()[0]
-        self.assertEqual(message["type"], "juju-units-info")
-        juju_info = message["juju-info-list"][0]
-        self.assertEqual(juju_info["environment-uuid"], "DEAD-BEEF")
-        self.assertEqual(juju_info["unit-name"], "juju-unit-name")
-        self.assertEqual(juju_info["api-addresses"], ["10.0.3.1:17070"])
-
-    def test_juju_info_reported_only_once(self):
-        """
-        Juju data shouldn't be reported unless it's changed since the
-        last time it was reported.
-        """
-        self.plugin.run()
-        messages = self.mstore.get_pending_messages()
-        self.assertEqual(len(messages), 1)
-        self.assertEqual(messages[0]["type"], "juju-units-info")
-
-        self.plugin.run()
-        messages = self.mstore.get_pending_messages()
-        self.assertEqual(len(messages), 1)
-
-    def test_report_changed_juju_info(self):
-        """
-        When juju data changes, the new data should be sent to the
-        server.
-        """
-        self.plugin.run()
-        message = self.mstore.get_pending_messages()[0]
-        self.assertEqual(message["type"], "juju-units-info")
-        juju_info = message["juju-info-list"][0]
-        self.assertEqual(juju_info["environment-uuid"], "DEAD-BEEF")
-        self.assertEqual(juju_info["unit-name"], "juju-unit-name")
-        self.assertEqual(juju_info["api-addresses"], ["10.0.3.1:17070"])
-
-        self.makeFile(
-            json.dumps({"environment-uuid": "FEED-BEEF",
-                        "machine-id": "1",
-                        "unit-name": "changed-unit-name",
-                        "api-addresses": "10.0.3.2:17070",
-                        "private-address": "127.0.1.1"}),
-            path=self.filepath)
-        self.plugin.run()
-
-        message = self.mstore.get_pending_messages()[1]
-        self.assertEqual(message["type"], "juju-units-info")
-        juju_info = message["juju-info-list"][0]
-        self.assertEqual(juju_info["environment-uuid"], "FEED-BEEF")
-        self.assertEqual(juju_info["unit-name"], "changed-unit-name")
-        self.assertEqual(juju_info["api-addresses"], ["10.0.3.2:17070"])
-
-    def test_no_message_with_invalid_json(self):
-        """No Juju message is sent if the JSON file is invalid."""
-        self.makeFile("barf", path=self.filepath)
-
-        self.plugin.run()
-        messages = self.mstore.get_pending_messages()
-        self.assertEqual(messages, [])
-        self.log_helper.ignore_errors(ValueError)
-        self.assertTrue(
-            "Error attempting to read JSON from" in self.logfile.getvalue())
-
-    def test_no_message_with_missing_file(self):
-        """No Juju message is sent if the JSON file is missing."""
-        os.remove(self.filepath)
-
-        self.plugin.run()
-        messages = self.mstore.get_pending_messages()
-        self.assertEqual(messages, [])