← Back to branch summary

~cerberus/nova/xs_migrations

« back to all changes in this revision

Viewing changes to nova/tests/test_xenapi.py

  • Committer: Cerberus
  • Date: 2011-02-17 20:23:28 UTC
  • mfrom: (569.1.124 nova)
  • Revision ID: matt.dietz@rackspace.com-20110217202328-i5iswmy28n9dme63
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_xenapi.py
32
32
from nova.virt.xenapi import fake as xenapi_fake
33
33
from nova.virt.xenapi import volume_utils
34
34
from nova.virt.xenapi.vmops import SimpleDH
 
35
from nova.virt.xenapi.vmops import VMOps
35
36
from nova.tests.db import fakes as db_fakes
36
37
from nova.tests.xenapi import stubs
37
38
from nova.tests.glance import stubs as glance_stubs
141
142
        self.stubs.UnsetAll()
142
143
 
143
144
 
 
145
def reset_network(*args):
 
146
    pass
 
147
 
 
148
 
144
149
class XenAPIVMTestCase(test.TestCase):
145
150
    """
146
151
    Unit tests for VM operations
162
167
        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
163
168
        stubs.stubout_get_this_vm_uuid(self.stubs)
164
169
        stubs.stubout_stream_disk(self.stubs)
 
170
        self.stubs.Set(VMOps, 'reset_network', reset_network)
165
171
        glance_stubs.stubout_glance_client(self.stubs,
166
172
                                           glance_stubs.FakeGlance)
167
173
        self.conn = xenapi_conn.get_connection(False)