diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-05 19:05:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-05 19:05:51 +0000 |
| commit | fbb4fbf9955dc3edd217472631b514d4c52f5b8a (patch) | |
| tree | 2b9c258f196754621799dcd0d588042429f07e1f | |
| parent | 4e4ec8178e6667f5e9eb7d92d9c014fc51686201 (diff) | |
| parent | 04d6def2b1702c962757d59ed086a2577300712a (diff) | |
| download | nova-fbb4fbf9955dc3edd217472631b514d4c52f5b8a.tar.gz nova-fbb4fbf9955dc3edd217472631b514d4c52f5b8a.tar.xz nova-fbb4fbf9955dc3edd217472631b514d4c52f5b8a.zip | |
Merge "Remove unnecessary target_host flag in xenapi driver tests"
| -rw-r--r-- | nova/tests/test_xenapi.py | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 83b0c6a37..e39049d34 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -143,11 +143,10 @@ class XenAPIVolumeTestCase(stubs.XenAPITestBase): self.user_id = 'fake' self.project_id = 'fake' self.context = context.RequestContext(self.user_id, self.project_id) - self.flags(target_host='127.0.0.1', - xenapi_connection_url='test_url', - xenapi_connection_password='test_pass', - firewall_driver='nova.virt.xenapi.firewall.' - 'Dom0IptablesFirewallDriver') + self.flags(xenapi_connection_url='test_url', + xenapi_connection_password='test_pass', + firewall_driver='nova.virt.xenapi.firewall.' + 'Dom0IptablesFirewallDriver') db_fakes.stub_out_db_instance_api(self.stubs) self.instance_values = {'id': 1, 'project_id': self.user_id, @@ -876,11 +875,10 @@ class XenAPIMigrateInstance(stubs.XenAPITestBase): def setUp(self): super(XenAPIMigrateInstance, self).setUp() - self.flags(target_host='127.0.0.1', - xenapi_connection_url='test_url', - xenapi_connection_password='test_pass', - firewall_driver='nova.virt.xenapi.firewall.' - 'Dom0IptablesFirewallDriver') + self.flags(xenapi_connection_url='test_url', + xenapi_connection_password='test_pass', + firewall_driver='nova.virt.xenapi.firewall.' + 'Dom0IptablesFirewallDriver') stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests) db_fakes.stub_out_db_instance_api(self.stubs) xenapi_fake.create_network('fake', FLAGS.flat_network_bridge) @@ -1168,8 +1166,7 @@ class XenAPIHostTestCase(stubs.XenAPITestBase): class XenAPIAutoDiskConfigTestCase(stubs.XenAPITestBase): def setUp(self): super(XenAPIAutoDiskConfigTestCase, self).setUp() - self.flags(target_host='127.0.0.1', - xenapi_connection_url='test_url', + self.flags(xenapi_connection_url='test_url', xenapi_connection_password='test_pass', firewall_driver='nova.virt.xenapi.firewall.' 'Dom0IptablesFirewallDriver') @@ -1259,8 +1256,7 @@ class XenAPIGenerateLocal(stubs.XenAPITestBase): """Test generating of local disks, like swap and ephemeral""" def setUp(self): super(XenAPIGenerateLocal, self).setUp() - self.flags(target_host='127.0.0.1', - xenapi_connection_url='test_url', + self.flags(xenapi_connection_url='test_url', xenapi_connection_password='test_pass', xenapi_generate_swap=True, firewall_driver='nova.virt.xenapi.firewall.' @@ -1336,8 +1332,7 @@ class XenAPIBWUsageTestCase(stubs.XenAPITestBase): super(XenAPIBWUsageTestCase, self).setUp() self.stubs.Set(vm_utils, 'compile_metrics', XenAPIBWUsageTestCase._fake_compile_metrics) - self.flags(target_host='127.0.0.1', - xenapi_connection_url='test_url', + self.flags(xenapi_connection_url='test_url', xenapi_connection_password='test_pass', firewall_driver='nova.virt.xenapi.firewall.' 'Dom0IptablesFirewallDriver') |