openstack/nova
Code Issues Proposed changes

Merge "nova-net: Make even more nova-net stuff optional"

Browse Source
This commit is contained in:
Zuul 2019-10-08 19:33:57 +00:00 committed by Gerrit Code Review
commit 89430c574f
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
nova/tests/functional/api_sample_tests/api_sample_base.py
View File

@ -126,30 +126,38 @@ class ApiSampleTestBaseV21(testscenarios.WithScenarios,
# this is used to generate sample docs # this is used to generate sample docs
self.generate_samples = os.getenv('GENERATE_SAMPLES') is not None self.generate_samples = os.getenv('GENERATE_SAMPLES') is not None
# NOTE(mikal): this is used to stub away privsep helpers # TODO(stephenfin): Remove once we remove the few remaining
def fake_noop(*args, **kwargs): # nova-network-only APIs
return '', '' if not self.USE_NEUTRON:
# NOTE(mikal): this is used to stub away privsep helpers
def fake_noop(*args, **kwargs):
return '', ''
def fake_true(*args, **kwargs): def fake_true(*args, **kwargs):
return True return True
self.stub_out('nova.privsep.linux_net.add_bridge', fake_noop) self.stub_out('nova.privsep.linux_net.add_bridge', fake_noop)
self.stub_out('nova.privsep.linux_net.set_device_mtu', fake_noop) self.stub_out('nova.privsep.linux_net.set_device_mtu', fake_noop)
self.stub_out('nova.privsep.linux_net.set_device_enabled', fake_noop) self.stub_out('nova.privsep.linux_net.set_device_enabled',
self.stub_out('nova.privsep.linux_net.set_device_macaddr', fake_noop) fake_noop)
self.stub_out('nova.privsep.linux_net.routes_show', fake_noop) self.stub_out('nova.privsep.linux_net.set_device_macaddr',
self.stub_out('nova.privsep.linux_net.lookup_ip', fake_noop) fake_noop)
self.stub_out('nova.privsep.linux_net.change_ip', fake_noop) self.stub_out('nova.privsep.linux_net.routes_show', fake_noop)
self.stub_out('nova.privsep.linux_net.address_command_deprecated', self.stub_out('nova.privsep.linux_net.lookup_ip', fake_noop)
fake_noop) self.stub_out('nova.privsep.linux_net.change_ip', fake_noop)
self.stub_out('nova.privsep.linux_net.ipv4_forwarding_check', self.stub_out('nova.privsep.linux_net.address_command_deprecated',
fake_true) fake_noop)
self.stub_out('nova.privsep.linux_net._enable_ipv4_forwarding_inner', self.stub_out('nova.privsep.linux_net.ipv4_forwarding_check',
fake_noop) fake_true)
self.stub_out('nova.privsep.linux_net.add_vlan', fake_noop) self.stub_out('nova.privsep.linux_net.'
self.stub_out('nova.privsep.linux_net.bridge_setfd', fake_noop) '_enable_ipv4_forwarding_inner',
self.stub_out('nova.privsep.linux_net.bridge_disable_stp', fake_noop) fake_noop)
self.stub_out('nova.privsep.linux_net.bridge_add_interface', fake_noop) self.stub_out('nova.privsep.linux_net.add_vlan', fake_noop)
self.stub_out('nova.privsep.linux_net.bridge_setfd', fake_noop)
self.stub_out('nova.privsep.linux_net.bridge_disable_stp',
fake_noop)
self.stub_out('nova.privsep.linux_net.bridge_add_interface',
fake_noop)
if self.availability_zones: if self.availability_zones:
self.useFixture( self.useFixture(