Merge "Make test_compute pass with CONF.use_neutron=True by default"

This commit is contained in:
Jenkins
2017-01-04 17:34:59 +00:00
committed by Gerrit Code Review

View File

@@ -969,6 +969,15 @@ class NeutronFixture(fixtures.Fixture):
'nova.network.neutronv2.api.API.'
'create_pci_requests_for_sriov_ports',
lambda *args, **kwargs: None)
self.test.stub_out(
'nova.network.neutronv2.api.API.setup_networks_on_host',
lambda *args, **kwargs: None)
self.test.stub_out(
'nova.network.neutronv2.api.API.migrate_instance_start',
lambda *args, **kwargs: None)
self.test.stub_out(
'nova.network.neutronv2.api.API.migrate_instance_finish',
lambda *args, **kwargs: None)
self.test.stub_out(
'nova.network.security_group.neutron_driver.SecurityGroupAPI.'
'get_instances_security_groups_bindings',