From ac2d7693e02a11d80879ccd80dc33a4f213295e6 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Sun, 19 Feb 2017 15:14:40 -0500
Subject: Add support for inline config changes

This patch changes VPP configuration from file template to inline
change directly. This prevents issue with overwriting existing
VPP config.

Change-Id: I4133be8ebe689d9288e3a8e64cca43afd7e42e64
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 spec/classes/fdio_spec.rb      | 25 +++++++------------------
 spec/classes/honeycomb_spec.rb |  2 +-
 2 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'spec/classes')

diff --git a/spec/classes/fdio_spec.rb b/spec/classes/fdio_spec.rb
index 0cc065a..4b65779 100644
--- a/spec/classes/fdio_spec.rb
+++ b/spec/classes/fdio_spec.rb
@@ -46,9 +46,10 @@ describe 'fdio' do
 
   shared_examples_for 'fdio - config' do
     it {
-      should contain_file('/etc/vpp/startup.conf').with(
-        'path' => '/etc/vpp/startup.conf',
-      )
+      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(
@@ -60,24 +61,12 @@ describe 'fdio' do
 
   shared_examples_for 'fdio - service' do
     it {
-      should contain_vpp_service('vpp').with(
-        'ensure' => 'present',
-        'pci_devs' => [],
-        'state'  => 'up',
+      should contain_service('vpp').with(
+        'ensure' => 'running',
+        'enable'  => true,
       )
     }
 
-    context 'with pci dev' do
-      let(:params) {{:vpp_dpdk_devs => ['0000:00:07.0']}}
-
-      it {
-        should contain_vpp_service('vpp').with(
-          'ensure' => 'present',
-          'pci_devs' => ['0000:00:07.0'],
-          'state' => 'up',
-        )
-      }
-    end
   end
 
   context 'on RedHat platforms' do
diff --git a/spec/classes/honeycomb_spec.rb b/spec/classes/honeycomb_spec.rb
index 8ba367a..fcd31f6 100644
--- a/spec/classes/honeycomb_spec.rb
+++ b/spec/classes/honeycomb_spec.rb
@@ -15,7 +15,7 @@ describe 'fdio::honeycomb' do
   it { should contain_file('honeycomb.json').that_requires('Package[honeycomb]') }
   it { should contain_file('honeycomb.json').that_notifies('Service[honeycomb]') }
   it { should contain_service('honeycomb').that_requires('Package[honeycomb]') }
-  it { should contain_service('honeycomb').that_requires('Vpp_service[vpp]') }
+  it { should contain_service('honeycomb').that_requires('Service[vpp]') }
 
   it { should contain_file('honeycomb.json').with(
     'ensure'  => 'file',
-- 
cgit 1.2.3-korg