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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2013-02-22 09:27:29 UTC
  • mfrom: (1.1.68)
  • Revision ID: package-import@ubuntu.com-20130222092729-nn3gt8rf97uvts77
Tags: 2013.1.g3-0ubuntu1
[ Chuck Short ]
* New usptream release. 
* debian/patches/debian/patches/fix-ubuntu-tests.patch: Refreshed.
* debian/nova-baremetal.logrotate: Fix logfile path.
* debian/control, debian/nova-spiceproxy.{install, logrotate, upstart}:
  Add spice html5 proxy support.
* debian/nova-novncproxy.upstart: Start on runlevel [2345]
* debian/rules: Call testr directly since run_tests.sh -N gives weird return
  value when tests pass.
* debian/pyddist-overrides: Add websockify.
* debian/nova-common.postinst: Removed config file conversion, since
  the option is no longer available. (LP: #1110567)
* debian/control: Add python-pyasn1 as a dependency.
* debian/control: Add python-oslo-config as a dependency.
* debian/control: Suggest sysfsutils, sg3-utils, multipath-tools for fibre
  channel support.

[ Adam Gandelman ]
* debian/control: Fix typo (websocikfy -> websockify).

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
#    under the License.
15
15
 
16
16
from lxml import etree
 
17
from oslo.config import cfg
17
18
import webob
18
19
 
19
20
from nova.api.metadata import password
20
21
from nova import compute
21
 
from nova.openstack.common import cfg
22
22
from nova.openstack.common import jsonutils
23
23
from nova import test
24
24
from nova.tests.api.openstack import fakes
40
40
        def fake_extract_password(instance):
41
41
            return self.password
42
42
 
43
 
        def fake_set_password(context, instance_uuid, password):
 
43
        def fake_convert_password(context, password):
44
44
            self.password = password
 
45
            return {}
45
46
 
46
47
        self.stubs.Set(password, 'extract_password', fake_extract_password)
47
 
        self.stubs.Set(password, 'set_password', fake_set_password)
 
48
        self.stubs.Set(password, 'convert_password', fake_convert_password)
48
49
        self.flags(
49
50
            osapi_compute_extension=[
50
51
                'nova.api.openstack.compute.contrib.select_extensions'],