lp://staging/~tealeg/landscape-client/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

700. By Geoff Teale on 2013-07-10

Fix syntax error. [trivial,a=tealeg,r=ack]

699. By Geoff Teale on 2013-07-10

Merge broker_handles_scoped_resynch [f=1198081] [r=bjornt,free.ekanayaka] [a=Geoff Teale]
This branch is the first of small series (probably 3) of
branches that implement scoped resynchronisation on the
client.

This branch does the following:

- Modifies the message schema so that ResynchronizeRequest
  contains a scopes parameter

- Changes MessageExchange.handle_resynchronize to read the
  scopes variable from the message and broadcast that list
  in the "resynchronize-clients" event.

- Modifies the RegistrationHandler so that when it
  triggers a resynchronisation it does so explicitly with
  global scope.

Although the tests should all pass in this branch it will
actually leave all the plugins that respond to
resynchronize-clients events in a broken state. That's
purely because I'm splitting a bigger branch and will be
addressed in the next one.

698. By Chris Glass on 2013-07-10

Merge from release branch (lp:~landscape/landscape-client/release)

697. By Geoff Teale on 2013-07-05

Merged add-session-ids-to-activity-responses [r=jseutter,free.ekanayaka] [f=1158822].

This branch implements the client side parts of a mechanism described here: https://wiki.canonical.com/Landscape/SpecRegistry/0047

In landscape.broker.store.MessageStore I've added three methods, get_session_id, is_valid_session_id, and drop_session_ids, they respectively create and store a new ID (with optional scope), check for existence of a given ID in the store, and delete all IDs within a certain scope. As I write this I suspect it might be sensible to remove scope as the work that requires it is unlikely to get scheduled soon (currently it always uses the default scope, None).

landscape.broker.server.BrokerServer has a get_session_id method that essentially is a pass-through to the MessageStore method. The send_message method on the BrokerServer has been modified to always require a session_id, which it will validate. If the session_id is not known to the message store then the message will be dropped, silently.

landscape.broker.exchange.MessageExchange will now drop all session-ids when it handles a resynchronize request. This means that any messages that are sent with IDs generated before that request will simply be dropped.

696. By Geoff Teale on 2013-06-28

Merge add-comms-docs [f=1194479] [r=free.ekanayaka,ack] [a=Geoff Teale]
This branch embeds some of the content from sequence
diagrams I made to describe the following
 client/server processes:

   - Ping
   - Message exchange
   - Resynchronisation

The intent has been to, as far as possible, limit
the scope to what is relevant to the file in which it
is being embedded. I have however branched out a
little in places where that seemed useful or
worthwhile.

695. By Alberto Donato on 2013-06-28

Merge detect-openstack-vm [f=1191843] [r=tealeg,bjornt] [a=Alberto Donato]
This changes the detection logic for kvm virtual machines, looking for the "Bochs" as reported by OpenStack Folsom) or "OpenStack" (as reported by Grizzly) vendor in /sys rather than the CPU model.
It also refactors a bit the existing logic, and only tries to detect HyperV/VmWare/KVM if the "hypervisor" flag is present in /proc/cpuinfo, which is meant to report that the machine is running under an hypervisor.

694. By Alberto Donato on 2013-06-26

Update UPSTERAM_VERSION to 13.06 [trivial] [r=andreas].

693. By Andreas Hasenack on 2013-06-19

Fix version number.

692. By Chris Glass on 2013-06-19

Fixed debian/changelog to be consistent with the name of the release

691. By Free Ekanayaka on 2013-06-19

Merge use-upstream-gather-results [f=1192138] [r=jseutter,ack] [a=Free Ekanayaka]
This mostly a trivial branch, just replaces our landscape.lib.twisted_utils.gather_results function with Twisted's official twisted.internet.defer.gatherResults.