Merge lp:~therve/landscape-client/configure-ping-time into lp:~landscape/landscape-client/trunk

[Thomas Herve]

A fairly simple change I hope.

[Kevin McDermott (bigkevmcd)]

Fairly simple change, the main reason this sat unfixed is because of the ComputerOfflineAlert.

Should we restrict the ping time to no more than 4 minutes? Otherwise it will trigger...

Or we need to do some work to either report it, or disable it or something.

Am happy enough with this fix, but it presents some problems for people using it (outside of load-testing).

review: Approve

[Alberto Donato (ack)]

Looks good, +1

review: Approve

[Thomas Herve (therve)]

Kevin: yeah I think we should try to configure the alert, but it's a longer term goal. Right now you can just deactivate the alert.

=== modified file 'landscape/broker/config.py'
--- landscape/broker/config.py	2011-06-29 17:50:48 +0000
+++ landscape/broker/config.py	2011-08-19 15:49:30 +0000
@@ -70,6 +70,9 @@
         parser.add_option("--ping-url",
                           help="The URL to perform lightweight exchange "
                                "initiation with.")
+        parser.add_option("--ping-interval", default=30, type="int",
+                          metavar="INTERVAL",
+                          help="The number of seconds between pings.")
         parser.add_option("--http-proxy", metavar="URL",
                           help="The URL of the HTTP proxy, if one is needed.")
         parser.add_option("--https-proxy", metavar="URL",

=== modified file 'landscape/broker/service.py'
--- landscape/broker/service.py	2011-07-21 23:55:47 +0000
+++ landscape/broker/service.py	2011-08-19 15:49:30 +0000
@@ -62,7 +62,8 @@
             self.reactor, self.message_store, self.transport, self.identity,
             exchange_store, config)
         self.pinger = self.pinger_factory(self.reactor, config.ping_url,
-                                          self.identity, self.exchanger)
+                                          self.identity, self.exchanger,
+                                          interval=config.ping_interval)
         self.registration = RegistrationHandler(
             config, self.identity, self.reactor, self.exchanger, self.pinger,
             self.message_store, fetch_async)

=== modified file 'landscape/broker/tests/test_config.py'
--- landscape/broker/tests/test_config.py	2011-07-05 05:09:11 +0000
+++ landscape/broker/tests/test_config.py	2011-08-19 15:49:30 +0000
@@ -64,15 +64,17 @@
 
     def test_intervals_are_ints(self):
         """
-        The 'urgent_exchange_interval and 'exchange_interval' values specified
-        in the configuration file are converted to integers.
+        The 'urgent_exchange_interval, 'exchange_interval' and 'ping_interval'
+        values specified in the configuration file are converted to integers.
         """
         filename = self.makeFile("[client]\n"
                                  "urgent_exchange_interval = 12\n"
-                                 "exchange_interval = 34\n")
+                                 "exchange_interval = 34\n"
+                                 "ping_interval = 6\n")
 
         configuration = BrokerConfiguration()
         configuration.load(["--config", filename, "--url", "whatever"])
 
         self.assertEqual(configuration.urgent_exchange_interval, 12)
         self.assertEqual(configuration.exchange_interval, 34)
+        self.assertEqual(configuration.ping_interval, 6)

=== modified file 'landscape/broker/tests/test_service.py'
--- landscape/broker/tests/test_service.py	2011-07-05 05:09:11 +0000
+++ landscape/broker/tests/test_service.py	2011-08-19 15:49:30 +0000
@@ -54,9 +54,14 @@
 
     def test_pinger(self):
         """
-        A L{BrokerService} instance has a proper C{pinger} attribute.
+        A L{BrokerService} instance has a proper C{pinger} attribute. Its
+        interval value is configured with the C{ping_interval} value.
         """
         self.assertEqual(self.service.pinger.get_url(), self.config.ping_url)
+        self.assertEqual(30, self.service.pinger.get_interval())
+        self.config.ping_interval = 20
+        service = BrokerService(self.config)
+        self.assertEqual(20, service.pinger.get_interval())
 
     def test_registration(self):
         """