Merge lp:~therve/landscape-client/earlier-hardware-info into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The branch moves a feature only accessible to monitor previously, so that all plugins can use it (call_on_accepted).

[Chris Glass (tribaal)]

Looks good! +1!

review: Approve

[Jerry Seutter (jseutter)]

+1 looks good :)

review: Approve

=== modified file 'landscape/broker/client.py'
--- landscape/broker/client.py	2011-07-21 23:55:47 +0000
+++ landscape/broker/client.py	2012-03-01 14:54:27 +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.

=== modified file 'landscape/manager/hardwareinfo.py'
--- landscape/manager/hardwareinfo.py	2011-12-02 08:29:46 +0000
+++ landscape/manager/hardwareinfo.py	2012-03-01 14:54:27 +0000
@@ -14,8 +14,7 @@
     command = "/usr/bin/lshw"
 
     def run(self):
-        return self.registry.broker.call_if_accepted(
-            self.message_type, self.send_message)
+        self.call_on_accepted(self.message_type, self.send_message)
 
     def send_message(self):
         result = getProcessOutput(

=== modified file 'landscape/manager/tests/test_hardwareinfo.py'
--- landscape/manager/tests/test_hardwareinfo.py	2011-12-01 13:38:58 +0000
+++ landscape/manager/tests/test_hardwareinfo.py	2012-03-01 14:54:27 +0000
@@ -19,7 +19,7 @@
         """
         L{HardwareInfo} sends the output of its command when running.
         """
-        deferred = self.info.run()
+        deferred = self.info.send_message()
 
         def check(ignored):
             self.assertMessages(

=== modified file 'landscape/monitor/plugin.py'
--- landscape/monitor/plugin.py	2010-12-10 13:57:11 +0000
+++ landscape/monitor/plugin.py	2012-03-01 14:54:27 +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):
     """