Skip to content

Commit 577dd09

Browse files
rwaffenrwaffen
committed
Merge pull request #189 from rwaffen/beaker_fixes
Beaker fixes
2 parents 3040d1f + 0f3e7f0 commit 577dd09

11 files changed

Lines changed: 66 additions & 104 deletions

File tree

‎lib/puppet/provider/onecluster/cli.rb‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,8 @@ def self.instances
9898
def self.prefetch(resources)
9999
clusters = instances
100100
resources.keys.each do |name|
101-
if provider = clusters.find{ |cluster| cluster.name == name }
102-
resources[name].provider = provider
103-
end
101+
provider = clusters.find{ |cluster| cluster.name == name }
102+
resources[name].provider = provider unless provider.nil?
104103
end
105104
end
106105

‎lib/puppet/provider/onedatastore/cli.rb‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,8 @@ def self.instances
9090
def self.prefetch(resources)
9191
datastores = instances
9292
resources.keys.each do |name|
93-
if provider = datastores.find{ |datastore| datastore.name == name }
94-
resources[name].provider = provider
95-
end
93+
provider = datastores.find{ |datastore| datastore.name == name }
94+
resources[name].provider = provider unless provider.nil?
9695
end
9796
end
9897

‎lib/puppet/provider/onehost/cli.rb‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ def self.instances
5353
def self.prefetch(resources)
5454
hosts = instances
5555
resources.keys.each do |name|
56-
if provider = hosts.find{ |host| host.name == name }
57-
resources[name].provider = provider
58-
end
56+
provider = hosts.find{ |host| host.name == name }
57+
resources[name].provider = provider unless provider.nil?
5958
end
6059
end
6160

‎lib/puppet/provider/oneimage/cli.rb‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,8 @@ def self.instances
105105
def self.prefetch(resources)
106106
images = instances
107107
resources.keys.each do |name|
108-
if provider = images.find{ |image| image.name == name }
109-
resources[name].provider = provider
110-
end
108+
provider = images.find{ |image| image.name == name }
109+
resources[name].provider = provider unless provider.nil?
111110
end
112111
end
113112

‎lib/puppet/provider/onesecgroup/cli.rb‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@ def self.instances
8383
def self.prefetch(resources)
8484
secgroups = instances
8585
resources.keys.each do |name|
86-
if provider = secgroups.find{ |secgroup| secgroup.name == name }
87-
resources[name].provider = provider
88-
end
86+
provider = secgroups.find{ |secgroup| secgroup.name == name }
87+
resources[name].provider = provider unless provider.nil?
8988
end
9089
end
9190

‎lib/puppet/provider/onetemplate/cli.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ def create
7171
end if resource[:context]
7272
end
7373
end
74+
tempfile = builder.to_xml
7475
file.write(tempfile)
7576
file.close
7677
self.debug "Creating template using #{tempfile}"
@@ -114,9 +115,8 @@ def self.instances
114115
def self.prefetch(resources)
115116
templates = instances
116117
resources.keys.each do |name|
117-
if provider = templates.find{ |template| template.name == name }
118-
resources[name].provider = provider
119-
end
118+
provider = templates.find { |template| template.name == name }
119+
resources[name].provider = provider unless provider.nil?
120120
end
121121
end
122122

‎lib/puppet/provider/onevm/cli.rb‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,13 @@ def self.instances
6363
def self.prefetch(resources)
6464
vms = instances
6565
resources.keys.each do |name|
66-
if provider = vms.find{ |vm| vm.name == name }
67-
resources[name].provider = provider
68-
end
66+
provider = vms.find{ |vm| vm.name == name }
67+
resources[name].provider = provider unless provider.nil?
6968
end
7069
end
7170

7271
# setters
7372
def template=(value)
74-
raise "Can not modify a VM template"
73+
raise 'Can not modify a VM template'
7574
end
7675
end

‎lib/puppet/provider/onevnet/cli.rb‎

Lines changed: 42 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
# Deutsche Post E-POST Development GmbH - 2014, 2015
1212
#
1313

14-
#require 'pry'
15-
1614
require 'rubygems'
1715
require 'nokogiri'
1816

1917
Puppet::Type.type(:onevnet).provide(:cli) do
20-
desc "onevnet provider"
18+
desc 'onevnet provider'
2119

22-
has_command(:onevnet, "onevnet") do
20+
has_command(:onevnet, 'onevnet') do
2321
environment :HOME => '/root', :ONE_AUTH => '/var/lib/one/.one/one_auth'
2422
end
2523

@@ -29,44 +27,18 @@
2927
def create
3028
file = Tempfile.new("onevnet-#{resource[:name]}")
3129
builder = Nokogiri::XML::Builder.new do |xml|
32-
xml.VNET do
33-
xml.NAME resource[:name]
34-
xml.BRIDGE resource[:bridge]
35-
xml.PHYDEV do
36-
resource[:phydev]
37-
end if resource[:phydev]
38-
xml.VLAN_ID do
39-
resource[:vlanid]
40-
end if resource[:vlanid]
41-
xml.TEMPLATE do
42-
xml.DNS do
43-
resource[:dnsservers]
44-
end
45-
end if resource[:dnsservers]
46-
xml.TEMPLATE do
47-
xml.GATEWAY do
48-
resource[:gateway]
49-
end
50-
end if resource[:gateway]
51-
xml.TEMPLATE do
52-
xml.NETWORK_MASK do
53-
resource[:netmask]
54-
end
55-
end if resource[:netmask]
56-
xml.TEMPLATE do
57-
xml.NETWORK_ADDRESS do
58-
resource[:network_address]
59-
end
60-
end if resource[:network_address]
61-
xml.CONTEXT do
62-
resource[:context].each do |k,v|
63-
xml.send(k.upcase, v)
64-
end if resource[:context]
65-
end
66-
end
67-
# end xml vnet do
30+
xml.VNET do
31+
xml.NAME resource[:name]
32+
xml.BRIDGE resource[:bridge]
33+
xml.PHYDEV resource[:phydev] if resource[:phydev]
34+
xml.VLAN_ID resource[:vlanid] if resource[:vlanid]
35+
xml.DNS resource[:dnsservers].join(' ') if resource[:dnsservers]
36+
xml.GATEWAY resource[:gateway] if resource[:gateway]
37+
xml.NETWORK_MASK resource[:netmask] if resource[:netmask]
38+
xml.NETWORK_ADDRESS resource[:network_address] if resource[:network_address]
39+
xml.CONTEXT resource[:context].each { |k, v| xml.send(k.upcase, v) } if resource[:context]
40+
end
6841
end
69-
# end builder
7042
tempfile = builder.to_xml
7143
file.write(tempfile)
7244
file.close
@@ -89,31 +61,29 @@ def exists?
8961

9062
# Return the full hash of all existing onevnet resources
9163
def self.instances
92-
vnets = Nokogiri::XML(onevnet('list','-x')).root.xpath('/VNET_POOL/VNET')
93-
#pry.binding
94-
vnets.collect do |vnet|
95-
new(
96-
:name => vnet.xpath('./NAME').text,
97-
:ensure => :present,
98-
:bridge => vnet.xpath('./BRIDGE').text,
99-
:context => nil,
100-
:dnsservers => (vnet.xpath('./TEMPLATE/DNS').text.split(" ") unless vnet.xpath('./TEMPLATE/DNS').nil?),
101-
:gateway => (vnet.xpath('./TEMPLATE/GATEWAY').text unless vnet.xpath('./TEMPLATE/GATEWAY').nil?),
102-
:netmask => (vnet.xpath('./TEMPLATE/NETWORK_MASK').text unless vnet.xpath('./TEMPLATE/NETWORK_MASK').nil?),
103-
:network_address => (vnet.xpath('./TEMPLATE/NETWORK_ADDRESS').text unless vnet.xpath('./TEMPLATE/NETWORK_ADDRESS').nil?),
104-
:model => (vnet.xpath('./TEMPLATE/MODEL').text unless vnet.xpath('./TEMPLATE/MODEL').nil?),
105-
:phydev => vnet.xpath('./PHYDEV').text,
106-
:vlanid => vnet.xpath('./VLAN_ID').text
107-
)
108-
end
64+
vnets = Nokogiri::XML(onevnet('list', '-x')).root.xpath('/VNET_POOL/VNET')
65+
vnets.collect do |vnet|
66+
new(
67+
:ensure => :present,
68+
:name => vnet.xpath('./NAME').text,
69+
:bridge => vnet.xpath('./BRIDGE').text,
70+
:phydev => vnet.xpath('./PHYDEV').text,
71+
:vlanid => vnet.xpath('./VLAN_ID').text,
72+
:context => nil,
73+
:dnsservers => (vnet.xpath('./TEMPLATE/DNS').text.split(' ') unless vnet.xpath('./TEMPLATE/DNS').nil?),
74+
:gateway => (vnet.xpath('./TEMPLATE/GATEWAY').text unless vnet.xpath('./TEMPLATE/GATEWAY').nil?),
75+
:netmask => (vnet.xpath('./TEMPLATE/NETWORK_MASK').text unless vnet.xpath('./TEMPLATE/NETWORK_MASK').nil?),
76+
:network_address => (vnet.xpath('./TEMPLATE/NETWORK_ADDRESS').text unless vnet.xpath('./TEMPLATE/NETWORK_ADDRESS').nil?),
77+
:model => (vnet.xpath('./TEMPLATE/MODEL').text unless vnet.xpath('./TEMPLATE/MODEL').nil?)
78+
)
79+
end
10980
end
11081

11182
def self.prefetch(resources)
11283
vnets = instances
11384
resources.keys.each do |name|
114-
if provider = vnets.find{ |vnet| vnet.name == name }
115-
resources[name].provider = provider
116-
end
85+
provider = vnets.find { |vnet| vnet.name == name }
86+
resources[name].provider = provider unless provider.nil?
11787
end
11888
end
11989

@@ -122,24 +92,22 @@ def flush
12292
file << @property_hash.map { |k, v|
12393
unless resource[k].nil? or resource[k].to_s.empty? or [:name, :provider, :ensure].include?(k)
12494
case k
125-
when :vlanid
126-
[ 'VLAN_ID', v ]
127-
when :addressrange
128-
k.each_pair do |key, value|
129-
end
130-
when :dnsservers
131-
[ 'DNS', "\"#{v.join(" ")}\"" ]
132-
when :netmask
133-
[ 'NETWORK_MASK', v ]
134-
else
135-
[ k.to_s.upcase, v ]
95+
when :vlanid
96+
['VLAN_ID', v]
97+
when :addressrange
98+
k.each_pair { |key, value|}
99+
when :dnsservers
100+
['DNS', "\"#{v.join(' ')}\""]
101+
when :netmask
102+
['NETWORK_MASK', v]
103+
else
104+
[k.to_s.upcase, v]
136105
end
137106
end
138-
}.map{|a| "#{a[0]} = #{a[1]}" unless a.nil? }.join("\n")
107+
}.map { |a| "#{a[0]} = #{a[1]}" unless a.nil? }.join("\n")
139108
file.close
140109
self.debug(IO.read file.path)
141110
onevnet('update', resource[:name], file.path, '--append') unless @property_hash.empty?
142111
file.delete
143112
end
144-
145113
end

‎lib/puppet/provider/onevnet_addressrange/cli.rb‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@ def self.instances
8484
def self.prefetch(resources)
8585
vnets = instances
8686
resources.keys.each do |name|
87-
if provider = vnets.find{ |vnet| vnet.name == name }
88-
resources[name].provider = provider
89-
end
87+
provider = vnets.find{ |vnet| vnet.name == name }
88+
resources[name].provider = provider unless provider.nil?
9089
end
9190
end
9291

@@ -109,12 +108,14 @@ def flush
109108
end
110109
end
111110
}.map{|a| "#{a[0]} = #{a[1]}," unless a.nil? }.join("\n")
112-
file << "AR_ID = #{ar_id}" unless ar_id.nil?
111+
file << "AR_ID = #{resource[:ar_id]}" unless resource[:ar_id].nil?
113112
file << ']'
114113
file.close
115114
self.debug(IO.read file.path)
116115
self.debug(@property_hash)
117-
onevnet('updatear', resource[:onevnet_name], ar_id, file.path ) unless ( @property_hash.empty? or ar_id.nil? or !defined? ar_id )
116+
unless @property_hash.empty? or resource[:ar_id].nil? or not defined? resource[:ar_id]
117+
onevnet('updatear', resource[:onevnet_name], resource[:ar_id], file.path)
118+
end
118119
file.delete
119120
end
120121

‎spec/acceptance/onesecgroup_spec.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
before :all do
55
pp =<<-EOS
66
class { 'one':
7-
oned => true,
8-
one_version => '4.12',
7+
oned => true,
98
}
109
EOS
1110
apply_manifest(pp, :catch_failures => true)

0 commit comments

Comments
 (0)