fog-proxmox 0.14.0 → 0.15.1

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

@@ -24,7 +24,6 @@ module Fog
   module Proxmox
     # module IpHelper mixins
     module IpHelper
-
       CIDRv4_PREFIX = '([0-9]|[1-2][0-9]|3[0-2])'
       CIDRv4_PREFIX_REGEXP = /^#{CIDRv4_PREFIX}$/
       IPv4_SRC = "#{Resolv::IPv4::Regex.source.delete_suffix('\z').delete_prefix('\A')}"
@@ -33,7 +32,7 @@ module Fog
       CIDRv6_PREFIX_REGEXP = /^#{CIDRv6_PREFIX}$/xi
       IPv6_SRC = "#{Resolv::IPv6::Regex_8Hex.source.delete_suffix('\z').delete_prefix('\A')}"
       CIDRv6_REGEXP = Regexp.new("\\A(#{IPv6_SRC})(\/#{CIDRv6_PREFIX})?\\z", Regexp::EXTENDED | Regexp::IGNORECASE)
-    
+
       def self.cidr?(ip)
         CIDRv4_REGEXP.match?(ip)
       end
@@ -43,15 +42,15 @@ module Fog
       end
 
       def self.prefix(ip)
-        if cidr = CIDRv4_REGEXP.match(ip)
-          cidr[7]
-        end
+        return unless cidr = CIDRv4_REGEXP.match(ip)
+
+        cidr[7]
       end
 
       def self.prefix6(ip)
-        if cidr = CIDRv6_REGEXP.match(ip)
-          cidr[3]
-        end
+        return unless cidr = CIDRv6_REGEXP.match(ip)
+
+        cidr[3]
       end
 
       def self.ip?(ip)
@@ -71,28 +70,30 @@ module Fog
       end
 
       def self.ip(ip)
-        if cidr = CIDRv4_REGEXP.match(ip)
-          cidr[1]
-        end
+        return unless cidr = CIDRv4_REGEXP.match(ip)
+
+        cidr[1]
       end
 
       def self.ip6(ip)
-        if cidr = CIDRv6_REGEXP.match(ip)
-          cidr[1]
-        end
+        return unless cidr = CIDRv6_REGEXP.match(ip)
+
+        cidr[1]
       end
 
-      def self.to_cidr(ip,prefix = nil)
-        return nil unless self.ip?(ip) && (!prefix || self.cidr_prefix?(prefix))
+      def self.to_cidr(ip, prefix = nil)
+        return nil unless ip?(ip) && (!prefix || cidr_prefix?(prefix))
+
         cidr = "#{ip}"
-        cidr += "/#{prefix}" if self.cidr_prefix?(prefix)
+        cidr += "/#{prefix}" if cidr_prefix?(prefix)
         cidr
       end
 
-      def self.to_cidr6(ip,prefix = nil)
-        return nil unless self.ip6?(ip) && (!prefix || self.cidr6_prefix?(prefix))
+      def self.to_cidr6(ip, prefix = nil)
+        return nil unless ip6?(ip) && (!prefix || cidr6_prefix?(prefix))
+
         cidr = "#{ip}"
-        cidr += "/#{prefix}" if self.cidr6_prefix?(prefix)
+        cidr += "/#{prefix}" if cidr6_prefix?(prefix)
         cidr
       end
     end

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

@@ -30,19 +30,19 @@ module Fog
       end
 
       def self.model_regexp
-        /^model=(\w+)[,].+/
+        /^model=(\w+),.+/
       end
 
       def self.name_regexp
-        /^name=(\w+)[,].+/
+        /^name=(\w+),.+/
       end
 
       def self.ip_regexp
-        /^(.+)[,]{1}ip=([\d\.\/]+)[,]?(.+)?$/
+        %r{^(.+),{1}ip=([\d./]+),?(.+)?$}
       end
 
       def self.nic_update_regexp
-        /^(\w+)[=]{1}([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2}).+/
+        /^(\w+)={1}([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2}).+/
       end
 
       def self.has_model?(nic_value)
@@ -75,33 +75,42 @@ module Fog
 
       def self.nic_name(nic)
         if nic.has_key?(:model)
-          "model"
+          'model'
         elsif nic.has_key?(:name)
-          "name"
+          'name'
         else
-          ""
+          ''
         end
       end
 
       def self.set_mac(nic_id, nic_hash)
-        mac_keys = [:macaddr, :hwaddr]
+        mac_keys = %i[macaddr hwaddr]
         nic_value = ''
         if (nic_hash.keys & mac_keys).empty?
-          nic_value = nic_name(nic_hash) + "=" + nic_id
+          nic_value = nic_name(nic_hash) + '=' + nic_id
         else
           mac_value = nic_hash[mac_keys[0]] if nic_hash.key?(mac_keys[0])
           mac_value ||= nic_hash[mac_keys[1]] if nic_hash.key?(mac_keys[1])
-          nic_value = nic_id + "=" + mac_value
+          nic_value = nic_id + '=' + mac_value
         end
         nic_value
       end
 
       # 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 { |key, _value| [nic_name(nic_hash).to_sym, :id, :macaddr, :hwaddr].include? key.to_sym }
-        nic_value += ',' + Fog::Proxmox::Hash.stringify(options) unless options.empty?
+        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_hash[:id]}": nic_value }
       end
 

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

@@ -31,7 +31,9 @@ module Fog
         end
 
         def save(new_attributes = {})
-          service.create_domain(type.attributes.merge(new_attributes).merge(attributes.reject { |attribute| [:type].include? attribute }))
+          service.create_domain(type.attributes.merge(new_attributes).merge(attributes.reject do |attribute|
+                                                                              [:type].include? attribute
+                                                                            end))
           reload
         end
 
@@ -43,7 +45,9 @@ module Fog
 
         def update
           requires :realm
-          service.update_domain(realm, type.attributes.merge(attributes).reject { |attribute| [:type, :realm].include? attribute })
+          service.update_domain(realm, type.attributes.merge(attributes).reject do |attribute|
+                                         %i[type realm].include? attribute
+                                       end)
           reload
         end
 
@@ -52,7 +56,7 @@ module Fog
         def initialize_type(new_attributes = {})
           if new_attributes.has_key? :realm
             realm = new_attributes.delete(:realm)
-          elsif new_attributes.has_key? 'realm'              
+          elsif new_attributes.has_key? 'realm'
             realm = new_attributes.delete('realm')
           end
           attributes[:type] = Fog::Proxmox::Identity::DomainType.new(new_attributes)

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

@@ -41,7 +41,6 @@ module Fog
         attribute :verify
         attribute :step
         attribute :digits
-
       end
     end
   end

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

@@ -31,14 +31,13 @@ module Fog
         end
 
         def get(id)
-          all.find { |domain| domain.identity === id }
+          all.find { |domain| domain.identity == id }
         end
 
         def destroy(id)
           domain = get(id)
           domain.destroy
         end
-
       end
     end
   end

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| [:users, :members].include? attribute }).merge(options))
+          service.create_group((attributes.reject { |attribute| %i[users members].include? attribute }).merge(options))
           reload
         end
 
@@ -40,7 +40,9 @@ module Fog
 
         def update
           requires :groupid
-          service.update_group(identity, attributes.reject { |attribute| [:groupid, :users, :members].include? attribute })
+          service.update_group(identity, attributes.reject do |attribute|
+                                           %i[groupid users members].include? attribute
+                                         end)
           reload
         end
       end

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

@@ -31,7 +31,7 @@ module Fog
         end
 
         def get(id)
-          all.find { |group| group.identity === id }
+          all.find { |group| group.identity == id }
         end
 
         def destroy(id)

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

@@ -40,17 +40,18 @@ module Fog
 
         def initialize_roles(new_attributes = {})
           roles = new_attributes.delete(:roleid)
-          new_attributes.store(:roles, roles)       
+          new_attributes.store(:roles, roles)
         end
 
         def initialize_ugid(new_attributes = {})
           ugs = new_attributes.delete(:ugid)
-          if type === 'user'
+          case type
+          when 'user'
             new_attributes.store(:users, ugs)
-          elsif type === 'group'
+          when 'group'
             new_attributes.store(:groups, ugs)
           end
-          new_attributes.delete(:type)          
+          new_attributes.delete(:type)
         end
 
         def to_update

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

@@ -31,7 +31,9 @@ module Fog
         end
 
         def get(type, path, roleid, ugid)
-          all.find { |permission| permission.type === type && permission.path === path && permission.roleid === roleid && permission.ugid === ugid }
+          all.find do |permission|
+            permission.type == type && permission.path == path && permission.roleid == roleid && permission.ugid == ugid
+          end
         end
 
         def destroy(permission_hash)

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

@@ -67,14 +67,14 @@ module Fog
         end
 
         def has_server?(vmid)
-          has?("vmid", vmid)
+          has?('vmid', vmid)
         end
 
         def has_storage?(storage)
-          has?("storage", storage)
+          has?('storage', storage)
         end
-        
-        private 
+
+        private
 
         def has?(key, vmid)
           result = false

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

@@ -27,13 +27,13 @@ module Fog
         model Fog::Proxmox::Identity::Pool
 
         def all
-          pools_with_members = Array.new
-          service.list_pools.each { |pool| pools_with_members.push(pool.merge(service.get_pool(pool["poolid"]))) }
+          pools_with_members = []
+          service.list_pools.each { |pool| pools_with_members.push(pool.merge(service.get_pool(pool['poolid']))) }
           load pools_with_members
         end
-   
+
         def get(id)
-          all.find { |pool| pool.identity === id }
+          all.find { |pool| pool.identity == id }
         end
 
         def destroy(id)

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

@@ -39,7 +39,7 @@ module Fog
 
         def update
           requires :roleid
-          service.update_role(roleid, attributes.reject { |attribute| [:roleid, :special].include? attribute })
+          service.update_role(roleid, attributes.reject { |attribute| %i[roleid special].include? attribute })
           reload
         end
       end

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

@@ -31,7 +31,7 @@ module Fog
         end
 
         def get(id)
-          all.find { |role| role.identity === id }
+          all.find { |role| role.identity == id }
         end
 
         def destroy(id)

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

@@ -40,10 +40,9 @@ module Fog
           super(new_attributes)
         end
 
-
         def save(options = {})
           requires :tokenid, :userid
-          token_hash = (attributes.reject { |attribute| [: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
@@ -56,7 +55,9 @@ module Fog
 
         def update
           requires :tokenid, :userid
-          service.update_token(userid, tokenid, attributes.reject { |attribute| [:userid, :tokenid, :info].include? attribute })
+          service.update_token(userid, tokenid, attributes.reject do |attribute|
+                                                  %i[userid tokenid info].include? attribute
+                                                end)
           reload
         end
 

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

@@ -24,9 +24,9 @@ module Fog
       class TokenInfo < Fog::Model
         identity  :tokenid
         identity  :userid
-        attribute  :fulltokenid
+        attribute :fulltokenid
         attribute :info
-        attribute :value        
+        attribute :value
 
         def initialize(new_attributes = {})
           prepare_service_value(new_attributes)

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

@@ -32,24 +32,20 @@ module Fog
         end
 
         def get(tokenid)
-          all.find { |token| token.tokenid === tokenid && token.userid == userid }
+          all.find { |token| token.tokenid == tokenid && token.userid == userid }
         end
 
-        def all(options = {})
-          begin
-            load service.list_tokens(userid)
-          rescue Excon::Error::InternalServerError => error
-            if error.response.status_line.include? "no such user"
-              return []
-            else
-              raise error
-            end
-          end
+        def all(_options = {})
+          load service.list_tokens(userid)
+        rescue Excon::Error::InternalServerError => e
+          raise e unless e.response.status_line.include? 'no such user'
+
+          []
         end
 
         def create(new_attributes = {})
-          object = new(new_attributes.select { |key, _value| [:userid, :tokenid].include? key.to_sym })
-          object.save(new_attributes.reject { |key, _value| [:userid, :tokenid].include? key.to_sym })
+          object = new(new_attributes.select { |key, _value| %i[userid tokenid].include? key.to_sym })
+          object.save(new_attributes.reject { |key, _value| %i[userid tokenid].include? key.to_sym })
           object
         end
       end

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

@@ -57,7 +57,7 @@ module Fog
 
         def update
           requires :userid
-          service.update_user(userid, attributes.reject { |attribute| [:userid, :tokens].include? attribute })
+          service.update_user(userid, attributes.reject { |attribute| %i[userid tokens].include? attribute })
           reload
         end
 
@@ -76,7 +76,6 @@ module Fog
         def initialize_tokens
           attributes[:tokens] = Fog::Proxmox::Identity::Tokens.new(service: service, userid: userid)
         end
-
       end
     end
   end

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

@@ -31,7 +31,7 @@ module Fog
         end
 
         def get(id)
-          all.find { |user| user.identity === id }
+          all.find { |user| user.identity == id }
         end
 
         def destroy(id)

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

@@ -31,6 +31,7 @@ module Fog
           )
         end
       end
+
       # class Mock get_user request
       class Mock
         def get_user(userid); end

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

@@ -26,7 +26,7 @@ module Fog
         def list_user_permissions(userid, path)
           options = { userid: userid }
           options.store(:path, path) if path
-            request(
+          request(
             expects: [200],
             method: 'GET',
             path: 'access/permissions',

data/lib/fog/proxmox/network/models/networks.rb

@@ -40,7 +40,7 @@ module Fog
         end
 
         def get(id)
-          all.find { |network| network.identity === id }
+          all.find { |network| network.identity == id }
         end
       end
     end

data/lib/fog/proxmox/network/models/node.rb

@@ -60,6 +60,7 @@ module Fog
           action_known = %w[reboot shutdown].include? action
           message = "Action #{action} not implemented"
           raise Fog::Errors::Error, message unless action_known
+
           service.power_node({ node: node }, command: action)
         end
 

data/lib/fog/proxmox/network/models/nodes.rb

@@ -31,7 +31,7 @@ module Fog
         end
 
         def get(id)
-          all.find { |node| node.identity === id }
+          all.find { |node| node.identity == id }
         end
       end
     end

data/lib/fog/proxmox/string.rb

@@ -22,9 +22,10 @@ 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)
-        raise ArgumentError.new("invalid value for 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)
+
+        raise ArgumentError, "invalid value for Boolean: \"#{text}\""
       end
     end
   end

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.14.0'
+    VERSION = '0.15.1'
   end
 end

data/lib/fog/proxmox.rb

@@ -24,7 +24,6 @@ require 'fog/json'
 module Fog
   # Proxmox module
   module Proxmox
-
     require 'fog/proxmox/auth/token'
 
     autoload :Core, 'fog/proxmox/core'
@@ -35,7 +34,7 @@ module Fog
     autoload :Network, 'fog/proxmox/network'
 
     extend Fog::Provider
-    
+
     service(:identity, 'Identity')
     service(:compute, 'Compute')
     service(:storage, 'Storage')
@@ -50,6 +49,5 @@ module Fog
     def self.clear_token_cache
       Fog::Proxmox.token_cache = {}
     end
-    
   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