opennebula 5.7.80.pre → 5.7.85.pre

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 (66) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ActionManager.rb +1 -1
  3. data/lib/CommandManager.rb +1 -1
  4. data/lib/DriverExecHelper.rb +1 -1
  5. data/lib/OpenNebulaDriver.rb +1 -1
  6. data/lib/VirtualMachineDriver.rb +1 -1
  7. data/lib/cloud/CloudClient.rb +3 -3
  8. data/lib/opennebula.rb +2 -2
  9. data/lib/opennebula/acl.rb +1 -1
  10. data/lib/opennebula/acl_pool.rb +1 -1
  11. data/lib/opennebula/client.rb +1 -1
  12. data/lib/opennebula/cluster.rb +1 -1
  13. data/lib/opennebula/cluster_pool.rb +1 -1
  14. data/lib/opennebula/datastore.rb +1 -1
  15. data/lib/opennebula/datastore_pool.rb +1 -1
  16. data/lib/opennebula/document.rb +1 -1
  17. data/lib/opennebula/document_json.rb +1 -1
  18. data/lib/opennebula/document_pool.rb +1 -1
  19. data/lib/opennebula/document_pool_json.rb +1 -1
  20. data/lib/opennebula/error.rb +1 -1
  21. data/lib/opennebula/group.rb +1 -1
  22. data/lib/opennebula/group_pool.rb +1 -1
  23. data/lib/opennebula/host.rb +1 -1
  24. data/lib/opennebula/host_pool.rb +1 -1
  25. data/lib/opennebula/image.rb +1 -1
  26. data/lib/opennebula/image_pool.rb +1 -1
  27. data/lib/opennebula/ldap_auth.rb +1 -1
  28. data/lib/opennebula/ldap_auth_spec.rb +1 -1
  29. data/lib/opennebula/marketplace.rb +1 -1
  30. data/lib/opennebula/marketplace_pool.rb +1 -1
  31. data/lib/opennebula/marketplaceapp.rb +12 -1
  32. data/lib/opennebula/marketplaceapp_pool.rb +1 -1
  33. data/lib/opennebula/oneflow_client.rb +1 -1
  34. data/lib/opennebula/pool.rb +1 -1
  35. data/lib/opennebula/pool_element.rb +1 -1
  36. data/lib/opennebula/security_group.rb +1 -1
  37. data/lib/opennebula/security_group_pool.rb +1 -1
  38. data/lib/opennebula/server_cipher_auth.rb +6 -3
  39. data/lib/opennebula/server_x509_auth.rb +5 -2
  40. data/lib/opennebula/ssh_auth.rb +1 -1
  41. data/lib/opennebula/system.rb +1 -1
  42. data/lib/opennebula/template.rb +1 -1
  43. data/lib/opennebula/template_pool.rb +1 -1
  44. data/lib/opennebula/user.rb +1 -1
  45. data/lib/opennebula/user_pool.rb +1 -1
  46. data/lib/opennebula/utils.rb +1 -1
  47. data/lib/opennebula/vdc.rb +1 -1
  48. data/lib/opennebula/vdc_pool.rb +1 -1
  49. data/lib/opennebula/virtual_machine.rb +1 -1
  50. data/lib/opennebula/virtual_machine_pool.rb +20 -3
  51. data/lib/opennebula/virtual_network.rb +1 -1
  52. data/lib/opennebula/virtual_network_pool.rb +1 -1
  53. data/lib/opennebula/virtual_router.rb +1 -1
  54. data/lib/opennebula/virtual_router_pool.rb +1 -1
  55. data/lib/opennebula/vm_group.rb +1 -1
  56. data/lib/opennebula/vm_group_pool.rb +1 -1
  57. data/lib/opennebula/vntemplate.rb +1 -1
  58. data/lib/opennebula/vntemplate_pool.rb +1 -1
  59. data/lib/opennebula/x509_auth.rb +1 -1
  60. data/lib/opennebula/xml_element.rb +1 -1
  61. data/lib/opennebula/xml_pool.rb +1 -1
  62. data/lib/opennebula/xml_utils.rb +1 -1
  63. data/lib/opennebula/zone.rb +1 -1
  64. data/lib/opennebula/zone_pool.rb +1 -1
  65. data/lib/vcenter_driver.rb +1 -1
  66. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: deb89f9163327f290a995f3318e5c9d4ef11e035
4
- data.tar.gz: 50bcd5012425d6880b15d9f07411b7fbef65d64d
3
+ metadata.gz: b256cdb614bb0023edc036f04ee8042e25e44b97
4
+ data.tar.gz: 84b055846759a9388ad7a2237548fd169c84e0c7
5
5
  SHA512:
6
- metadata.gz: 13e09da10e18bf2ee093b5e35c51862d9bafdb329538aac0a25a386be02f9f8c03d1f6b26c26b5fc90221c481e50c62442040d661afc9cebddcd071ab24cad1e
7
- data.tar.gz: 596263c07baa18b494b71cedfd10a42bcf7fbf78c869f4eff0d2eec998633b4b44ac6c6336ed17a1d068abf7e6ce7c1348b56d3e3c3d2c6f13f29f2f1b5628ee
6
+ metadata.gz: d5fd4ad8d73fcaee3b0c26cce1bb45ede90a9928c6b81f76b1405a4c711dca35877f469b04cdc7a0780ff636f5dc56b1f42c475377780e4c7d16be7cd637081e
7
+ data.tar.gz: d683dab0fa543b85ee8753b663154bab86511846b08df3435c5084feadcff1ecb5c29d6e2ba66b12bf7e0beced5c2b9a816752ede48768a27100205540591fa0
data/lib/ActionManager.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- */
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, OpenNebula Project, OpenNebula Systems #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"); you may */
4
4
  # not use this file except in compliance with the License. You may obtain */
5
5
  # a copy of the License at */
data/lib/CommandManager.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # --------------------------------------------------------------------------
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems
2
+ # Copyright 2002-2019, 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/DriverExecHelper.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/OpenNebulaDriver.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/VirtualMachineDriver.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/cloud/CloudClient.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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 #
@@ -50,7 +50,7 @@ end
50
50
  module CloudClient
51
51
 
52
52
  # OpenNebula version
53
- VERSION = '5.7.80'
53
+ VERSION = '5.7.85'
54
54
 
55
55
  # #########################################################################
56
56
  # Default location for the authentication file
@@ -207,7 +207,7 @@ module CloudCLI
207
207
  def version_text
208
208
  version=<<EOT
209
209
  OpenNebula #{CloudClient::VERSION}
210
- Copyright 2002-2018, OpenNebula Project, OpenNebula Systems
210
+ Copyright 2002-2019, OpenNebula Project, OpenNebula Systems
211
211
 
212
212
  Licensed under the Apache License, Version 2.0 (the "License"); you may
213
213
  not use this file except in compliance with the License. You may obtain
data/lib/opennebula.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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 #
@@ -71,5 +71,5 @@ require 'opennebula/vntemplate_pool'
71
71
  module OpenNebula
72
72
 
73
73
  # OpenNebula version
74
- VERSION = '5.7.80'
74
+ VERSION = '5.7.85'
75
75
  end
data/lib/opennebula/acl.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/acl_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/client.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/cluster.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/cluster_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/datastore.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/datastore_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/document.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/document_json.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/document_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/document_pool_json.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/error.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/group.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/group_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/host.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/host_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/image.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/image_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/ldap_auth.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # ---------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/ldap_auth_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # ---------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/marketplace.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/marketplace_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/marketplaceapp.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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 #
@@ -193,6 +193,17 @@ module OpenNebula
193
193
  image = Image.new(Image.build_xml, @client)
194
194
  rc = image.allocate(tmpl, options[:dsid])
195
195
 
196
+ ds = OpenNebula::Datastore.new_with_id(options[:dsid], @client)
197
+ image.info
198
+ ds.info
199
+
200
+ xpath = 'TEMPLATE/DRIVER'
201
+ if ds[xpath] == 'vcenter' && self['FORMAT'] != 'iso' && self['FORMAT'] != 'vmdk'
202
+ image.replace({'FORMAT' => 'vmdk'})
203
+ elsif ds[xpath] && ds[xpath] != 'vcenter' && self['FORMAT'] == 'vmdk'
204
+ image.replace({'FORMAT' => ds[xpath] })
205
+ end
206
+
196
207
  return { :image => [rc] } if OpenNebula.is_error?(rc)
197
208
 
198
209
  image_id = image.id
data/lib/opennebula/marketplaceapp_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/oneflow_client.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/pool_element.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/security_group.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/security_group_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/server_cipher_auth.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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 #
@@ -108,12 +108,15 @@ class OpenNebula::ServerCipherAuth
108
108
  end
109
109
 
110
110
  # auth method for auth_mad
111
- def authenticate(srv_user,srv_pass, signed_text)
111
+ def authenticate(srv_user, srv_pass, signed_text)
112
112
  begin
113
113
  # truncate token to 32-bytes for Ruby >= 2.4
114
114
  @key = srv_pass[0..31]
115
115
 
116
- s_user, t_user, expires = decrypt(signed_text).split(':')
116
+ token_array = decrypt(signed_text).split(':')
117
+
118
+ s_user = token_array[0]
119
+ expires = token_array[-1]
117
120
 
118
121
  return "User name missmatch" if s_user != srv_user
119
122
 
data/lib/opennebula/server_x509_auth.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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 #
@@ -87,7 +87,10 @@ class OpenNebula::ServerX509Auth < OpenNebula::X509Auth
87
87
  # auth method for auth_mad
88
88
  def authenticate(server_user, server_pass, signed_text)
89
89
  begin
90
- s_user, t_user, expires = decrypt(signed_text).split(':')
90
+ token_array = decrypt(signed_text).split(':')
91
+
92
+ s_user = token_array[0]
93
+ expires = token_array[-1]
91
94
 
92
95
  return "Server password missmatch" if server_pass != password
93
96
 
data/lib/opennebula/ssh_auth.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/template.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/template_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/virtual_machine.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/virtual_machine_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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 #
@@ -115,6 +115,23 @@ module OpenNebula
115
115
  INFO_NOT_DONE)
116
116
  end
117
117
 
118
+ def info_search(args = {})
119
+ default_args = {
120
+ :who => INFO_ALL,
121
+ :start_id => -1,
122
+ :end_id => -1,
123
+ :state => INFO_NOT_DONE,
124
+ :query => ""
125
+ }.merge!(args)
126
+
127
+ return info_filter(VM_POOL_METHODS[:info],
128
+ default_args[:who],
129
+ default_args[:start_id],
130
+ default_args[:end_id],
131
+ default_args[:state],
132
+ default_args[:query])
133
+ end
134
+
118
135
  alias_method :info!, :info
119
136
  alias_method :info_all!, :info_all
120
137
  alias_method :info_mine!, :info_mine
@@ -458,8 +475,8 @@ module OpenNebula
458
475
  data_hash
459
476
  end
460
477
 
461
- def info_filter(xml_method, who, start_id, end_id, state)
462
- return xmlrpc_info(xml_method, who, start_id, end_id, state)
478
+ def info_filter(xml_method, who, start_id, end_id, state, query="")
479
+ return xmlrpc_info(xml_method, who, start_id, end_id, state, query)
463
480
  end
464
481
  end
465
482
  end
data/lib/opennebula/virtual_network.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/virtual_network_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/virtual_router.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/virtual_router_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/vntemplate.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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/vntemplate_pool.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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_element.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -------------------------------------------------------------------------- #
2
- # Copyright 2002-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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-2018, OpenNebula Project, OpenNebula Systems #
2
+ # Copyright 2002-2019, 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 #
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.7.80.pre
4
+ version: 5.7.85.pre
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenNebula
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-01-15 00:00:00.000000000 Z
11
+ date: 2019-02-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nokogiri