fog-proxmox 0.14.0 → 0.15.1

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,20 +73,21 @@ module Fog
           super(new_attributes)
         end
 
+        def to_s
+          name
+        end
+
         def container?
           type == 'lxc'
         end
 
         def persisted?
           service.next_vmid(vmid: vmid)
-          persisted = false
-          persisted
+          false
         rescue Excon::Error::InternalServerError
-          persisted = false
-          persisted
+          false
         rescue Excon::Error::BadRequest
-          persisted = true
-          persisted
+          true
         end
 
         # request with async task
@@ -122,6 +124,7 @@ module Fog
           action_known = %w[start stop resume suspend shutdown reset].include? action
           message = "Action #{action} not implemented"
           raise Fog::Errors::Error, message unless action_known
+
           request(:action_server, options, action: action, vmid: vmid)
           reload
         end
@@ -136,11 +139,11 @@ module Fog
         end
 
         def restore(backup, options = {})
-          if container?
-            attr_hash = options.merge(ostemplate: backup.volid, force: 1, restore: 1)
-          else
-            attr_hash = options.merge(archive: backup.volid, force: 1)
-          end
+          attr_hash = if container?
+                        options.merge(ostemplate: backup.volid, force: 1, restore: 1)
+                      else
+                        options.merge(archive: backup.volid, force: 1)
+                      end
           save(attr_hash)
         end
 
@@ -186,14 +189,24 @@ module Fog
         end
 
         def start_console(options = {})
-          raise ::Fog::Proxmox::Errors::ServiceError, "Unable to start console because server not running." unless ready?
+          unless ready?
+            raise ::Fog::Proxmox::Errors::ServiceError,
+                  'Unable to start console because server not running.'
+          end
+
           if container?
             type_console = options[:console]
             options.delete_if { |option| [:console].include? option }
-            raise ::Fog::Proxmox::Errors::ServiceError, "Unable to start console because console container config is not set or unknown." unless type_console
+            unless type_console
+              raise ::Fog::Proxmox::Errors::ServiceError,
+                    'Unable to start console because console container config is not set or unknown.'
+            end
           else
             type_console = config.type_console
-            raise ::Fog::Proxmox::Errors::ServiceError, "Unable to start console because VGA display server config is not set or unknown." unless type_console
+            unless type_console
+              raise ::Fog::Proxmox::Errors::ServiceError,
+                    'Unable to start console because VGA display server config is not set or unknown.'
+            end
           end
           requires :vmid, :node_id, :type
           path_params = { node: node_id, type: type, vmid: vmid }
@@ -238,17 +251,21 @@ module Fog
         private
 
         def initialize_snapshots
-          attributes[:snapshots] = Fog::Proxmox::Compute::Snapshots.new(service: service, server_id: vmid, server_type: type, node_id: node_id)
+          attributes[:snapshots] =
+            Fog::Proxmox::Compute::Snapshots.new(service: service, server_id: vmid, server_type: type, node_id: node_id)
         end
 
         def initialize_tasks
-          attributes[:tasks] = Fog::Proxmox::Compute::Tasks.new(service: service, node_id: node_id).select { |task| task.id == vmid }
+          attributes[:tasks] = Fog::Proxmox::Compute::Tasks.new(service: service, node_id: node_id).select do |task|
+            task.id == vmid
+          end
         end
 
         def node
           Fog::Proxmox::Compute::Node.new(service: service, node: node_id)
         end
       end
+      # rubocop:enable ClassLength
     end
   end
 end

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

@@ -24,7 +24,8 @@ require 'fog/proxmox/helpers/controller_helper'
 module Fog
   module Proxmox
     class Compute
-      # ServerConfig model
+      # ServerConfig model: https://pve.proxmox.com/pve-docs/api-viewer/index.html#/nodes/{node}/{qemu|lxc}/{vmid}/config
+      # memory, balloon, shares and swap are in Mb
       class ServerConfig < Fog::Model
         identity  :vmid
         attribute :description
@@ -99,7 +100,7 @@ module Fog
         end
 
         def flatten
-          flat_hash = attributes.reject { |attribute| [:node_id, :type, :vmid, :disks, :interfaces].include? attribute }
+          flat_hash = attributes.reject { |attribute| %i[node_id type vmid disks interfaces].include? attribute }
           flat_hash.merge(interfaces_flatten)
           flat_hash.merge(disks_flatten)
           flat_hash
@@ -128,7 +129,9 @@ module Fog
               model: Fog::Proxmox::NicHelper.extract_nic_id(value),
               macaddr: Fog::Proxmox::NicHelper.extract_mac_address(value)
             }
-            names = Fog::Proxmox::Compute::Interface.attributes.reject { |attribute| [:id, :macaddr, :model].include? attribute }
+            names = Fog::Proxmox::Compute::Interface.attributes.reject do |attribute|
+              %i[id macaddr model].include? attribute
+            end
             names.each { |name| nic_hash.store(name.to_sym, Fog::Proxmox::ControllerHelper.extract(name, value)) }
             attributes[:interfaces] << Fog::Proxmox::Compute::Interface.new(nic_hash)
           end
@@ -145,7 +148,9 @@ module Fog
               volid: volid,
               storage: storage
             }
-            names = Fog::Proxmox::Compute::Disk.attributes.reject { |attribute| [:id, :size, :storage, :volid].include? attribute }
+            names = Fog::Proxmox::Compute::Disk.attributes.reject do |attribute|
+              %i[id size storage volid].include? attribute
+            end
             names.each { |name| disk_hash.store(name.to_sym, Fog::Proxmox::ControllerHelper.extract(name, value)) }
             attributes[:disks] << Fog::Proxmox::Compute::Disk.new(disk_hash)
           end

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

@@ -52,12 +52,12 @@ module Fog
           begin
             status_data = service.get_server_status path_params
             config_data = service.get_server_config path_params
-          rescue => e
+          rescue StandardError => e
             if e.respond_to?('response') && e.response.respond_to?('data') && e.response.data.has_key?(:reason_phrase) && e.response.data[:reason_phrase].end_with?('does not exist')
               raise(Fog::Errors::NotFound)
-            else
-              raise(e)
             end
+
+            raise(e)
           else
             data = status_data.merge(config_data).merge(node: node_id, vmid: id)
             new(data)
@@ -70,8 +70,8 @@ module Fog
         end
 
         def create(new_attributes = {})
-          object = new(new_attributes.select { |key, _value| [:node_id, :vmid, :type].include? key.to_sym })
-          object.save(new_attributes.reject { |key, _value| [:node_id, :vmid, :type].include? key.to_sym })
+          object = new(new_attributes.select { |key, _value| %i[node_id vmid type].include? key.to_sym })
+          object.save(new_attributes.reject { |key, _value| %i[node_id vmid type].include? key.to_sym })
           object
         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/snapshots.rb

@@ -39,7 +39,7 @@ module Fog
         end
 
         def get(name)
-          all.find { |snapshot| snapshot.identity === name }
+          all.find { |snapshot| snapshot.identity == name }
         end
       end
     end

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

@@ -29,7 +29,7 @@
 module Fog
   module Proxmox
     class Compute
-      # class Storage model
+      # class Storage model: https://pve.proxmox.com/pve-docs/api-viewer/index.html#/nodes/{node}/storage/{storage}
       class Storage < Fog::Model
         identity  :storage
         attribute :node_id, aliases: :node
@@ -56,7 +56,8 @@ module Fog
         private
 
         def initialize_volumes
-          attributes[:volumes] = Fog::Proxmox::Compute::Volumes.new(service: service, node_id: node_id, storage_id: identity)
+          attributes[:volumes] =
+            Fog::Proxmox::Compute::Volumes.new(service: service, node_id: node_id, storage_id: identity)
         end
       end
     end

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

@@ -26,7 +26,7 @@ module Fog
       class Storages < Fog::Collection
         model Fog::Proxmox::Compute::Storage
         attribute :node_id
-        
+
         def new(new_attributes = {})
           super({ node_id: node_id }.merge(new_attributes))
         end
@@ -43,7 +43,7 @@ module Fog
 
         def get(id)
           requires :node_id
-          all.find { |storage| storage.identity === id }
+          all.find { |storage| storage.identity == id }
         end
       end
     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/compute/models/tasks.rb

@@ -56,6 +56,7 @@ module Fog
           task.wait_for { finished? }
           message = "Task #{task_upid} failed because #{task.exitstatus}"
           raise Fog::Errors::Error, message unless task.succeeded?
+
           task.succeeded?
         end
       end

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

@@ -31,7 +31,8 @@ require 'fog/proxmox/helpers/disk_helper'
 module Fog
   module Proxmox
     class Compute
-      # class Volume model
+      # class Volume model: https://pve.proxmox.com/pve-docs/api-viewer/index.html#/nodes/{node}/storage/{storage}/content/{volume}
+      # size is in bytes
       class Volume < Fog::Model
         identity  :volid
         attribute :content

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

@@ -37,10 +37,10 @@ module Fog
         end
 
         def list_by_content_type(content)
-          all.select { |volume| volume.content.include? content}
+          all.select { |volume| volume.content.include? content }
         end
 
-        def list_by_content_type_and_by_server(content, vmid)
+        def list_by_content_type_and_by_server(_content, vmid)
           all(vmid: vmid)
         end
 

data/lib/fog/proxmox/compute/requests/get_server_config.rb

@@ -38,20 +38,20 @@ module Fog
       class Mock
         def get_server_config(_path_params)
           {
-            :onboot => 0,
-            :memory => 512,
-            :ostype => 'l26',
-            :cores => 1,
-            :keyboard => 'en-us',
-            :digest => nil,
-            :smbios1 => nil,
-            :vmgenid => nil,
-            :balloon => 0,
-            :kvm => 0,
-            :cpu => 'cputype=kvm64',
-            :sockets => 1,
-            :bootdisk => 'scsi0',
-            :vga => 'std'
+            onboot: 0,
+            memory: 512,
+            ostype: 'l26',
+            cores: 1,
+            keyboard: 'en-us',
+            digest: nil,
+            smbios1: nil,
+            vmgenid: nil,
+            balloon: 0,
+            kvm: 0,
+            cpu: 'cputype=kvm64',
+            sockets: 1,
+            bootdisk: 'scsi0',
+            vga: 'std'
           }
         end
       end

data/lib/fog/proxmox/compute/requests/get_server_status.rb

@@ -38,23 +38,23 @@ module Fog
       class Mock
         def get_server_status(_path_params)
           {
-            :netout => 0,
-            :ha => { 'managed' => 0 },
-            :mem => 0,
-            :vmid => '100',
-            :maxdisk => 8_589_934_592,
-            :diskread => 0,
-            :template => '',
-            :qmpstatus => 'stopped',
-            :diskwrite => 0,
-            :maxmem => 536_870_912,
-            :pid => nil,
-            :uptime => 0,
-            :status => 'stopped',
-            :cpu => 'cputype=kvm64',
-            :cpus => 1,
-            :disk => 0,
-            :netin => 0
+            netout: 0,
+            ha: { 'managed' => 0 },
+            mem: 0,
+            vmid: '100',
+            maxdisk: 8_589_934_592,
+            diskread: 0,
+            template: '',
+            qmpstatus: 'stopped',
+            diskwrite: 0,
+            maxmem: 536_870_912,
+            pid: nil,
+            uptime: 0,
+            status: 'stopped',
+            cpu: 'cputype=kvm64',
+            cpus: 1,
+            disk: 0,
+            netin: 0
           }
         end
       end

data/lib/fog/proxmox/compute/requests/log_task.rb

@@ -35,7 +35,7 @@ module Fog
 
       # class Mock status_task
       class Mock
-        def log_task(_node, _upid, options = {})
+        def log_task(_node, _upid, _options = {})
           [{ 't' => 'TASK OK', 'n' => 1 }]
         end
       end

data/lib/fog/proxmox/core.rb

@@ -26,9 +26,7 @@ module Fog
     # Core module
     module Core
       attr_accessor :token
-      attr_reader :auth_method
-      attr_reader :expires
-      attr_reader :current_user
+      attr_reader :auth_method, :expires, :current_user
 
       def user_token?
         @auth_token == 'user_token'
@@ -46,24 +44,25 @@ module Fog
         @connection = Fog::Core::Connection.new(@proxmox_url, @persistent, @connection_options)
       end
 
-      def setup(options)        
+      def setup(options)
         if options.respond_to?(:config_service?) && options.config_service?
           configure(options)
           return
         end
         Fog::Proxmox::Variables.to_variables(self, options, 'proxmox')
         @connection_options = options[:connection_options] || {}
-        @connection_options[:disable_proxy] = true if ENV['DISABLE_PROXY'] == 'true'    
+        @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]   
-        @auth_method ||= options[:proxmox_auth_method]   
-        if @token
-          @proxmox_can_reauthenticate = false
-        else
-          @proxmox_can_reauthenticate = true
-        end   
+        @persistent = options[:persistent] || false
+        @token ||= options[:proxmox_token]
+        @auth_method ||= options[:proxmox_auth_method]
+        @proxmox_can_reauthenticate = if @token
+                                        false
+                                      else
+                                        true
+                                      end
       end
 
       def credentials
@@ -85,31 +84,36 @@ module Fog
       def expired?
         return false if @expires.nil?
         return false if @expires == 0
-        return @expires - Time.now.utc.to_i < 60
+
+        @expires - Time.now.utc.to_i < 60
       end
 
       def request(params)
-        retried = false     
+        retried = false
         begin
           authenticate! if expired?
-          request_options = params.merge(path: "#{@path}/#{params[:path]}", headers: @auth_token.headers(params[:method], params.respond_to?(:headers) ? params[:headers] : {}, {}))
+          request_options = params.merge(path: "#{@path}/#{params[:path]}",
+                                         headers: @auth_token.headers(
+                                           params[:method], params.respond_to?(:headers) ? params[:headers] : {}, {}
+                                         ))
           response = @connection.request(request_options)
-        rescue Excon::Errors::Unauthorized => error
+        rescue Excon::Errors::Unauthorized => e
           # token expiration and token renewal possible
-          if !%w[Bad username or password, invalid token value!].include?(error.response.body) && @proxmox_can_reauthenticate && !retried
+          if !%w[Bad username or password, invalid token
+                 value!].include?(e.response.body) && @proxmox_can_reauthenticate && !retried
             authenticate!
             retried = true
             retry
           # bad credentials or token renewal not possible
           else
-            raise error
+            raise e
           end
-        rescue Excon::Errors::HTTPStatusError => error
-          raise case error
+        rescue Excon::Errors::HTTPStatusError => e
+          raise case e
                 when Excon::Errors::NotFound
-                  self.class.not_found_class.slurp(error)
+                  self.class.not_found_class.slurp(e)
                 else
-                  error
+                  e
                 end
         end
         Fog::Proxmox::Json.get_data(response)
@@ -123,7 +127,7 @@ module Fog
         if @proxmox_must_reauthenticate
           @token = nil if @proxmox_must_reauthenticate
           @auth_token = Fog::Proxmox::Auth::Token.build(proxmox_options, @connection_options)
-          @current_user = proxmox_options[:proxmox_userid] ? proxmox_options[:proxmox_userid] : proxmox_options[:proxmox_username]
+          @current_user = proxmox_options[:proxmox_userid] || proxmox_options[:proxmox_username]
           @token = @auth_token.token
           @expires = @auth_token.expires
           @proxmox_must_reauthenticate = false

data/lib/fog/proxmox/errors.rb

@@ -51,7 +51,8 @@ module Fog
         def self.slurp(error)
           new_error = super(error)
           unless new_error.response_data.nil? || new_error.response_data['badRequest'].nil?
-            new_error.instance_variable_set(:@validation_errors, new_error.response_data['badRequest']['validationErrors'])
+            new_error.instance_variable_set(:@validation_errors,
+                                            new_error.response_data['badRequest']['validationErrors'])
           end
           new_error
         end

data/lib/fog/proxmox/hash.rb

@@ -21,7 +21,6 @@ module Fog
   module Proxmox
     # module Hash mixins
     module Hash
-
       def self.stringify(hash)
         filtered = hash.reject { |_key, value| value.nil? }
         a = filtered.to_a.collect { |item| item.join('=') }
@@ -33,7 +32,6 @@ module Fog
         a = filtered.to_a.collect { |item| item.join(': ') }
         a.join(',')
       end
-
     end
   end
 end

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

@@ -21,10 +21,9 @@ module Fog
   module Proxmox
     # module ControllerHelper mixins
     module ControllerHelper
-
       CONTROLLERS = %w[ide sata scsi virtio mp rootfs].freeze
       def self.extract(name, controller_value)
-        matches = controller_value.match(/[,]{0,1}#{name}[=]{1}(?<name_value>[\w\/\.\:]+)/)
+        matches = controller_value.match(%r{,{0,1}#{name}={1}(?<name_value>[\w/.:]+)})
         matches ? matches[:name_value] : matches
       end
 
@@ -40,6 +39,7 @@ module Fog
 
       def self.last_index(name, values)
         return -1 if values.empty?
+
         indexes = []
         values.each do |value|
           index = extract_index(name, value)
@@ -49,7 +49,7 @@ module Fog
         indexes.empty? ? -1 : indexes.last
       end
 
-      def self.select(hash,name)
+      def self.select(hash, name)
         hash.select { |key| valid?(name, key.to_s) }
       end
 
@@ -58,7 +58,6 @@ module Fog
         CONTROLLERS.each { |controller| controllers.merge!(select(attributes, controller)) }
         controllers
       end
-
     end
   end
 end

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

@@ -21,12 +21,13 @@ module Fog
   module Proxmox
     # module Cpu mixins
     module CpuHelper
-      CPU_REGEXP = /(\bcputype=)?(?<cputype>[\w-]+)[,]?(\bflags=)?(?<flags>[[\+\-][\w-]+[;]?]*)/
-      FLAGS = { spectre: 'spec-ctrl', pcid: 'pcid', ssbd: 'ssbd', ibpb: 'ibpb', virt_ssbd: 'virt-ssbd', amd_ssbd: 'amd-ssbd', amd_no_ssb: 'amd-no-ssb', md_clear: 'md-clear', pdpe1gb: 'pdpe1gb', hv_tlbflush: 'hv-tlbflush', aes: 'aes', hv_evmcs: 'hv-evmcs' }
+      CPU_REGEXP = /(\bcputype=)?(?<cputype>[\w-]+),?(\bflags=)?(?<flags>[[+-][\w-]+;?]*)/
+      FLAGS = { spectre: 'spec-ctrl', pcid: 'pcid', ssbd: 'ssbd', ibpb: 'ibpb', virt_ssbd: 'virt-ssbd',
+                amd_ssbd: 'amd-ssbd', amd_no_ssb: 'amd-no-ssb', md_clear: 'md-clear', pdpe1gb: 'pdpe1gb', hv_tlbflush: 'hv-tlbflush', aes: 'aes', hv_evmcs: 'hv-evmcs' }
       def self.flags
         FLAGS
       end
-      
+
       def self.extract(cpu, name)
         captures_h = cpu ? CPU_REGEXP.match(cpu.to_s) : { cputype: '', flags: '' }
         captures_h[name]
@@ -44,7 +45,11 @@ module Fog
         flag_value = '0'
         raw_values = extract_flags(cpu).split(';').select { |flag| ['+' + flag_key, '-' + flag_key].include?(flag) }
         unless raw_values.empty?
-          flag_value = raw_values[0].start_with?('+') ? '+1' : raw_values[0].start_with?('-') ? '-1' : '0'
+          flag_value = if raw_values[0].start_with?('+')
+                         '+1'
+                       else
+                         raw_values[0].start_with?('-') ? '-1' : '0'
+                       end
         end
         flag_value
       end
@@ -64,12 +69,14 @@ module Fog
 
       def self.flatten(cpu_h)
         return '' unless cpu_h['cpu_type']
-    
+
         cpu_type = "cputype=#{cpu_h['cpu_type']}"
         num_flags = 0
         FLAGS.each_key { |flag_key| num_flags += 1 if hash_has_no_default_flag?(cpu_h, flag_key.to_s) }
         cpu_type += ',flags=' if num_flags > 0
-        flags_with_no_default_value = FLAGS.select { |flag_key, _flag_value| hash_has_no_default_flag?(cpu_h, flag_key.to_s) }
+        flags_with_no_default_value = FLAGS.select do |flag_key, _flag_value|
+          hash_has_no_default_flag?(cpu_h, flag_key.to_s)
+        end
         flags_with_no_default_value.each_with_index do |(flag_key, flag_value), index|
           cpu_type += hash_flag(cpu_h, flag_key.to_s) + flag_value if hash_has_no_default_flag?(cpu_h, flag_key.to_s)
           cpu_type += ';' if num_flags > index + 1

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

@@ -27,7 +27,7 @@ module Fog
       SERVER_DISK_REGEXP = /^(scsi|sata|virtio|ide)(\d+)$/
       MOUNT_POINT_REGEXP = /^(mp)(\d+)$/
       ROOTFS_REGEXP = /^(rootfs)$/
-      CDROM_REGEXP = /^(.*)[,]{0,1}(media=cdrom)[,]{0,1}(.*)$/
+      CDROM_REGEXP = /^(.*),{0,1}(media=cdrom),{0,1}(.*)$/
       TEMPLATE_REGEXP = /^(.*)(base-)(.*)$/
       CLOUD_INIT_REGEXP = /^(.*)(cloudinit)(.*)$/
 
@@ -44,7 +44,7 @@ module Fog
           value += 'none'
         end
         opts = disk[:options] if disk[:options]
-        main_a = [:id, :volid, :storage, :size]
+        main_a = %i[id volid storage size]
         opts ||= disk.reject { |key, _value| main_a.include? key }
         options = ''
         options += Fog::Proxmox::Hash.stringify(opts) if opts
@@ -79,9 +79,9 @@ module Fog
       # Convert API Proxmox volume/disk parameter string into volume/disk attributes hash value
       def self.extract_storage_volid_size(disk_value)
         # volid definition: <VOLUME_ID>:=<STORAGE_ID>:<storage type dependent volume name>
-        values_a = disk_value.scan(/^(([\w-]+)[:]{0,1}([\w\/\.-]+))/)
+        values_a = disk_value.scan(%r{^(([\w-]+):{0,1}([\w/.-]+))})
         no_cdrom = !disk_value.match(CDROM_REGEXP)
-        creation = disk_value.split(',')[0].match(/^(([\w-]+)[:]{1}([\d]+))$/)
+        creation = disk_value.split(',')[0].match(/^(([\w-]+):{1}(\d+))$/)
         values = values_a.first if values_a
         if no_cdrom
           storage = values[1]
@@ -104,11 +104,11 @@ module Fog
         val = size.match(/\d+(\w?)/)
         m = 0
         case val[1]
-          when "K" then m = 1
-          when "M" then m = 2
-          when "G" then m = 3
-          when "T" then m = 4
-          when "P" then m = 5
+        when 'K' then m = 1
+        when 'M' then m = 2
+        when 'G' then m = 3
+        when 'T' then m = 4
+        when 'P' then m = 5
         end
         val[0].to_i * 1024**m
       end
@@ -118,10 +118,10 @@ module Fog
       end
 
       def self.to_human_bytes(size)
-        units = ['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
@@ -129,9 +129,15 @@ module Fog
         human_size
       end
 
+      def self.to_int_gb(size_bytes)
+        val = to_human_bytes(size_bytes.to_i).match(/\d+(Gb)/)
+        val ? val[0].to_i : 0
+      end
+
       def self.extract_size(disk_value)
         size = extract_option('size', disk_value)
-        size ? to_bytes(size) : "1G"
+        size = to_int_gb(to_bytes(size)).to_s if size.match?(/\d+(G)/)
+        size
       end
 
       def self.disk?(id)