← Back to branch summary

~gandelman-a/ubuntu/precise/nova/UCA_2012.2.1

« back to all changes in this revision

Viewing changes to nova/scheduler/rpcapi.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman, Adam Gandelman, Chuck Short
  • Date: 2012-08-27 15:37:18 UTC
  • mfrom: (1.1.60)
  • Revision ID: package-import@ubuntu.com-20120827153718-lj8er44eqqz1gsrj
Tags: 2012.2~rc1~20120827.15815-0ubuntu1
https://launchpad.net/bugs/820694
[ Adam Gandelman ]
* New upstream release.

[ Chuck Short ]
* debian/patches/0001-Update-tools-hacking-for-pep8-1.2-and-
  beyond.patch: Dropped we dont run pep8 tests anymore.
* debian/control: Drop pep8 build depends
* debian/*.upstart.in: Make sure we transition correctly from runlevel
  1 to 2. (LP: #820694)

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/scheduler/rpcapi.py
40
40
        1.3 - Remove instance_id, add instance to live_migration
41
41
        1.4 - Remove update_db from prep_resize
42
42
        1.5 - Add reservations argument to prep_resize()
 
43
        1.6 - Remove reservations argument to run_instance()
43
44
    '''
44
45
 
45
46
    BASE_RPC_API_VERSION = '1.0'
50
51
 
51
52
    def run_instance(self, ctxt, request_spec, admin_password,
52
53
            injected_files, requested_networks, is_first_time,
53
 
            filter_properties, reservations, call=True):
54
 
        rpc_method = self.call if call else self.cast
55
 
        return rpc_method(ctxt, self.make_msg('run_instance',
 
54
            filter_properties):
 
55
        return self.cast(ctxt, self.make_msg('run_instance',
56
56
                request_spec=request_spec, admin_password=admin_password,
57
57
                injected_files=injected_files,
58
58
                requested_networks=requested_networks,
59
59
                is_first_time=is_first_time,
60
 
                filter_properties=filter_properties,
61
 
                reservations=reservations), version='1.2')
 
60
                filter_properties=filter_properties), version='1.6')
62
61
 
63
62
    def prep_resize(self, ctxt, instance, instance_type, image,
64
63
            request_spec, filter_properties, reservations):