← Back to branch summary

~therve/landscape-client/sysinfo-network-disks

« back to all changes in this revision

Viewing changes to landscape/broker/transport.py

  • Committer: Free Ekanayaka
  • Date: 2010-01-27 10:33:17 UTC
  • mfrom: (194.1.2 client-api-bump)
  • Revision ID: free.ekanayaka@canonical.com-20100127103317-b5khytx1npz84cvu
Merge client-api-bump [f=511149] [r=sidnei,therve]

Split the API variable in SERVER_API and CLIENT_API, this let us evolve
them separately.

Show diffs side-by-side

added added

removed removed

Lines of Context:
landscape/broker/transport.py
8
8
from landscape.lib.fetch import fetch
9
9
from landscape.lib import bpickle
10
10
from landscape.log import format_delta
11
 
from landscape import API, VERSION
 
11
from landscape import SERVER_API, VERSION
12
12
 
13
13
 
14
14
class HTTPTransport(object):
40
40
        return (curl, fetch(self._url, post=True, data=payload,
41
41
                            headers=headers, cainfo=self._pubkey, curl=curl))
42
42
 
43
 
    def exchange(self, payload, computer_id=None, message_api=API):
 
43
    def exchange(self, payload, computer_id=None, message_api=SERVER_API):
44
44
        """Exchange message data with the server.
45
45
 
46
46
        @param payload: The object to send, it must be L{bpickle}-compatible.
105
105
    def set_url(self, url):
106
106
        self._url = url
107
107
 
108
 
    def exchange(self, payload, computer_id=None, message_api=API):
 
108
    def exchange(self, payload, computer_id=None, message_api=SERVER_API):
109
109
        self.payloads.append(payload)
110
110
        self.computer_id = computer_id
111
111
        self.message_api = message_api