fog-proxmox 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbbd25ac2c953f21c2a4f5b9ab59e30269ab68f9f832abf4dc740743e10a93ec
-  data.tar.gz: 3c20988aca648ae685ce5c8e86c17af02ae667bbf6fe53ee012616fec2300ebe
+  metadata.gz: b8570832df51a02eaf643d8ff711aded5ed8f664168eb2c1e0e8b3dec1f4b309
+  data.tar.gz: c162e5cddd1f8c809310d95b82bce305e2a48c19dad469c432ffd77f8f733723
 SHA512:
-  metadata.gz: 813919e970090cde4ccac7ec991b06f4a8380bdf0a1e0e85c0f5b73fce6da91d48da381bcba239ba995e5b706d80bf6b9123823f66420967685deb350dd30a22
-  data.tar.gz: 3d638a97782b63a70e12237e6494bf67386e019b287965eb02d36c92f7c097c36a443fe84b2e53464f13895984be7f9141171a4212fab8d3792d08ebab85920d
+  metadata.gz: caa4247e9c6f778ad157ba72561f04da0876a6e2d5acd185c93dc84c5ecba5168f1fb3ae3d6a87ddb803d26271963e101f51b8aef5955877ee2f3434cb8de60a
+  data.tar.gz: 8dee3cdb18fe8c1e6ec5103adfb311d6d5d946b44cf3b73acba3b66808321306ea0542c7d40111f53d2b681a1d39b87b2fd43949d5fd15468fd496b66e704184

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [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/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

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
 

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.15.0'
+    VERSION = '0.15.1'
   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