fog-proxmox 0.15.0 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbbd25ac2c953f21c2a4f5b9ab59e30269ab68f9f832abf4dc740743e10a93ec
-  data.tar.gz: 3c20988aca648ae685ce5c8e86c17af02ae667bbf6fe53ee012616fec2300ebe
+  metadata.gz: 76ca5dd7645b67a287e1f668a536de1fcf180f4d363ba2472e03ad33fc1a5194
+  data.tar.gz: 551e55a53ce2c316be4134f45251539209e90b6a87ad207653b17754653cfebc
 SHA512:
-  metadata.gz: 813919e970090cde4ccac7ec991b06f4a8380bdf0a1e0e85c0f5b73fce6da91d48da381bcba239ba995e5b706d80bf6b9123823f66420967685deb350dd30a22
-  data.tar.gz: 3d638a97782b63a70e12237e6494bf67386e019b287965eb02d36c92f7c097c36a443fe84b2e53464f13895984be7f9141171a4212fab8d3792d08ebab85920d
+  metadata.gz: 7263bb9be5064c515fa658f284afbd696251dde07e2b74d86d61c3f367c19f3b3894b3ff2392fa275f258e5c4b5b640a66808d7c59405038d16c560424eb72a1
+  data.tar.gz: b6a10b77669b5782e2ec2d8e4ab8a7ea6bcdd7a6af10abf8a271008f3db9f896e4dad07506d570d022a817a5ce9f908b8c05f9b17634809cffd9e1b872780683

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.15.2](https://github.com/fog/fog-proxmox/compare/v0.15.1...v0.15.2) (2025-08-06)
+
+
+### Miscellaneous Chores
+
+* release 0.15.2 ([#116](https://github.com/fog/fog-proxmox/issues/116)) ([d460740](https://github.com/fog/fog-proxmox/commit/d46074059cc48e0951109850904b8bc6a030da81))
+
+## [0.15.1](https://github.com/fog/fog-proxmox/compare/v0.15.0...v0.15.1) (2025-02-25)
+
+
+### Bug Fixes
+
+* Fixes EOF OpenSSL error in Proxmox connection ([#102](https://github.com/fog/fog-proxmox/issues/102)) ([ac8b0e1](https://github.com/fog/fog-proxmox/commit/ac8b0e11a39da6b19703b4f4507edf19486899ba))
+
 ## [0.15.0](https://github.com/fog/fog-proxmox/compare/v0.14.0...v0.15.0) (2022-12-01)
 
 

data/lib/fog/proxmox/auth/token/access_ticket.rb

@@ -48,11 +48,11 @@ module Fog
           def auth_body(params = {})
             raise URIError, 'URI params is required' if params.nil? || params.empty?
 
-            if params[:proxmox_username].nil? || params[:proxmox_username].empty?
+            if params[:proxmox_username].nil? || params[:proxmox_username].to_s.strip.empty?
               raise URIError,
                     'proxmox_username is required'
             end
-            if params[:proxmox_password].nil? || params[:proxmox_password].empty?
+            if params[:proxmox_password].nil? || params[:proxmox_password].to_s.strip.empty?
               raise URIError,
                     'proxmox_password is required'
             end

data/lib/fog/proxmox/compute/models/server.rb

@@ -26,6 +26,7 @@ module Fog
   module Proxmox
     class Compute
       # Server model
+      # rubocop:disable ClassLength
       class Server < Fog::Compute::Server
         identity  :vmid
         attribute :type
@@ -72,6 +73,10 @@ module Fog
           super(new_attributes)
         end
 
+        def to_s
+          name
+        end
+
         def container?
           type == 'lxc'
         end
@@ -260,6 +265,7 @@ module Fog
           Fog::Proxmox::Compute::Node.new(service: service, node: node_id)
         end
       end
+      # rubocop:enable ClassLength
     end
   end
 end

data/lib/fog/proxmox/compute/models/snapshot.rb

@@ -51,7 +51,7 @@ module Fog
 
         def save
           path_params = { node: node_id, type: server_type, vmid: server_id }
-          body_params = { snapname: name }
+          body_params = { snapname: name, vmstate: vmstate }
           server.tasks.wait_for(service.create_snapshot(path_params, body_params))
         end
 

data/lib/fog/proxmox/compute/models/task.rb

@@ -54,7 +54,7 @@ module Fog
         end
 
         def succeeded?
-          finished? && exitstatus == 'OK'
+          finished? && (exitstatus == 'OK' || exitstatus.include?('WARNING'))
         end
 
         def finished?

data/lib/fog/proxmox/core.rb

@@ -53,6 +53,7 @@ module Fog
         @connection_options = options[:connection_options] || {}
         @connection_options[:disable_proxy] = true if ENV['DISABLE_PROXY'] == 'true'
         @connection_options[:ssl_verify_peer] = false if ENV['SSL_VERIFY_PEER'] == 'false'
+        @connection_options[:ignore_unexpected_eof] = true
         @proxmox_must_reauthenticate = true
         @persistent = options[:persistent] || false
         @token ||= options[:proxmox_token]

data/lib/fog/proxmox/helpers/disk_helper.rb

@@ -118,10 +118,10 @@ module Fog
       end
 
       def self.to_human_bytes(size)
-        units = %w[Kb Mb Gb Tb Pb]
+        units = %w[Kb Mb Gb]
         i = 0
         human_size = size.to_s + 'b'
-        while i < 5 && size >= 1024
+        while i < 3 && size >= 1024
           size = modulo_bytes(size)
           human_size = size.to_s + units[i]
           i += 1
@@ -136,28 +136,28 @@ module Fog
 
       def self.extract_size(disk_value)
         size = extract_option('size', disk_value)
-        size = to_int_gb(to_bytes(size)).to_s if size.match?(/\d+(G)/)
+        size = to_int_gb(to_bytes(size)).to_s if size&.match?(/\d+(G)/)
         size
       end
 
       def self.disk?(id)
-        DISKS_REGEXP.match(id) ? true : false
+        DISKS_REGEXP.match(id) || false
       end
 
       def self.cdrom?(value)
-        CDROM_REGEXP.match(value) ? true : false
+        CDROM_REGEXP.match(value) || false
       end
 
       def self.server_disk?(id)
-        SERVER_DISK_REGEXP.match(id) ? true : false
+        SERVER_DISK_REGEXP.match(id) || false
       end
 
       def self.rootfs?(id)
-        ROOTFS_REGEXP.match(id) ? true : false
+        ROOTFS_REGEXP.match(id) || false
       end
 
       def self.mount_point?(id)
-        MOUNT_POINT_REGEXP.match(id) ? true : false
+        MOUNT_POINT_REGEXP.match(id) || false
       end
 
       def self.container_disk?(id)
@@ -165,11 +165,11 @@ module Fog
       end
 
       def self.template?(volid)
-        TEMPLATE_REGEXP.match(volid) ? true : false
+        TEMPLATE_REGEXP.match(volid) || false
       end
 
       def self.cloud_init?(volid)
-        CLOUD_INIT_REGEXP.match(volid) ? true : false
+        CLOUD_INIT_REGEXP.match(volid) || false
       end
 
       def self.of_type?(disk_h, vm_type)

data/lib/fog/proxmox/helpers/nic_helper.rb

@@ -98,12 +98,19 @@ module Fog
 
       # Convert nic attributes hash into API Proxmox parameters string
       def self.flatten(nic_hash)
-        nic_id = nic_hash[nic_name(nic_hash).to_sym]
-        nic_value = set_mac(nic_id, nic_hash)
-        options = nic_hash.reject do |key, _value|
-          [nic_name(nic_hash).to_sym, :id, :macaddr, :hwaddr].include? key.to_sym
+        if nic_hash[:hwaddr].nil?
+          nic_id = nic_hash[nic_name(nic_hash).to_sym]
+          nic_value = set_mac(nic_id, nic_hash)
+          options = nic_hash.reject do |key, _value|
+            [nic_name(nic_hash).to_sym, :id, :hwaddr, :macaddr].include? key.to_sym
+          end
+          nic_value += ',' + Fog::Proxmox::Hash.stringify(options) unless options.empty?
+        else
+          options = nic_hash.reject do |key, _value|
+            %i[id model macaddr].include? key.to_sym
+          end
+          nic_value = Fog::Proxmox::Hash.stringify(options) unless options.empty?
         end
-        nic_value += ',' + Fog::Proxmox::Hash.stringify(options) unless options.empty?
         { "#{nic_hash[:id]}": nic_value }
       end
 
@@ -112,7 +119,7 @@ module Fog
       end
 
       def self.nic?(id)
-        NICS_REGEXP.match(id) ? true : false
+        NICS_REGEXP.match(id) || false
       end
 
       def self.extract_ip(nic_value)

data/lib/fog/proxmox/identity/models/group.rb

@@ -28,7 +28,7 @@ module Fog
         attribute :members
 
         def save(options = {})
-          service.create_group((attributes.reject { |attribute| %i[users members].include? attribute }).merge(options))
+          service.create_group(attributes.reject { |attribute| %i[users members].include? attribute }.merge(options))
           reload
         end
 

data/lib/fog/proxmox/identity/models/token.rb

@@ -42,7 +42,7 @@ module Fog
 
         def save(options = {})
           requires :tokenid, :userid
-          token_hash = (attributes.reject { |attribute| %i[userid tokenid info].include? attribute }).merge(options)
+          token_hash = attributes.reject { |attribute| %i[userid tokenid info].include? attribute }.merge(options)
           service.create_token(userid, tokenid, token_hash)
           reload
         end

data/lib/fog/proxmox/identity/models/user.rb

@@ -45,7 +45,7 @@ module Fog
         end
 
         def save(options = {})
-          service.create_user((attributes.reject { |attribute| [:tokens].include? attribute }).merge(options))
+          service.create_user(attributes.reject { |attribute| [:tokens].include? attribute }.merge(options))
           reload
         end
 

data/lib/fog/proxmox/string.rb

@@ -22,8 +22,8 @@ module Fog
     # module String mixins
     module String
       def self.to_boolean(text)
-        return true if text == true || text =~ (/(true|t|yes|y|1)$/i)
-        return false if text == false || text.empty? || text =~ (/(false|f|no|n|0)$/i)
+        return true if text == true || text =~ /(true|t|yes|y|1)$/i
+        return false if text == false || text.empty? || text =~ /(false|f|no|n|0)$/i
 
         raise ArgumentError, "invalid value for Boolean: \"#{text}\""
       end

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.15.0'
+    VERSION = '0.15.2'
   end
 end

data/spec/compute_spec.rb

@@ -277,15 +277,16 @@ describe Fog::Proxmox::Compute do
 
   it 'CRUD snapshots' do
     VCR.use_cassette('snapshots') do
-      node_name = 'pve'
+      node_name = 'proxmox-noris'
       node = @service.nodes.get node_name
       vmid = node.servers.next_id
       server_hash = { vmid: vmid }
       node.servers.create server_hash
       # Create
       snapname = 'snapshot1'
+      vmstate = 0
       server = node.servers.get vmid
-      snapshot_hash = { name: snapname }
+      snapshot_hash = { name: snapname, vmstate: vmstate }
       server.snapshots.create(snapshot_hash)
       # Find by id
       snapshot = server.snapshots.get snapname