← Back to branch summary

~cloudbuilders/nova/os-keypair-integration

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/fakes.py

  • Committer: Vishvananda Ishaya
  • Date: 2011-09-01 04:55:12 UTC
  • mfrom: (1455.1.62 nova)
  • Revision ID: vishvananda@gmail.com-20110901045512-ndwp9nu3alwbnnj8
merge trunk, fix tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/fakes.py
117
117
        return []
118
118
 
119
119
    if have_key_pair:
120
 
        stubs.Set(nova.db, 'key_pair_get_all_by_user', key_pair)
121
 
        stubs.Set(nova.db, 'key_pair_get', one_key_pair)
 
120
        stubs.Set(nova.db.api, 'key_pair_get_all_by_user', key_pair)
 
121
        stubs.Set(nova.db.api, 'key_pair_get', one_key_pair)
122
122
    else:
123
 
        stubs.Set(nova.db, 'key_pair_get_all_by_user', no_key_pair)
 
123
        stubs.Set(nova.db.api, 'key_pair_get_all_by_user', no_key_pair)
124
124
 
125
125
 
126
126
def stub_out_image_service(stubs):