ovirt 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +5 -13
  2. data/lib/ovirt/service.rb +1 -1
  3. data/lib/ovirt/version.rb +1 -1
  4. data/lib/ovirt/vm.rb +11 -1
  5. data/spec/vm_spec.rb +72 -0
  6. metadata +24 -24
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- YWY4MTRkMzgxNGI4NGZiMDMxYjNjYTE2MTViMTE2ZGNmYzA5ODA5Yg==
5
- data.tar.gz: !binary |-
6
- ODBlZDRkZWVlZDE3ODAyMGU1MDg3MTIzMGQ0NTNiYTMyNDIwMmEyZA==
2
+ SHA1:
3
+ metadata.gz: 10b6d10e2dbe6b5ddda171616410385918364b27
4
+ data.tar.gz: 834f0da7109fcca641fa29fdd0cc816f6cdd22b1
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- ZjJhYmU3YTQyN2JmOTA3MDAzODQ2OGEyODE5YmQ1OGE4N2UyYzcwMTgzZjkx
10
- NmJmNDg5ODMzZTUzYTZlOWI4MDgyMDAxZDM5MGE5YWY2OWM5NjVmMWEwNmM4
11
- M2ZlMTc4NzlkMTUzYTBlNmEzY2ViMmQxMTAxNTQ3MGU0YjA5M2Y=
12
- data.tar.gz: !binary |-
13
- ZTNmNjkyOTU3MWEwMDNiZDFiNjFlYzZkZWI3ZTgyY2EzOTZjMjkyYTk1YTYx
14
- ZTcxMmI1M2NiY2I2OGJjNzQyNzUwMmI5OTFiNWJjZjFlY2Q2MjVmYmEyNDgz
15
- MGU0NWRmZDBiNzUyYTdmNWU3MDYwMGJlYTQ1OTFjNWY1ODc5ZmM=
6
+ metadata.gz: b39909442e767c345cacb67097dc90bb52e93da03100357194f5aa61f8fbc2154b9706c6ab03dcac1322f1604b9b301afe0be40a50c8c174307f84e02129e72d
7
+ data.tar.gz: d7745ad9cd164aac4f8997a665a8ad273998691377e96721b1d4b5ab1d3448d4b204a2cfc64a41945157ffc43d262d9ac44ebab1a1a9e9ab68e4384d8a2f07f7
data/lib/ovirt/service.rb CHANGED
@@ -250,7 +250,7 @@ module Ovirt
250
250
 
251
251
  def resource_options
252
252
  headers = merge_headers({ 'Prefer' => 'persistent-auth' })
253
- options = { :ssl_version => :SSLv3 }
253
+ options = { :ssl_version => 'TLSv1' }
254
254
 
255
255
  if self.session_id
256
256
  headers[:cookie] = "#{SESSION_ID_KEY}=#{self.session_id}"
data/lib/ovirt/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Ovirt
2
- VERSION = "0.2.0"
2
+ VERSION = "0.2.1"
3
3
  end
data/lib/ovirt/vm.rb CHANGED
@@ -180,13 +180,23 @@ module Ovirt
180
180
  # types:: A payload type or Array of payload types to detach.
181
181
  # Acceptable types are floppy or cdrom.
182
182
  def detach_payload(types)
183
+ send("detach_payload_#{payload_version}".to_sym, Array(types))
184
+ end
185
+
186
+ def detach_payload_3_0(types)
183
187
  # HACK: The removal of payloads is not supported until possibly RHEVM 3.1.1
184
188
  # https://bugzilla.redhat.com/show_bug.cgi?id=882649
185
189
  # For now, just set the payload to blank content.
186
- payload = Array(types).each_with_object({}) { |t, h| h[t] = {} }
190
+ payload = types.each_with_object({}) { |t, h| h[t] = {} }
187
191
  attach_payload(payload)
188
192
  end
189
193
 
194
+ def detach_payload_3_3(types)
195
+ update! do |xml|
196
+ xml.payloads
197
+ end
198
+ end
199
+
190
200
  # Attaches the +files+ as a floppy drive payload.
191
201
  #
192
202
  # files:: Hash of file_name => content that will be attached as a floppy
data/spec/vm_spec.rb CHANGED
@@ -186,4 +186,76 @@ EOX
186
186
  expect { @vm.stop }.to raise_error Ovirt::VmIsNotRunning
187
187
  end
188
188
  end
189
+
190
+ context "payloads" do
191
+ skip "attach" do
192
+ end
193
+
194
+ context "detach floppy" do
195
+ it "Ovirt 3.0 should set empty payload" do
196
+ expected_data = <<-EOX.chomp
197
+ <vm>
198
+ <payloads>
199
+ <payload type="floppy"/>
200
+ </payloads>
201
+ </vm>
202
+ EOX
203
+ return_data = <<-EOX.chomp
204
+ <vm href="/api/vms/128f9ffd-b82c-41e4-8c00-9742ed173bac" id="128f9ffd-b82c-41e4-8c00-9742ed173bac">
205
+ <name>bd-skeletal-clone-from-template</name>
206
+ <cpu>
207
+ <topology sockets="1" cores="1"/>
208
+ </cpu>
209
+ <os type="rhel_6x64">
210
+ <boot dev="hd"/>
211
+ </os>
212
+ <payloads>
213
+ <payload type="floppy"/>
214
+ </payloads>
215
+ <placement_policy>
216
+ <host id="a3abe9ed-fa52-4a7f-8a9b-1eebc782781f"/>
217
+ <affinity>migratable</affinity>
218
+ </placement_policy>
219
+ <memory_policy>
220
+ <guaranteed>1073741824</guaranteed>
221
+ <ballooning>true</ballooning>
222
+ </memory_policy>
223
+ </vm>
224
+ EOX
225
+ @service.should_receive(:version).twice.and_return(:major=>"3", :minor=>"0", :build=>"0", :revision=>"0")
226
+ @service.should_receive(:resource_put).once.with(@vm.attributes[:href], expected_data).and_return(return_data)
227
+ @vm.detach_floppy
228
+ end
229
+
230
+ it "Ovirt 3.3 should remove payload" do
231
+ expected_data = <<-EOX.chomp
232
+ <vm>
233
+ <payloads/>
234
+ </vm>
235
+ EOX
236
+ return_data = <<-EOX.chomp
237
+ <vm href="/api/vms/128f9ffd-b82c-41e4-8c00-9742ed173bac" id="128f9ffd-b82c-41e4-8c00-9742ed173bac">
238
+ <name>bd-skeletal-clone-from-template</name>
239
+ <cpu>
240
+ <topology sockets="1" cores="1"/>
241
+ </cpu>
242
+ <os type="rhel_6x64">
243
+ <boot dev="hd"/>
244
+ </os>
245
+ <placement_policy>
246
+ <host id="a3abe9ed-fa52-4a7f-8a9b-1eebc782781f"/>
247
+ <affinity>migratable</affinity>
248
+ </placement_policy>
249
+ <memory_policy>
250
+ <guaranteed>1073741824</guaranteed>
251
+ <ballooning>true</ballooning>
252
+ </memory_policy>
253
+ </vm>
254
+ EOX
255
+ @service.should_receive(:version).and_return(:major=>"3", :minor=>"3", :build=>"0", :revision=>"0")
256
+ @service.should_receive(:resource_put).once.with(@vm.attributes[:href], expected_data).and_return(return_data)
257
+ @vm.detach_floppy
258
+ end
259
+ end
260
+ end
189
261
  end
metadata CHANGED
@@ -1,15 +1,16 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ovirt
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jason Frey
8
8
  - Brandon Dunne
9
+ - Keenan Brock
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2014-10-06 00:00:00.000000000 Z
13
+ date: 2014-11-04 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: bundler
@@ -29,14 +30,14 @@ dependencies:
29
30
  name: rake
30
31
  requirement: !ruby/object:Gem::Requirement
31
32
  requirements:
32
- - - ! '>='
33
+ - - '>='
33
34
  - !ruby/object:Gem::Version
34
35
  version: '0'
35
36
  type: :development
36
37
  prerelease: false
37
38
  version_requirements: !ruby/object:Gem::Requirement
38
39
  requirements:
39
- - - ! '>='
40
+ - - '>='
40
41
  - !ruby/object:Gem::Version
41
42
  version: '0'
42
43
  - !ruby/object:Gem::Dependency
@@ -57,70 +58,70 @@ dependencies:
57
58
  name: coveralls
58
59
  requirement: !ruby/object:Gem::Requirement
59
60
  requirements:
60
- - - ! '>='
61
+ - - '>='
61
62
  - !ruby/object:Gem::Version
62
63
  version: '0'
63
64
  type: :development
64
65
  prerelease: false
65
66
  version_requirements: !ruby/object:Gem::Requirement
66
67
  requirements:
67
- - - ! '>='
68
+ - - '>='
68
69
  - !ruby/object:Gem::Version
69
70
  version: '0'
70
71
  - !ruby/object:Gem::Dependency
71
72
  name: activesupport
72
73
  requirement: !ruby/object:Gem::Requirement
73
74
  requirements:
74
- - - ! '>='
75
+ - - '>='
75
76
  - !ruby/object:Gem::Version
76
77
  version: '0'
77
78
  type: :runtime
78
79
  prerelease: false
79
80
  version_requirements: !ruby/object:Gem::Requirement
80
81
  requirements:
81
- - - ! '>='
82
+ - - '>='
82
83
  - !ruby/object:Gem::Version
83
84
  version: '0'
84
85
  - !ruby/object:Gem::Dependency
85
86
  name: more_core_extensions
86
87
  requirement: !ruby/object:Gem::Requirement
87
88
  requirements:
88
- - - ! '>='
89
+ - - '>='
89
90
  - !ruby/object:Gem::Version
90
91
  version: '0'
91
92
  type: :runtime
92
93
  prerelease: false
93
94
  version_requirements: !ruby/object:Gem::Requirement
94
95
  requirements:
95
- - - ! '>='
96
+ - - '>='
96
97
  - !ruby/object:Gem::Version
97
98
  version: '0'
98
99
  - !ruby/object:Gem::Dependency
99
100
  name: nokogiri
100
101
  requirement: !ruby/object:Gem::Requirement
101
102
  requirements:
102
- - - ! '>='
103
+ - - '>='
103
104
  - !ruby/object:Gem::Version
104
105
  version: '0'
105
106
  type: :runtime
106
107
  prerelease: false
107
108
  version_requirements: !ruby/object:Gem::Requirement
108
109
  requirements:
109
- - - ! '>='
110
+ - - '>='
110
111
  - !ruby/object:Gem::Version
111
112
  version: '0'
112
113
  - !ruby/object:Gem::Dependency
113
114
  name: parallel
114
115
  requirement: !ruby/object:Gem::Requirement
115
116
  requirements:
116
- - - ! '>='
117
+ - - '>='
117
118
  - !ruby/object:Gem::Version
118
119
  version: '0'
119
120
  type: :runtime
120
121
  prerelease: false
121
122
  version_requirements: !ruby/object:Gem::Requirement
122
123
  requirements:
123
- - - ! '>='
124
+ - - '>='
124
125
  - !ruby/object:Gem::Version
125
126
  version: '0'
126
127
  - !ruby/object:Gem::Dependency
@@ -129,28 +130,24 @@ dependencies:
129
130
  requirements:
130
131
  - - ~>
131
132
  - !ruby/object:Gem::Version
132
- version: !binary |-
133
- MS42Ljc=
133
+ version: 1.7.2
134
134
  type: :runtime
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
138
  - - ~>
139
139
  - !ruby/object:Gem::Version
140
- version: !binary |-
141
- MS42Ljc=
140
+ version: 1.7.2
142
141
  description: Ovirt provides a simple Object Oriented interface to the REST API of
143
142
  oVirt and RHEV-M servers.
144
143
  email:
145
144
  - jfrey@redhat.com
146
145
  - bdunne@redhat.com
146
+ - keenan@thebrocks.net
147
147
  executables: []
148
148
  extensions: []
149
149
  extra_rdoc_files: []
150
150
  files:
151
- - .rspec
152
- - LICENSE.txt
153
- - README.md
154
151
  - lib/ovirt.rb
155
152
  - lib/ovirt/api.rb
156
153
  - lib/ovirt/base.rb
@@ -183,12 +180,15 @@ files:
183
180
  - lib/ovirt/version.rb
184
181
  - lib/ovirt/vm.rb
185
182
  - lib/ovirt/vmpool.rb
183
+ - README.md
184
+ - LICENSE.txt
186
185
  - spec/base_spec.rb
187
186
  - spec/event_spec.rb
188
187
  - spec/service_spec.rb
189
188
  - spec/spec_helper.rb
190
189
  - spec/template_spec.rb
191
190
  - spec/vm_spec.rb
191
+ - .rspec
192
192
  homepage: http://github.com/ManageIQ/ovirt
193
193
  licenses:
194
194
  - Apache
@@ -199,17 +199,17 @@ require_paths:
199
199
  - lib
200
200
  required_ruby_version: !ruby/object:Gem::Requirement
201
201
  requirements:
202
- - - ! '>='
202
+ - - '>='
203
203
  - !ruby/object:Gem::Version
204
204
  version: '0'
205
205
  required_rubygems_version: !ruby/object:Gem::Requirement
206
206
  requirements:
207
- - - ! '>='
207
+ - - '>='
208
208
  - !ruby/object:Gem::Version
209
209
  version: '0'
210
210
  requirements: []
211
211
  rubyforge_project:
212
- rubygems_version: 2.4.1
212
+ rubygems_version: 2.0.14
213
213
  signing_key:
214
214
  specification_version: 4
215
215
  summary: Ovirt provides a simple Object Oriented interface to the REST API of oVirt