opennebula 5.12.7 → 5.12.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cloud/CloudClient.rb +1 -1
- data/lib/opennebula/pool.rb +13 -0
- data/lib/opennebula/virtual_machine_pool.rb +8 -0
- data/lib/opennebula.rb +1 -1
- data/lib/vcenter_driver.rb +17 -3
- metadata +32 -32
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e4b58536ab717d40009555f14c8c8fcda70410ae
|
4
|
+
data.tar.gz: 52a729f5f2682793b520ffe1082d3b853ed255fa
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 79bc6dd1459137866b3a2fa32547557a074ba510ceaf20d05703270526c40127682f58517f4e053880542d0e150dbf47f00ed8955ae9678fb8a4a58af9d9e901
|
7
|
+
data.tar.gz: 0b7bdfeee63cd6801c8833ee1dae3243065b62d5648c66995487a3ee0934099ae5880e193356a1bdcc2c0d1584f16504a04b0168570cd96b6f6c2d73fdae769b
|
data/lib/cloud/CloudClient.rb
CHANGED
data/lib/opennebula/pool.rb
CHANGED
@@ -127,6 +127,19 @@ module OpenNebula
|
|
127
127
|
return hash
|
128
128
|
end
|
129
129
|
|
130
|
+
def monitoring_last(xml_method, *args)
|
131
|
+
rc = @client.call(xml_method, *args)
|
132
|
+
|
133
|
+
if OpenNebula.is_error?(rc)
|
134
|
+
return rc
|
135
|
+
end
|
136
|
+
|
137
|
+
xmldoc = XMLElement.new
|
138
|
+
xmldoc.initialize_xml(rc, 'MONITORING_DATA')
|
139
|
+
|
140
|
+
xmldoc.to_hash
|
141
|
+
end
|
142
|
+
|
130
143
|
private
|
131
144
|
# Calls to the corresponding info method to retreive the pool
|
132
145
|
# representation in XML format
|
@@ -202,6 +202,10 @@ module OpenNebula
|
|
202
202
|
return super(VM_POOL_METHODS[:monitoring], xpaths, filter_flag)
|
203
203
|
end
|
204
204
|
|
205
|
+
def monitoring_last(filter_flag=INFO_ALL)
|
206
|
+
return super(VM_POOL_METHODS[:monitoring], filter_flag, 0)
|
207
|
+
end
|
208
|
+
|
205
209
|
# Retrieves the monitoring data for all the VMs in the pool, in XML
|
206
210
|
#
|
207
211
|
# @param [Integer] filter_flag Optional filter flag to retrieve all or
|
@@ -446,6 +450,10 @@ module OpenNebula
|
|
446
450
|
private
|
447
451
|
|
448
452
|
def build_accounting(filter_flag, options, &block)
|
453
|
+
|
454
|
+
options[:start_time] = -1 if options[:start_time].nil?
|
455
|
+
options[:end_time] = -1 if options[:end_time].nil?
|
456
|
+
|
449
457
|
xml_str = @client.call(VM_POOL_METHODS[:accounting],
|
450
458
|
filter_flag,
|
451
459
|
options[:start_time],
|
data/lib/opennebula.rb
CHANGED
data/lib/vcenter_driver.rb
CHANGED
@@ -36,11 +36,25 @@ end
|
|
36
36
|
|
37
37
|
ENV['LANG'] = 'C'
|
38
38
|
|
39
|
+
# %%RUBYGEMS_SETUP_BEGIN%%
|
39
40
|
if File.directory?(GEMS_LOCATION)
|
40
|
-
|
41
|
-
|
42
|
-
|
41
|
+
real_gems_path = File.realpath(GEMS_LOCATION)
|
42
|
+
if !defined?(Gem) || Gem.path != [real_gems_path]
|
43
|
+
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
|
44
|
+
|
45
|
+
# Suppress warnings from Rubygems
|
46
|
+
# https://github.com/OpenNebula/one/issues/5379
|
47
|
+
begin
|
48
|
+
verb = $VERBOSE
|
49
|
+
$VERBOSE = nil
|
50
|
+
require 'rubygems'
|
51
|
+
Gem.use_paths(real_gems_path)
|
52
|
+
ensure
|
53
|
+
$VERBOSE = verb
|
54
|
+
end
|
55
|
+
end
|
43
56
|
end
|
57
|
+
# %%RUBYGEMS_SETUP_END%%
|
44
58
|
|
45
59
|
$LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'
|
46
60
|
$LOAD_PATH << LIB_LOCATION + '/ruby'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: opennebula
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.12.
|
4
|
+
version: 5.12.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- OpenNebula
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-12-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: nokogiri
|
@@ -65,61 +65,61 @@ files:
|
|
65
65
|
- lib/CommandManager.rb
|
66
66
|
- lib/ActionManager.rb
|
67
67
|
- lib/DriverExecHelper.rb
|
68
|
-
- lib/opennebula/acl.rb
|
69
|
-
- lib/opennebula/acl_pool.rb
|
70
|
-
- lib/opennebula/client.rb
|
71
|
-
- lib/opennebula/cluster.rb
|
72
|
-
- lib/opennebula/cluster_pool.rb
|
73
|
-
- lib/opennebula/datastore.rb
|
74
|
-
- lib/opennebula/datastore_pool.rb
|
75
|
-
- lib/opennebula/document_pool.rb
|
76
|
-
- lib/opennebula/document_pool_json.rb
|
77
|
-
- lib/opennebula/error.rb
|
78
|
-
- lib/opennebula/group.rb
|
79
|
-
- lib/opennebula/group_pool.rb
|
80
|
-
- lib/opennebula/hook_log.rb
|
81
|
-
- lib/opennebula/hook_pool.rb
|
82
|
-
- lib/opennebula/host.rb
|
83
|
-
- lib/opennebula/host_pool.rb
|
84
|
-
- lib/opennebula/image_pool.rb
|
85
|
-
- lib/opennebula/marketplace.rb
|
86
|
-
- lib/opennebula/marketplace_pool.rb
|
87
|
-
- lib/opennebula/marketplaceapp_pool.rb
|
88
|
-
- lib/opennebula/pool_element.rb
|
89
|
-
- lib/opennebula/security_group.rb
|
90
68
|
- lib/opennebula/security_group_pool.rb
|
91
69
|
- lib/opennebula/system.rb
|
70
|
+
- lib/opennebula/template.rb
|
92
71
|
- lib/opennebula/template_pool.rb
|
72
|
+
- lib/opennebula/user.rb
|
93
73
|
- lib/opennebula/user_pool.rb
|
94
74
|
- lib/opennebula/utils.rb
|
95
75
|
- lib/opennebula/vdc.rb
|
96
76
|
- lib/opennebula/vdc_pool.rb
|
77
|
+
- lib/opennebula/virtual_machine.rb
|
97
78
|
- lib/opennebula/virtual_machine_pool.rb
|
79
|
+
- lib/opennebula/virtual_network.rb
|
98
80
|
- lib/opennebula/virtual_network_pool.rb
|
81
|
+
- lib/opennebula/virtual_router.rb
|
99
82
|
- lib/opennebula/virtual_router_pool.rb
|
83
|
+
- lib/opennebula/vm_group.rb
|
100
84
|
- lib/opennebula/vm_group_pool.rb
|
85
|
+
- lib/opennebula/vntemplate.rb
|
101
86
|
- lib/opennebula/vntemplate_pool.rb
|
102
87
|
- lib/opennebula/xml_element.rb
|
103
88
|
- lib/opennebula/xml_pool.rb
|
104
89
|
- lib/opennebula/xml_utils.rb
|
105
90
|
- lib/opennebula/zone.rb
|
106
91
|
- lib/opennebula/zone_pool.rb
|
92
|
+
- lib/opennebula/acl.rb
|
93
|
+
- lib/opennebula/acl_pool.rb
|
94
|
+
- lib/opennebula/client.rb
|
95
|
+
- lib/opennebula/cluster.rb
|
96
|
+
- lib/opennebula/cluster_pool.rb
|
97
|
+
- lib/opennebula/datastore.rb
|
98
|
+
- lib/opennebula/datastore_pool.rb
|
107
99
|
- lib/opennebula/document.rb
|
108
100
|
- lib/opennebula/document_json.rb
|
101
|
+
- lib/opennebula/document_pool.rb
|
102
|
+
- lib/opennebula/document_pool_json.rb
|
103
|
+
- lib/opennebula/error.rb
|
104
|
+
- lib/opennebula/group.rb
|
105
|
+
- lib/opennebula/group_pool.rb
|
109
106
|
- lib/opennebula/hook.rb
|
107
|
+
- lib/opennebula/hook_log.rb
|
108
|
+
- lib/opennebula/hook_pool.rb
|
109
|
+
- lib/opennebula/host.rb
|
110
|
+
- lib/opennebula/host_pool.rb
|
110
111
|
- lib/opennebula/image.rb
|
112
|
+
- lib/opennebula/image_pool.rb
|
113
|
+
- lib/opennebula/marketplace.rb
|
114
|
+
- lib/opennebula/marketplace_pool.rb
|
111
115
|
- lib/opennebula/marketplaceapp.rb
|
116
|
+
- lib/opennebula/marketplaceapp_pool.rb
|
112
117
|
- lib/opennebula/oneflow_client.rb
|
113
118
|
- lib/opennebula/pool.rb
|
114
|
-
- lib/opennebula/
|
115
|
-
- lib/opennebula/
|
116
|
-
- lib/opennebula/virtual_machine.rb
|
117
|
-
- lib/opennebula/virtual_network.rb
|
118
|
-
- lib/opennebula/virtual_router.rb
|
119
|
-
- lib/opennebula/vm_group.rb
|
120
|
-
- lib/opennebula/vntemplate.rb
|
121
|
-
- lib/opennebula/ldap_auth.rb
|
119
|
+
- lib/opennebula/pool_element.rb
|
120
|
+
- lib/opennebula/security_group.rb
|
122
121
|
- lib/opennebula/ldap_auth_spec.rb
|
122
|
+
- lib/opennebula/ldap_auth.rb
|
123
123
|
- lib/opennebula/server_cipher_auth.rb
|
124
124
|
- lib/opennebula/server_x509_auth.rb
|
125
125
|
- lib/opennebula/ssh_auth.rb
|