diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-11 15:44:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-11 15:44:24 +0000 |
| commit | 0c8d9c749a5d697c49ba45c08ba716c47809e2ab (patch) | |
| tree | 6311f0f5bf42b3ff8693e6af1deafd9036727464 /nova/tests | |
| parent | 8c4441822731933502e8a5e1149dc6e4888f8dcb (diff) | |
| parent | 44db828e8c7bd5a0cdb794d35234d824261a4644 (diff) | |
Merge "Split xenapi agent code out to nova.virt.xenapi.agent"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_xenapi.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 301c78d69..b7caf63ba 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -40,6 +40,7 @@ from nova.tests import fake_network from nova.tests import fake_utils import nova.tests.image.fake as fake_image from nova.tests.xenapi import stubs +from nova.virt.xenapi import agent from nova.virt.xenapi import driver as xenapi_conn from nova.virt.xenapi import fake as xenapi_fake from nova.virt.xenapi import vm_utils @@ -862,8 +863,8 @@ class XenAPIDiffieHellmanTestCase(test.TestCase): """Unit tests for Diffie-Hellman code.""" def setUp(self): super(XenAPIDiffieHellmanTestCase, self).setUp() - self.alice = vmops.SimpleDH() - self.bob = vmops.SimpleDH() + self.alice = agent.SimpleDH() + self.bob = agent.SimpleDH() def test_shared(self): alice_pub = self.alice.get_public() |