Merge lp:~jkakar/landscape-client/include-eucalyptus-by-default into lp:~landscape/landscape-client/trunk

[Jamu Kakar]

This branch introduces the following changes:

- The Eucalyptus plugin is loaded by default.

[Free Ekanayaka (free.ekanayaka)]

Looks good. +1!

review: Approve

[Kevin McDermott (bigkevmcd)]

2010-08-13 11:38:20,718 ERROR [MainThread] No module named imagestore.lib.service
Traceback (most recent call last):
  File "./landscape/manager/eucalyptus.py", line 141, in send_message
    service_hub = self._service_hub_factory(data_path)
  File "./landscape/manager/eucalyptus.py", line 219, in start_service_hub
    from imagestore.lib.service import ServiceHub
ImportError: No module named imagestore.lib.service
2010-08-13 11:38:20,719 INFO [MainThread] Couldn't start service hub. 'eucalyptus-info' plugin has been disabled.

I don't think we should allow this traceback to appear in the logs, and it's unlikely that we want imagestore to become a dependency of landscape-client ?

review: Needs Fixing

[Jamu Kakar (jkakar)]

Kevin:

imagestore is not a hard dependency of landscape-client. It is only
needed when the Eucalyptus plugin is run. The traceback is slightly
unfortunate, but the behaviour is correct: the plugin is disabling
itself because the imagestore package isn't available.

[Thomas Herve (therve)]

+1!

review: Approve

[Jamu Kakar (jkakar)]

Kevin:

Is your comment a blocker still? ie: Have I missed an important
detail or is the branch fine to land now?

[Thomas Herve (therve)]

Jamu: yes, please turn that traceback into a debug output.

[Jamu Kakar (jkakar)]

Okay, fixed. The exception is now written to the log with
logging.debug.

[lp:~jkakar/landscape-client/include-eucalyptus-by-default]

277. By Jamu Kakar on 2010-08-23

- Merged trunk.

278. By Jamu Kakar on 2010-08-23

- When an exception causes the eucalyptus-info plugin to be disabled
  information about it will be written to the log using
  logging.debug instead of logging.exception. This prevents a
  traceback from appearing in the log during normal client operation.

[Kevin McDermott (bigkevmcd)]

review: Approve

=== modified file 'landscape/manager/config.py'
--- landscape/manager/config.py	2010-01-02 11:43:27 +0000
+++ landscape/manager/config.py	2010-08-23 11:30:54 +0000
@@ -5,7 +5,7 @@
 
 
 ALL_PLUGINS = ["ProcessKiller", "PackageManager", "UserManager",
-               "ShutdownManager"]
+               "ShutdownManager", "Eucalyptus"]
 
 
 class ManagerConfiguration(Configuration):

=== modified file 'landscape/manager/eucalyptus.py'
--- landscape/manager/eucalyptus.py	2010-06-28 12:53:16 +0000
+++ landscape/manager/eucalyptus.py	2010-08-23 11:30:54 +0000
@@ -140,7 +140,7 @@
         try:
             service_hub = self._service_hub_factory(data_path)
         except Exception, e:
-            logging.exception(e)
+            logging.debug(e)
             self.enabled = False
             logging.info("Couldn't start service hub.  '%s' plugin has been "
                          "disabled." % self.message_type)

=== modified file 'landscape/manager/tests/test_config.py'
--- landscape/manager/tests/test_config.py	2010-03-30 09:56:13 +0000
+++ landscape/manager/tests/test_config.py	2010-08-23 11:30:54 +0000
@@ -10,10 +10,11 @@
         self.config = ManagerConfiguration()
 
     def test_plugin_factories(self):
-        """
-        By default all plugins are enabled.
-        """
-        self.assertEquals(self.config.plugin_factories, ALL_PLUGINS)
+        """By default all plugins are enabled."""
+        self.assertEqual(["ProcessKiller", "PackageManager", "UserManager",
+                          "ShutdownManager", "Eucalyptus"],
+                         ALL_PLUGINS)
+        self.assertEqual(ALL_PLUGINS, self.config.plugin_factories)
 
     def test_plugin_factories_with_manager_plugins(self):
         """