← Back to branch summary

~ahasenack/landscape-client/landscape-client-11.02-0ubuntu0.10.10.1

« back to all changes in this revision

Viewing changes to landscape/manager/eucalyptus.py

  • Committer: Bazaar Package Importer
  • Author(s): Free Ekanayaka
  • Date: 2010-04-21 19:58:10 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20100421195810-s30uv3s6i27lue38
Tags: 1.5.2-0ubuntu0.10.10.0
https://launchpad.net/bugs/594594
https://launchpad.net/bugs/272344
https://launchpad.net/bugs/538253
https://launchpad.net/bugs/574810
* New upstream version (LP: #594594):
  - A new includes information about active network devices and their
    IP address in sysinfo output (LP: #272344).
  - A new plugin collects information about network traffic (#LP :284662).
  - Report information about which packages requested a reboot (LP: #538253).
  - Fix breakage on Lucid AMIs having no ramdisk (LP: #574810).
  - Migrate the inter-process communication system from DBus to Twisted AMP.

Show diffs side-by-side

added added

removed removed

Lines of Context:
landscape/manager/eucalyptus.py
4
4
from twisted.internet.defer import succeed
5
5
 
6
6
from landscape.lib.twisted_util import gather_results
7
 
from landscape.manager.manager import ManagerPlugin
 
7
from landscape.manager.plugin import ManagerPlugin
8
8
 
9
9
 
10
10
class EucalyptusInfo(object):
89
89
            self.message_type, self.send_message)
90
90
 
91
91
    def send_message(self):
 
92
        data_path = self.registry.config.data_path
92
93
        try:
93
 
            data_path = self.registry.config.data_path
94
94
            service_hub = self._service_hub_factory(data_path)
95
95
        except Exception, e:
96
96
            logging.exception(e)
150
150
            error that occurred while trying to retrieve credentials.
151
151
        @return: An error message to send to the server.
152
152
        """
 
153
        from imagestore.eucaservice import EucaToolsError
 
154
 
 
155
        if failure.check(EucaToolsError):
 
156
            self.enabled = False
153
157
        error = failure.getBriefTraceback()
154
158
        return {"type": self.error_message_type, "error": error}
155
159
 
181
185
    @return: A L{EucalyptusInfo} instance.
182
186
    """
183
187
    from imagestore.eucaservice import EucaTools
 
188
 
184
189
    return EucalyptusInfo(EucaTools(credentials))