opennebula 5.10.5 → 5.12.0.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.
- checksums.yaml +4 -4
- data/lib/ActionManager.rb +1 -1
- data/lib/CommandManager.rb +13 -3
- data/lib/DriverExecHelper.rb +19 -18
- data/lib/OpenNebulaDriver.rb +38 -62
- data/lib/VirtualMachineDriver.rb +1 -1
- data/lib/cloud/CloudClient.rb +3 -3
- data/lib/opennebula.rb +2 -2
- data/lib/opennebula/acl.rb +1 -1
- data/lib/opennebula/acl_pool.rb +1 -1
- data/lib/opennebula/client.rb +1 -1
- data/lib/opennebula/cluster.rb +1 -1
- data/lib/opennebula/cluster_pool.rb +1 -1
- data/lib/opennebula/datastore.rb +1 -1
- data/lib/opennebula/datastore_pool.rb +1 -1
- data/lib/opennebula/document.rb +1 -1
- data/lib/opennebula/document_json.rb +1 -1
- data/lib/opennebula/document_pool.rb +2 -2
- data/lib/opennebula/document_pool_json.rb +1 -1
- data/lib/opennebula/error.rb +1 -1
- data/lib/opennebula/group.rb +1 -1
- data/lib/opennebula/group_pool.rb +1 -1
- data/lib/opennebula/hook.rb +1 -1
- data/lib/opennebula/hook_log.rb +1 -1
- data/lib/opennebula/hook_pool.rb +1 -1
- data/lib/opennebula/host.rb +13 -5
- data/lib/opennebula/host_pool.rb +11 -5
- data/lib/opennebula/image.rb +1 -1
- data/lib/opennebula/image_pool.rb +1 -1
- data/lib/opennebula/ldap_auth.rb +24 -19
- data/lib/opennebula/ldap_auth_spec.rb +1 -1
- data/lib/opennebula/marketplace.rb +1 -1
- data/lib/opennebula/marketplace_pool.rb +1 -1
- data/lib/opennebula/marketplaceapp.rb +4 -3
- data/lib/opennebula/marketplaceapp_pool.rb +1 -1
- data/lib/opennebula/oneflow_client.rb +24 -3
- data/lib/opennebula/pool.rb +4 -10
- data/lib/opennebula/pool_element.rb +9 -37
- data/lib/opennebula/security_group.rb +1 -1
- data/lib/opennebula/security_group_pool.rb +1 -1
- data/lib/opennebula/server_cipher_auth.rb +1 -1
- data/lib/opennebula/server_x509_auth.rb +1 -1
- data/lib/opennebula/ssh_auth.rb +1 -1
- data/lib/opennebula/system.rb +3 -3
- data/lib/opennebula/template.rb +1 -1
- data/lib/opennebula/template_pool.rb +1 -1
- data/lib/opennebula/user.rb +1 -1
- data/lib/opennebula/user_pool.rb +1 -1
- data/lib/opennebula/utils.rb +1 -1
- data/lib/opennebula/vdc.rb +1 -1
- data/lib/opennebula/vdc_pool.rb +1 -1
- data/lib/opennebula/virtual_machine.rb +8 -7
- data/lib/opennebula/virtual_machine_pool.rb +9 -7
- data/lib/opennebula/virtual_network.rb +9 -3
- data/lib/opennebula/virtual_network_pool.rb +1 -1
- data/lib/opennebula/virtual_router.rb +1 -1
- data/lib/opennebula/virtual_router_pool.rb +1 -1
- data/lib/opennebula/vm_group.rb +1 -1
- data/lib/opennebula/vm_group_pool.rb +1 -1
- data/lib/opennebula/vntemplate.rb +1 -1
- data/lib/opennebula/vntemplate_pool.rb +1 -1
- data/lib/opennebula/x509_auth.rb +1 -1
- data/lib/opennebula/xml_element.rb +1 -1
- data/lib/opennebula/xml_pool.rb +1 -1
- data/lib/opennebula/xml_utils.rb +1 -1
- data/lib/opennebula/zone.rb +1 -1
- data/lib/opennebula/zone_pool.rb +1 -1
- data/lib/vcenter_driver.rb +10 -3
- metadata +6 -6
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/ssh_auth.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/system.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -60,7 +60,7 @@ module OpenNebula
|
|
|
60
60
|
|
|
61
61
|
# Executes a SQL query command on OpenNebula DB
|
|
62
62
|
# @param [String] Sql string
|
|
63
|
-
# @return [String, OpenNebula::Error] Sql execution result in XML
|
|
63
|
+
# @return [String, OpenNebula::Error] Sql execution result in XML
|
|
64
64
|
# format in case of success, Error otherwise
|
|
65
65
|
# <QUERY>
|
|
66
66
|
# the query sent to oned
|
|
@@ -110,7 +110,7 @@ module OpenNebula
|
|
|
110
110
|
end
|
|
111
111
|
|
|
112
112
|
config = XMLElement.new
|
|
113
|
-
config.initialize_xml(rc, '
|
|
113
|
+
config.initialize_xml(rc, 'OPENNEBULA_CONFIGURATION')
|
|
114
114
|
|
|
115
115
|
return config
|
|
116
116
|
end
|
data/lib/opennebula/template.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/user.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/user_pool.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/utils.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/vdc.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/vdc_pool.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -122,6 +122,7 @@ module OpenNebula
|
|
|
122
122
|
DISK_RESIZE
|
|
123
123
|
DISK_RESIZE_POWEROFF
|
|
124
124
|
DISK_RESIZE_UNDEPLOYED
|
|
125
|
+
HOTPLUG_NIC_POWEROFF
|
|
125
126
|
}
|
|
126
127
|
|
|
127
128
|
SHORT_VM_STATES={
|
|
@@ -202,7 +203,8 @@ module OpenNebula
|
|
|
202
203
|
"PROLOG_MIGRATE_UNKNOWN_FAILURE" => "fail",
|
|
203
204
|
"DISK_RESIZE" => "drsz",
|
|
204
205
|
"DISK_RESIZE_POWEROFF" => "drsz",
|
|
205
|
-
"DISK_RESIZE_UNDEPLOYED" => "drsz"
|
|
206
|
+
"DISK_RESIZE_UNDEPLOYED" => "drsz",
|
|
207
|
+
"HOTPLUG_NIC_POWEROFF" => "hotp"
|
|
206
208
|
}
|
|
207
209
|
|
|
208
210
|
HISTORY_ACTION=%w{none migrate live-migrate shutdown shutdown-hard
|
|
@@ -560,18 +562,17 @@ module OpenNebula
|
|
|
560
562
|
# the requested xpath expressions, and an Array of 'timestamp, value'.
|
|
561
563
|
#
|
|
562
564
|
# @example
|
|
563
|
-
# vm.monitoring( ['
|
|
565
|
+
# vm.monitoring( ['CPU', 'NETTX'] )
|
|
564
566
|
#
|
|
565
567
|
# {
|
|
566
|
-
# "
|
|
568
|
+
# "CPU"=>[["1435085098", "47"], ["1435085253", "5"],
|
|
567
569
|
# ["1435085410", "48"], ["1435085566", "3"], ["1435088136", "2"]],
|
|
568
|
-
# "
|
|
570
|
+
# "NETTX"=>[["1435085098", "0"], ["1435085253", "50"],
|
|
569
571
|
# ["1435085410", "50"], ["1435085566", "50"], ["1435085723", "50"]]
|
|
570
572
|
# }
|
|
571
573
|
#
|
|
572
574
|
def monitoring(xpath_expressions)
|
|
573
|
-
return super(VM_METHODS[:monitoring],
|
|
574
|
-
'LAST_POLL', xpath_expressions)
|
|
575
|
+
return super(VM_METHODS[:monitoring], xpath_expressions)
|
|
575
576
|
end
|
|
576
577
|
|
|
577
578
|
# Retrieves this VM's monitoring data from OpenNebula, in XML
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -191,19 +191,21 @@ module OpenNebula
|
|
|
191
191
|
# }
|
|
192
192
|
# }
|
|
193
193
|
#
|
|
194
|
-
def monitoring(
|
|
195
|
-
return super(VM_POOL_METHODS[:monitoring],
|
|
196
|
-
'VM', 'LAST_POLL', xpath_expressions, filter_flag)
|
|
194
|
+
def monitoring(xpaths, filter_flag=INFO_ALL)
|
|
195
|
+
return super(VM_POOL_METHODS[:monitoring], xpaths, filter_flag)
|
|
197
196
|
end
|
|
198
197
|
|
|
199
198
|
# Retrieves the monitoring data for all the VMs in the pool, in XML
|
|
200
199
|
#
|
|
201
200
|
# @param [Integer] filter_flag Optional filter flag to retrieve all or
|
|
202
201
|
# part of the Pool. Possible values: INFO_ALL, INFO_GROUP, INFO_MINE.
|
|
203
|
-
#
|
|
202
|
+
# @param [Integer] num Optional Retrieve monitor records in the last num
|
|
203
|
+
# seconds. 0 just the last record, -1 or nil all records
|
|
204
204
|
# @return [String] VM monitoring data, in XML
|
|
205
|
-
def monitoring_xml(filter_flag=INFO_ALL)
|
|
206
|
-
return @client.call(VM_POOL_METHODS[:monitoring], filter_flag)
|
|
205
|
+
def monitoring_xml(filter_flag=INFO_ALL, num=nil)
|
|
206
|
+
return @client.call(VM_POOL_METHODS[:monitoring], filter_flag) if num.nil?
|
|
207
|
+
|
|
208
|
+
@client.call(VM_POOL_METHODS[:monitoring], filter_flag, num.to_i)
|
|
207
209
|
end
|
|
208
210
|
|
|
209
211
|
# Processes all the history records, and stores the monthly cost for
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -145,10 +145,10 @@ module OpenNebula
|
|
|
145
145
|
end
|
|
146
146
|
|
|
147
147
|
# Removes an Address Range from the VirtualNetwork
|
|
148
|
-
def rm_ar(ar_id)
|
|
148
|
+
def rm_ar(ar_id, force = false)
|
|
149
149
|
return Error.new('ID not defined') if !@pe_id
|
|
150
150
|
|
|
151
|
-
rc = @client.call(VN_METHODS[:rm_ar], @pe_id, ar_id.to_i)
|
|
151
|
+
rc = @client.call(VN_METHODS[:rm_ar], @pe_id, ar_id.to_i, force)
|
|
152
152
|
rc = nil if !OpenNebula.is_error?(rc)
|
|
153
153
|
|
|
154
154
|
return rc
|
|
@@ -252,6 +252,12 @@ module OpenNebula
|
|
|
252
252
|
return @client.call(VN_METHODS[:reserve], @pe_id, rtmpl)
|
|
253
253
|
end
|
|
254
254
|
|
|
255
|
+
def reserve_with_extra(extra)
|
|
256
|
+
return Error.new('ID not defined') unless @pe_id
|
|
257
|
+
|
|
258
|
+
@client.call(VN_METHODS[:reserve], @pe_id, extra)
|
|
259
|
+
end
|
|
260
|
+
|
|
255
261
|
# Removes an Address Range from the VirtualNetwork
|
|
256
262
|
def free(ar_id)
|
|
257
263
|
return Error.new('ID not defined') if !@pe_id
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/vm_group.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/x509_auth.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/xml_pool.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/xml_utils.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/zone.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/opennebula/zone_pool.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/vcenter_driver.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# ---------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -37,7 +37,9 @@ end
|
|
|
37
37
|
ENV['LANG'] = 'C'
|
|
38
38
|
|
|
39
39
|
if File.directory?(GEMS_LOCATION)
|
|
40
|
-
|
|
40
|
+
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
|
|
41
|
+
require 'rubygems'
|
|
42
|
+
Gem.use_paths(File.realpath(GEMS_LOCATION))
|
|
41
43
|
end
|
|
42
44
|
|
|
43
45
|
$LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'
|
|
@@ -83,6 +85,12 @@ require 'resolv'
|
|
|
83
85
|
require 'vcenter_importer.rb'
|
|
84
86
|
require 'memoize'
|
|
85
87
|
require 'vi_client'
|
|
88
|
+
begin
|
|
89
|
+
require 'rest_client'
|
|
90
|
+
REST_CLIENT=true
|
|
91
|
+
rescue LoadError
|
|
92
|
+
REST_CLIENT=false
|
|
93
|
+
end
|
|
86
94
|
require 'vi_helper'
|
|
87
95
|
require 'datacenter'
|
|
88
96
|
require 'host'
|
|
@@ -97,7 +105,6 @@ require 'vm_device'
|
|
|
97
105
|
require 'vm_disk'
|
|
98
106
|
require 'vm_nic'
|
|
99
107
|
require 'vm_helper'
|
|
100
|
-
require 'vm_monitor'
|
|
101
108
|
|
|
102
109
|
CHECK_REFS = true
|
|
103
110
|
|
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.
|
|
4
|
+
version: 5.12.0.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- OpenNebula
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-07-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: nokogiri
|
|
@@ -53,7 +53,7 @@ dependencies:
|
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
54
|
version: '0'
|
|
55
55
|
description: Libraries needed to talk to OpenNebula
|
|
56
|
-
email: contact@opennebula.
|
|
56
|
+
email: contact@opennebula.io
|
|
57
57
|
executables: []
|
|
58
58
|
extensions: []
|
|
59
59
|
extra_rdoc_files: []
|
|
@@ -75,7 +75,6 @@ files:
|
|
|
75
75
|
- lib/opennebula/document.rb
|
|
76
76
|
- lib/opennebula/document_json.rb
|
|
77
77
|
- lib/opennebula/document_pool.rb
|
|
78
|
-
- lib/opennebula/document_pool_json.rb
|
|
79
78
|
- lib/opennebula/error.rb
|
|
80
79
|
- lib/opennebula/group.rb
|
|
81
80
|
- lib/opennebula/group_pool.rb
|
|
@@ -118,8 +117,9 @@ files:
|
|
|
118
117
|
- lib/opennebula/xml_utils.rb
|
|
119
118
|
- lib/opennebula/zone.rb
|
|
120
119
|
- lib/opennebula/zone_pool.rb
|
|
121
|
-
- lib/opennebula/
|
|
120
|
+
- lib/opennebula/document_pool_json.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
|
|
@@ -127,7 +127,7 @@ files:
|
|
|
127
127
|
- lib/cloud/CloudClient.rb
|
|
128
128
|
- NOTICE
|
|
129
129
|
- LICENSE
|
|
130
|
-
homepage: http://opennebula.
|
|
130
|
+
homepage: http://opennebula.io
|
|
131
131
|
licenses:
|
|
132
132
|
- Apache-2.0
|
|
133
133
|
metadata: {}
|