From 81b99caae021593ba65f2fe6a2dbc0f9532d1c70 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Tue, 5 Sep 2017 16:06:31 -0400 Subject: [PATCH] Make xen unit tests work with os-xenapi>=0.3.0 Change Ie1b49a206b57219083059871f326926cc4628142 in os-xenapi 0.3.0 requires that the URL passed into the XenAPISession is an actual URL, which means we need to fix a bunch of unit tests. Change-Id: Ida4b8c33e8b3bbd03548648f8e57d923b255f35c Closes-Bug: #1715217 --- nova/tests/unit/compute/test_compute_xen.py | 2 +- .../unit/virt/xenapi/image/test_glance.py | 2 +- nova/tests/unit/virt/xenapi/test_driver.py | 2 +- nova/tests/unit/virt/xenapi/test_vm_utils.py | 6 ++--- nova/tests/unit/virt/xenapi/test_vmops.py | 4 +-- nova/tests/unit/virt/xenapi/test_xenapi.py | 25 ++++++++++--------- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/nova/tests/unit/compute/test_compute_xen.py b/nova/tests/unit/compute/test_compute_xen.py index 372676c6d8..aa51218769 100644 --- a/nova/tests/unit/compute/test_compute_xen.py +++ b/nova/tests/unit/compute/test_compute_xen.py @@ -32,7 +32,7 @@ class ComputeXenTestCase(stubs.XenAPITestBaseNoDB): def setUp(self): super(ComputeXenTestCase, self).setUp() self.flags(compute_driver='xenapi.XenAPIDriver') - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') diff --git a/nova/tests/unit/virt/xenapi/image/test_glance.py b/nova/tests/unit/virt/xenapi/image/test_glance.py index 0e4c3da7c1..e1bf68823f 100644 --- a/nova/tests/unit/virt/xenapi/image/test_glance.py +++ b/nova/tests/unit/virt/xenapi/image/test_glance.py @@ -38,7 +38,7 @@ class TestGlanceStore(stubs.XenAPITestBaseNoDB): self.store = glance.GlanceStore() self.flags(api_servers=['http://localhost:9292'], group='glance') - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') diff --git a/nova/tests/unit/virt/xenapi/test_driver.py b/nova/tests/unit/virt/xenapi/test_driver.py index 13586352ff..13ffbe4226 100644 --- a/nova/tests/unit/virt/xenapi/test_driver.py +++ b/nova/tests/unit/virt/xenapi/test_driver.py @@ -31,7 +31,7 @@ class XenAPIDriverTestCase(stubs.XenAPITestBaseNoDB): def _get_driver(self): stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests) - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') return xenapi.XenAPIDriver(fake.FakeVirtAPI(), False) diff --git a/nova/tests/unit/virt/xenapi/test_vm_utils.py b/nova/tests/unit/virt/xenapi/test_vm_utils.py index 4e0b088b60..724001b0bd 100644 --- a/nova/tests/unit/virt/xenapi/test_vm_utils.py +++ b/nova/tests/unit/virt/xenapi/test_vm_utils.py @@ -517,7 +517,7 @@ class GetInstanceForVdisForSrTestCase(VMUtilsTestBase): self.flags(instance_name_template='%d', firewall_driver='nova.virt.xenapi.firewall.' 'Dom0IptablesFirewallDriver') - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') @@ -1181,7 +1181,7 @@ class VMUtilsSRPath(VMUtilsTestBase): self.flags(instance_name_template='%d', firewall_driver='nova.virt.xenapi.firewall.' 'Dom0IptablesFirewallDriver') - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') stubs.stubout_session(self.stubs, fake.SessionBase) @@ -2123,7 +2123,7 @@ class CreateVmRecordTestCase(VMUtilsTestBase): self.flags(instance_name_template='%d', firewall_driver='nova.virt.xenapi.firewall.' 'Dom0IptablesFirewallDriver') - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') diff --git a/nova/tests/unit/virt/xenapi/test_vmops.py b/nova/tests/unit/virt/xenapi/test_vmops.py index c4239bcde8..98e38468aa 100644 --- a/nova/tests/unit/virt/xenapi/test_vmops.py +++ b/nova/tests/unit/virt/xenapi/test_vmops.py @@ -56,8 +56,8 @@ class VMOpsTestBase(stubs.XenAPITestBaseNoDB): def _setup_mock_vmops(self, product_brand=None, product_version=None): stubs.stubout_session(self.stubs, xenapi_fake.SessionBase) - self._session = xenapi_session.XenAPISession('test_url', 'root', - 'test_pass') + self._session = xenapi_session.XenAPISession( + 'http://localhost', 'root', 'test_pass') self.vmops = vmops.VMOps(self._session, fake.FakeVirtAPI()) def create_vm(self, name, state="Running"): diff --git a/nova/tests/unit/virt/xenapi/test_xenapi.py b/nova/tests/unit/virt/xenapi/test_xenapi.py index e0cf2dea07..5dbc041b13 100644 --- a/nova/tests/unit/virt/xenapi/test_xenapi.py +++ b/nova/tests/unit/virt/xenapi/test_xenapi.py @@ -143,7 +143,8 @@ IMAGE_FIXTURES = { def get_session(): - return xenapi_session.XenAPISession('test_url', 'root', 'test_pass') + return xenapi_session.XenAPISession( + 'http://localhost', 'root', 'test_pass') def set_image_fixtures(): @@ -234,7 +235,7 @@ class XenAPIVolumeTestCase(stubs.XenAPITestBaseNoDB): group='oslo_concurrency') self.flags(firewall_driver='nova.virt.xenapi.firewall.' 'Dom0IptablesFirewallDriver') - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') @@ -294,7 +295,7 @@ class XenAPIVMTestCase(stubs.XenAPITestBase, self.flags(instance_name_template='%d', firewall_driver='nova.virt.xenapi.firewall.' 'Dom0IptablesFirewallDriver') - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') db_fakes.stub_out_db_instance_api(self) @@ -1637,7 +1638,7 @@ class XenAPIMigrateInstance(stubs.XenAPITestBase): def setUp(self): super(XenAPIMigrateInstance, self).setUp() - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') self.flags(firewall_driver='nova.virt.xenapi.firewall.' @@ -2125,7 +2126,7 @@ class XenAPIHostTestCase(stubs.XenAPITestBase): def setUp(self): super(XenAPIHostTestCase, self).setUp() - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests) @@ -2396,7 +2397,7 @@ class ToSupportedInstancesTestCase(test.NoDBTestCase): class XenAPIAutoDiskConfigTestCase(stubs.XenAPITestBase): def setUp(self): super(XenAPIAutoDiskConfigTestCase, self).setUp() - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') self.flags(firewall_driver='nova.virt.xenapi.firewall.' @@ -2523,7 +2524,7 @@ class XenAPIGenerateLocal(stubs.XenAPITestBase): """Test generating of local disks, like swap and ephemeral.""" def setUp(self): super(XenAPIGenerateLocal, self).setUp() - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') self.flags(firewall_driver='nova.virt.xenapi.firewall.' @@ -2641,7 +2642,7 @@ class XenAPIBWCountersTestCase(stubs.XenAPITestBaseNoDB): super(XenAPIBWCountersTestCase, self).setUp() self.stubs.Set(vm_utils, 'list_vms', XenAPIBWCountersTestCase._fake_list_vms) - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') self.flags(firewall_driver='nova.virt.xenapi.firewall.' @@ -2777,7 +2778,7 @@ class XenAPIDom0IptablesFirewallTestCase(stubs.XenAPITestBase): def setUp(self): super(XenAPIDom0IptablesFirewallTestCase, self).setUp() - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') self.flags(instance_name_template='%d', @@ -3061,7 +3062,7 @@ class XenAPIAggregateTestCase(stubs.XenAPITestBase): """Unit tests for aggregate operations.""" def setUp(self): super(XenAPIAggregateTestCase, self).setUp() - self.flags(connection_url='http://test_url', + self.flags(connection_url='http://localhost', connection_username='test_user', connection_password='test_pass', group='xenserver') @@ -3441,7 +3442,7 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBaseNoDB): """Unit tests for live_migration.""" def setUp(self): super(XenAPILiveMigrateTestCase, self).setUp() - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') self.flags(firewall_driver='nova.virt.xenapi.firewall.' @@ -3950,7 +3951,7 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBaseNoDB): class XenAPIInjectMetadataTestCase(stubs.XenAPITestBaseNoDB): def setUp(self): super(XenAPIInjectMetadataTestCase, self).setUp() - self.flags(connection_url='test_url', + self.flags(connection_url='http://localhost', connection_password='test_pass', group='xenserver') self.flags(firewall_driver='nova.virt.xenapi.firewall.'