fog-proxmox 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72c9c0184ad5eeb569e93c6c87efb86878b9dd1f9cf3b721366c29bd433a756a
-  data.tar.gz: 99a1b6d7dc83eabb4ce9270bc8d059b24545de8ddecb4ecaf2b299ade4c1714b
+  metadata.gz: 3c327b80ae98f3f8868ad071d74ed181cc84817c049ad69fa244f7dea3fceb39
+  data.tar.gz: 748ec5a7786e00c3630a6efa54c4c0936a7ae93bb98b4160b45cad74233e0795
 SHA512:
-  metadata.gz: '08a0bf25cec3bd9096edea232740dfc39552a1a89c0c4b63fb80392b96cb53fe601779faf956610d4107bf84093180c949c48ce868715135ab1aef0ca9bae49a'
-  data.tar.gz: d073370e33a01afc0db3cb3d97309e7e30d914241bb61016a37fea371e9749d68213f64d188da46c15a91bcb69b8e0bbb666acc29dc9bd7fcc097d47a3f82819
+  metadata.gz: 9f13a62fb4343dfd8717e495452f6d5b628cf14ea757b961348e2447205baaa3db3e840347d7ce0af9c4c3119e571897e075f03dd96c9dfe23d51d1f3ef2e675
+  data.tar.gz: 8c4d8286d6cfed6839aedca88f9bca574c4983274ed4fade81a030eb243a0846a82ff5f725dc8ca4eca91e2331b477e62ee388f551ef067dd2ef128e84842cd4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog-proxmox (0.8.1)
+    fog-proxmox (0.8.2)
       fog-core (~> 2.1)
       fog-json (~> 1.2)
       ipaddress (~> 0.8)

data/README.md

@@ -18,6 +18,7 @@ It is inspired by the great [fog-openstack](https://github.com/fog/fog-openstack
 |--|--|
 |<0.6|<5.3|
 |>=0.6|>=5.3|
+|>=0.8|>=5.4|
 
 ## Installation
 

data/lib/fog/identity/proxmox/requests/change_password.rb

@@ -28,7 +28,7 @@ module Fog
             expects: [200],
             method: 'PUT',
             path: 'access/password',
-            body: "userid=#{userid}&password=#{password}"
+            body: URI.encode_www_form(userid: userid, password: password)
           )
         end
       end

data/lib/fog/proxmox.rb

@@ -47,6 +47,7 @@ module Fog
       attr_reader :credentials
       attr_reader :version
       attr_accessor :now # tests only
+      attr_accessor :ticket_lifetime # tests only
     end
 
     def self.clear_credentials
@@ -54,7 +55,7 @@ module Fog
     end
 
     def self.authenticate(options, connection_options = {})
-      get_tokens(options, connection_options)
+      get_credentials(options, connection_options)
       self
     end
 
@@ -71,7 +72,7 @@ module Fog
       options[:pve_password] = ticket unless ticket
     end
 
-    def self.get_tokens(options, connection_options = {})
+    def self.get_credentials(options, connection_options = {})
       username          = options[:pve_username].to_s
       password          = options[:pve_password].to_s
       url               = options[:pve_url]
@@ -79,15 +80,15 @@ module Fog
       uri = URI.parse(url)
       @api_path = uri.path
       connection_options = connection_options.merge(path_prefix: @api_path)
-      password = @credentials[:csrftoken] if credentials_has_expired?
-      retrieve_tokens(uri, connection_options, username, password) unless authenticated? && !credentials_has_expired?
+      password = @credentials[:ticket] if credentials_has_expired?
+      request_credentials(uri, connection_options, username, password) unless authenticated? && !credentials_has_expired?
     end
 
-    def self.retrieve_tokens(uri, connection_options, username, password)
+    def self.request_credentials(uri, connection_options, username, password)
       request = {
         expects: [200, 204],
         headers: { 'Accept' => 'application/json' },
-        body: "username=#{username}&password=#{password}",
+        body: URI.encode_www_form(username: username, password: password),
         method: 'POST',
         path: 'access/ticket'
       }
@@ -102,10 +103,10 @@ module Fog
       username  = data['username']
       csrftoken = data['CSRFPreventionToken']
       deadline = Time.at(@now.to_i + @ticket_lifetime)
-      save_token(username, ticket, csrftoken, deadline)
+      save_credentials(username, ticket, csrftoken, deadline)
     end
 
-    def self.save_token(username, ticket, csrftoken, deadline)
+    def self.save_credentials(username, ticket, csrftoken, deadline)
       @credentials = {
         username: username,
         ticket: ticket,

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.8.1'
+    VERSION = '0.8.2'
   end
 end

data/spec/compute_spec.rb

@@ -38,92 +38,92 @@ describe Fog::Proxmox::Compute do
     VCR.use_cassette('tasks') do
       # List all tasks
       filters = { limit: 1 }
-      node_name = 'proxmox'
+      node_name = 'pve'
       node = @service.nodes.get node_name
       tasks = node.tasks.all(filters)
-      tasks.wont_be_nil
-      tasks.wont_be_empty
-      tasks.size.must_equal 1
+      _(tasks).wont_be_nil
+      _(tasks).wont_be_empty
+      _(tasks.size).must_equal 1
       # Get task
       upid = tasks[0].upid
       task = node.tasks.get(upid)
-      task.wont_be_nil
+      _(task).wont_be_nil
       # Stop task
       task.stop
       task.wait_for { finished? }
-      task.finished?.must_equal true
+      _(task.finished?).must_equal true
     end
   end
 
   it 'Manage nodes' do
     VCR.use_cassette('nodes') do
       # Get node
-      node_name = 'proxmox'
+      node_name = 'pve'
       node = @service.nodes.get node_name
       # Get statistics data
       data = node.statistics
-      data.wont_be_nil
-      data.wont_be_empty
+      _(data).wont_be_nil
+      _(data).wont_be_empty
       # Get statistics image
       data = node.statistics('rrd', { timeframe: 'hour', ds: 'cpu,memused', cf: 'AVERAGE' })
-      data.wont_be_nil
-      data['image'].wont_be_nil
+      _(data).wont_be_nil
+      _(data['image']).wont_be_nil
     end
   end
 
   it 'Manage storages' do
     VCR.use_cassette('storages') do
       # Get node
-      node_name = 'proxmox'
+      node_name = 'pve'
       node = @service.nodes.get node_name
       # List all storages
       storages = node.storages.all
-      storages.wont_be_nil
-      storages.wont_be_empty
-      storages.size.must_equal 2
+      _(storages).wont_be_nil
+      _(storages).wont_be_empty
+      _(storages.size).must_equal 2
       # List by content type
       storages = node.storages.list_by_content_type 'iso'
-      storages.wont_be_nil
-      storages.wont_be_empty
-      storages.size.must_equal 1
+      _(storages).wont_be_nil
+      _(storages).wont_be_empty
+      _(storages.size).must_equal 1
       # Get storage
       storage = node.storages.get('local')
-      storage.wont_be_nil
-      storage.identity.must_equal 'local'
+      _(storage).wont_be_nil
+      _(storage.identity).must_equal 'local'
     end
   end
 
   it 'CRUD servers' do
     VCR.use_cassette('servers') do
-      node_name = 'proxmox'
+      node_name = 'pve'
       node = @service.nodes.get node_name
       # Get next vmid
       vmid = node.servers.next_id
       server_hash = { vmid: vmid }
       # Check valid vmid
       valid = node.servers.id_valid? vmid
-      valid.must_equal true
+      _(valid).must_equal true
       # Check not valid vmid
       valid = node.servers.id_valid? 99
-      valid.must_equal false
+      _(valid).must_equal false
       # Create 1st time
       server = node.servers.create(server_hash)
       ok = server.persisted?
-      ok.must_equal true
+      _(ok).must_equal true
       # Check already used vmid
       valid = node.servers.id_valid? vmid
-      valid.must_equal false
+      _(valid).must_equal false
       # Clone server
       newid = node.servers.next_id
       # Get server
       server = node.servers.get vmid
-      server.wont_be_nil
+      _(server).wont_be_nil
       # Backup it
       server.backup(compress: 'lzo')
       # Get this backup image
       # Find available backup volumes
       volume = server.backups.first
-      volume.wont_be_nil
+      _(volume).wont_be_nil
       # Restore it
       server.restore(volume, storage: 'local')
       # Delete it
@@ -148,16 +148,16 @@ describe Fog::Proxmox::Compute do
       clone.create_template
       # Get clone disk image
       image = clone.images.first
-      image.wont_be_nil
+      _(image).wont_be_nil
       # Delete clone
       clone.destroy
-      proc do
+      _(proc do
         clone = node.servers.get newid
-      end.must_raise Fog::Errors::NotFound
+      end).must_raise Fog::Errors::NotFound
       # Create 2nd time must fails
-      proc do
+      _(proc do
         node.servers.create server_hash
-      end.must_raise Excon::Errors::InternalServerError
+      end).must_raise Excon::Errors::InternalServerError
       # Update config server
       # Add empty cdrom
       config_hash = { ide2: 'none,media=cdrom' }
@@ -175,109 +175,109 @@ describe Fog::Proxmox::Compute do
       server.update(config_hash)
       # server config
       config = server.config
-      config.identity.must_equal vmid
+      _(config.identity).must_equal vmid
       disks = server.config.disks
       interfaces = server.config.interfaces
-      interfaces.wont_be_nil
-      interfaces.wont_be_empty
+      _(interfaces).wont_be_nil
+      _(interfaces).wont_be_empty
       net0 = interfaces.get('net0')
-      net0.wont_be_nil
-      disks.wont_be_nil
-      disks.wont_be_empty
+      _(net0).wont_be_nil
+      _(disks).wont_be_nil
+      _(disks).wont_be_empty
       virtio0 = disks.get('virtio0')
-      virtio0.wont_be_nil
+      _(virtio0).wont_be_nil
       ide2 = disks.get('ide2')
-      ide2.wont_be_nil
+      _(ide2).wont_be_nil
       # Get a mac adress
       mac_address = server.config.mac_addresses.first
-      mac_address.wont_be_nil
+      _(mac_address).wont_be_nil
       # all servers
       servers_all = node.servers.all
-      servers_all.wont_be_empty
-      servers_all.must_include server
+      _(servers_all).wont_be_empty
+      _(servers_all).must_include server
       # server not running exception
-      proc do
+      _(proc do
         server.start_console(websocket: 1)
-      end.must_raise Fog::Proxmox::Errors::ServiceError
+      end).must_raise Fog::Proxmox::Errors::ServiceError
       # Start server
       server.action('start')
       server.wait_for { ready? }
       status = server.ready?
-      status.must_equal true
+      _(status).must_equal true
       # server vga not set exception
-      proc do
+      _(proc do
         server.start_console(websocket: 1)
-      end.must_raise Fog::Proxmox::Errors::ServiceError
+      end).must_raise Fog::Proxmox::Errors::ServiceError
       # Stop server
       server.action('stop')
       server.wait_for { server.status == 'stopped' }
       status = server.status
-      status.must_equal 'stopped'
+      _(status).must_equal 'stopped'
       server.update(vga: 'std')
       # Start server
       server.action('start')
       server.wait_for { ready? }
       status = server.ready?
-      status.must_equal true
+      _(status).must_equal true
       vnc = server.start_console(websocket: 1)
-      vnc['cert'].wont_be_nil
+      _(vnc['cert']).wont_be_nil
       port = server.connect_vnc(vnc)
-      port.wont_be_nil
+      _(port).wont_be_nil
       # Stop server
       server.action('stop')
       server.wait_for { server.status == 'stopped' }
       status = server.status
-      status.must_equal 'stopped'
+      _(status).must_equal 'stopped'
       server.update(serial0: 'socket', vga: 'serial0')
       # Start server
       server.action('start')
       server.wait_for { ready? }
       status = server.ready?
-      status.must_equal true
+      _(status).must_equal true
       term = server.start_console
-      term['ticket'].wont_be_nil
+      _(term['ticket']).wont_be_nil
       # Stop server
       server.action('stop')
       server.wait_for { server.status == 'stopped' }
       status = server.status
-      status.must_equal 'stopped'
+      _(status).must_equal 'stopped'
       server.update(vga: 'qxl')
       # Start server
       server.action('start')
       server.wait_for { ready? }
       status = server.ready?
-      status.must_equal true
+      _(status).must_equal true
       spice = server.start_console
-      spice['password'].wont_be_nil
+      _(spice['password']).wont_be_nil
       # Suspend server
       server.action('suspend')
       server.wait_for { server.qmpstatus == 'paused' }
       qmpstatus = server.qmpstatus
-      qmpstatus.must_equal 'paused'
+      _(qmpstatus).must_equal 'paused'
       # Resume server
       server.action('resume')
       server.wait_for { ready? }
       status = server.ready?
-      status.must_equal true
+      _(status).must_equal true
       # Stop server
       server.action('stop')
       server.wait_for { server.status == 'stopped' }
       status = server.status
-      status.must_equal 'stopped'
-      proc do
+      _(status).must_equal 'stopped'
+      _(proc do
         server.action('hello')
-      end.must_raise Fog::Errors::Error
+      end).must_raise Fog::Errors::Error
       # Delete
       server.destroy
-      proc do
+      _(proc do
         node.servers.get vmid
-      end.must_raise Fog::Errors::NotFound
+      end).must_raise Fog::Errors::NotFound
     end
   end
 
   it 'CRUD snapshots' do
     VCR.use_cassette('snapshots') do
-      node_name = 'proxmox'
+      node_name = 'pve'
       node = @service.nodes.get node_name
       vmid = node.servers.next_id
       server_hash = { vmid: vmid }
@@ -289,15 +289,15 @@ describe Fog::Proxmox::Compute do
       server.snapshots.create(snapshot_hash)
       # Find by id
       snapshot = server.snapshots.get snapname
-      snapshot.wont_be_nil
+      _(snapshot).wont_be_nil
       # Update
       snapshot.description = 'Snapshot 1'
       snapshot.update
       # all snapshots
       snapshots_all = server.snapshots.all
-      snapshots_all.wont_be_nil
-      snapshots_all.wont_be_empty
-      snapshots_all.must_include snapshot
+      _(snapshots_all).wont_be_nil
+      _(snapshots_all).wont_be_empty
+      _(snapshots_all).must_include snapshot
       # Delete
       snapshot.destroy
       server.destroy
@@ -306,44 +306,44 @@ describe Fog::Proxmox::Compute do
 
   it 'CRUD containers' do
     VCR.use_cassette('containers') do
-      node_name = 'proxmox'
+      node_name = 'pve'
       node = @service.nodes.get node_name
-      node.wont_be_nil
+      _(node).wont_be_nil
       # Get next vmid
       vmid = node.containers.next_id
       ostemplate = 'local:vztmpl/alpine-3.8-default_20180913_amd64.tar.xz'
       container_hash = { ostemplate: ostemplate, storage: 'local-lvm', password: 'proxmox01', rootfs: 'local-lvm:1' }
       # Check valid vmid
       valid = node.containers.id_valid? vmid
-      valid.must_equal true
+      _(valid).must_equal true
       # Check not valid vmid
       valid = node.containers.id_valid? 99
-      valid.must_equal false
+      _(valid).must_equal false
       # Create 1st time
       node.containers.create(container_hash.merge(vmid: vmid))
       # Check already used vmid
       valid = node.containers.id_valid? vmid
-      valid.must_equal false
+      _(valid).must_equal false
       # Clone container
       newid = node.containers.next_id
       # Get container
       container = node.containers.get vmid
-      container.wont_be_nil
+      _(container).wont_be_nil
       rootfs_a = container.config.disks.select { |disk| disk.rootfs? }
-      rootfs_a.wont_be_empty
+      _(rootfs_a).wont_be_empty
       rootfs = rootfs_a.first
-      rootfs.wont_be_nil
+      _(rootfs).wont_be_nil
       # Backup it
       container.backup(compress: 'lzo')
       # Get this backup image
       # Find available backup volumes
       backup = container.backups.first
-      container.wont_be_nil
+      _(container).wont_be_nil
       # Restore it
       container.restore(backup, storage: 'local-lvm')
       # Delete it
       backup.destroy
-      container.backups.must_be_empty
+      _(container.backups).must_be_empty
       # Add mount points
       # Find available storages with images
       storages = node.storages.list_by_content_type 'images'
@@ -353,8 +353,8 @@ describe Fog::Proxmox::Compute do
       container.attach(mp0, options)
       # Fetch mount points
       mount_points = container.config.disks.select { |disk| disk.mount_point? }
-      mount_points.wont_be_empty
-      mount_points.get('mp0').wont_be_nil
+      _(mount_points).wont_be_empty
+      _(mount_points.get('mp0')).wont_be_nil
       # Remove mount points
       container.detach('mp0')
       container.detach('unused0')
@@ -367,16 +367,16 @@ describe Fog::Proxmox::Compute do
       clone.template
       # Get clone disk image
       image = clone.images.first
-      image.wont_be_nil
+      _(image).wont_be_nil
       # Delete clone
       clone.destroy
-      proc do
+      _(proc do
         node.containers.get newid
-      end.must_raise Fog::Errors::NotFound
+      end).must_raise Fog::Errors::NotFound
       # Create 2nd time must fails
-      proc do
+      _(proc do
         node.containers.create(container_hash.merge(vmid: vmid))
-      end.must_raise Excon::Errors::InternalServerError
+      end).must_raise Excon::Errors::InternalServerError
       # Update config container
       # Resize rootfs container
       container.extend('rootfs', '+5M')
@@ -391,56 +391,56 @@ describe Fog::Proxmox::Compute do
       container.update(config_hash)
       # get container config
       config = container.config
-      config.wont_be_nil
-      config.identity.must_equal vmid
+      _(config).wont_be_nil
+      _(config.identity).must_equal vmid
       # Fetch nics
       interfaces = container.config.interfaces
-      interfaces.wont_be_empty
-      interfaces.get('net0').wont_be_nil
+      _(interfaces).wont_be_empty
+      _(interfaces.get('net0')).wont_be_nil
       # Get a mac address
       mac_address = container.config.mac_addresses.first
-      mac_address.wont_be_nil
+      _(mac_address).wont_be_nil
       # all containers
       containers_all = node.containers.all
-      containers_all.wont_be_nil
-      containers_all.wont_be_empty
-      containers_all.first.vmid.must_equal container.vmid.to_s
+      _(containers_all).wont_be_nil
+      _(containers_all).wont_be_empty
+      _(containers_all.first.vmid).must_equal container.vmid.to_s
       # Start container
       container.action('start')
       container.wait_for { ready? }
       status = container.ready?
-      status.must_equal true
+      _(status).must_equal true
       # Start console
-      proc do
+      _(proc do
         container.start_console
-      end.must_raise Fog::Errors::Error
+      end).must_raise Fog::Errors::Error
       spice = container.start_console(console: 'spice')
-      spice['password'].wont_be_nil
+      _(spice['password']).wont_be_nil
       # Suspend container (: command 'lxc-checkpoint -n 100 -s -D /var/lib/vz/dump' failed: exit code 1)
       # container.action('suspend')
       # container.wait_for { container.qmpstatus == 'paused' }
       # qmpstatus = container.qmpstatus
-      # qmpstatus.must_equal 'paused'
+      # _(qmpstatus).must_equal 'paused'
       # Resume server
       # container.action('resume')
       # container.wait_for { ready? }
       # status = container.ready?
-      # status.must_equal true
+      # _(status).must_equal true
       # Stop container
       container.action('stop')
       container.wait_for { container.status == 'stopped' }
       status = container.status
-      status.must_equal 'stopped'
-      proc do
+      _(status).must_equal 'stopped'
+      _(proc do
         container.action('hello')
-      end.must_raise Fog::Errors::Error
+      end).must_raise Fog::Errors::Error
       # Delete
       container.destroy
       # Delete container does not delete images
       storage.volumes.each(&:destroy)
-      proc do
+      _(proc do
         node.containers.get vmid
-      end.must_raise Fog::Errors::NotFound
+      end).must_raise Fog::Errors::NotFound
     end
   end
 end