fog-proxmox 0.13.0 → 0.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (194) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +34 -49
  3. data/.github/workflows/release.yml +38 -0
  4. data/.rubocop.yml +11 -10
  5. data/.rubocop_todo.yml +255 -0
  6. data/CHANGELOG.md +8 -0
  7. data/README.md +35 -4
  8. data/Rakefile +8 -35
  9. data/bin/console +2 -4
  10. data/bin/setup +2 -4
  11. data/docs/compute.md +23 -7
  12. data/docs/identity.md +31 -6
  13. data/examples/compute.rb +11 -11
  14. data/examples/identity.rb +28 -15
  15. data/fog-proxmox.gemspec +8 -6
  16. data/lib/fog/proxmox/attributes.rb +3 -2
  17. data/lib/fog/proxmox/auth/token/access_ticket.rb +96 -0
  18. data/lib/fog/proxmox/auth/token/user_token.rb +107 -0
  19. data/lib/fog/proxmox/auth/token.rb +94 -0
  20. data/lib/fog/{compute/proxmox → proxmox/compute}/models/disk.rb +21 -3
  21. data/lib/fog/{compute/proxmox → proxmox/compute}/models/disks.rb +6 -2
  22. data/lib/fog/{compute/proxmox → proxmox/compute}/models/interface.rb +5 -1
  23. data/lib/fog/{compute/proxmox → proxmox/compute}/models/interfaces.rb +2 -2
  24. data/lib/fog/{compute/proxmox → proxmox/compute}/models/node.rb +3 -5
  25. data/lib/fog/{compute/proxmox → proxmox/compute}/models/nodes.rb +2 -2
  26. data/lib/fog/{compute/proxmox → proxmox/compute}/models/server.rb +29 -18
  27. data/lib/fog/{compute/proxmox → proxmox/compute}/models/server_config.rb +17 -4
  28. data/lib/fog/{compute/proxmox → proxmox/compute}/models/servers.rb +6 -6
  29. data/lib/fog/{compute/proxmox → proxmox/compute}/models/snapshot.rb +0 -0
  30. data/lib/fog/{compute/proxmox → proxmox/compute}/models/snapshots.rb +2 -2
  31. data/lib/fog/{compute/proxmox → proxmox/compute}/models/storage.rb +3 -2
  32. data/lib/fog/{compute/proxmox → proxmox/compute}/models/storages.rb +3 -3
  33. data/lib/fog/{compute/proxmox → proxmox/compute}/models/task.rb +0 -0
  34. data/lib/fog/{compute/proxmox → proxmox/compute}/models/tasks.rb +2 -1
  35. data/lib/fog/{compute/proxmox → proxmox/compute}/models/volume.rb +8 -1
  36. data/lib/fog/{compute/proxmox → proxmox/compute}/models/volumes.rb +3 -3
  37. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/action_server.rb +0 -0
  38. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/clone_server.rb +0 -0
  39. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/create_backup.rb +0 -0
  40. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/create_server.rb +0 -0
  41. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/create_snapshot.rb +0 -0
  42. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/create_spice.rb +0 -0
  43. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/create_term.rb +0 -0
  44. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/create_vnc.rb +0 -0
  45. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/delete_server.rb +0 -0
  46. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/delete_snapshot.rb +0 -0
  47. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/delete_volume.rb +0 -0
  48. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/get_node_statistics.rb +0 -0
  49. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/get_server_config.rb +14 -14
  50. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/get_server_status.rb +17 -17
  51. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/get_snapshot_config.rb +0 -0
  52. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/get_task.rb +0 -0
  53. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/get_vnc.rb +0 -0
  54. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/get_volume.rb +0 -0
  55. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/list_nodes.rb +0 -0
  56. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/list_servers.rb +0 -0
  57. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/list_snapshots.rb +0 -0
  58. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/list_storages.rb +0 -0
  59. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/list_tasks.rb +0 -0
  60. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/list_volumes.rb +0 -0
  61. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/log_task.rb +1 -1
  62. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/migrate_server.rb +0 -0
  63. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/move_disk.rb +0 -0
  64. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/move_volume.rb +0 -0
  65. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/next_vmid.rb +0 -0
  66. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/resize_container.rb +0 -0
  67. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/resize_server.rb +0 -0
  68. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/rollback_snapshot.rb +0 -0
  69. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/status_task.rb +0 -0
  70. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/stop_task.rb +0 -0
  71. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/template_server.rb +0 -0
  72. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/update_server.rb +0 -0
  73. data/lib/fog/{compute/proxmox → proxmox/compute}/requests/update_snapshot.rb +0 -0
  74. data/lib/fog/{compute/proxmox.rb → proxmox/compute.rb} +31 -16
  75. data/lib/fog/proxmox/core.rb +76 -64
  76. data/lib/fog/proxmox/errors.rb +2 -1
  77. data/lib/fog/proxmox/hash.rb +2 -4
  78. data/lib/fog/proxmox/helpers/controller_helper.rb +3 -4
  79. data/lib/fog/proxmox/helpers/cpu_helper.rb +55 -9
  80. data/lib/fog/proxmox/helpers/disk_helper.rb +51 -25
  81. data/lib/fog/proxmox/helpers/ip_helper.rb +21 -20
  82. data/lib/fog/proxmox/helpers/nic_helper.rb +37 -27
  83. data/lib/fog/{identity/proxmox → proxmox/identity}/models/domain.rb +7 -3
  84. data/lib/fog/{identity/proxmox → proxmox/identity}/models/domain_type.rb +0 -1
  85. data/lib/fog/{identity/proxmox → proxmox/identity}/models/domains.rb +2 -3
  86. data/lib/fog/{identity/proxmox → proxmox/identity}/models/group.rb +6 -2
  87. data/lib/fog/{identity/proxmox → proxmox/identity}/models/groups.rb +2 -2
  88. data/lib/fog/{identity/proxmox → proxmox/identity}/models/permission.rb +5 -4
  89. data/lib/fog/{identity/proxmox → proxmox/identity}/models/permissions.rb +4 -2
  90. data/lib/fog/{identity/proxmox → proxmox/identity}/models/pool.rb +4 -4
  91. data/lib/fog/{identity/proxmox → proxmox/identity}/models/pools.rb +5 -5
  92. data/lib/fog/{identity/proxmox → proxmox/identity}/models/principal.rb +0 -0
  93. data/lib/fog/{identity/proxmox → proxmox/identity}/models/role.rb +1 -1
  94. data/lib/fog/{identity/proxmox → proxmox/identity}/models/roles.rb +2 -2
  95. data/lib/fog/proxmox/identity/models/token.rb +72 -0
  96. data/lib/fog/proxmox/identity/models/token_info.rb +41 -0
  97. data/lib/fog/proxmox/identity/models/tokens.rb +54 -0
  98. data/lib/fog/{identity/proxmox → proxmox/identity}/models/user.rb +24 -2
  99. data/lib/fog/{identity/proxmox → proxmox/identity}/models/users.rb +2 -2
  100. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/change_password.rb +0 -0
  101. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/check_permissions.rb +0 -0
  102. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/create_domain.rb +0 -0
  103. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/create_group.rb +0 -0
  104. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/create_pool.rb +0 -0
  105. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/create_role.rb +0 -0
  106. data/lib/fog/proxmox/identity/requests/create_token.rb +40 -0
  107. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/create_user.rb +0 -0
  108. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/delete_domain.rb +0 -0
  109. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/delete_group.rb +0 -0
  110. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/delete_pool.rb +0 -0
  111. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/delete_role.rb +0 -0
  112. data/lib/fog/proxmox/identity/requests/delete_token.rb +40 -0
  113. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/delete_user.rb +0 -0
  114. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/get_domain.rb +0 -0
  115. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/get_group.rb +0 -0
  116. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/get_pool.rb +0 -0
  117. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/get_role.rb +0 -0
  118. data/lib/fog/proxmox/identity/requests/get_token_info.rb +41 -0
  119. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/get_user.rb +1 -0
  120. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/list_domains.rb +0 -0
  121. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/list_groups.rb +0 -0
  122. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/list_permissions.rb +0 -0
  123. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/list_pools.rb +0 -0
  124. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/list_roles.rb +0 -0
  125. data/lib/fog/proxmox/identity/requests/list_tokens.rb +41 -0
  126. data/lib/fog/proxmox/identity/requests/list_user_permissions.rb +44 -0
  127. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/list_users.rb +0 -0
  128. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/read_version.rb +0 -0
  129. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/update_domain.rb +0 -0
  130. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/update_group.rb +0 -0
  131. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/update_permissions.rb +0 -0
  132. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/update_pool.rb +0 -0
  133. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/update_role.rb +0 -0
  134. data/lib/fog/proxmox/identity/requests/update_token.rb +41 -0
  135. data/lib/fog/{identity/proxmox → proxmox/identity}/requests/update_user.rb +0 -0
  136. data/lib/fog/{identity/proxmox.rb → proxmox/identity.rb} +31 -17
  137. data/lib/fog/{network/proxmox → proxmox/network}/models/network.rb +0 -0
  138. data/lib/fog/{network/proxmox → proxmox/network}/models/networks.rb +2 -2
  139. data/lib/fog/{network/proxmox → proxmox/network}/models/node.rb +2 -1
  140. data/lib/fog/{network/proxmox → proxmox/network}/models/nodes.rb +2 -2
  141. data/lib/fog/{network/proxmox → proxmox/network}/requests/create_network.rb +0 -0
  142. data/lib/fog/{network/proxmox → proxmox/network}/requests/delete_network.rb +0 -0
  143. data/lib/fog/{network/proxmox → proxmox/network}/requests/get_network.rb +0 -0
  144. data/lib/fog/{network/proxmox → proxmox/network}/requests/get_node.rb +0 -0
  145. data/lib/fog/{network/proxmox → proxmox/network}/requests/list_networks.rb +0 -0
  146. data/lib/fog/{network/proxmox → proxmox/network}/requests/list_nodes.rb +0 -0
  147. data/lib/fog/{network/proxmox → proxmox/network}/requests/power_node.rb +0 -0
  148. data/lib/fog/{network/proxmox → proxmox/network}/requests/update_network.rb +0 -0
  149. data/lib/fog/{network/proxmox.rb → proxmox/network.rb} +21 -14
  150. data/lib/fog/{storage/proxmox.rb → proxmox/storage.rb} +1 -1
  151. data/lib/fog/proxmox/string.rb +4 -3
  152. data/lib/fog/proxmox/version.rb +1 -1
  153. data/lib/fog/proxmox.rb +14 -76
  154. data/spec/compute_spec.rb +4 -4
  155. data/spec/fixtures/proxmox/compute/common_auth.yml +40 -0
  156. data/spec/fixtures/proxmox/compute/containers.yml +1752 -7568
  157. data/spec/fixtures/proxmox/compute/nodes.yml +24 -30
  158. data/spec/fixtures/proxmox/compute/servers.yml +5015 -10683
  159. data/spec/fixtures/proxmox/compute/snapshots.yml +479 -1719
  160. data/spec/fixtures/proxmox/compute/storages.yml +32 -40
  161. data/spec/fixtures/proxmox/compute/tasks.yml +118 -338
  162. data/spec/fixtures/proxmox/identity/auth.yml +10 -12
  163. data/spec/fixtures/proxmox/identity/auth_access_ticket.yml +77 -0
  164. data/spec/fixtures/proxmox/identity/auth_user_token.yml +77 -0
  165. data/spec/fixtures/proxmox/identity/common_auth.yml +40 -0
  166. data/spec/fixtures/proxmox/identity/domains.yml +145 -181
  167. data/spec/fixtures/proxmox/identity/groups.yml +72 -90
  168. data/spec/fixtures/proxmox/identity/permissions.yml +297 -189
  169. data/spec/fixtures/proxmox/identity/pools.yml +176 -421
  170. data/spec/fixtures/proxmox/identity/read_version.yml +7 -9
  171. data/spec/fixtures/proxmox/identity/roles.yml +69 -87
  172. data/spec/fixtures/proxmox/identity/tokens.yml +494 -0
  173. data/spec/fixtures/proxmox/identity/users.yml +149 -187
  174. data/spec/fixtures/proxmox/network/common_auth.yml +40 -0
  175. data/spec/fixtures/proxmox/network/networks.yml +99 -96
  176. data/spec/hash_spec.rb +2 -1
  177. data/spec/helpers/controller_helper_spec.rb +135 -123
  178. data/spec/helpers/cpu_helper_spec.rb +57 -45
  179. data/spec/helpers/disk_helper_spec.rb +281 -187
  180. data/spec/helpers/ip_helper_spec.rb +155 -138
  181. data/spec/helpers/nic_helper_spec.rb +122 -114
  182. data/spec/identity_spec.rb +123 -29
  183. data/spec/network_spec.rb +3 -3
  184. data/spec/proxmox_vcr.rb +24 -22
  185. data/spec/spec_helper.rb +4 -3
  186. data/tasks/audit.rake +25 -0
  187. data/tasks/lint.rake +22 -0
  188. data/tasks/test.rake +65 -0
  189. metadata +205 -174
  190. data/.codeclimate.yml +0 -14
  191. data/spec/fixtures/proxmox/compute/identity_ticket.yml +0 -40
  192. data/spec/fixtures/proxmox/identity/identity_ticket.yml +0 -40
  193. data/spec/fixtures/proxmox/identity/renew.yml +0 -40
  194. data/spec/fixtures/proxmox/network/identity_ticket.yml +0 -40
data/spec/compute_spec.rb CHANGED
@@ -27,11 +27,11 @@ describe Fog::Proxmox::Compute do
27
27
  service_class: Fog::Proxmox::Compute
28
28
  )
29
29
  @service = @proxmox_vcr.service
30
- @pve_url = @proxmox_vcr.url
30
+ @proxmox_url = @proxmox_vcr.url
31
31
  @username = @proxmox_vcr.username
32
32
  @password = @proxmox_vcr.password
33
- @ticket = @proxmox_vcr.ticket
34
- @csrftoken = @proxmox_vcr.csrftoken
33
+ @tokenid = @proxmox_vcr.tokenid
34
+ @token = @proxmox_vcr.token
35
35
  end
36
36
 
37
37
  it 'Manage tasks' do
@@ -311,7 +311,7 @@ describe Fog::Proxmox::Compute do
311
311
  _(node).wont_be_nil
312
312
  # Get next vmid
313
313
  vmid = node.containers.next_id
314
- ostemplate = 'local:vztmpl/alpine-3.10-default_20190626_amd64.tar.xz'
314
+ ostemplate = 'local:vztmpl/alpine-3.12-default_20200823_amd64.tar.xz'
315
315
  container_hash = { ostemplate: ostemplate, storage: 'local-lvm', password: 'proxmox01', rootfs: 'local-lvm:1' }
316
316
  # Check valid vmid
317
317
  valid = node.containers.id_valid? vmid
@@ -0,0 +1,40 @@
1
+ ---
2
+ http_interactions:
3
+ - request:
4
+ method: post
5
+ uri: https://192.168.56.101:8006/api2/json/access/ticket
6
+ body:
7
+ encoding: US-ASCII
8
+ string: username=root%40pam&password=proxmox01
9
+ headers:
10
+ User-Agent:
11
+ - fog-core/2.2.3
12
+ Accept:
13
+ - application/json
14
+ response:
15
+ status:
16
+ code: 200
17
+ message: OK
18
+ headers:
19
+ Cache-Control:
20
+ - max-age=0
21
+ Connection:
22
+ - close, Keep-Alive
23
+ Date:
24
+ - Wed, 25 Nov 2020 13:40:06 GMT
25
+ Pragma:
26
+ - no-cache
27
+ Server:
28
+ - pve-api-daemon/3.0
29
+ Content-Length:
30
+ - '1167'
31
+ Content-Type:
32
+ - application/json;charset=UTF-8
33
+ Expires:
34
+ - Wed, 25 Nov 2020 13:40:06 GMT
35
+ body:
36
+ encoding: ASCII-8BIT
37
+ string: '{"data":{"username":"root@pam","cap":{"storage":{"Datastore.AllocateSpace":1,"Datastore.Allocate":1,"Permissions.Modify":1,"Datastore.Audit":1,"Datastore.AllocateTemplate":1},"vms":{"VM.Config.Memory":1,"VM.Config.Disk":1,"VM.Migrate":1,"VM.Config.HWType":1,"VM.Snapshot.Rollback":1,"VM.Config.CPU":1,"VM.Allocate":1,"VM.Clone":1,"VM.Config.Network":1,"Permissions.Modify":1,"VM.Config.Options":1,"VM.Snapshot":1,"VM.Console":1,"VM.Backup":1,"VM.PowerMgmt":1,"VM.Monitor":1,"VM.Config.CDROM":1,"VM.Audit":1},"dc":{"Sys.Audit":1},"nodes":{"Sys.Audit":1,"Sys.Console":1,"Permissions.Modify":1,"Sys.Syslog":1,"Sys.Modify":1,"Sys.PowerMgmt":1},"access":{"User.Modify":1,"Permissions.Modify":1,"Group.Allocate":1}},"ticket":"PVE:root@pam:5FBE5EB6::g4qMFg0e3MKdn9WVHBLmbv0nBEx/ABBWlk4Gfe/wae+YGWnaw3XRUDvHbZudrd1UDYXpszaCbwIR2YJPhHMU8coLAFAYqIE3wtbfMQzGwwuHPPiNm3EeVOKx4SPtRqXJOSE9LBuAnDo9tmhEmZ7m8i0y4XVEwV68VghDAqxInStyIbI/1rIlMikgMKx1JApaK9+UlT5K7eAP7Lxpi8n+2wmcLgVaC34A+C8r2eJFiO+99zbEGjE6JZZLO384biMUbpoR0K56tuRxFE3Df9sRCLkEHQWD+AewWg887r3n3VMpcM250Fw7boFvRGjvFLlP0nBylFYmgf5AMrxbEI2eUw==","CSRFPreventionToken":"5FBE5EB6:VSdRDpLPnZZ5sus603Nds5Nu3o4VE02VdkljtT0/YHk"}}'
38
+ http_version:
39
+ recorded_at: Wed, 25 Nov 2020 13:40:08 GMT
40
+ recorded_with: VCR 4.0.0