fog-proxmox 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '056981428a2dd09b1d8e93d7a4578cc797310bbe'
-  data.tar.gz: eea20ceac33c67ea37bb2942717a582564a22543
+  metadata.gz: bbbdd3aadac2823e21f3a920021fe70067b1f711
+  data.tar.gz: 83d7e18c74cd2eecc897a0732437020a16bfd7d1
 SHA512:
-  metadata.gz: 0e880f0b5554949ede95015bbca2f7b11eb38ee9d2166933bec0c703bb68d8d60e949c922327c04dd89d65c6fa7068090a8738d47d2e497e5bef6ab718b2a799
-  data.tar.gz: ae2813964763f177f71716a9d71e025ea575d4d9159e4f1c27848715d53670dc2c37985e9acfac4bc4ecbd4dd46b8818d1a08e38d34d17a2e51f4c8dfde878b1
+  metadata.gz: 6a0708b3f3b2c6afe53e852e00b15f59b1b7410ba06a10b2339c4aa162168de7fa25b2984d32d24c90a883f4954cbc99bb34d5ad3630ee30517098cda22d6aa6
+  data.tar.gz: e56a28ea1faff24e7023034c3ed8fc082f5b83e15841e23eef4e78cdc4f29f304d40171555019ee361a52edc5144cb3ef317c037e85def22fd130fc788708883

data/.gitignore

@@ -2,4 +2,5 @@ vendor/
 bin/
 pkg/
 spec/debug/
-coverage/
+coverage/
+TAGS

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog-proxmox (0.5.0)
+    fog-proxmox (0.5.1)
       fog-core (~> 1.45)
       fog-json (~> 1.0)
       ipaddress (~> 0.8)

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

@@ -31,17 +31,6 @@ module Fog
         attribute :swap
         attribute :config
 
-        def initialize(attributes = {})
-          prepare_service_value(attributes)
-          set_config(attributes)
-          super
-        end
-
-        def type(attributes = {})
-          @type ||= 'lxc' unless attributes[:type] || attributes['type']
-          @type
-        end
-
         def restore(backup, options = {})
           requires :node, :vmid
           path_params = { node: node, type: type }
@@ -66,7 +55,7 @@ module Fog
         end
 
         def set_config(attributes = {})
-          @config = Fog::Compute::Proxmox::ContainerConfig.new({ service: service }.merge(attributes))
+          @config = Fog::Compute::Proxmox::ContainerConfig.new({ service: service, vmid: vmid }.merge(attributes))
         end
 
         def config

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

@@ -19,20 +19,40 @@
 
 require 'fog/proxmox/variables'
 require 'fog/proxmox/helpers/nic_helper'
+require 'fog/proxmox/helpers/controller_helper'
 
 module Fog
   module Compute
     class Proxmox
       # ContainerConfig model
       class ContainerConfig < Fog::Proxmox::Model
-        identity  :digest
+        identity  :vmid
+        attribute :digest
         attribute :ostype
+        attribute :storage
+        attribute :template
         attribute :arch
         attribute :memory
         attribute :swap
         attribute :hostname
+        attribute :nameserver
+        attribute :searchdomain
+        attribute :password
         attribute :onboot
+        attribute :startup
         attribute :rootfs
+        attribute :cores
+        attribute :cpuunits
+        attribute :cpulimit
+        attribute :description
+        attribute :console
+        attribute :cmode
+        attribute :tty
+        attribute :force
+        attribute :lock
+        attribute :pool
+        attribute :bwlimit
+        attribute :unprivileged
         attribute :interfaces
         attribute :mount_points
 
@@ -51,10 +71,14 @@ module Fog
           Fog::Proxmox::NicHelper.to_mac_adresses_array(interfaces)
         end
 
+        def type_console
+          'vnc' # by default. term is available too
+        end
+
         private
 
         def compute_nets(attributes)
-          nets = Fog::Proxmox::ControllerHelper.to_hash(attributes, Fog::Compute::Proxmox::Interface::NAME)
+          nets = Fog::Proxmox::NicHelper.collect_nics(attributes)
           @interfaces ||= Fog::Compute::Proxmox::Interfaces.new
           nets.each do |key, value|
             nic_hash = {
@@ -69,9 +93,9 @@ module Fog
         end
 
         def compute_mps(attributes)
-          mps = Fog::Proxmox::ControllerHelper.to_hash(attributes, 'mp')
+          controllers = Fog::Proxmox::ControllerHelper.collect_controllers(attributes)
           @mount_points ||= Fog::Compute::Proxmox::Disks.new
-          mps.each do |key, value|
+          controllers.each do |key, value|
             storage, volid, size = Fog::Proxmox::DiskHelper.extract_storage_volid_size(value)
             disk_hash = {
               id: key.to_s,
@@ -79,7 +103,7 @@ module Fog
               volid: volid,
               size: size
             }
-            names = Fog::Compute::Proxmox::Disk.attributes.reject { |key, _value| %i[id size storage].include? key }
+            names = Fog::Compute::Proxmox::Disk.attributes.reject { |key, _value| %i[id size storage volid].include? key }
             names.each { |name| disk_hash.store(name.to_sym, Fog::Proxmox::ControllerHelper.extract(name, value)) }
             @mount_points << Fog::Compute::Proxmox::Disk.new(disk_hash)
           end

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

@@ -26,13 +26,16 @@ module Fog
       class Containers < Fog::Compute::Proxmox::Servers
         model Fog::Compute::Proxmox::Container
 
-        def new(attributes = {})
-          super({ node: node, type: type }.merge(attributes))
+        def initialize(attributes = {})
+          super(attributes)
+        end
+
+        def type
+          'lxc'
         end
 
-        def type(attributes = {})
-          @type ||= 'lxc' unless attributes[:type] || attributes['type']
-          @type
+        def new(attributes = {})
+          super({ node: node, type: type }.merge(attributes))
         end
       end
     end

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

@@ -48,8 +48,6 @@ module Fog
         attribute :backup
         attribute :aio
 
-        CONTROLLERS = %w[ide sata scsi virtio].freeze
-
         def controller
           Fog::Proxmox::DiskHelper.extract_controller(id)
         end
@@ -61,6 +59,10 @@ module Fog
         def cdrom?
           id == 'ide2' && media == 'cdrom'
         end
+
+        def rootfs?
+          id == 'rootfs'
+        end
       end
     end
   end

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

@@ -43,6 +43,10 @@ module Fog
         def cdrom
           find(&:cdrom?)
         end
+
+        def rootfs
+          find(&:rootfs?)
+        end
       end
     end
   end

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

@@ -36,14 +36,15 @@ module Fog
         identity  :id
         attribute :mac
         attribute :model
+        attribute :name
+        attribute :ip
+        attribute :ip6
         attribute :bridge
         attribute :firewall
         attribute :link_down
         attribute :rate
         attribute :queues
         attribute :tag
-
-        NAME = 'net'
       end
     end
   end

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

@@ -27,6 +27,7 @@ module Fog
       # Server model
       class Server < Fog::Compute::Server
         identity  :vmid
+        attribute :id
         attribute :node
         attribute :config
         attribute :name
@@ -59,10 +60,9 @@ module Fog
           super
         end
 
-        def type(attributes = {})
-          @type ||= 'qemu' unless attributes[:type] || attributes['type']
-          @type
-        end
+        def type
+          attributes[:type]
+        end 
 
         def request(name, body_params = {}, path_params = {})
           requires :node, :type
@@ -149,7 +149,7 @@ module Fog
         end
 
         def set_config(attributes = {})
-          @config = Fog::Compute::Proxmox::ServerConfig.new({ service: service }.merge(attributes))
+          @config = Fog::Compute::Proxmox::ServerConfig.new({ service: service, vmid: vmid }.merge(attributes))
         end
 
         def config

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

@@ -19,6 +19,7 @@
 
 require 'fog/proxmox/variables'
 require 'fog/proxmox/helpers/nic_helper'
+require 'fog/proxmox/helpers/controller_helper'
 require 'fog/proxmox/models/model'
 
 module Fog
@@ -26,7 +27,7 @@ module Fog
     class Proxmox
       # ServerConfig model
       class ServerConfig < Fog::Proxmox::Model
-        identity  :id
+        identity  :vmid
         attribute :digest
         attribute :description
         attribute :ostype
@@ -79,7 +80,7 @@ module Fog
         private
 
         def compute_nets(attributes)
-          nets = Fog::Proxmox::ControllerHelper.to_hash(attributes, Fog::Compute::Proxmox::Interface::NAME)
+          nets = Fog::Proxmox::NicHelper.collect_nics(attributes)
           @interfaces ||= Fog::Compute::Proxmox::Interfaces.new
           nets.each do |key, value|
             nic_hash = {
@@ -94,8 +95,7 @@ module Fog
         end
 
         def compute_disks(attributes)
-          controllers = {}
-          Fog::Compute::Proxmox::Disk::CONTROLLERS.each { |controller| controllers.merge!(Fog::Proxmox::ControllerHelper.to_hash(attributes, controller)) }
+          controllers = Fog::Proxmox::ControllerHelper.collect_controllers(attributes)
           @disks ||= Fog::Compute::Proxmox::Disks.new
           controllers.each do |key, value|
             storage, volid, size = Fog::Proxmox::DiskHelper.extract_storage_volid_size(value)

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

@@ -26,15 +26,17 @@ module Fog
       class Servers < Fog::Proxmox::Collection
         model Fog::Compute::Proxmox::Server
         attribute :node
-        attribute :type
 
-        def new(attributes = {})
-          super({ node: node, type: type }.merge(attributes))
+        def initialize(attributes = {})
+          super(attributes)
+        end
+
+        def type
+          'qemu'
         end
 
-        def type(attributes = {})
-          @type ||= 'qemu' unless attributes[:type] || attributes['type']
-          @type
+        def new(attributes = {})
+          super({ node: node, type: type }.merge(attributes))
         end
 
         def next_id

data/lib/fog/network/proxmox/requests/update_network.rb

@@ -26,7 +26,6 @@ module Fog
       class Real
         def update_network(path_params, body_params)
           node = path_params[:node]
-          type = body_params[:type]
           iface = path_params[:iface]
           response = request(
             expects: [200],

data/lib/fog/proxmox/hash.rb

@@ -22,11 +22,12 @@ module Fog
     # module Hash mixins
     module Hash
       def self.stringify(hash)
+        return '' unless hash
         string = ''
         hash.each do |key, value|
-          string += "#{key}=#{value},"
+          string += "#{key}=#{value}," if value
         end
-        string.slice(0, string.length - 1)
+        string.slice(0, string.length - 1) if string.length > 0
       end
     end
   end

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

@@ -21,6 +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)
         values = controller_value.scan(/#{name}=(\w+)/)
         name_value = values.first if values
@@ -33,7 +36,7 @@ module Fog
       end
 
       def self.valid?(name, key)
-        key.to_s.match(/#{name}(\d+)/)
+        key.to_s.match(/^#{name}(\d*)$/)
       end
 
       def self.last_index(name, values)
@@ -47,9 +50,16 @@ module Fog
         indexes.empty? ? -1 : indexes.last
       end
 
-      def self.to_hash(hash, name)
+      def self.select(hash,name)
         hash.select { |key| valid?(name, key.to_s) }
       end
+
+      def self.collect_controllers(attributes)
+        controllers = {}
+        CONTROLLERS.each { |controller| controllers.merge!(select(attributes, controller)) }
+        controllers
+      end
+
     end
   end
 end

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

@@ -30,8 +30,11 @@ module Fog
                 else
                   "#{disk[:storage]}:#{disk[:size]}"
                 end
-        options = Fog::Proxmox::Hash.stringify(disk[:options])
-        value += ",#{options}" unless options.empty?
+        opts = disk[:options] if disk.has_key? :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 }
       end
 

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

@@ -23,6 +23,7 @@ module Fog
   module Proxmox
     # module NicHelper mixins
     module NicHelper
+
       def self.extract_mac_address(nic_value)
         nic_value[/([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})/]
       end
@@ -57,6 +58,21 @@ module Fog
         model += ',' + Fog::Proxmox::Hash.stringify(options) unless options.empty?
         { "#{nic[:id]}": model }
       end
+
+      def self.container_flatten(nic)
+        name = "name=#{nic[:name]}"
+        options = nic.reject { |key, _value| %i[name id].include? key }
+        name += ',' + Fog::Proxmox::Hash.stringify(options) unless options.empty?
+        { "#{nic[:id]}": name }
+      end
+
+      def self.valid?(key)
+        key.to_s.match(/^net(\d+)$/)
+      end
+
+      def self.collect_nics(attributes)        
+        attributes.select { |key| valid?(key.to_s) }
+      end
     end
   end
 end

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

data/spec/compute_spec.rb

@@ -167,6 +167,8 @@ describe Fog::Compute::Proxmox do
       config_hash = { onboot: 1, keyboard: 'fr', ostype: 'l26', kvm: 0 }
       server.update(config_hash)
       # server config
+      #config = server.config
+      #config.identity.must_equal vmid
       disks = server.config.disks
       nics = server.config.interfaces
       nics.wont_be_nil
@@ -188,7 +190,7 @@ describe Fog::Compute::Proxmox do
       servers_all.must_include server
       # server not running exception
       proc do
-        vnc = server.start_console(websocket: 1)
+        server.start_console(websocket: 1)
       end.must_raise Fog::Proxmox::Errors::ServiceError
       # Start server
       server.action('start')
@@ -197,7 +199,7 @@ describe Fog::Compute::Proxmox do
       status.must_equal true
       # server vga not set exception
       proc do
-        vnc = server.start_console(websocket: 1)
+        server.start_console(websocket: 1)
       end.must_raise Fog::Proxmox::Errors::ServiceError
       # Stop server
       server.action('stop')
@@ -379,6 +381,7 @@ describe Fog::Compute::Proxmox do
       # get container config
       config = container.config
       config.wont_be_nil
+      config.identity.must_equal vmid
       # Get a mac address
       mac_address = container.config.mac_addresses.first
       mac_address.wont_be_nil

data/spec/helpers/controller_helper_spec.rb

@@ -31,6 +31,15 @@ require 'fog/proxmox/helpers/controller_helper'
         let(:scsi) do 
             { scsi10: 'local-lvm:1,cache=none' }
         end
+        let(:cdrom) do 
+            { ide2: 'none,media=cdrom' }
+        end
+        let(:mp) do 
+            { mp0: 'local-lvm:1' }
+        end        
+        let(:rootfs) do 
+            { rootfs: 'local-lvm:1' }
+        end
 
         describe '#extract' do
             it "returns bridge" do
@@ -74,4 +83,37 @@ require 'fog/proxmox/helpers/controller_helper'
                 assert !Fog::Proxmox::ControllerHelper.valid?('net','sdfdsf')
             end
         end
+
+        describe '#select' do
+            it "returns scsi10" do
+                controllers = Fog::Proxmox::ControllerHelper.select(scsi,'scsi')
+                assert controllers.has_key?(:scsi10)
+                assert controllers.has_value?(scsi[:scsi10])
+            end
+            it "returns empty" do
+                controllers = Fog::Proxmox::ControllerHelper.select(net,'scsi')
+                assert controllers.empty?
+            end
+        end
+
+        describe '#collect_controllers' do
+            it "returns scsi0 and ide2" do
+                controllers = Fog::Proxmox::ControllerHelper.collect_controllers(scsi.merge(cdrom))
+                assert controllers.has_key?(:scsi10)
+                assert controllers.has_value?(scsi[:scsi10])
+                assert controllers.has_key?(:ide2)
+                assert controllers.has_value?(cdrom[:ide2])
+            end
+            it "returns rootfs and mp0" do
+                controllers = Fog::Proxmox::ControllerHelper.collect_controllers(rootfs.merge(mp))
+                assert controllers.has_key?(:mp0)
+                assert controllers.has_value?(mp[:mp0])
+                assert controllers.has_key?(:rootfs)
+                assert controllers.has_value?(rootfs[:rootfs])
+            end
+            it "returns empty" do
+                controllers = Fog::Proxmox::ControllerHelper.collect_controllers(net)
+                assert controllers.empty?
+            end
+        end
     end

data/spec/helpers/nic_helper_spec.rb

@@ -70,4 +70,26 @@ require 'fog/proxmox/helpers/nic_helper'
                 assert_equal '66:89:C5:59:AA:96', mac_address
             end
         end
+
+        describe '#valid?' do
+            it "returns true" do
+                assert Fog::Proxmox::NicHelper.valid?('net0')
+            end
+            it "returns false" do
+                assert !Fog::Proxmox::NicHelper.valid?('net')
+            end
+        end
+
+        describe '#collect_nics' do
+            it "returns net0" do
+                nets = Fog::Proxmox::NicHelper.collect_nics(net_vm.merge({'netout': 'sdfdsgfdsf'}))
+                assert nets.has_key?(:net0)
+                assert nets.has_value?(net_vm[:net0])
+                assert !nets.has_key?('netout')
+            end
+            it "returns empty" do
+                nets = Fog::Proxmox::NicHelper.collect_nics({'netout': 'sdfdsgfdsf'})
+                assert nets.empty?
+            end
+        end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tristan Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler