openstack
/
fuel-library
Code Issues Proposed changes

Fix SR-IOV re-apply 

* vendor_specific update fixed
* check new sriov_numvfs for nil fixed
* prefetch fixed
* also, conventional "FLUSH properties" debug added

Change-Id: I8ebbbff278e448ee20fad7826bf5b1f7c11ea610
Closes-Bug: #1558427
This commit is contained in:
Vladimir Eremin 2016-03-17 14:06:57 +03:00
parent 7ffaea78d5
commit 7f9bebc073
No known key found for this signature in database
GPG Key ID: 2E97FC2056F3E83F
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/puppet/l23network/lib/puppet/provider/l2_bridge/ovs.rb
View File

@ -84,7 +84,8 @@ Puppet::Type.type(:l2_bridge).provide(:ovs, :parent => Puppet::Provider::Ovs_bas
end
def vendor_specific=(val)
old = @property_hash[:vendor_specific] || {}
@property_flush[:vendor_specific] = val.reject{|(k,v)| old[k.to_sym] == v }
changes = val.to_a - old.to_a
@property_flush[:vendor_specific] = Hash[changes]
end
def stp

11
deployment/puppet/l23network/lib/puppet/provider/l2_port/sriov.rb
View File

@ -21,7 +21,7 @@ Puppet::Type.type(:l2_port).provide(:sriov, :parent => Puppet::Provider::Lnx_bas
sriov_numvfs = self.get_sriov_numvfs(if_name)
if sriov_numvfs and sriov_numvfs > 0
props[:provider] = 'sriov'
props[:vendor_specific] = {'sriov_numvfs' => sriov_numvfs}
props[:vendor_specific] = {'sriov_numvfs' => sriov_numvfs.to_s}
end
props[:port_type] = props[:port_type].insert(0, props[:provider]).join(':')
@ -68,14 +68,14 @@ Puppet::Type.type(:l2_port).provide(:sriov, :parent => Puppet::Provider::Lnx_bas
def flush
unless @property_flush.empty?
debug("FLUSH properties: #{@property_flush}")
unless ['', 'absent'].include? @property_flush[:mtu].to_s
self.class.set_mtu(@resource[:interface], @property_flush[:mtu])
end
vendor_specific = (@property_flush[:vendor_specific] || {})
sriov_numvfs = vendor_specific["sriov_numvfs"].to_i
if self.sriov_numvfs != sriov_numvfs
unless vendor_specific["sriov_numvfs"].nil?
self.sriov_numvfs = 0
self.sriov_numvfs = sriov_numvfs
self.sriov_numvfs = vendor_specific["sriov_numvfs"].to_i
end
@property_hash = resource.to_hash
end
@ -86,7 +86,8 @@ Puppet::Type.type(:l2_port).provide(:sriov, :parent => Puppet::Provider::Lnx_bas
end
def vendor_specific=(val)
old = @property_hash[:vendor_specific] || {}
@property_flush[:vendor_specific] = val.reject{|(k,v)| old[k.to_sym] == v }
changes = val.to_a - old.to_a
@property_flush[:vendor_specific] = Hash[changes]
end
def vlan_dev