opennebula 4.6.0 → 4.6.1
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/opennebula.rb +1 -1
- data/lib/opennebula/client.rb +6 -4
- data/lib/opennebula/xml_utils.rb +6 -1
- metadata +2 -2
data/lib/opennebula.rb
CHANGED
data/lib/opennebula/client.rb
CHANGED
@@ -20,7 +20,9 @@ require 'stringio'
|
|
20
20
|
|
21
21
|
|
22
22
|
module OpenNebula
|
23
|
-
|
23
|
+
def self.pool_page_size
|
24
|
+
@@pool_page_size
|
25
|
+
end
|
24
26
|
|
25
27
|
if OpenNebula::OX
|
26
28
|
class OxStreamParser < XMLRPC::XMLParser::AbstractStreamParser
|
@@ -68,12 +70,12 @@ module OpenNebula
|
|
68
70
|
|
69
71
|
if size=ENV['ONE_POOL_PAGE_SIZE']
|
70
72
|
if size.strip.match(/^\d+$/) && size.to_i >= 2
|
71
|
-
|
73
|
+
@@pool_page_size = size.to_i
|
72
74
|
else
|
73
|
-
|
75
|
+
@@pool_page_size = nil
|
74
76
|
end
|
75
77
|
else
|
76
|
-
|
78
|
+
@@pool_page_size = DEFAULT_POOL_PAGE_SIZE
|
77
79
|
end
|
78
80
|
|
79
81
|
|
data/lib/opennebula/xml_utils.rb
CHANGED
@@ -72,7 +72,12 @@ module OpenNebula
|
|
72
72
|
if @levels[@current].empty?
|
73
73
|
@levels[@current-1][name] = @value || {}
|
74
74
|
else
|
75
|
-
@levels[@current-1][name]
|
75
|
+
if @levels[@current-1][name]
|
76
|
+
@levels[@current-1][name] = [@levels[@current-1][name], @levels[@current]].flatten
|
77
|
+
else
|
78
|
+
@levels[@current-1][name] = @levels[@current]
|
79
|
+
end
|
80
|
+
|
76
81
|
@levels[@current] = Hash.new
|
77
82
|
end
|
78
83
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: opennebula
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.6.
|
4
|
+
version: 4.6.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-
|
12
|
+
date: 2014-05-16 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: nokogiri
|