openstack/puppet-neutron
Code Issues Proposed changes

Load libraries in a single place

Browse Source 
This change refactors how the dependent libraries are loaded during
unit tests, and load the libraries in the base spec_helper to avoid
duplicate and redundant implementations.

Change-Id: I2b766959dd8ce8cb59f50226f52839ec786f33f9
This commit is contained in:
Takashi Kajinami
2021-12-27 10:51:28 +09:00
parent e4e61a9e4c
commit c14dbaccb1
28 changed files with 3 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spec/spec_helper.rb
View File

@@ -1,3 +1,6 @@
# Load libraries here to simulate how they live together in a real puppet run (for provider unit tests)
$LOAD_PATH.push(File.join(File.dirname(__FILE__), 'fixtures', 'modules', 'inifile', 'lib'))
$LOAD_PATH.push(File.join(File.dirname(__FILE__), 'fixtures', 'modules', 'openstacklib', 'lib'))
require 'puppetlabs_spec_helper/module_spec_helper'
require 'shared_examples'
require 'puppet-openstack_spec_helper/facts'

23
spec/unit/provider/ironic_neutron_agent_config/ini_settings_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:ironic_neutron_agent_config).provider(:ini_setting)

23
spec/unit/provider/neutron_agent_linuxbridge/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_agent_linuxbridge).provider(:ini_setting)

23
spec/unit/provider/neutron_agent_ovs/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_agent_ovs).provider(:ini_setting)

23
spec/unit/provider/neutron_agent_vpp/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_agent_vpp).provider(:ini_setting)

23
spec/unit/provider/neutron_api_config/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_api_config).provider(:ini_setting)

16
spec/unit/provider/neutron_api_paste_ini/ini_setting_spec.rb
View File

@@ -1,19 +1,3 @@
#
# these tests are a little concerning b/c they are hacking around the
# modulepath, so these tests will not catch issues that may eventually arise
# related to loading these plugins.
# I could not, for the life of me, figure out how to programatcally set the modulepath
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_api_paste_ini).provider(:ini_setting)
describe provider_class do

11
spec/unit/provider/neutron_api_uwsgi_config/ini_setting_spec.rb
View File

@@ -3,17 +3,6 @@
# modulepath, so these tests will not catch issues that may eventually arise
# related to loading these plugins.
# I could not, for the life of me, figure out how to programatcally set the modulepath
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_api_uwsgi_config).provider(:ini_setting)
describe provider_class do

23
spec/unit/provider/neutron_bgp_dragent_config/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_bgp_dragent_config).provider(:ini_setting)

23
spec/unit/provider/neutron_bgpvpn_bagpipe_config/openstackconfig_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_bgpvpn_bagpipe_config).provider(:openstackconfig)

23
spec/unit/provider/neutron_bgpvpn_service_config/openstackconfig_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_bgpvpn_service_config).provider(:openstackconfig)

23
spec/unit/provider/neutron_dhcp_agent_config/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_dhcp_agent_config).provider(:ini_setting)

23
spec/unit/provider/neutron_l2gw_agent_confg/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_l2gw_agent_config).provider(:ini_setting)

23
spec/unit/provider/neutron_l2gw_service_config/openstackconfig_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_l2gw_service_config).provider(:openstackconfig)

23
spec/unit/provider/neutron_l3_agent_config/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_l3_agent_config).provider(:ini_setting)

23
spec/unit/provider/neutron_metadata_agent_config/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_metadata_agent_config).provider(:ini_setting)

23
spec/unit/provider/neutron_metering_agent_config/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_metering_agent_config).provider(:ini_setting)

12
spec/unit/provider/neutron_mlnx_agent_config/ini_setting_spec.rb
View File

@@ -1,15 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_mlnx_agent_config).provider(:ini_setting)

23
spec/unit/provider/neutron_plugin_ml2/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_plugin_ml2).provider(:ini_setting)

12
spec/unit/provider/neutron_plugin_nsx/ini_setting_spec.rb
View File

@@ -1,15 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_plugin_nsx).provider(:ini_setting)

12
spec/unit/provider/neutron_plugin_nuage/ini_setting_spec.rb
View File

@@ -1,15 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_plugin_nuage).provider(:ini_setting)

23
spec/unit/provider/neutron_plugin_nvp/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_plugin_nvp).provider(:ini_setting)

23
spec/unit/provider/neutron_plugin_opencontrail/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_plugin_opencontrail).provider(:ini_setting)

23
spec/unit/provider/neutron_rootwrap_config/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_rootwrap_config).provider(:ini_setting)

23
spec/unit/provider/neutron_sfc_service_config/openstackconfig_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_sfc_service_config).provider(:openstackconfig)

23
spec/unit/provider/neutron_vpnaas_agent_config/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:neutron_vpnaas_agent_config).provider(:ini_setting)

23
spec/unit/provider/ovn_metadata_agent_config/ini_setting_spec.rb
View File

@@ -1,26 +1,3 @@
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'openstacklib',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:ovn_metadata_agent_config).provider(:ini_setting)

12
spec/unit/type/neutron_api_paste_ini_spec.rb
View File

@@ -1,16 +1,4 @@
require 'spec_helper'
# this hack is required for now to ensure that the path is set up correctly
# to retrieve the parent provider
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
require 'puppet/type/neutron_api_paste_ini'
describe 'Puppet::Type.type(:neutron_api_paste_ini)' do
before :each do