← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/compute/contrib/test_admin_actions.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/compute/contrib/test_admin_actions.py
22
22
from nova import context
23
23
from nova import exception
24
24
from nova import flags
 
25
from nova.scheduler import rpcapi as scheduler_rpcapi
25
26
from nova import test
 
27
from nova.tests.api.openstack import fakes
26
28
from nova import utils
27
 
from nova.scheduler import api as scheduler_api
28
 
from nova.tests.api.openstack import fakes
29
29
 
30
30
 
31
31
FLAGS = flags.FLAGS
59
59
    return {'id': 1, 'uuid': instance_id}
60
60
 
61
61
 
62
 
def fake_scheduler_api_live_migration(context, block_migration,
 
62
def fake_scheduler_api_live_migration(self, context, block_migration,
63
63
                                      disk_over_commit, instance_id,
64
64
                                      dest, topic):
65
65
    return None
87
87
        self.UUID = utils.gen_uuid()
88
88
        for _method in self._methods:
89
89
            self.stubs.Set(compute.API, _method, fake_compute_api)
90
 
        self.stubs.Set(scheduler_api,
 
90
        self.stubs.Set(scheduler_rpcapi.SchedulerAPI,
91
91
                       'live_migration',
92
92
                       fake_scheduler_api_live_migration)
93
93