From 55c9ca2f20c501209d883d288797d7b25b3ceb4f Mon Sep 17 00:00:00 2001 From: Wojciech Dec Date: Tue, 14 Nov 2017 14:29:51 +0100 Subject: Remove default setting of uio_driver Change-Id: Iabf7a4e33e88a2127e1746fa9a585a6ddd46eef9 Signed-off-by: Wojciech Dec --- spec/acceptance/fdio_spec.rb | 1 - spec/classes/fdio_spec.rb | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/acceptance/fdio_spec.rb b/spec/acceptance/fdio_spec.rb index 293707f..400641b 100644 --- a/spec/acceptance/fdio_spec.rb +++ b/spec/acceptance/fdio_spec.rb @@ -21,7 +21,6 @@ describe 'fdio' do describe file('/etc/vpp/startup.conf') do it { is_expected.to exist } - its(:content) { should match /uio-driver\s+uio_pci_generic/ } end describe service('vpp') do diff --git a/spec/classes/fdio_spec.rb b/spec/classes/fdio_spec.rb index b543246..c14fe87 100644 --- a/spec/classes/fdio_spec.rb +++ b/spec/classes/fdio_spec.rb @@ -51,17 +51,23 @@ describe 'fdio' do shared_examples_for 'fdio - config' do it { - should contain_vpp_config('dpdk/uio-driver').with_value('uio_pci_generic') should contain_vpp_config('dpdk/dev/default') should contain_vpp_config('cpu/main-core') should contain_vpp_config('cpu/corelist-workers') } - it { - should contain_exec('insert_dpdk_kmod').with( - 'command' => 'modprobe uio_pci_generic', - 'unless' => 'lsmod | grep uio_pci_generic', - ) - } + + context 'with uio_driver' do + before :each do + params.merge!(:vpp_dpdk_uio_driver => 'uio_pci_generic') + end + it 'should configure uio_driver setting' do + is_expected.to contain_vpp_config('dpdk/uio-driver').with_value('uio_pci_generic') + is_expected.to contain_exec('insert_dpdk_kmod').with( + 'command' => 'modprobe uio_pci_generic', + 'unless' => 'lsmod | grep uio_pci_generic', + ) + end + end context 'with socket_mem' do before :each do -- cgit 1.2.3-korg