
When running Linux kernel 3.14, TSO/GRO could be enabled on compute nodes to improve performances. To improve north-south performances, this feature is needed on Neutron L3 agent nodes. This patch add TSO management for Neutron L3 agent and also change the behavor for previous patch in ensuring that we use a kernel >= 3.14 for both hypervisor & compute nodes. Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
217 lines
7.2 KiB
Ruby
217 lines
7.2 KiB
Ruby
#
|
|
# Copyright (C) 2014 eNovance SAS <licensing@enovance.com>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
# Unit tests for cloud::network::l3 class
|
|
#
|
|
require 'spec_helper'
|
|
|
|
describe 'cloud::network::l3' do
|
|
|
|
shared_examples_for 'openstack network l3' do
|
|
|
|
let :pre_condition do
|
|
"class { 'cloud::network':
|
|
rabbit_hosts => ['10.0.0.1'],
|
|
rabbit_password => 'secrete',
|
|
tunnel_eth => '10.0.1.1',
|
|
api_eth => '10.0.0.1',
|
|
provider_vlan_ranges => ['physnet1:1000:2999'],
|
|
provider_bridge_mappings => ['public:br-pub'],
|
|
flat_networks => ['public'],
|
|
external_int => 'eth1',
|
|
external_bridge => 'br-pub',
|
|
manage_ext_network => false,
|
|
verbose => true,
|
|
debug => true,
|
|
use_syslog => true,
|
|
dhcp_lease_duration => '10',
|
|
tunnel_types => ['vxlan'],
|
|
tenant_network_types => ['vxlan'],
|
|
type_drivers => ['gre', 'vlan', 'flat', 'vxlan'],
|
|
log_facility => 'LOG_LOCAL0' }"
|
|
end
|
|
|
|
let :params do
|
|
{ :debug => true,
|
|
:external_int => 'eth1' }
|
|
end
|
|
|
|
it 'configure neutron common' do
|
|
should contain_class('neutron').with(
|
|
:allow_overlapping_ips => true,
|
|
:dhcp_agents_per_network => '2',
|
|
:verbose => true,
|
|
:debug => true,
|
|
:log_facility => 'LOG_LOCAL0',
|
|
:use_syslog => true,
|
|
:rabbit_user => 'neutron',
|
|
:rabbit_hosts => ['10.0.0.1'],
|
|
:rabbit_password => 'secrete',
|
|
:rabbit_virtual_host => '/',
|
|
:bind_host => '10.0.0.1',
|
|
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
|
|
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
|
|
:log_dir => false,
|
|
:dhcp_lease_duration => '10',
|
|
:report_interval => '30'
|
|
)
|
|
should contain_class('neutron::agents::ovs').with(
|
|
:enable_tunneling => true,
|
|
:tunnel_types => ['vxlan'],
|
|
:bridge_mappings => ['public:br-pub'],
|
|
:local_ip => '10.0.1.1'
|
|
)
|
|
should contain_class('neutron::plugins::ml2').with(
|
|
:type_drivers => ['gre', 'vlan', 'flat', 'vxlan'],
|
|
:tenant_network_types => ['vxlan'],
|
|
:mechanism_drivers => ['openvswitch','l2population'],
|
|
:tunnel_id_ranges => ['1:10000'],
|
|
:network_vlan_ranges => ['physnet1:1000:2999'],
|
|
:flat_networks => ['public'],
|
|
:enable_security_group => true
|
|
)
|
|
should_not contain__neutron_network('public')
|
|
end
|
|
|
|
it 'configure neutron l3' do
|
|
should contain_class('neutron::agents::l3').with(
|
|
:debug => true,
|
|
:external_network_bridge => 'br-ex'
|
|
)
|
|
end
|
|
it 'configure br-ex bridge' do
|
|
should_not contain__vs_bridge('br-ex')
|
|
end
|
|
|
|
it 'configure neutron metering agent' do
|
|
should contain_class('neutron::agents::metering').with(
|
|
:debug => true
|
|
)
|
|
end
|
|
|
|
context 'when using provider external network' do
|
|
let :pre_condition do
|
|
"class { 'cloud::network':
|
|
rabbit_hosts => ['10.0.0.1'],
|
|
rabbit_password => 'secrete',
|
|
tunnel_eth => '10.0.1.1',
|
|
api_eth => '10.0.0.1',
|
|
provider_vlan_ranges => ['physnet1:1000:2999'],
|
|
provider_bridge_mappings => ['public:br-pub'],
|
|
flat_networks => ['public'],
|
|
external_int => 'eth1',
|
|
external_bridge => 'br-pub',
|
|
manage_ext_network => true,
|
|
verbose => true,
|
|
debug => true,
|
|
use_syslog => true,
|
|
dhcp_lease_duration => '10',
|
|
log_facility => 'LOG_LOCAL0' }"
|
|
end
|
|
|
|
before do
|
|
params.merge!(
|
|
:ext_provider_net => true,
|
|
)
|
|
end
|
|
|
|
it 'configure neutron l3 without br-ex' do
|
|
should contain_class('neutron::agents::l3').with(
|
|
:debug => true,
|
|
:external_network_bridge => ''
|
|
)
|
|
end
|
|
|
|
it 'do not configure br-ex bridge' do
|
|
should_not contain_vs_bridge('br-ex')
|
|
end
|
|
|
|
it 'configure br-pub bridge' do
|
|
should contain_vs_bridge('br-pub')
|
|
end
|
|
it 'configure eth1 in br-pub' do
|
|
should contain_vs_port('eth1').with(
|
|
:ensure => 'present',
|
|
:bridge => 'br-pub'
|
|
)
|
|
end
|
|
it 'should not configure provider external network' do
|
|
should_not contain__neutron_network('public')
|
|
end
|
|
end
|
|
|
|
context 'without TSO/GSO/GRO on Debian systems with 3.14 kernel' do
|
|
before :each do
|
|
facts.merge!( :osfamily => 'Debian',
|
|
:kernelmajversion => '3.14' )
|
|
end
|
|
|
|
it 'ensure TSO script is enabled at boot' do
|
|
should contain_exec('enable-tso-script').with(
|
|
:command => '/usr/sbin/update-rc.d disable-tso defaults',
|
|
:unless => '/bin/ls /etc/rc*.d | /bin/grep disable-tso',
|
|
:onlyif => 'test -f /etc/init.d/disable-tso'
|
|
)
|
|
end
|
|
it 'start TSO script' do
|
|
should contain_exec('start-tso-script').with(
|
|
:command => '/etc/init.d/disable-tso start',
|
|
:unless => 'test -f /tmp/disable-tso-lock',
|
|
:onlyif => 'test -f /etc/init.d/disable-tso'
|
|
)
|
|
end
|
|
end
|
|
|
|
context 'ensure TSO/GSO/GRO is not managed on Debian systems with kernel < 3.14' do
|
|
before :each do
|
|
facts.merge!( :osfamily => 'Debian',
|
|
:kernelmajversion => '3.12' )
|
|
end
|
|
|
|
it 'ensure TSO script is not enabled at boot' do
|
|
should_not contain_exec('enable-tso-script')
|
|
end
|
|
it 'do no tstart TSO script' do
|
|
should_not contain_exec('start-tso-script')
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'on Debian platforms' do
|
|
let :facts do
|
|
{ :osfamily => 'Debian' }
|
|
end
|
|
|
|
let :platform_params do
|
|
{ :gre_module_name => 'gre' }
|
|
end
|
|
|
|
it_configures 'openstack network l3'
|
|
end
|
|
|
|
context 'on RedHat platforms' do
|
|
let :facts do
|
|
{ :osfamily => 'RedHat' }
|
|
end
|
|
|
|
let :platform_params do
|
|
{ :gre_module_name => 'ip_gre' }
|
|
end
|
|
|
|
it_configures 'openstack network l3'
|
|
end
|
|
|
|
end
|