fog-proxmox 0.5.5 → 0.6.0

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

@@ -17,8 +17,6 @@
 # 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 'fog/proxmox/json'
-
 module Fog
   module Network
     class Proxmox
@@ -26,13 +24,12 @@ module Fog
       class Real
         def create_network(path_params, body_params)
           node = path_params[:node]
-          response = request(
+          request(
             expects: [200],
             method: 'POST',
             path: "nodes/#{node}/network",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -18,8 +18,6 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/json'
-
 module Fog
   module Network
     class Proxmox
@@ -28,12 +26,11 @@ module Fog
         def delete_network(path_params)
           node = path_params[:node]
           iface = path_params[:iface]
-          response = request(
+          request(
             expects: [200],
             method: 'DELETE',
             path: "nodes/#{node}/network/#{iface}"
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -18,8 +18,6 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/json'
-
 module Fog
   module Network
     class Proxmox
@@ -28,12 +26,11 @@ module Fog
         def get_network(path_params)
           node = path_params[:node]
           iface = path_params[:iface]
-          response = request(
+          request(
             expects: [200],
             method: 'GET',
             path: "nodes/#{node}/network/#{iface}"
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -18,20 +18,17 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/json'
-
 module Fog
   module Network
     class Proxmox
       # class Real get_node request
       class Real
         def get_node(node)
-          response = request(
+          request(
             expects: [200],
             method: 'GET',
             path: "nodes/#{node}/status"
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -18,8 +18,6 @@
 
 # frozen_string_literal: true
 
-require 'fog/proxmox/json'
-
 module Fog
   module Network
     class Proxmox
@@ -27,13 +25,12 @@ module Fog
       class Real
         def power_node(path_params, body_params)
           node = path_params[:node]
-          response = request(
+          request(
             expects: [200],
             method: 'POST',
             path: "nodes/#{node}/status",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

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

@@ -17,8 +17,6 @@
 # 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 'fog/proxmox/json'
-
 module Fog
   module Network
     class Proxmox
@@ -27,13 +25,12 @@ module Fog
         def update_network(path_params, body_params)
           node = path_params[:node]
           iface = path_params[:iface]
-          response = request(
+          request(
             expects: [200],
             method: 'PUT',
             path: "nodes/#{node}/network/#{iface}",
             body: URI.encode_www_form(body_params)
           )
-          Fog::Proxmox::Json.get_data(response)
         end
       end
 

data/lib/fog/{compute/proxmox/requests/check_vmid.rb → proxmox/attributes.rb}

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Copyright 2018 Tristan Robert
 
 # This file is part of Fog::Proxmox.
@@ -16,25 +17,16 @@
 # You should have received a copy of the GNU General Public License
 # along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
 
-# frozen_string_literal: true
-
 module Fog
-  module Compute
-    class Proxmox
-      # class Real check_vmid collection
-      class Real
-        def check_vmid(vmid)
-          request(
-            expects: [200],
-            method: 'GET',
-            path: 'cluster/nextid',
-            query: "vmid=#{vmid}"
-          )
-        end
+  module Proxmox
+    # module Attributes mixins
+    module Attributes
+      def self.set_attr(attr_name, attributes, new_attributes)
+        attributes[attr_name.to_sym] = new_attributes[attr_name] unless new_attributes[attr_name].nil?
       end
-
-      # class Mock check_vmid collection
-      class Mock
+      def self.set_attr_and_sym(attr_name, attributes, new_attributes)
+        self.set_attr(attr_name, attributes, new_attributes)
+        self.set_attr(attr_name.to_sym, attributes, new_attributes)
       end
     end
   end

data/lib/fog/proxmox/core.rb

@@ -19,6 +19,7 @@
 
 require 'fog/json'
 require 'fog/proxmox/variables'
+require 'fog/proxmox/json'
 
 module Fog
   module Proxmox
@@ -93,7 +94,7 @@ module Fog
                   error
                 end
         end
-        response
+        Fog::Proxmox::Json.get_data(response)
       end
 
       def headers(method, additional_headers)

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

@@ -22,11 +22,13 @@ module Fog
     # module Cpu mixins
     module CpuHelper
       def self.extract(cpu)
-        cpu&.scan(/^(cputype=)?(\w+)(,flags=){0,1}(\+[\w-]+){0,1}[;]{0,1}(\+[\w-]+){0,1}/)&.first
+        cpu_regexp = /^(cputype=)?(\w+)(,flags=){0,1}(\+[\w-]+){0,1}[;]{0,1}(\+[\w-]+){0,1}/
+        cpu && cpu.is_a?(String) && cpu&.match(cpu_regexp) ? cpu&.scan(cpu_regexp)&.first : []
       end
 
       def self.extract_type(cpu)
-        extract(cpu)[1] if cpu
+        cpu_a = extract(cpu)
+        cpu_a[1] unless cpu_a.empty? || cpu_a.size < 2
       end
 
       def self.extract_pcid(cpu)
@@ -38,7 +40,8 @@ module Fog
       end
 
       def self.has?(value, cpu)
-        extract(cpu).include? value if cpu
+        cpu_a = extract(cpu)
+        cpu_a.include? value
       end
     end
   end

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

@@ -95,7 +95,7 @@ module Fog
 
       def self.extract_size(disk_value)
         size=extract_option('size', disk_value)
-	self.to_bytes(size)
+	      size ? self.to_bytes(size) : "1G"
       end
     end
   end

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

@@ -28,21 +28,33 @@ module Fog
         nic_value[/([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})/]
       end
 
-      def self.extract_model(nic_value)
-        creation = nic_value.match(/^model=(\w+)[,].+/)
-        if creation
-          nic_value.scan(/^model=(\w+)[,].+/).first.first
-        else
-          nic_value.scan(/^(\w+)[=]{1}([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2}).+/).first.first
-        end
+      def self.model_regexp
+        /^model=(\w+)[,].+/
+      end
+
+      def self.name_regexp
+        /^name=(\w+)[,].+/
+      end
+
+      def self.nic_creation_regexp
+        /^(\w+)[=]{1}([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2}).+/
+      end
+
+      def self.has_model?(nic_value)
+        nic_value.match(self.model_regexp)
+      end
+
+      def self.has_name?(nic_value)
+        nic_value.match(self.name_regexp)
       end
 
-      def self.extract_name(nic_value)
-        creation = nic_value.match(/^name=(\w+)[,].+/)
-        if creation
-          nic_value.scan(/^name=(\w+)[,].+/).first.first
+      def self.extract_nic_id(nic_value)
+        if self.has_model?(nic_value)
+          nic_value.scan(self.model_regexp).first.first
+        elsif self.has_name?(nic_value)
+          nic_value.scan(self.name_regexp).first.first
         else
-          nic_value.scan(/^(\w+)[=]{1}([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2}).+/).first.first
+          nic_value.scan(self.nic_creation_regexp).first.first
         end
       end
 
@@ -52,18 +64,21 @@ module Fog
         addresses
       end
 
-      def self.flatten(nic)
-        model = "model=#{nic[:model]}"
-        options = nic.reject { |key, _value| %i[model id].include? key }
-        model += ',' + Fog::Proxmox::Hash.stringify(options) unless options.empty?
-        { "#{nic[:id]}": model }
+      def self.nic_name(nic)
+        if nic.has_key?(:model)
+          "model"
+        elsif nic.has_key?(:name)
+          "name"
+        else
+          ""
+        end
       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 }
+      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)

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.5.5'
+    VERSION = '0.6.0'
   end
 end

data/lib/fog/storage/proxmox.rb

@@ -23,7 +23,7 @@ module Fog
     # Procmox storage service
     class Proxmox < Fog::Service
       # Models
-      model_path 'fog/storage/proxmox/models'
+      model_path 'fog/storage/proxmox'
     end
   end
 end

data/spec/compute_spec.rb

@@ -37,27 +37,29 @@ describe Fog::Compute::Proxmox do
   it 'Manage tasks' do
     VCR.use_cassette('tasks') do
       # List all tasks
-      options = { limit: 1 }
-      node_name = 'pve'
-      node = @service.nodes.find_by_id node_name
-      tasks = node.tasks.search(options)
+      filters = { limit: 1 }
+      node_name = 'proxmox'
+      node = @service.nodes.get node_name
+      tasks = node.tasks.all(filters)
       tasks.wont_be_nil
       tasks.wont_be_empty
+      tasks.size.must_equal 1
       # Get task
       upid = tasks[0].upid
-      task = node.tasks.find_by_id(upid)
+      task = node.tasks.get(upid)
       task.wont_be_nil
       # Stop task
       task.stop
-      task.exitstatus.must_equal 'OK'
+      task.wait_for { finished? }
+      task.finished?.must_equal true
     end
   end
 
   it 'Manage nodes' do
     VCR.use_cassette('nodes') do
       # Get node
-      node_name = 'pve'
-      node = @service.nodes.find_by_id node_name
+      node_name = 'proxmox'
+      node = @service.nodes.get node_name
       # Get statistics data
       data = node.statistics
       data.wont_be_nil
@@ -72,26 +74,29 @@ describe Fog::Compute::Proxmox do
   it 'Manage storages' do
     VCR.use_cassette('storages') do
       # Get node
-      node_name = 'pve'
-      node = @service.nodes.find_by_id node_name
+      node_name = 'proxmox'
+      node = @service.nodes.get node_name
       # List all storages
       storages = node.storages.all
       storages.wont_be_nil
       storages.wont_be_empty
+      storages.size.must_equal 2
       # List by content type
       storages = node.storages.list_by_content_type 'iso'
       storages.wont_be_nil
       storages.wont_be_empty
+      storages.size.must_equal 1
       # Get storage
-      storage = node.storages.find_by_id('local')
+      storage = node.storages.get('local')
       storage.wont_be_nil
+      storage.identity.must_equal 'local'
     end
   end
 
   it 'CRUD servers' do
     VCR.use_cassette('servers') do
-      node_name = 'pve'
-      node = @service.nodes.find_by_id node_name
+      node_name = 'proxmox'
+      node = @service.nodes.get node_name
       # Get next vmid
       vmid = node.servers.next_id
       server_hash = { vmid: vmid }
@@ -102,7 +107,9 @@ describe Fog::Compute::Proxmox do
       valid = node.servers.id_valid? 99
       valid.must_equal false
       # Create 1st time
-      node.servers.create(server_hash)
+      server = node.servers.create(server_hash)
+      ok = server.persisted?
+      ok.must_equal true
       # Check already used vmid
       valid = node.servers.id_valid? vmid
       valid.must_equal false
@@ -138,15 +145,15 @@ describe Fog::Compute::Proxmox do
       # Get clone
       clone = node.servers.get newid
       # Template this clone (read-only)
-      clone.template
+      clone.create_template
       # Get clone disk image
       image = clone.images.first
       image.wont_be_nil
       # Delete clone
       clone.destroy
       proc do
-        node.servers.get newid
-      end.must_raise Excon::Errors::InternalServerError
+        clone = node.servers.get newid
+      end.must_raise Fog::Errors::NotFound
       # Create 2nd time must fails
       proc do
         node.servers.create server_hash
@@ -170,10 +177,11 @@ describe Fog::Compute::Proxmox do
       config = server.config
       config.identity.must_equal vmid
       disks = server.config.disks
-      nics = server.config.interfaces
-      nics.wont_be_nil
-      nics.wont_be_empty
-      nics.get('net0').wont_be_nil
+      interfaces = server.config.interfaces
+      interfaces.wont_be_nil
+      interfaces.wont_be_empty
+      net0 = interfaces.get('net0')
+      net0.wont_be_nil
       disks.wont_be_nil
       disks.wont_be_empty
       virtio0 = disks.get('virtio0')
@@ -185,7 +193,6 @@ describe Fog::Compute::Proxmox do
       mac_address.wont_be_nil
       # all servers
       servers_all = node.servers.all
-      servers_all.wont_be_nil
       servers_all.wont_be_empty
       servers_all.must_include server
       # server not running exception
@@ -264,21 +271,21 @@ describe Fog::Compute::Proxmox do
       server.destroy
       proc do
         node.servers.get vmid
-      end.must_raise Excon::Errors::InternalServerError
+      end.must_raise Fog::Errors::NotFound
     end
   end
 
   it 'CRUD snapshots' do
     VCR.use_cassette('snapshots') do
-      node_name = 'pve'
-      node = @service.nodes.find_by_id node_name
+      node_name = 'proxmox'
+      node = @service.nodes.get node_name
       vmid = node.servers.next_id
       server_hash = { vmid: vmid }
       node.servers.create server_hash
       # Create
       snapname = 'snapshot1'
       server = node.servers.get vmid
-      snapshot_hash = { snapname: snapname }
+      snapshot_hash = { name: snapname }
       server.snapshots.create(snapshot_hash)
       # Find by id
       snapshot = server.snapshots.get snapname
@@ -299,14 +306,13 @@ describe Fog::Compute::Proxmox do
 
   it 'CRUD containers' do
     VCR.use_cassette('containers') do
-      node_name = 'pve'
-      node = @service.nodes.find_by_id node_name
+      node_name = 'proxmox'
+      node = @service.nodes.get node_name
+      node.wont_be_nil
       # Get next vmid
       vmid = node.containers.next_id
       ostemplate = 'local:vztmpl/alpine-3.8-default_20180913_amd64.tar.xz'
-      container_hash = { vmid: vmid,
-                         storage: 'local-lvm',
-                         ostemplate: ostemplate, password: 'proxmox01', rootfs: 'local-lvm:1' }
+      container_hash = { ostemplate: ostemplate, storage: 'local-lvm', password: 'proxmox01', rootfs: 'local-lvm:1' }
       # Check valid vmid
       valid = node.containers.id_valid? vmid
       valid.must_equal true
@@ -314,7 +320,7 @@ describe Fog::Compute::Proxmox do
       valid = node.containers.id_valid? 99
       valid.must_equal false
       # Create 1st time
-      node.containers.create(container_hash)
+      node.containers.create(container_hash.merge(vmid: vmid))
       # Check already used vmid
       valid = node.containers.id_valid? vmid
       valid.must_equal false
@@ -323,6 +329,10 @@ describe Fog::Compute::Proxmox do
       # Get container
       container = node.containers.get vmid
       container.wont_be_nil
+      rootfs_a = container.config.disks.select { |disk| disk.rootfs? }
+      rootfs_a.wont_be_empty
+      rootfs = rootfs_a.first
+      rootfs.wont_be_nil
       # Backup it
       container.backup(compress: 'lzo')
       # Get this backup image
@@ -333,6 +343,7 @@ describe Fog::Compute::Proxmox do
       container.restore(backup, storage: 'local-lvm')
       # Delete it
       backup.destroy
+      container.backups.must_be_empty
       # Add mount points
       # Find available storages with images
       storages = node.storages.list_by_content_type 'images'
@@ -341,7 +352,7 @@ describe Fog::Compute::Proxmox do
       options = { mp: '/opt/app', backup: 0, replicate: 0, quota: 1 }
       container.attach(mp0, options)
       # Fetch mount points
-      mount_points = container.config.mount_points
+      mount_points = container.config.disks.select { |disk| disk.mount_point? }
       mount_points.wont_be_empty
       mount_points.get('mp0').wont_be_nil
       # Remove mount points
@@ -361,10 +372,10 @@ describe Fog::Compute::Proxmox do
       clone.destroy
       proc do
         node.containers.get newid
-      end.must_raise Excon::Errors::InternalServerError
+      end.must_raise Fog::Errors::NotFound
       # Create 2nd time must fails
       proc do
-        node.containers.create container_hash
+        node.containers.create(container_hash.merge(vmid: vmid))
       end.must_raise Excon::Errors::InternalServerError
       # Update config container
       # Resize rootfs container
@@ -382,13 +393,13 @@ describe Fog::Compute::Proxmox do
       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
       # Fetch nics
       interfaces = container.config.interfaces
       interfaces.wont_be_empty
       interfaces.get('net0').wont_be_nil
+      # Get a mac address
+      mac_address = container.config.mac_addresses.first
+      mac_address.wont_be_nil
       # all containers
       containers_all = node.containers.all
       containers_all.wont_be_nil
@@ -399,14 +410,22 @@ describe Fog::Compute::Proxmox do
       container.wait_for { ready? }
       status = container.ready?
       status.must_equal true
-      # Suspend container not implemented
-      proc do
-        container.action('suspend')
-      end.must_raise Fog::Errors::Error
-      # Resume container not implemented
+      # Start console
       proc do
-        container.action('resume')
+        container.start_console
       end.must_raise Fog::Errors::Error
+      spice = container.start_console(console: 'spice')
+      spice['password'].wont_be_nil
+      # Suspend container (: command 'lxc-checkpoint -n 100 -s -D /var/lib/vz/dump' failed: exit code 1)
+      # container.action('suspend')
+      # container.wait_for { container.qmpstatus == 'paused' }
+      # qmpstatus = container.qmpstatus
+      # qmpstatus.must_equal 'paused'
+      # Resume server
+      # container.action('resume')
+      # container.wait_for { ready? }
+      # status = container.ready?
+      # status.must_equal true
       # Stop container
       container.action('stop')
       container.wait_for { container.status == 'stopped' }
@@ -421,7 +440,7 @@ describe Fog::Compute::Proxmox do
       storage.volumes.each(&:destroy)
       proc do
         node.containers.get vmid
-      end.must_raise Excon::Errors::InternalServerError
+      end.must_raise Fog::Errors::NotFound
     end
   end
 end