fog-libvirt 0.10.0 → 0.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/fog-libvirt.gemspec +2 -2
- data/lib/fog/libvirt/models/compute/server.rb +1 -1
- data/lib/fog/libvirt/requests/compute/list_domains.rb +2 -6
- data/lib/fog/libvirt/requests/compute/list_pools.rb +24 -16
- data/lib/fog/libvirt/version.rb +1 -1
- data/tests/libvirt/requests/compute/list_pools_tests.rb +2 -2
- metadata +12 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 478f04152afea3fd1b8ea8e6aa2d8a2bcdc83fc121f2e9cf61925c64a69c483b
|
4
|
+
data.tar.gz: 364dcd8e9c09434b872d06b2c0d8bfce4c2f9320a57ee8d0f954223628797814
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b65c110f9d40bc749f967da511d7c534852dd4004d39b410cc07125eac26a0ebbece4fbbe7a38de1026142d5fe6d4457abba0f472a2769ef900c31af1e98d939
|
7
|
+
data.tar.gz: 5e2508a3aeef1041963995a594b6c3788c9bda9638f5ff73f2a5fd2c12fbd1e18556c46a983b3ae6de07e96a08d3fd15c6b037fb1f2f845194587a69d844b360
|
data/fog-libvirt.gemspec
CHANGED
@@ -36,11 +36,11 @@ Gem::Specification.new do |s|
|
|
36
36
|
s.add_development_dependency("minitest-stub-const")
|
37
37
|
s.add_development_dependency("pry")
|
38
38
|
s.add_development_dependency("rake")
|
39
|
-
s.add_development_dependency("rubocop")
|
39
|
+
s.add_development_dependency("rubocop")
|
40
40
|
s.add_development_dependency("shindo", "~> 0.3.4")
|
41
41
|
s.add_development_dependency("simplecov")
|
42
42
|
s.add_development_dependency("yard")
|
43
|
-
s.add_development_dependency("mocha", "
|
43
|
+
s.add_development_dependency("mocha", ">= 1.15", "< 3")
|
44
44
|
|
45
45
|
# Let's not ship dot files and gemfiles
|
46
46
|
git_files = `git ls-files`.split("\n")
|
@@ -92,7 +92,7 @@ module Fog
|
|
92
92
|
|
93
93
|
def destroy(options={ :destroy_volumes => false, :flags => 0 })
|
94
94
|
poweroff unless stopped?
|
95
|
-
if options
|
95
|
+
if options.fetch(:flags, 0).zero?
|
96
96
|
service.vm_action(uuid, :undefine)
|
97
97
|
else
|
98
98
|
service.vm_action(uuid, :undefine, options[:flags])
|
@@ -39,13 +39,9 @@ module Fog
|
|
39
39
|
end
|
40
40
|
|
41
41
|
def domain_volumes xml
|
42
|
-
|
43
|
-
|
44
|
-
vols = []
|
45
|
-
vols_by_file.zip(vols_by_name).each do |by_file,by_name|
|
46
|
-
vols.push(by_file.nil? ? by_name : by_file)
|
42
|
+
xml_elements(xml, "domain/devices/disk/source").map do |element|
|
43
|
+
element[:file] || element[:dev] || element[:name]
|
47
44
|
end
|
48
|
-
vols
|
49
45
|
end
|
50
46
|
|
51
47
|
def boot_order xml
|
@@ -1,24 +1,10 @@
|
|
1
1
|
module Fog
|
2
2
|
module Libvirt
|
3
3
|
class Compute
|
4
|
-
|
5
|
-
def list_pools(filter = { })
|
6
|
-
data=[]
|
7
|
-
if filter.key?(:name)
|
8
|
-
data << find_pool_by_name(filter[:name], filter[:include_inactive])
|
9
|
-
elsif filter.key?(:uuid)
|
10
|
-
data << find_pool_by_uuid(filter[:uuid], filter[:include_inactive])
|
11
|
-
else
|
12
|
-
(client.list_storage_pools + client.list_defined_storage_pools).each do |name|
|
13
|
-
data << find_pool_by_name(name, filter[:include_inactive])
|
14
|
-
end
|
15
|
-
end
|
16
|
-
data.compact
|
17
|
-
end
|
18
|
-
|
4
|
+
module Shared
|
19
5
|
private
|
20
6
|
|
21
|
-
|
7
|
+
def pool_to_attributes(pool, include_inactive = nil)
|
22
8
|
return nil unless pool.active? || include_inactive
|
23
9
|
|
24
10
|
states=[:inactive, :building, :running, :degrated, :inaccessible]
|
@@ -34,6 +20,26 @@ module Fog
|
|
34
20
|
:state => states[pool.info.state]
|
35
21
|
}
|
36
22
|
end
|
23
|
+
end
|
24
|
+
|
25
|
+
class Real
|
26
|
+
include Shared
|
27
|
+
|
28
|
+
def list_pools(filter = { })
|
29
|
+
data=[]
|
30
|
+
if filter.key?(:name)
|
31
|
+
data << find_pool_by_name(filter[:name], filter[:include_inactive])
|
32
|
+
elsif filter.key?(:uuid)
|
33
|
+
data << find_pool_by_uuid(filter[:uuid], filter[:include_inactive])
|
34
|
+
else
|
35
|
+
(client.list_storage_pools + client.list_defined_storage_pools).each do |name|
|
36
|
+
data << find_pool_by_name(name, filter[:include_inactive])
|
37
|
+
end
|
38
|
+
end
|
39
|
+
data.compact
|
40
|
+
end
|
41
|
+
|
42
|
+
private
|
37
43
|
|
38
44
|
def find_pool_by_name name, include_inactive
|
39
45
|
pool_to_attributes(client.lookup_storage_pool_by_name(name), include_inactive)
|
@@ -49,6 +55,8 @@ module Fog
|
|
49
55
|
end
|
50
56
|
|
51
57
|
class Mock
|
58
|
+
include Shared
|
59
|
+
|
52
60
|
def list_pools(filter = { })
|
53
61
|
pool1 = mock_pool 'pool1'
|
54
62
|
pool2 = mock_pool 'pool1'
|
data/lib/fog/libvirt/version.rb
CHANGED
@@ -59,11 +59,11 @@ Shindo.tests("Fog::Compute[:libvirt] | list_pools request", 'libvirt') do
|
|
59
59
|
:num_of_volumes => 3
|
60
60
|
}
|
61
61
|
|
62
|
-
response =
|
62
|
+
response = compute.send(:pool_to_attributes, FakePool.new(inactive_pool), true)
|
63
63
|
|
64
64
|
test("should be hash of attributes") { response.kind_of? Hash }
|
65
65
|
|
66
|
-
response =
|
66
|
+
response = compute.send(:pool_to_attributes, FakePool.new(inactive_pool))
|
67
67
|
|
68
68
|
test("should be nil") { response.nil? }
|
69
69
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fog-libvirt
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.11.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- geemus (Wesley Beary)
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-12-
|
11
|
+
date: 2022-12-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fog-core
|
@@ -210,16 +210,22 @@ dependencies:
|
|
210
210
|
name: mocha
|
211
211
|
requirement: !ruby/object:Gem::Requirement
|
212
212
|
requirements:
|
213
|
-
- - "
|
213
|
+
- - ">="
|
214
|
+
- !ruby/object:Gem::Version
|
215
|
+
version: '1.15'
|
216
|
+
- - "<"
|
214
217
|
- !ruby/object:Gem::Version
|
215
|
-
version:
|
218
|
+
version: '3'
|
216
219
|
type: :development
|
217
220
|
prerelease: false
|
218
221
|
version_requirements: !ruby/object:Gem::Requirement
|
219
222
|
requirements:
|
220
|
-
- - "
|
223
|
+
- - ">="
|
224
|
+
- !ruby/object:Gem::Version
|
225
|
+
version: '1.15'
|
226
|
+
- - "<"
|
221
227
|
- !ruby/object:Gem::Version
|
222
|
-
version:
|
228
|
+
version: '3'
|
223
229
|
description: This library can be used as a module for 'fog' or as standalone libvirt
|
224
230
|
provider.
|
225
231
|
email: geemus@gmail.com
|