ovirt 0.10.0 → 0.11.0

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ovirt/service.rb +9 -2
  3. data/lib/ovirt/version.rb +1 -1
  4. data/lib/ovirt.rb +0 -1
  5. data/spec/service_spec.rb +23 -0
  6. data/spec/vm_spec.rb +4 -4
  7. metadata +42 -42
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1886f330149d0994b6de59583f62471a5efeed5e
4
- data.tar.gz: dd5ed8130d545bc6a33219e007f80f2bee9cf428
3
+ metadata.gz: 5048f3089d3d263bbd87e8269ebf1b62aa07d71a
4
+ data.tar.gz: 678194cdf3266c45341f285a242c1c4736e1bc34
5
5
  SHA512:
6
- metadata.gz: dd28d604f2b102b336fe528a3c6f41a3f2225b7c7eb9308554021b21f726871b486e7b34d0b83e7743823bdff278b326890612faed50abea4f556e999b94059c
7
- data.tar.gz: 562e1d21bc674e8b57abdfde3f8aaa509da282e2dffc4707b3f7ad18be98541765c17e12685e8bead0b9ef1173dba386c47d174376f6bcc16918a37e44c23010
6
+ metadata.gz: e28b83730c169e9180e02ed1a8b920ad99bbbd5862980a320fa480495f0119b3060abfffa54db49c80eceac6d1d0053e71f9fee70f6c2532d8149a7e9acf9209
7
+ data.tar.gz: f0bd623f3e33d426d8580a7a57045ad834cb8445527f1ccd2f86ec43f5c3d2dc752cc0d2c12b512eb5d9d82d13580028d6dddaa42246e5bf29bc30ced614d78c
data/lib/ovirt/service.rb CHANGED
@@ -197,10 +197,17 @@ module Ovirt
197
197
  def api_uri(path = nil)
198
198
  # Calculate the complete URI:
199
199
  uri = URI.join(base_uri, api_path).to_s
200
+
201
+ # The path passed to this method will have the "/api" prefix if it comes from the "ems_ref"
202
+ # attribute stored in the database, and will have the "/ovirt-engine/api" if it comes directly
203
+ # from the "href" attribute of the XML documents, for example when using the "relationships"
204
+ # method to fetch secondary objects related to the primary object. This means that to have
205
+ # a clean path we need to remove both "ovirt-engine" and "api".
200
206
  unless path.nil?
201
207
  parts = path.to_s.split('/')
202
- parts.shift if parts.first == '' # Remove leading slash
203
- parts.shift if parts.first == 'api' # We already have /api in our URI
208
+ parts.shift if parts.first == ''
209
+ parts.shift if parts.first == 'ovirt-engine'
210
+ parts.shift if parts.first == 'api'
204
211
  uri += "/#{parts.join('/')}" unless parts.empty?
205
212
  end
206
213
  uri
data/lib/ovirt/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Ovirt
2
- VERSION = "0.10.0"
2
+ VERSION = "0.11.0"
3
3
  end
data/lib/ovirt.rb CHANGED
@@ -1,4 +1,3 @@
1
- require 'active_support/all'
2
1
  require 'more_core_extensions/all'
3
2
 
4
3
  require 'ovirt/exception'
data/spec/service_spec.rb CHANGED
@@ -206,6 +206,29 @@ EOX
206
206
  end
207
207
  end
208
208
 
209
+ context "#api_uri" do
210
+ BASE_URI = "https://nobody.com"
211
+ API_PATH = "/ovirt-engine/api"
212
+
213
+ before do
214
+ expect(service).to receive(:base_uri).and_return(BASE_URI)
215
+ expect(service).to receive(:api_path).and_return(API_PATH)
216
+ end
217
+
218
+ it "removes slash" do
219
+ expect(service.api_uri("/vms/123")).to eq("#{BASE_URI}#{API_PATH}/vms/123")
220
+ end
221
+
222
+ it "removes /api" do
223
+ expect(service.api_uri("/api/vms/123")).to eq("#{BASE_URI}#{API_PATH}/vms/123")
224
+ end
225
+
226
+ it "removes /ovirt-engine/api" do
227
+ expect(service.api_uri("/ovirt-engine/api/vms/123")).to eq("#{BASE_URI}#{API_PATH}/vms/123")
228
+ end
229
+
230
+ end
231
+
209
232
  context "#version" do
210
233
  it "with :full_version" do
211
234
  allow(service).to receive(:product_info).and_return(:full_version => "3.4.5-0.3.el6ev", :version => {:major => "3", :minor => "4", :build => "0", :revision => "0"})
data/spec/vm_spec.rb CHANGED
@@ -13,9 +13,9 @@ describe Ovirt::Vm do
13
13
  :interface => "virtio",
14
14
  :format => "raw",
15
15
  :image_id => "a791ba77-8cc1-44de-9945-69f0a291cc47",
16
- :size => 10_737_418_240,
17
- :provisioned_size => 10_737_418_240,
18
- :actual_size => 1_316_855_808,
16
+ :size => 10_737_418_240, # 10.gigabytes
17
+ :provisioned_size => 10_737_418_240, # 10.gigabytes
18
+ :actual_size => 1_316_855_808, # 1255.megabytes
19
19
  :sparse => true,
20
20
  :bootable => true,
21
21
  :wipe_after_delete => true,
@@ -169,7 +169,7 @@ EOX
169
169
 
170
170
  context "#memory_reserve" do
171
171
  it "updates the memory policy guarantee" do
172
- memory_reserve = 1.gigabyte
172
+ memory_reserve = 1_073_741_824 # 1.gigabyte
173
173
  expected_data = <<-EOX.chomp
174
174
  <vm>
175
175
  <memory_policy>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ovirt
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.0
4
+ version: 0.11.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jason Frey
@@ -20,146 +20,146 @@ authors:
20
20
  autorequire:
21
21
  bindir: bin
22
22
  cert_chain: []
23
- date: 2016-05-04 00:00:00.000000000 Z
23
+ date: 2016-07-07 00:00:00.000000000 Z
24
24
  dependencies:
25
+ - !ruby/object:Gem::Dependency
26
+ name: activesupport
27
+ requirement: !ruby/object:Gem::Requirement
28
+ requirements:
29
+ - - <
30
+ - !ruby/object:Gem::Version
31
+ version: '5'
32
+ type: :development
33
+ prerelease: false
34
+ version_requirements: !ruby/object:Gem::Requirement
35
+ requirements:
36
+ - - <
37
+ - !ruby/object:Gem::Version
38
+ version: '5'
25
39
  - !ruby/object:Gem::Dependency
26
40
  name: bundler
27
41
  requirement: !ruby/object:Gem::Requirement
28
42
  requirements:
29
- - - "~>"
43
+ - - ~>
30
44
  - !ruby/object:Gem::Version
31
45
  version: '1.3'
32
46
  type: :development
33
47
  prerelease: false
34
48
  version_requirements: !ruby/object:Gem::Requirement
35
49
  requirements:
36
- - - "~>"
50
+ - - ~>
37
51
  - !ruby/object:Gem::Version
38
52
  version: '1.3'
39
53
  - !ruby/object:Gem::Dependency
40
54
  name: factory_girl
41
55
  requirement: !ruby/object:Gem::Requirement
42
56
  requirements:
43
- - - "~>"
57
+ - - ~>
44
58
  - !ruby/object:Gem::Version
45
59
  version: '4.0'
46
60
  type: :development
47
61
  prerelease: false
48
62
  version_requirements: !ruby/object:Gem::Requirement
49
63
  requirements:
50
- - - "~>"
64
+ - - ~>
51
65
  - !ruby/object:Gem::Version
52
66
  version: '4.0'
53
67
  - !ruby/object:Gem::Dependency
54
68
  name: rake
55
69
  requirement: !ruby/object:Gem::Requirement
56
70
  requirements:
57
- - - ">="
71
+ - - '>='
58
72
  - !ruby/object:Gem::Version
59
73
  version: '0'
60
74
  type: :development
61
75
  prerelease: false
62
76
  version_requirements: !ruby/object:Gem::Requirement
63
77
  requirements:
64
- - - ">="
78
+ - - '>='
65
79
  - !ruby/object:Gem::Version
66
80
  version: '0'
67
81
  - !ruby/object:Gem::Dependency
68
82
  name: rspec
69
83
  requirement: !ruby/object:Gem::Requirement
70
84
  requirements:
71
- - - "~>"
85
+ - - ~>
72
86
  - !ruby/object:Gem::Version
73
87
  version: '3.0'
74
88
  type: :development
75
89
  prerelease: false
76
90
  version_requirements: !ruby/object:Gem::Requirement
77
91
  requirements:
78
- - - "~>"
92
+ - - ~>
79
93
  - !ruby/object:Gem::Version
80
94
  version: '3.0'
81
95
  - !ruby/object:Gem::Dependency
82
96
  name: coveralls
83
97
  requirement: !ruby/object:Gem::Requirement
84
98
  requirements:
85
- - - ">="
99
+ - - '>='
86
100
  - !ruby/object:Gem::Version
87
101
  version: '0'
88
102
  type: :development
89
103
  prerelease: false
90
104
  version_requirements: !ruby/object:Gem::Requirement
91
105
  requirements:
92
- - - ">="
93
- - !ruby/object:Gem::Version
94
- version: '0'
95
- - !ruby/object:Gem::Dependency
96
- name: activesupport
97
- requirement: !ruby/object:Gem::Requirement
98
- requirements:
99
- - - ">="
100
- - !ruby/object:Gem::Version
101
- version: '0'
102
- type: :runtime
103
- prerelease: false
104
- version_requirements: !ruby/object:Gem::Requirement
105
- requirements:
106
- - - ">="
106
+ - - '>='
107
107
  - !ruby/object:Gem::Version
108
108
  version: '0'
109
109
  - !ruby/object:Gem::Dependency
110
110
  name: more_core_extensions
111
111
  requirement: !ruby/object:Gem::Requirement
112
112
  requirements:
113
- - - ">="
113
+ - - '>='
114
114
  - !ruby/object:Gem::Version
115
- version: '0'
115
+ version: 3.0.0
116
116
  type: :runtime
117
117
  prerelease: false
118
118
  version_requirements: !ruby/object:Gem::Requirement
119
119
  requirements:
120
- - - ">="
120
+ - - '>='
121
121
  - !ruby/object:Gem::Version
122
- version: '0'
122
+ version: 3.0.0
123
123
  - !ruby/object:Gem::Dependency
124
124
  name: nokogiri
125
125
  requirement: !ruby/object:Gem::Requirement
126
126
  requirements:
127
- - - ">="
127
+ - - '>='
128
128
  - !ruby/object:Gem::Version
129
129
  version: '0'
130
130
  type: :runtime
131
131
  prerelease: false
132
132
  version_requirements: !ruby/object:Gem::Requirement
133
133
  requirements:
134
- - - ">="
134
+ - - '>='
135
135
  - !ruby/object:Gem::Version
136
136
  version: '0'
137
137
  - !ruby/object:Gem::Dependency
138
138
  name: parallel
139
139
  requirement: !ruby/object:Gem::Requirement
140
140
  requirements:
141
- - - ">="
141
+ - - '>='
142
142
  - !ruby/object:Gem::Version
143
143
  version: '0'
144
144
  type: :runtime
145
145
  prerelease: false
146
146
  version_requirements: !ruby/object:Gem::Requirement
147
147
  requirements:
148
- - - ">="
148
+ - - '>='
149
149
  - !ruby/object:Gem::Version
150
150
  version: '0'
151
151
  - !ruby/object:Gem::Dependency
152
152
  name: rest-client
153
153
  requirement: !ruby/object:Gem::Requirement
154
154
  requirements:
155
- - - ">="
155
+ - - '>='
156
156
  - !ruby/object:Gem::Version
157
157
  version: 2.0.0.rc1
158
158
  type: :runtime
159
159
  prerelease: false
160
160
  version_requirements: !ruby/object:Gem::Requirement
161
161
  requirements:
162
- - - ">="
162
+ - - '>='
163
163
  - !ruby/object:Gem::Version
164
164
  version: 2.0.0.rc1
165
165
  description: Ovirt provides a simple Object Oriented interface to the REST API of
@@ -182,7 +182,7 @@ executables: []
182
182
  extensions: []
183
183
  extra_rdoc_files: []
184
184
  files:
185
- - ".rspec"
185
+ - .rspec
186
186
  - LICENSE.txt
187
187
  - README.md
188
188
  - lib/ovirt.rb
@@ -239,17 +239,17 @@ require_paths:
239
239
  - lib
240
240
  required_ruby_version: !ruby/object:Gem::Requirement
241
241
  requirements:
242
- - - ">="
242
+ - - '>='
243
243
  - !ruby/object:Gem::Version
244
- version: 1.9.3
244
+ version: 2.0.0
245
245
  required_rubygems_version: !ruby/object:Gem::Requirement
246
246
  requirements:
247
- - - ">="
247
+ - - '>='
248
248
  - !ruby/object:Gem::Version
249
249
  version: '0'
250
250
  requirements: []
251
251
  rubyforge_project:
252
- rubygems_version: 2.6.3
252
+ rubygems_version: 2.6.6
253
253
  signing_key:
254
254
  specification_version: 4
255
255
  summary: Ovirt provides a simple Object Oriented interface to the REST API of oVirt
@@ -265,4 +265,4 @@ test_files:
265
265
  - spec/spec_helper.rb
266
266
  - spec/template_spec.rb
267
267
  - spec/vm_spec.rb
268
- - ".rspec"
268
+ - .rspec