openstack
/
fuel-library
Code Issues Proposed changes

Merge "handle infiniband NICs naming, which looks like"

This commit is contained in:
Jenkins 2016-05-31 12:19:50 +00:00 committed by Gerrit Code Review
parent cba4ab766a 27adf49103
commit d0dd024bfa
4 changed files with 120 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
deployment/puppet/l23network/lib/puppet/parser/functions/generate_network_config.rb
View File

@ -41,6 +41,16 @@ module L23network
return rv
end
def self.is_ib_interface(name)
# whether interface with name is Infiniband interface?
return name =~ /^ib\d+\.80\d+$/
end
def self.is_subinterface(name)
# whether transformation should operate with subinterface?
return (name =~ /\.\d+$/) && !L23network.is_ib_interface(name)
end
def self.sanitize_transformation(trans)
action = trans[:action].to_s.downcase()
# Setup defaults
@ -154,7 +164,7 @@ Puppet::Parser::Functions::newfunction(:generate_network_config, :type => :rvalu
resource = res_factory[:ifconfig]
debug("generate_network_config(): Endpoint '#{endpoint_name}' will be created with properties: \n#{endpoints[endpoint_name].to_yaml.gsub('!ruby/sym ','')}")
# collect properties for creating endpoint resource
endpoints[endpoint_name].each_pair do |k,v|
endpoints[endpoint_name].each do |k,v|
if k.to_s.downcase == 'routes'
# for routes we should create additional resource, not a property of ifconfig
next if ! v.is_a?(Array)
@ -256,7 +266,7 @@ Puppet::Parser::Functions::newfunction(:generate_network_config, :type => :rvalu
born_ports << int_name
# add some of 1st level interface properties to it's config
ports_properties[int_name] ||= {}
if ! int_properties.nil?
if int_properties.is_a? Hash
int_properties.each do |k,v|
if v.to_s != ''
k = k.to_s.tr('-','_').to_sym
@ -310,7 +320,7 @@ Puppet::Parser::Functions::newfunction(:generate_network_config, :type => :rvalu
debug("generate_network_config(): precheck transformations")
tmp = []
config_hash[:transformations].each do |t|
if (t[:action].match(/add-(port|bond)/) && t[:name].match(/\.\d+$/))
if (t[:action].match(/add-(port|bond)/) && L23network.is_subinterface(t[:name]))
# we found vlan subinterface, but main interface for one didn't defined
# earlier. We should configure main interface as unaddressed interface
# wich has state UP to prevent fails in network configuration
@ -418,13 +428,18 @@ Puppet::Parser::Functions::newfunction(:generate_network_config, :type => :rvalu
end
end
if L23network.is_ib_interface(trans[:name])
# Infiniband device is not vlan, but name looks like vlan subinterface
resource_properties[:vlan_dev] = false
end
resource_properties['require'] = [correct_requirement_name(previous)] if previous
resource_properties = L23network.correct_ethtool_set(resource_properties)
function_create_resources([resource, {
"#{trans[:name]}" => resource_properties
}])
resources_created << "#{t[:action].strip()}(#{trans[:name]})"
born_ports.insert(-1, trans[:name].to_sym()) if action != :patch
born_ports << trans[:name].to_sym() if action != :patch
previous = "#{resource}[#{trans[:name]}]"
end
@ -447,6 +462,18 @@ Puppet::Parser::Functions::newfunction(:generate_network_config, :type => :rvalu
if ! born_ports.include? endpoint_name
raise(Puppet::ParseError, "generate_network_config(): Endpoint '#{endpoint_name}' not found in interfaces or transformations result.")
end
if L23network.is_ib_interface(endpoint_name) and !resources_created.include?("add-port(#{endpoint_name})")
# Infiniband device should be created as port if does not created early
ib_resource_properties = { :vlan_dev => false }
ib_resource_properties['require'] = [correct_requirement_name(previous)] if previous
function_create_resources(['l23network::l2::port', {
"#{endpoint_name}" => ib_resource_properties
}])
previous = "L23network::L2::Port[#{endpoint_name}]"
resources_created << "add-port(#{endpoint_name})"
end
previous = create_l3_ifconfig_resource(endpoints, endpoint_name, previous)
resources_created << "endpoint(#{endpoint_name})"
end

2
deployment/puppet/l23network/lib/puppet/type/l23_stored_config.rb
View File

@ -130,7 +130,7 @@ Puppet::Type.newtype(:l23_stored_config) do
min_vid = 0
max_vid = 4094
if ! (val.to_s == 'absent' or (min_vid .. max_vid).include?(val.to_i))
raise ArgumentError, "'#{val}' is not a valid 802.1q NALN_ID (must be a integer value in range (#{min_vid} .. #{max_vid})"
raise ArgumentError, "'#{val}' is not a valid 802.1q VLAN_ID (must be a integer value in range (#{min_vid} .. #{max_vid})"
end
end
munge do |val|

2
deployment/puppet/l23network/lib/puppet/type/l2_port.rb
View File

@ -105,7 +105,7 @@ Puppet::Type.newtype(:l2_port) do
min_vid = 1
max_vid = 4094
if ! (value.to_s == 'absent' or (min_vid .. max_vid).include?(value.to_i))
raise ArgumentError, "'#{value}' is not a valid 802.1q NALN_ID (must be a integer value in range (#{min_vid} .. #{max_vid})"
raise ArgumentError, "'#{value}' is not a valid 802.1q VLAN_ID (must be a integer value in range (#{min_vid} .. #{max_vid})"
end
end
munge do |val|

128
deployment/puppet/l23network/spec/classes/ifconfig_for_infiniband__spec.rb
View File

@ -1,27 +1,7 @@
require 'spec_helper'
describe 'l23network::examples::run_network_scheme', :type => :class do
let(:network_scheme) do
<<eof
---
network_scheme:
version: 1.1
provider: lnx
interfaces:
ib2: {}
transformations:
- action: add-port
name: ib2.8001
vlan_dev: false
endpoints:
ib2.8001:
IP:
- 192.168.101.3/24
roles: {}
eof
end
context 'network scheme with endpoint, which contained additionat routes' do
context 'network scheme with IB device, listed into interfaces, transformations and endpoints sections' do
let(:title) { 'empty network scheme' }
let(:facts) {
{
@ -33,36 +13,102 @@ end
}
}
let(:params) do {
:settings_yaml => network_scheme,
} end
let(:params) {{
:settings_yaml => '''
network_scheme:
version: 1.1
provider: lnx
interfaces:
ib2.8001: {}
transformations:
- action: add-port
name: ib2.8001
endpoints:
ib2.8001:
IP:
- 192.168.101.3/24
roles: {}
'''
}}
before(:each) do
puppet_debug_override()
end
it do
should compile.with_all_deps
end
it do
should contain_l2_port('ib2')
end
it do
should contain_l2_port('ib2.8001').with({
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_l23network__l2__port('ib2.8001') }
it { is_expected.to contain_l23network__l2__port('ib2.8001').with({
'vlan_dev' => false,
'vlan_id' => nil
})}
it { is_expected.to contain_l2_port('ib2.8001') }
it { is_expected.to contain_l2_port('ib2.8001').with({
'vlan_dev' => nil,
'vlan_id' => nil
})}
it { is_expected.to contain_l23network__l3__ifconfig('ib2.8001') }
it { is_expected.to contain_l23network__l3__ifconfig('ib2.8001').with({
'ipaddr' => '192.168.101.3/24',
})}
it { is_expected.to contain_l23_stored_config('ib2.8001').with({
'vlan_dev' => nil,
'vlan_id' => nil,
'vlan_mode' => nil,
})
'vlan_mode' => nil
})}
end
context 'network scheme with IB device, listed into interfaces and endpoints sections only' do
let(:title) { 'empty network scheme' }
let(:facts) {
{
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:kernel => 'Linux',
:l23_os => 'ubuntu',
:l3_fqdn_hostname => 'stupid_hostname',
}
}
let(:params) {{
:settings_yaml => '''
network_scheme:
version: 1.1
provider: lnx
interfaces:
ib2.8001: {}
transformations: []
endpoints:
ib2.8001:
IP:
- 192.168.101.3/24
roles: {}
'''
}}
before(:each) do
puppet_debug_override()
end
it do
should contain_l3_ifconfig('ib2.8001').with({
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_l23network__l2__port('ib2.8001') }
it { is_expected.to contain_l23network__l2__port('ib2.8001').with({
'vlan_dev' => false,
'vlan_id' => nil
})}
it { is_expected.to contain_l2_port('ib2.8001') }
it { is_expected.to contain_l2_port('ib2.8001').with({
'vlan_dev' => nil,
'vlan_id' => nil
})}
it { is_expected.to contain_l23network__l3__ifconfig('ib2.8001') }
it { is_expected.to contain_l23network__l3__ifconfig('ib2.8001').with({
'ipaddr' => '192.168.101.3/24',
})
end
})}
it { is_expected.to contain_l23_stored_config('ib2.8001').with({
'vlan_dev' => nil,
'vlan_id' => nil,
'vlan_mode' => nil
})}
end
end