From ea4460fa3f36ec22a616522e8eb94a4419040064 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 3 Jan 2021 17:53:04 +0900 Subject: [PATCH] Remove support for FUJITSU plugin ... which was deprecated during the previous cycle[1]. [1] e1e1350f7176f663af0d64e34d7222adc8e696cb Change-Id: Iae9b40475447302e4300deee4f62d6196b72cb4a --- manifests/plugins/ml2/fujitsu.pp | 27 ------- manifests/plugins/ml2/fujitsu/cfab.pp | 63 ---------------- manifests/plugins/ml2/fujitsu/fossw.pp | 75 ------------------- ...r-networking-fujitsu-5f1594c391aefc53.yaml | 4 + .../neutron_plugins_ml2_fujitsu_cfab_spec.rb | 58 -------------- .../neutron_plugins_ml2_fujitsu_fossw_spec.rb | 60 --------------- .../neutron_plugins_ml2_fujitsu_spec.rb | 49 ------------ 7 files changed, 4 insertions(+), 332 deletions(-) delete mode 100644 manifests/plugins/ml2/fujitsu.pp delete mode 100644 manifests/plugins/ml2/fujitsu/cfab.pp delete mode 100644 manifests/plugins/ml2/fujitsu/fossw.pp create mode 100644 releasenotes/notes/remove-support-for-networking-fujitsu-5f1594c391aefc53.yaml delete mode 100644 spec/classes/neutron_plugins_ml2_fujitsu_cfab_spec.rb delete mode 100644 spec/classes/neutron_plugins_ml2_fujitsu_fossw_spec.rb delete mode 100644 spec/classes/neutron_plugins_ml2_fujitsu_spec.rb diff --git a/manifests/plugins/ml2/fujitsu.pp b/manifests/plugins/ml2/fujitsu.pp deleted file mode 100644 index 38869e673..000000000 --- a/manifests/plugins/ml2/fujitsu.pp +++ /dev/null @@ -1,27 +0,0 @@ -# -# DEPRECATED! -# Install the Fujitsu ML2 plugin. -# -# === Parameters -# -# [*package_ensure*] -# (optional) The intended state of the Fujitsu ML2 plugin package -# i.e. any of the possible values of the 'ensure' property for a -# package resource type. Defaults to 'present' -# - -class neutron::plugins::ml2::fujitsu ( - $package_ensure = 'present' -) { - - include neutron::deps - - warning('FUJITSU plugin support is deprecated and will be removed in a future release') - - ensure_resource('package', 'python-networking-fujitsu', - { - ensure => $package_ensure, - tag => ['openstack', 'neutron-plugin-ml2-package'] - } - ) -} diff --git a/manifests/plugins/ml2/fujitsu/cfab.pp b/manifests/plugins/ml2/fujitsu/cfab.pp deleted file mode 100644 index ed9c734e2..000000000 --- a/manifests/plugins/ml2/fujitsu/cfab.pp +++ /dev/null @@ -1,63 +0,0 @@ -# -# DEPRECATED! -# Configure the Fujitsu neutron ML2 plugin for C-Fabric -# -# === Parameters -# -# [*address*] -# (required) The address of the C-Fabric to telnet to. -# Example: 192.168.0.1 -# -# [*username*] -# (optional) The C-Fabric username to use. -# Example: username -# -# [*password*] -# (optional) The C-Fabric password to use. -# Example: password -# -# [*physical_networks*] -# (optional) physical_network names and corresponding vfab ids. -# Example: physnet1:1,physnet2:2 -# Defaults to '' -# -# [*share_pprofile*] -# (optional) Whether to share a C-Fabric pprofile among Neutron ports using the -# same VLAN ID. -# Example: true -# Defaults to false -# -# [*pprofile_prefix*] -# (optional) The prefix string for pprofile name. -# Example: neutron- -# Defaults to '' -# -# [*save_config*] -# (optional) Whether to save configuration. -# Example: true -# Defaults to true -# -class neutron::plugins::ml2::fujitsu::cfab ( - $address, - $username, - $password, - $physical_networks = '', - $share_pprofile = false, - $pprofile_prefix = '', - $save_config = true, -) -{ - require neutron::plugins::ml2 - - warning('FUJITSU plugin support is deprecated and will be removed in a future release') - - neutron_plugin_ml2 { - 'fujitsu_cfab/address' : value => $address; - 'fujitsu_cfab/username' : value => $username; - 'fujitsu_cfab/password' : value => $password, secret => true; - 'fujitsu_cfab/physical_networks' : value => join(any2array($physical_networks), ','); - 'fujitsu_cfab/share_pprofile' : value => $share_pprofile; - 'fujitsu_cfab/pprofile_prefix' : value => $pprofile_prefix; - 'fujitsu_cfab/save_config' : value => $save_config; - } -} diff --git a/manifests/plugins/ml2/fujitsu/fossw.pp b/manifests/plugins/ml2/fujitsu/fossw.pp deleted file mode 100644 index 690ca0f0f..000000000 --- a/manifests/plugins/ml2/fujitsu/fossw.pp +++ /dev/null @@ -1,75 +0,0 @@ -# -# DEPRECATED! -# Configure the Fujitsu neutron ML2 plugin for FOS -# -# === Parameters -# -# [*fossw_ips*] -# (required) The List of IP address of all fos switches. -# Example: 192.168.0.1,192.168.0.2 -# -# NOTE: The following parameters will be shared by all fos switches. -# [*username*] -# (optional) The username of the fos switches. -# Example: username -# -# [*password*] -# (optional) The password of the fos switches. -# Example: password -# -# [*port*] -# (optional) The port number used for SSH connection. -# Example: 22 -# Defaults to 22 -# -# [*timeout*] -# (optional) The timeout os SSH connection. -# Example: 30 -# Defaults to 30 -# -# [*udp_dest_port*] -# (optional) The port number of VXLAN UDP destination on the fos switches. -# All VXLANs on the switches use this UDP port as the UDP destination port in -# the UDP header when encapsulating. -# Example: 4789 -# Defaults to 4789 -# -# [*ovsdb_vlanid_range_min*] -# (optional) The minimum VLAN ID in the range that is used for binding VNI and -# physical port. The range of 78 VLAN IDs (starts from this value) will be -# reserved. Default is 2 (VLAN ID from 2 to 79 will be reserved). -# NOTE: DO NOT include these VLAN IDs into "network_vlan_ranges" in ml2_conf.ini. -# Example: 2 -# Defaults to 2 -# -# [*ovsdb_port*] -# (optional) The port number which OVSDB server on the fos switches listen. -# Example: 6640 -# Defaults to 6640 -# -class neutron::plugins::ml2::fujitsu::fossw ( - $fossw_ips, - $username, - $password, - $port = 22, - $timeout = 30, - $udp_dest_port = 4789, - $ovsdb_vlanid_range_min = 2, - $ovsdb_port = 6640, -) -{ - require neutron::plugins::ml2 - - warning('FUJITSU plugin support is deprecated and will be removed in a future release') - - neutron_plugin_ml2 { - 'fujitsu_fossw/fossw_ips' : value => join(any2array($fossw_ips), ','); - 'fujitsu_fossw/username' : value => $username; - 'fujitsu_fossw/password' : value => $password, secret => true; - 'fujitsu_fossw/port' : value => $port; - 'fujitsu_fossw/timeout' : value => $timeout; - 'fujitsu_fossw/udp_dest_port' : value => $udp_dest_port; - 'fujitsu_fossw/ovsdb_vlanid_range_min' : value => $ovsdb_vlanid_range_min; - 'fujitsu_fossw/ovsdb_port' : value => $ovsdb_port; - } -} diff --git a/releasenotes/notes/remove-support-for-networking-fujitsu-5f1594c391aefc53.yaml b/releasenotes/notes/remove-support-for-networking-fujitsu-5f1594c391aefc53.yaml new file mode 100644 index 000000000..ce552f1c1 --- /dev/null +++ b/releasenotes/notes/remove-support-for-networking-fujitsu-5f1594c391aefc53.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for networking-futjisu has been removed. diff --git a/spec/classes/neutron_plugins_ml2_fujitsu_cfab_spec.rb b/spec/classes/neutron_plugins_ml2_fujitsu_cfab_spec.rb deleted file mode 100644 index f912f5c85..000000000 --- a/spec/classes/neutron_plugins_ml2_fujitsu_cfab_spec.rb +++ /dev/null @@ -1,58 +0,0 @@ -require 'spec_helper' - -describe 'neutron::plugins::ml2::fujitsu::cfab' do - let :pre_condition do - "class { 'neutron::keystone::authtoken': - password => 'passw0rd', - } - class { 'neutron::server': } - class { 'neutron': - core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }" - end - - let :default_params do - { - :address => '192.168.0.1', - :username => 'admin', - :password => 'admin', - :physical_networks => 'physnet1:1,physnet2:2', - :share_pprofile => 'false', - :pprofile_prefix => 'neutron-', - :save_config => 'true', - } - end - - let :params do - {} - end - - shared_examples 'neutron fujitsu ml2 cfab plugin' do - - before do - params.merge!(default_params) - end - - it do - should contain_neutron_plugin_ml2('fujitsu_cfab/address').with_value(params[:address]) - should contain_neutron_plugin_ml2('fujitsu_cfab/username').with_value(params[:username]) - should contain_neutron_plugin_ml2('fujitsu_cfab/password').with_value(params[:password]).with_secret(true) - should contain_neutron_plugin_ml2('fujitsu_cfab/physical_networks').with_value(params[:physical_networks]) - should contain_neutron_plugin_ml2('fujitsu_cfab/share_pprofile').with_value(params[:share_pprofile]) - should contain_neutron_plugin_ml2('fujitsu_cfab/pprofile_prefix').with_value(params[:pprofile_prefix]) - should contain_neutron_plugin_ml2('fujitsu_cfab/save_config').with_value(params[:save_config]) - end - - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - it_behaves_like 'neutron fujitsu ml2 cfab plugin' - end - end -end diff --git a/spec/classes/neutron_plugins_ml2_fujitsu_fossw_spec.rb b/spec/classes/neutron_plugins_ml2_fujitsu_fossw_spec.rb deleted file mode 100644 index 3ffcf4b3b..000000000 --- a/spec/classes/neutron_plugins_ml2_fujitsu_fossw_spec.rb +++ /dev/null @@ -1,60 +0,0 @@ -require 'spec_helper' - -describe 'neutron::plugins::ml2::fujitsu::fossw' do - let :pre_condition do - "class { 'neutron::keystone::authtoken': - password => 'passw0rd', - } - class { 'neutron::server': } - class { 'neutron': - core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }" - end - - let :default_params do - { - :fossw_ips => '192.168.0.1,192.168.0.2', - :username => 'admin', - :password => 'admin', - :port => 22, - :timeout => 30, - :udp_dest_port => 4789, - :ovsdb_vlanid_range_min => 2, - :ovsdb_port => 6640, - } - end - - let :params do - {} - end - - shared_examples 'neutron fujitsu ml2 fossw plugin' do - - before do - params.merge!(default_params) - end - - it do - should contain_neutron_plugin_ml2('fujitsu_fossw/fossw_ips').with_value(params[:fossw_ips]) - should contain_neutron_plugin_ml2('fujitsu_fossw/username').with_value(params[:username]) - should contain_neutron_plugin_ml2('fujitsu_fossw/password').with_value(params[:password]).with_secret(true) - should contain_neutron_plugin_ml2('fujitsu_fossw/port').with_value(params[:port]) - should contain_neutron_plugin_ml2('fujitsu_fossw/timeout').with_value(params[:timeout]) - should contain_neutron_plugin_ml2('fujitsu_fossw/udp_dest_port').with_value(params[:udp_dest_port]) - should contain_neutron_plugin_ml2('fujitsu_fossw/ovsdb_vlanid_range_min').with_value(params[:ovsdb_vlanid_range_min]) - should contain_neutron_plugin_ml2('fujitsu_fossw/ovsdb_port').with_value(params[:ovsdb_port]) - end - - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - it_behaves_like 'neutron fujitsu ml2 fossw plugin' - end - end -end diff --git a/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb b/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb deleted file mode 100644 index 915742a69..000000000 --- a/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb +++ /dev/null @@ -1,49 +0,0 @@ -require 'spec_helper' - -describe 'neutron::plugins::ml2::fujitsu' do - let :pre_condition do - "class { 'neutron::keystone::authtoken': - password => 'passw0rd', - } - class { 'neutron::server': } - class { 'neutron': - core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }" - end - - let :default_params do - { - :package_ensure => 'present' - } - end - - let :params do - {} - end - - shared_examples 'neutron plugin fujitsu ml2' do - before do - params.merge!(default_params) - end - - it { should contain_class('neutron::params') } - - it 'should have' do - should contain_package('python-networking-fujitsu').with( - :ensure => params[:package_ensure], - :tag => ['openstack', 'neutron-plugin-ml2-package'] - ) - end - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - it_behaves_like 'neutron plugin fujitsu ml2' - end - end -end