fog-proxmox 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60f322bc1b1cd38bb76d5c25e932f68adcc8ec7a18d0060a7e4c6977a7d8db0d
-  data.tar.gz: bae297b90d4e4aeb2da54d76534a7cb725c7b721b6ee4b4ae1835d04c56c1778
+  metadata.gz: 0320a22c2debb1a4e6dcc2f7d90e4bee91aa9015391a56bfc727620d3d72c55d
+  data.tar.gz: '075000983c20f5ba9170766ecf1839c0e6c407a57711a0e7efbdcc0cd1b98ef9'
 SHA512:
-  metadata.gz: e78294eed3cebd7a5e3a840edd918b3cb239498701b963463aa3616832e697f34cf204ff0efedf064657ca4ad1c3fc7ba4c46f75a3d2e148e313ae03b14dcde9
-  data.tar.gz: b049b84b24d4bd399ee043f3e7c4896f4b5a055add4607bebcf9f5f546dd9da6898b024f9194e8c433bbe15cf2eb24a9576c78085b37c30335abc70941403328
+  metadata.gz: 57e88aae5403f9b7b3487963787b7898b18ce4277c44f4bdb264c10997890c5d9d890dd1af005a3808b6e20035a0941baafe5973caaba35615579e97216c7869
+  data.tar.gz: 7bd9493e5601e647f24a5ff1c56231e4543162cd9fbfa57bf66fe9333d06f3cb639633ea1460d27149cd05aa61e6b4a6539827093d04ffb99523697ae45f41c4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog-proxmox (0.7.0)
+    fog-proxmox (0.8.0)
       fog-core (~> 2.1)
       fog-json (~> 1.2)
       ipaddress (~> 0.8)
@@ -51,7 +51,7 @@ GEM
       fog-core
       multi_json (~> 1.10)
     formatador (0.2.5)
-    hashdiff (0.3.8)
+    hashdiff (0.3.9)
     ice_nine (0.11.2)
     ipaddress (0.8.3)
     jaro_winkler (1.5.2)
@@ -69,7 +69,6 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    psych (3.1.0)
     public_suffix (3.0.3)
     rainbow (3.0.0)
     rake (12.3.2)
@@ -84,18 +83,17 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.67.2)
+    rubocop (0.68.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.6)

data/README.md

@@ -1,4 +1,4 @@
-![Foreman](fogproxmox.png)
+![Foreman](.github/fogproxmox.png)
 
 # Fog::Proxmox
 
@@ -65,10 +65,10 @@ USE_VCR=true bundle exec rake spec
 
 ## Contributing
 
-You can reach the [contributors](CONTRIBUTORS.md).
+You can reach the [contributors](.github/CONTRIBUTORS.md).
 Bug reports and pull requests are welcome on GitHub at [Fog-Proxmox](https://github.com/fog/fog-proxmox/issues). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-Please read [how to contribute](CONTRIBUTING.md).
+Please read [how to contribute](.github/CONTRIBUTING.md).
 
 ## License
 

data/fog-proxmox.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Module for the 'Fog' gem to support Proxmox VE"
   spec.description   = 'This library can be used as a module for `fog`.'
-  spec.homepage      = 'http://github.com/fog/fog-proxmox'
+  spec.homepage      = 'https://github.com/fog/fog-proxmox'
   spec.license       = 'GPL-3.0'
 
   spec.files         = `git ls-files -z`.split("\x0")

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

@@ -66,6 +66,10 @@ module Fog
         def flatten
           Fog::Proxmox::DiskHelper.flatten(attributes)
         end
+
+        def to_s
+          Fog::Proxmox::Hash.flatten(flatten)
+        end
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Fog
       # class Interface model
       class Interface < Fog::Model
         identity  :id
-        attribute :mac
+        attribute :macaddr
         attribute :model
         attribute :name
         attribute :ip
@@ -40,6 +40,10 @@ module Fog
         def flatten
           Fog::Proxmox::NicHelper.flatten(attributes)
         end
+
+        def to_s
+          Fog::Proxmox::Hash.flatten(flatten)
+        end
       end
     end
   end

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

@@ -118,9 +118,9 @@ module Fog
             nic_hash = {
               id: key.to_s,
               model: Fog::Proxmox::NicHelper.extract_nic_id(value),
-              mac: Fog::Proxmox::NicHelper.extract_mac_address(value)
+              macaddr: Fog::Proxmox::NicHelper.extract_mac_address(value)
             }
-            names = Fog::Proxmox::Compute::Interface.attributes.reject { |attribute| [:id, :mac, :model].include? attribute }
+            names = Fog::Proxmox::Compute::Interface.attributes.reject { |attribute| [:id, :macaddr, :model].include? attribute }
             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

data/lib/fog/proxmox.rb

@@ -37,27 +37,33 @@ module Fog
     service(:storage, 'Storage')
     service(:network, 'Network')
 
-    @cache = {}
+    @credentials = {}
+    @now = Time.now
 
     # Default lifetime ticket is 2 hours
     @ticket_lifetime = 2 * 60 * 60
 
     class << self
-      attr_accessor :cache
+      attr_reader :credentials
       attr_reader :version
+      attr_accessor :now # tests only
     end
 
-    def self.clear_cache
-      Fog::Proxmox.cache = {}
+    def self.clear_credentials
+      @credentials = {}
     end
 
     def self.authenticate(options, connection_options = {})
       get_tokens(options, connection_options)
-      @cache
+      self
     end
 
     def self.authenticated?
-      !@cache.empty?
+      !@credentials.empty?
+    end
+
+    def self.credentials_has_expired?
+      authenticated? && @credentials[:deadline] > @now
     end
 
     def self.extract_password(options)
@@ -73,7 +79,8 @@ module Fog
       uri = URI.parse(url)
       @api_path = uri.path
       connection_options = connection_options.merge(path_prefix: @api_path)
-      retrieve_tokens(uri, connection_options, username, password) unless authenticated?
+      password = @credentials[:csrftoken] if credentials_has_expired?
+      retrieve_tokens(uri, connection_options, username, password) unless authenticated? && !credentials_has_expired?
     end
 
     def self.retrieve_tokens(uri, connection_options, username, password)
@@ -96,20 +103,17 @@ module Fog
       ticket    = data['ticket']
       username  = data['username']
       csrftoken = data['CSRFPreventionToken']
-
-      now = Time.now
-      deadline = Time.at(now.to_i + @ticket_lifetime)
+      deadline = Time.at(@now.to_i + @ticket_lifetime)
       save_token(username, ticket, csrftoken, deadline)
     end
 
     def self.save_token(username, ticket, csrftoken, deadline)
-      @cache = {
+      @credentials = {
         username: username,
         ticket: ticket,
         csrftoken: csrftoken,
         deadline: deadline
       }
-      Fog::Proxmox.cache = @cache
     end
   end
 end

data/lib/fog/proxmox/core.rb

@@ -38,11 +38,9 @@ module Fog
 
       def initialize_identity(options)
         @principal = nil
-        @pve_must_reauthenticate = true
         @pve_ticket = nil
         Fog::Proxmox::Variables.to_variables(self, options, 'pve')
         @pve_uri = URI.parse(@pve_url)
-        @pve_must_reauthenticate = true unless @pve_ticket
         missing_credentials = []
         missing_credentials << :pve_username unless @pve_username
 
@@ -78,7 +76,7 @@ module Fog
           ))
         rescue Excon::Errors::Unauthorized => error
           # token expiration and token renewal possible
-          if error.response.body != 'Bad username or password' && @pve_can_reauthenticate && !retried
+          if error.response.body != 'Bad username or password' && !retried
             authenticate
             retried = true
             retry
@@ -115,17 +113,14 @@ module Fog
       end
 
       def authenticate
-        unless @principal
-          options = pve_options
-          options[:pve_ticket] = @pve_must_reauthenticate ? nil : @pve_ticket
-          credentials = Fog::Proxmox.authenticate(options, @connection_options)
-          @principal = credentials
-          @pve_username = credentials[:username]
-          @pve_ticket = credentials[:ticket]
-          @pve_deadline = credentials[:deadline]
-          @pve_csrftoken = credentials[:csrftoken]
-          @pve_must_reauthenticate = false
-        end
+        options = pve_options
+        @pve_ticket = options[:pve_ticket]
+        Fog::Proxmox.authenticate(options, @connection_options)
+        @principal = Fog::Proxmox.credentials
+        @pve_username = Fog::Proxmox.credentials[:username]
+        @pve_ticket = Fog::Proxmox.credentials[:ticket]
+        @pve_deadline = Fog::Proxmox.credentials[:deadline]
+        @pve_csrftoken = Fog::Proxmox.credentials[:csrftoken]
 
         @host       = @pve_uri.host
         @api_path   = @pve_uri.path

data/lib/fog/proxmox/hash.rb

@@ -21,14 +21,19 @@ module Fog
   module Proxmox
     # module Hash mixins
     module Hash
+
       def self.stringify(hash)
-        return '' unless hash
-        string = ''
-        hash.each do |key, value|
-          string += "#{key}=#{value}," if value
-        end
-        string.slice(0, string.length - 1) if string.length > 0
+        filtered = hash.reject { |_key,value| value.to_s.empty? }
+        a = filtered.to_a.collect { |item| item.join('=') }
+        a.join(',')
+      end
+
+      def self.flatten(hash)
+        filtered = hash.reject { |_key,value| value.to_s.empty? }
+        a = filtered.to_a.collect { |item| item.join(': ') }
+        a.join(',')
       end
+
     end
   end
 end

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

@@ -23,19 +23,36 @@ module Fog
   module Proxmox
     # module Disk mixins
     module DiskHelper
+      
+      DISKS_REGEXP = /^(scsi|sata|mp|rootfs|virtio|ide)(\d+){0,1}$/
+      SERVER_DISK_REGEXP = /^(scsi|sata|virtio|ide)(\d+)$/
+      MOUNT_POINT_REGEXP = /^(mp)(\d+)$/
+      ROOTFS_REGEXP = /^(rootfs)$/
+      CDROM_REGEXP = /^(.*)[,]{0,1}(media=cdrom)[,]{0,1}(.*)$/
+
       def self.flatten(disk)
-        volid = disk[:volid]
-        value = if volid
-                  "#{disk[:volid]},size=#{disk[:size]}"
-                else
-                  "#{disk[:storage]}:#{disk[:size]}"
-                end
-        opts = disk[:options] if disk.has_key? :options
+        id = disk[:id]
+        value = ''
+        if disk[:volid]
+          value += disk[:volid]
+          value += ',size=' + disk[:size].to_s if disk[:size]
+        elsif disk[:storage] && disk[:size]
+          value += disk[:storage] + ':' + disk[:size].to_s
+        elsif id == 'ide2'
+          value += 'none'
+        end
+        opts = disk[:options] if disk[:options]
         main_a = [:id,:volid,:storage,:size]
         opts = disk.reject { |key,_value| main_a.include? key } unless opts
-        options = Fog::Proxmox::Hash.stringify(opts) if opts
-        value += ",#{options}" if options
-        { "#{disk[:id]}": value }
+        options = ''
+        options += Fog::Proxmox::Hash.stringify(opts) if opts
+        if id == 'ide2' && !self.cdrom?(options)
+          options += ',' if !options.empty?
+          options += 'media=cdrom'
+        end
+        value += ',' if !options.empty? && !value.empty?
+        value += options
+        { "#{id}": value }
       end
 
       def self.extract_controller(id)
@@ -59,7 +76,7 @@ module Fog
       def self.extract_storage_volid_size(disk_value)
         #volid definition: <VOULME_ID>:=<STORAGE_ID>:<storage type dependent volume name>
         values_a = disk_value.scan(/^(([\w-]+)[:]{0,1}([\w\/\.-]+))/)
-        no_cdrom = !disk_value.match(/^(.+)[,]{1}(media=cdrom)$/)
+        no_cdrom = !disk_value.match(CDROM_REGEXP)
         creation = disk_value.split(',')[0].match(/^(([\w-]+)[:]{1}([\d]+))$/)
         values = values_a.first if values_a
         if no_cdrom
@@ -97,6 +114,30 @@ module Fog
         size=extract_option('size', disk_value)
 	      size ? self.to_bytes(size) : "1G"
       end
+
+      def self.disk?(id)
+        DISKS_REGEXP.match?(id)
+      end
+
+      def self.cdrom?(value)
+        CDROM_REGEXP.match?(value)
+      end
+
+      def self.server_disk?(id)
+        SERVER_DISK_REGEXP.match?(id)
+      end
+
+      def self.rootfs?(id)
+        ROOTFS_REGEXP.match?(id)
+      end
+
+      def self.mount_point?(id)
+        MOUNT_POINT_REGEXP.match?(id)
+      end
+
+      def self.container_disk?(id)
+        rootfs?(id) || mount_point?(id)
+      end
     end
   end
 end

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

@@ -24,6 +24,8 @@ module Fog
     # module NicHelper mixins
     module NicHelper
 
+      NICS_REGEXP = /^(net)(\d+)/
+
       def self.extract_mac_address(nic_value)
         nic_value[/([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})/]
       end
@@ -36,7 +38,7 @@ module Fog
         /^name=(\w+)[,].+/
       end
 
-      def self.nic_creation_regexp
+      def self.nic_update_regexp
         /^(\w+)[=]{1}([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2}).+/
       end
 
@@ -54,13 +56,13 @@ module Fog
         elsif self.has_name?(nic_value)
           nic_value.scan(self.name_regexp).first.first
         else
-          nic_value.scan(self.nic_creation_regexp).first.first
+          nic_value.scan(self.nic_update_regexp).first.first
         end
       end
 
       def self.to_mac_adresses_array(nics)
         addresses = []
-        nics.each { |nic| addresses.push(nic.mac) }
+        nics.each { |nic| addresses.push(nic.macaddr) }
         addresses
       end
 
@@ -74,19 +76,25 @@ module Fog
         end
       end
 
-      def self.flatten(nic)
-        nic_id = self.nic_name(nic) + "=" + nic[self.nic_name(nic).to_sym]
-        options = nic.reject { |key, _value| [self.nic_name(nic).to_sym, :id].include? key }
-        nic_id += ',' + Fog::Proxmox::Hash.stringify(options) unless options.empty?
-        { "#{nic[:id]}": nic_id }
-      end
-
-      def self.valid?(key)
-        key.to_s.match(/^net(\d+)$/)
+      def self.flatten(nic_hash)
+        nic_id = nic_hash[self.nic_name(nic_hash).to_sym]
+        if nic_hash.has_key?(:macaddr)
+          nic_value = nic_id + "=" + nic_hash[:macaddr]
+        else
+          nic_value = self.nic_name(nic_hash) + "=" + nic_id
+        end
+        options = nic_hash.reject { |key, _value| [self.nic_name(nic_hash).to_sym,:id,:macaddr].include? key.to_sym }
+        nic_value += ',' unless options.empty?
+        nic_value += Fog::Proxmox::Hash.stringify(options) unless options.empty?
+        { "#{nic_hash[:id]}": nic_value }
       end
 
       def self.collect_nics(attributes)        
-        attributes.select { |key| valid?(key.to_s) }
+        attributes.select { |key| nic?(key.to_s) }
+      end
+    
+      def self.nic?(id)
+        NICS_REGEXP.match?(id)
       end
     end
   end

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

data/spec/hash_spec.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Tristan Robert
+
+# This file is part of Fog::Proxmox.
+
+# Fog::Proxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Fog::Proxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
+
+require 'spec_helper'
+require 'fog/proxmox/hash'
+
+    describe Fog::Proxmox::Hash do
+            
+        let(:net_vm) do 
+            { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+        end
+        let(:net) do 
+            { id: 'net0', model: 'virtio', macaddr: '66:89:C5:59:AA:96', z: nil }
+        end
+
+        describe '#flatten' do
+            it "returns string net_vm" do
+                assert_equal 'net0: virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1', Fog::Proxmox::Hash.flatten(net_vm)
+            end
+        end
+
+        describe '#stringify' do
+            it "returns stringify hash" do
+                assert_equal 'id=net0,model=virtio,macaddr=66:89:C5:59:AA:96', Fog::Proxmox::Hash.stringify(net)
+            end
+        end
+    end

data/spec/helpers/disk_helper_spec.rb

@@ -35,12 +35,20 @@ require 'fog/proxmox/helpers/disk_helper'
         end
 
         let(:virtio1) do
-	    { id: 'virtio1', volid: 'local:108/vm-108-disk-1.qcow2,size=15G' }
-	end
+	        { id: 'virtio1', volid: 'local:108/vm-108-disk-1.qcow2,size=15G' }
+	    end
 
-	let(:virtio) do
-	    { virtio1: 'local:108/vm-108-disk-1.qcow2,size=245'}
-	end
+        let(:virtio) do
+            { virtio1: 'local:108/vm-108-disk-1.qcow2,size=245'}
+        end
+
+        let(:ide2) do 
+            { id: 'ide2' }
+        end
+
+        let(:ide2_image) do 
+            { id: 'ide2', volid: 'local:iso/alpine-virt-3.7.0-x86_64.iso' }
+        end
 
         let(:cdrom_none) do 
             { ide2: 'none,media=cdrom'}
@@ -59,6 +67,14 @@ require 'fog/proxmox/helpers/disk_helper'
                 disk = Fog::Proxmox::DiskHelper.flatten(scsi0_image)
                 assert_equal({ scsi0: 'local-lvm:vm-100-disk-1,size=1,cache=none' }, disk)
             end
+            it "returns cdrom none string" do
+                disk = Fog::Proxmox::DiskHelper.flatten(ide2)
+                assert_equal(cdrom_none, disk)
+            end
+            it "returns cdrom image string" do
+                disk = Fog::Proxmox::DiskHelper.flatten(ide2_image)
+                assert_equal(cdrom_iso, disk)
+            end
         end
 
         describe '#extract_controller' do
@@ -122,4 +138,61 @@ require 'fog/proxmox/helpers/disk_helper'
                 assert_equal(245, size)
             end
         end
+
+        describe '#disk?' do
+            it "rootfs returns true" do
+                assert Fog::Proxmox::DiskHelper.disk?('rootfs')
+            end
+            it "mp0 returns true" do
+                assert Fog::Proxmox::DiskHelper.disk?('mp0')
+            end
+            it "scsi0 returns true" do
+                assert Fog::Proxmox::DiskHelper.disk?('scsi0')
+            end
+            it "virtio12 returns true" do
+                assert Fog::Proxmox::DiskHelper.disk?('virtio12')
+            end
+            it "sata2 returns true" do
+                assert Fog::Proxmox::DiskHelper.disk?('sata2')
+            end
+            it "ide0 returns true" do
+                assert Fog::Proxmox::DiskHelper.disk?('ide0')
+            end
+            it "dsfdsfdsfds returns false" do
+                assert !Fog::Proxmox::DiskHelper.disk?('dsfdsfdsfds')
+            end
+        end
+
+        describe '#server_disk?' do
+            it "ide0 returns true" do
+                assert Fog::Proxmox::DiskHelper.server_disk?('ide0')
+            end
+            it "scsi1 returns true" do
+                assert Fog::Proxmox::DiskHelper.server_disk?('scsi1')
+            end
+            it "virtio returns false" do
+                assert !Fog::Proxmox::DiskHelper.server_disk?('virtio')
+            end
+        end
+
+        describe '#container_disk?' do
+            it "rootfs returns true" do
+                assert Fog::Proxmox::DiskHelper.container_disk?('rootfs')
+            end
+            it "mp0 returns true" do
+                assert Fog::Proxmox::DiskHelper.container_disk?('mp0')
+            end
+            it "mp returns false" do
+                assert !Fog::Proxmox::DiskHelper.container_disk?('mp')
+            end
+        end
+
+        describe '#cdrom?' do
+            it "local:iso/alpine-virt-3.7.0-x86_64.iso,media=cdrom returns true" do
+                assert Fog::Proxmox::DiskHelper.cdrom?('local:iso/alpine-virt-3.7.0-x86_64.iso,media=cdrom')
+            end
+            it "local:iso/alpine-virt-3.7.0-x86_64.iso returns false" do
+                assert !Fog::Proxmox::DiskHelper.cdrom?('local:iso/alpine-virt-3.7.0-x86_64.iso')
+            end
+        end
     end

data/spec/helpers/nic_helper_spec.rb

@@ -38,6 +38,18 @@ require 'fog/proxmox/helpers/nic_helper'
             { net0: 'name=eth0,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
         end
 
+        let(:lxc_nic) do 
+            { id: 'net0', name: 'eth0', macaddr: '66:89:C5:59:AA:96', bridge: 'vmbr0', firewall: 1, link_down: 1, queues: 1, rate: 1, tag: 1 }
+        end
+
+        let(:qemu_nic) do 
+            { id: 'net1', model: 'virtio', macaddr: '66:89:C5:59:AA:96', bridge: 'vmbr0', firewall: 1, link_down: 1, queues: 1, rate: 1, tag: 1 }
+        end
+
+        let(:qemu_nic_create) do 
+            { id: 'net1', model: 'virtio', bridge: 'vmbr0', firewall: 1, link_down: 1, queues: 1, rate: 1, tag: 1 }
+        end
+
         describe '#extract_model' do
             it "returns model card" do
                 model = Fog::Proxmox::NicHelper.extract_nic_id(net_vm[:net0])
@@ -71,12 +83,12 @@ require 'fog/proxmox/helpers/nic_helper'
             end
         end
 
-        describe '#valid?' do
+        describe '#nic?' do
             it "returns true" do
-                assert Fog::Proxmox::NicHelper.valid?('net0')
+                assert Fog::Proxmox::NicHelper.nic?('net0')
             end
             it "returns false" do
-                assert !Fog::Proxmox::NicHelper.valid?('net')
+                assert !Fog::Proxmox::NicHelper.nic?('net')
             end
         end
 
@@ -92,4 +104,19 @@ require 'fog/proxmox/helpers/nic_helper'
                 assert nets.empty?
             end
         end
+
+        describe '#flatten' do
+            it "returns qemu nic string" do
+                flat_qemu = { net1: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+                assert_equal flat_qemu ,Fog::Proxmox::NicHelper.flatten(qemu_nic)
+            end
+            it "returns qemu nic create string" do
+                flat_qemu = { net1: 'model=virtio,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+                assert_equal flat_qemu ,Fog::Proxmox::NicHelper.flatten(qemu_nic_create)
+            end
+            it "returns lxc nic string" do
+                flat_lxc = { net0: 'eth0=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+                assert_equal flat_lxc ,Fog::Proxmox::NicHelper.flatten(lxc_nic)
+            end
+        end
     end

data/spec/proxmox_vcr.rb

@@ -72,7 +72,7 @@ class ProxmoxVCR
     @connection_options[:ssl_verify_peer] = false if ENV['SSL_VERIFY_PEER'] == 'false'
 
     VCR.use_cassette('identity_ticket') do
-      Fog::Proxmox.clear_cache
+      Fog::Proxmox.clear_credentials
 
       @username  = 'root@pam'
       @password  = 'proxmox01'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Tristan Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -287,8 +287,14 @@ extra_rdoc_files: []
 files:
 - ".bundle/config"
 - ".codeclimate.yml"
+- ".github/CODE_OF_CONDUCT.md"
+- ".github/CONTRIBUTING.md"
+- ".github/CONTRIBUTORS.md"
+- ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/SUPPORT.md"
+- ".github/fogproxmox.png"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rubocop.yml"
@@ -298,16 +304,11 @@ files:
 - ".vscode/launch.json"
 - ".vscode/settings.json"
 - ".vscode/tasks.json"
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- CONTRIBUTORS.md
 - Gemfile
 - Gemfile.lock
-- ISSUE_TEMPLATE.md
 - LICENSE
 - README.md
 - Rakefile
-- SUPPORT.md
 - bin/console
 - bin/setup
 - docs/compute.md
@@ -317,7 +318,6 @@ files:
 - examples/compute.rb
 - examples/identity.rb
 - fog-proxmox.gemspec
-- fogproxmox.png
 - lib/fog/compute/proxmox.rb
 - lib/fog/compute/proxmox/models/disk.rb
 - lib/fog/compute/proxmox/models/disks.rb
@@ -463,6 +463,7 @@ files:
 - spec/fixtures/proxmox/identity/users.yml
 - spec/fixtures/proxmox/network/identity_ticket.yml
 - spec/fixtures/proxmox/network/networks.yml
+- spec/hash_spec.rb
 - spec/helpers/controller_helper_spec.rb
 - spec/helpers/cpu_helper_spec.rb
 - spec/helpers/disk_helper_spec.rb
@@ -471,7 +472,7 @@ files:
 - spec/network_spec.rb
 - spec/proxmox_vcr.rb
 - spec/spec_helper.rb
-homepage: http://github.com/fog/fog-proxmox
+homepage: https://github.com/fog/fog-proxmox
 licenses:
 - GPL-3.0
 metadata: {}
@@ -514,6 +515,7 @@ test_files:
 - spec/fixtures/proxmox/identity/users.yml
 - spec/fixtures/proxmox/network/identity_ticket.yml
 - spec/fixtures/proxmox/network/networks.yml
+- spec/hash_spec.rb
 - spec/helpers/controller_helper_spec.rb
 - spec/helpers/cpu_helper_spec.rb
 - spec/helpers/disk_helper_spec.rb