fog-proxmox 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b70163a7fccb9ed54779d18ca8dc37d6ea04fec9ab2c94c91d13282feb589c6
-  data.tar.gz: 65b66339365af13f176e4cd4410f58bd9fa46c10c45082852b36bb5beaa4332b
+  metadata.gz: d03cdedefefcb299e2a86e1d53560f027fe9178ff076f47b5f349e89e9f801e6
+  data.tar.gz: 3200e0a475d337e279d3a6d8a916f6f4aab8259debe6c7a3ef7a7e59487f9c55
 SHA512:
-  metadata.gz: 6e85b1ec840dd0bb45da7eec64fb4b0a0727cf99fadc08a6a2f8a1b6a389a280b6ea36420bb611f645be77f19c351b00651f08d32e9448f904f1e4b1e0a91ee4
-  data.tar.gz: 7e4fcd61713c55989078272a458b98fddb6399eacf36e5dc0d2678925799a48179097cec35bcc0f2332569b432d1c275fd5b25c50ba5d2fe4f3697c6c8f7ec69
+  metadata.gz: 63ce8917cda9c49a79fc935015cb11bbf423453ba9a40da51ae04678bfa1907e961214b2d2f47125954dedbee6b2a7dd50298391412d06dbdd6a0dacaee90100
+  data.tar.gz: 6e1c8db4bd2c38731bfe0113b26b0d7d5d1ca241da6e03afa1f73675abcf266ba7edc0e7edf84f08c800053cd3ef45195e0c34f364c4bf57acda3ed7b917f297

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

@@ -156,7 +156,6 @@ module Fog
 
         def migrate(target, options = {})
           request(:migrate_server, options.merge(target: target), vmid: vmid)
-          reload
         end
 
         def extend(disk, size, options = {})

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

@@ -41,11 +41,10 @@ module Fog
 
         def initialize(new_attributes = {})
           prepare_service_value(new_attributes)
-          attributes[:node_id] = new_attributes[:node_id] unless new_attributes[:node_id].nil?
-          attributes[:server_id] = new_attributes[:server_id] unless new_attributes[:server_id].nil?
-          attributes[:server_type] = new_attributes[:server_type] unless new_attributes[:server_type].nil?
-          attributes[:name] = new_attributes[:name] unless new_attributes[:name].nil?
-          attributes[:name] = new_attributes['name'] unless new_attributes['name'].nil?
+          Fog::Proxmox::Attributes.set_attr_and_sym('node_id', attributes, new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('server_id', attributes, new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('server_type', attributes, new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('name', attributes, new_attributes)
           requires :node_id, :server_id, :server_type, :name
           super(new_attributes)
         end

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

@@ -46,9 +46,8 @@ module Fog
 
         def initialize(new_attributes = {})
           prepare_service_value(new_attributes)
-          attributes[:node_id] = new_attributes[:node_id] unless new_attributes[:node_id].nil?
-          attributes[:storage] = new_attributes[:storage] unless new_attributes[:storage].nil?
-          attributes[:storage] = new_attributes['storage'] unless new_attributes['storage'].nil?
+          Fog::Proxmox::Attributes.set_attr_and_sym('node_id', attributes, new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('storage', attributes, new_attributes)
           requires :node_id, :storage
           initialize_volumes
           super(new_attributes)

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

@@ -47,9 +47,8 @@ module Fog
 
         def initialize(new_attributes = {})
           prepare_service_value(new_attributes)
-          attributes[:node_id] = new_attributes[:node_id] unless new_attributes[:node_id].nil?
-          attributes[:upid] = new_attributes[:upid] unless new_attributes[:upid].nil?
-          attributes[:upid] = new_attributes['upid'] unless new_attributes['upid'].nil?
+          Fog::Proxmox::Attributes.set_attr_and_sym('node_id', attributes, new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('upid', attributes, new_attributes)
           requires :node_id, :upid
           super(new_attributes)
         end

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

@@ -41,9 +41,9 @@ module Fog
 
         def initialize(new_attributes = {})
           prepare_service_value(new_attributes)
-          attributes[:node_id] = new_attributes[:node_id] unless new_attributes[:node_id].nil?
-          attributes[:storage_id] = new_attributes[:storage_id] unless new_attributes[:storage_id].nil?
-          attributes[:volid] = new_attributes['volid'] unless new_attributes['volid'].nil?
+          Fog::Proxmox::Attributes.set_attr_and_sym('node_id', attributes, new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('storage_id', attributes, new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('volid', attributes, new_attributes)
           requires :node_id, :storage_id, :volid
           super(new_attributes)
         end

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

@@ -110,6 +110,22 @@ module Fog
         val[0].to_i*1024**m
       end
 
+      def self.modulo_bytes(size)
+        size / 1024
+      end
+
+      def self.to_human_bytes(size)
+        units = ['Kb','Mb','Gb','Tb','Pb']
+        i = 0
+        human_size = size.to_s + 'b'
+        while i < 5 && size >= 1024
+          size = self.modulo_bytes(size)
+          human_size = size.to_s + units[i]
+          i+=1            
+        end
+        human_size
+      end
+
       def self.extract_size(disk_value)
         size=extract_option('size', disk_value)
 	      size ? self.to_bytes(size) : "1G"

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.10.0'
+    VERSION = '0.11.0'
   end
 end

data/spec/helpers/disk_helper_spec.rb

@@ -195,4 +195,16 @@ require 'fog/proxmox/helpers/disk_helper'
                 assert !Fog::Proxmox::DiskHelper.cdrom?('local:iso/alpine-virt-3.7.0-x86_64.iso')
             end
         end
+
+        describe '#to_bytes' do
+            it "1Gb returns 1 073 741 824" do
+                assert_equal Fog::Proxmox::DiskHelper.to_bytes('1Gb'), 1073741824
+            end
+        end
+
+        describe '#to_human_bytes' do
+            it "1 073 741 824 returns 1Gb" do
+                assert_equal '1Gb', Fog::Proxmox::DiskHelper.to_human_bytes(1073741824)
+            end
+        end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Tristan Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler