Merge lp:~therve/landscape-client/backport-hardware-support into lp:~landscape/landscape-client/backport-12.03

[Thomas Herve]

Fairly trivial change, just introduce the feature, and the fix recently made.

[Free Ekanayaka (free.ekanayaka)]

I'm missing the greater picture, and would like to understand more the reason for this backport.

Also, backport-12.03 was right cut from the Ubuntu packaging branch, which doesn't feel the right workflow (tho it'd do it), as we shouldn't use a packaging branch for upstream source changes.

Unmerged revisions

41. By Thomas Herve on 2012-03-05

Backport hardware support

=== modified file 'landscape/broker/client.py'
--- landscape/broker/client.py	2010-04-21 19:58:10 +0000
+++ landscape/broker/client.py	2012-03-05 09:27:18 +0000
@@ -41,6 +41,18 @@
         """An alias for the C{client} attribute."""
         return self.client
 
+    def call_on_accepted(self, type, callable, *args, **kwargs):
+        """
+        Register a callback fired upon a C{message-type-acceptance-changed}.
+        """
+
+        def acceptance_changed(acceptance):
+            if acceptance:
+                return callable(*args, **kwargs)
+
+        self.client.reactor.call_on(("message-type-acceptance-changed", type),
+                                    acceptance_changed)
+
 
 class BrokerClient(object):
     """Basic plugin registry for clients that have to deal with the broker.
@@ -53,13 +65,12 @@
         defined by sub-classes.
     @ivar broker: A reference to a connected L{RemoteBroker}, it must be set
         by the connecting machinery at service startup.
+
+    @param reactor: A L{TwistedReactor}.
     """
     name = "client"
 
     def __init__(self, reactor):
-        """
-        @param reactor: A L{TwistedReactor}.
-        """
         super(BrokerClient, self).__init__()
         self.reactor = reactor
         self.broker = None

=== modified file 'landscape/manager/config.py'
--- landscape/manager/config.py	2011-07-18 15:16:18 +0000
+++ landscape/manager/config.py	2012-03-05 09:27:18 +0000
@@ -5,7 +5,7 @@
 
 
 ALL_PLUGINS = ["ProcessKiller", "PackageManager", "UserManager",
-               "ShutdownManager", "Eucalyptus", "AptSources"]
+               "ShutdownManager", "Eucalyptus", "AptSources", "HardwareInfo"]
 
 
 class ManagerConfiguration(Configuration):

=== added file 'landscape/manager/hardwareinfo.py'
--- landscape/manager/hardwareinfo.py	1970-01-01 00:00:00 +0000
+++ landscape/manager/hardwareinfo.py	2012-03-05 09:27:18 +0000
@@ -0,0 +1,26 @@
+import os
+
+from twisted.internet.utils import getProcessOutput
+
+from landscape.manager.plugin import ManagerPlugin
+
+
+class HardwareInfo(ManagerPlugin):
+    """A plugin to retrieve hardware information."""
+
+    message_type = "hardware-info"
+    run_interval = 60 * 60 * 24
+    run_immediately = True
+    command = "/usr/bin/lshw"
+
+    def run(self):
+        self.call_on_accepted(self.message_type, self.send_message)
+
+    def send_message(self):
+        result = getProcessOutput(
+            self.command, args=["-xml", "-quiet"], env=os.environ, path=None)
+        return result.addCallback(self._got_output)
+
+    def _got_output(self, output):
+        message = {"type": self.message_type, "data": output}
+        return self.registry.broker.send_message(message)

=== modified file 'landscape/manager/tests/test_config.py'
--- landscape/manager/tests/test_config.py	2011-07-18 15:16:18 +0000
+++ landscape/manager/tests/test_config.py	2012-03-05 09:27:18 +0000
@@ -12,7 +12,8 @@
     def test_plugin_factories(self):
         """By default all plugins are enabled."""
         self.assertEqual(["ProcessKiller", "PackageManager", "UserManager",
-                          "ShutdownManager", "Eucalyptus", "AptSources"],
+                          "ShutdownManager", "Eucalyptus", "AptSources",
+                          "HardwareInfo"],
                          ALL_PLUGINS)
         self.assertEqual(ALL_PLUGINS, self.config.plugin_factories)
 

=== added file 'landscape/manager/tests/test_hardwareinfo.py'
--- landscape/manager/tests/test_hardwareinfo.py	1970-01-01 00:00:00 +0000
+++ landscape/manager/tests/test_hardwareinfo.py	2012-03-05 09:27:18 +0000
@@ -0,0 +1,29 @@
+from landscape.tests.helpers import LandscapeTest, ManagerHelper
+
+from landscape.manager.hardwareinfo import HardwareInfo
+
+
+class HardwareInfoTests(LandscapeTest):
+    helpers = [ManagerHelper]
+
+    def setUp(self):
+        super(HardwareInfoTests, self).setUp()
+        self.info = HardwareInfo()
+        self.info.command = "/bin/echo"
+        self.manager.add(self.info)
+
+        service = self.broker_service
+        service.message_store.set_accepted_types(["hardware-info"])
+
+    def test_message(self):
+        """
+        L{HardwareInfo} sends the output of its command when running.
+        """
+        deferred = self.info.send_message()
+
+        def check(ignored):
+            self.assertMessages(
+                self.broker_service.message_store.get_pending_messages(),
+                [{"data": u"-xml -quiet\n", "type": "hardware-info"}])
+
+        return deferred.addCallback(check)

=== modified file 'landscape/message_schemas.py'
--- landscape/message_schemas.py	2011-07-18 15:16:18 +0000
+++ landscape/message_schemas.py	2012-03-05 09:27:18 +0000
@@ -99,6 +99,10 @@
                     )})
 
 
+HARDWARE_INFO = Message("hardware-info", {
+    "data": utf8})
+
+
 LOAD_AVERAGE = Message("load-average", {
     "load-averages": List(Tuple(Int(), Float())),
     })
@@ -386,7 +390,7 @@
 message_schemas = {}
 for schema in [ACTIVE_PROCESS_INFO, COMPUTER_UPTIME, CLIENT_UPTIME,
                OPERATION_RESULT, COMPUTER_INFO, DISTRIBUTION_INFO,
-               HARDWARE_INVENTORY, LOAD_AVERAGE, MEMORY_INFO,
+               HARDWARE_INVENTORY, HARDWARE_INFO, LOAD_AVERAGE, MEMORY_INFO,
                RESYNCHRONIZE, MOUNT_ACTIVITY, MOUNT_INFO, FREE_SPACE,
                REGISTER, REGISTER_CLOUD_VM, TEMPERATURE, PROCESSOR_INFO,
                USERS, PACKAGES, PACKAGE_LOCKS,

=== modified file 'landscape/monitor/plugin.py'
--- landscape/monitor/plugin.py	2011-01-14 10:11:04 +0000
+++ landscape/monitor/plugin.py	2012-03-05 09:27:18 +0000
@@ -36,18 +36,6 @@
         """An alias for the C{client} attribute."""
         return self.client
 
-    def call_on_accepted(self, type, callable, *args, **kwargs):
-        """
-        Register a callback fired upon a C{message-type-acceptance-changed}.
-        """
-
-        def acceptance_changed(acceptance):
-            if acceptance:
-                return callable(*args, **kwargs)
-
-        self.monitor.reactor.call_on(("message-type-acceptance-changed",
-                                       type), acceptance_changed)
-
 
 class DataWatcher(MonitorPlugin):
     """