~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/tests/test_vmwareapi.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-08-16 14:04:11 UTC
  • mto: This revision was merged to the branch mainline in revision 84.
  • Revision ID: package-import@ubuntu.com-20120816140411-0mr4n241wmk30t9l
Tags: upstream-2012.2~f3
ImportĀ upstreamĀ versionĀ 2012.2~f3

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
import nova.tests.image.fake
29
29
from nova.tests.vmwareapi import db_fakes
30
30
from nova.tests.vmwareapi import stubs
 
31
from nova.virt.vmwareapi import driver
31
32
from nova.virt.vmwareapi import fake as vmwareapi_fake
32
 
from nova.virt import vmwareapi_conn
33
33
 
34
34
 
35
35
FLAGS = flags.FLAGS
50
50
        vmwareapi_fake.reset()
51
51
        db_fakes.stub_out_db_instance_api(self.stubs)
52
52
        stubs.set_stubs(self.stubs)
53
 
        self.conn = vmwareapi_conn.VMWareESXDriver(False)
 
53
        self.conn = driver.VMWareESXDriver(False)
54
54
        # NOTE(vish): none of the network plugging code is actually
55
55
        #             being tested
56
56
        self.network_info = [({'bridge': 'fa0',