fog-proxmox 0.9.0 → 0.13.0

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

@@ -37,7 +37,7 @@ module Fog
 
       # class Mock get_snapshot_config request
       class Mock
-        def get_snapshot_config; end
+        def get_snapshot_config(_path_params); end
       end
     end
   end

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

@@ -34,7 +34,7 @@ module Fog
 
       # class Mock get_task collection
       class Mock
-        def get_task(node, upid); end
+        def get_task(_node, _upid); end
       end
     end
   end

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

@@ -37,6 +37,7 @@ module Fog
 
       # class Mock get_vnc request
       class Mock
+        def get_vnc(_path_params, _query_params); end
       end
     end
   end

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

@@ -35,7 +35,7 @@ module Fog
 
       # class Mock get_volume request
       class Mock
-        def get_volume; end
+        def get_volume(_node, _storage, _volume); end
       end
     end
   end

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

@@ -34,7 +34,14 @@ module Fog
 
       # class Mock list_nodes request
       class Mock
-        def list_nodes; end
+        def list_nodes
+          [
+            {
+              'node' => 'proxmox',
+              'type' => 'node'
+            }
+          ]
+        end
       end
     end
   end

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

@@ -35,7 +35,78 @@ module Fog
 
       # class Mock list_servers request
       class Mock
-        def list_servers; end
+        def list_servers(_options = {})
+          if options[:type] == 'qemu'
+            [
+              {
+                'vmid' => '100',
+                'type' => 'qemu',
+                'node_id' => 'proxmox',
+                'config' => {
+                  'vmid' => '100',
+                  'description' => nil,
+                  'smbios1' => nil,
+                  'numa' => 0,
+                  'kvm' => 0,
+                  'vcpus' => nil,
+                  'cores' => 1,
+                  'bootdisk' => 'scsi0',
+                  'onboot' => 0,
+                  'boot' => nil,
+                  'agent' => '0',
+                  'scsihw' => nil,
+                  'sockets' => 1,
+                  'memory' => 512,
+                  'min_memory' => nil,
+                  'shares' => nil,
+                  'balloon' => 0,
+                  'cpu' => 'cputype=kvm64',
+                  'cpulimit' => nil,
+                  'cpuunits' => nil,
+                  'keyboard' => 'en-us',
+                  'vga' => 'std',
+                  'storage' => nil,
+                  'template' => '',
+                  'arch' => nil,
+                  'swap' => nil,
+                  'hostname' => nil,
+                  'nameserver' => nil,
+                  'searchdomain' => nil,
+                  'password' => nil,
+                  'startup' => nil,
+                  'console' => nil
+                },
+                'digest' => nil,
+                'maxdisk' => 8_589_934_592,
+                'disk' => 0,
+                'diskwrite' => 0,
+                'diskread' => 0,
+                'uptime' => 0,
+                'netout' => 0,
+                'netin' => 0,
+                'cpu' => 'cputype=kvm64',
+                'cpus' => 1,
+                'template' => '',
+                'status' => 'stopped',
+                'maxcpu' => nil,
+                'mem' => 0,
+                'maxmem' => 536_870_912,
+                'qmpstatus' => 'stopped',
+                'ha' => { 'managed' => 0 },
+                'pid' => nil,
+                'blockstat' => nil,
+                'balloon' => 0,
+                'ballooninfo' => nil,
+                'vmgenid' => nil,
+                'lock' => nil,
+                'maxswap' => nil,
+                'swap' => nil
+              }
+            ]
+          else
+            []
+          end
+        end
       end
     end
   end

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

@@ -36,7 +36,30 @@ module Fog
 
       # class Mock list_snapshots request
       class Mock
-        def list_snapshots; end
+        def list_snapshots(_path_params)
+          [
+            {
+              'name' => 'snapshot1',
+              'description' => 'latest snapshot',
+              'snaptime' => 1_578_057_452,
+              'vmstate' => 0,
+              'node_id' => 'proxmox',
+              'server_id' => '100',
+              'server_type' => 'qemu',
+              'vmgenid' => nil
+            },
+            {
+              'name' => 'snapshot2',
+              'description' => 'latest snapshot2',
+              'snaptime' => 1_578_058_452,
+              'vmstate' => 0,
+              'node_id' => 'proxmox',
+              'server_id' => '100',
+              'server_type' => 'qemu',
+              'vmgenid' => nil
+            }
+          ]
+        end
       end
     end
   end

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

@@ -37,7 +37,9 @@ module Fog
 
       # class Mock list_storages request
       class Mock
-        def list_storages; end
+        def list_storages(_node, _options = {})
+          []
+        end
       end
     end
   end

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

@@ -35,7 +35,9 @@ module Fog
 
       # class Mock list_tasks request
       class Mock
-        def list_tasks; end
+        def list_tasks(_node, _options = {})
+          []
+        end
       end
     end
   end

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

@@ -35,7 +35,9 @@ module Fog
 
       # class Mock list_volumes request
       class Mock
-        def list_volumes; end
+        def list_volumes(_node, _storage, _options = {})
+          []
+        end
       end
     end
   end

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

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

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

@@ -37,7 +37,7 @@ module Fog
 
       # class Mock migrate_server request
       class Mock
-        def migrate_server; end
+        def migrate_server(_path_params, _body_params); end
       end
     end
   end

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

@@ -36,7 +36,7 @@ module Fog
 
       # class Mock move_disk request
       class Mock
-        def move_disk; end
+        def move_disk(_path_params, _body_params); end
       end
     end
   end

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

@@ -36,7 +36,7 @@ module Fog
 
       # class Mock move_volume request
       class Mock
-        def move_volume; end
+        def move_volume(_path_params, _body_params); end
       end
     end
   end

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

@@ -35,6 +35,7 @@ module Fog
 
       # class Mock next_vmid collection
       class Mock
+        def next_vmid; end
       end
     end
   end

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

@@ -36,7 +36,7 @@ module Fog
 
       # class Mock resize_container request
       class Mock
-        def resize_container; end
+        def resize_container(_path_params, _body_params); end
       end
     end
   end

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

@@ -36,7 +36,7 @@ module Fog
 
       # class Mock resize_server request
       class Mock
-        def resize_server; end
+        def resize_server(_path_params, _body_params); end
       end
     end
   end

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

@@ -39,7 +39,9 @@ module Fog
 
       # class Mock rollback_snapshot request
       class Mock
-        def rollback_snapshot; end
+        def rollback_snapshot(_path_params)
+          'UPID:proxmox:00002EBF:646E2BF3:5E1C7E39:qmrollback:100:root@pam:'
+        end
       end
     end
   end

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

@@ -34,7 +34,7 @@ module Fog
 
       # class Mock status_task
       class Mock
-        def status_task(node, upid); end
+        def status_task(_node, _upid); end
       end
     end
   end

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

@@ -34,7 +34,7 @@ module Fog
 
       # class Mock get_task collection
       class Mock
-        def stop_task(taskid); end
+        def stop_task(_node, _taskid); end
       end
     end
   end

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

@@ -37,6 +37,7 @@ module Fog
 
       # class Mock template_server request
       class Mock
+        def template_server(_path_params, _body_params); end
       end
     end
   end

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

@@ -37,6 +37,7 @@ module Fog
 
       # class Mock update_server request
       class Mock
+        def update_server(_path_params, _body_params); end
       end
     end
   end

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

@@ -38,7 +38,7 @@ module Fog
 
       # class Mock update_snapshot request
       class Mock
-        def update_snapshot; end
+        def update_snapshot(_path_params, _body_params); end
       end
     end
   end

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

@@ -65,6 +65,24 @@ module Fog
         def update
           update_with_member(nil, nil, false)
         end
+
+        def has_server?(vmid)
+          has?("vmid", vmid)
+        end
+
+        def has_storage?(storage)
+          has?("storage", storage)
+        end
+        
+        private 
+
+        def has?(key, vmid)
+          result = false
+          attributes[:members].each do |member|
+            result = member[key].to_s.eql?(vmid.to_s) if member.has_key?(key) && member[key] && vmid
+          end
+          result
+        end
       end
     end
   end

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

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

data/lib/fog/proxmox/core.rb

@@ -69,7 +69,7 @@ module Fog
       private
 
       def request(params)
-        retried = false
+        retried = false     
         begin
           response = @connection.request(params.merge(
                                            headers: headers(params[:method], params[:headers])

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

@@ -24,7 +24,7 @@ module Fog
 
       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(/[,]{0,1}#{name}[=]{1}(?<name_value>[\w\/\.\:]+)/)
         matches ? matches[:name_value] : matches
       end
 

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

@@ -21,7 +21,7 @@ module Fog
   module Proxmox
     # module Cpu mixins
     module CpuHelper
-      CPU_REGEXP = /(\bcputype=)?(\w+)[,]?(\bflags=)?(\+[\w-]+)?[;]?(\+[\w-]+)?/
+      CPU_REGEXP = /(\bcputype=)?([\w-]+)[,]?(\bflags=)?(\+[\w-]+)?[;]?(\+[\w-]+)?/
       def self.extract(cpu,i)
         cpu ? CPU_REGEXP.match(cpu.to_s)[i] : ''
       end

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

@@ -110,6 +110,22 @@ module Fog
         val[0].to_i*1024**m
       end
 
+      def self.modulo_bytes(size)
+        size / 1024
+      end
+
+      def self.to_human_bytes(size)
+        units = ['Kb','Mb','Gb','Tb','Pb']
+        i = 0
+        human_size = size.to_s + 'b'
+        while i < 5 && size >= 1024
+          size = self.modulo_bytes(size)
+          human_size = size.to_s + units[i]
+          i+=1            
+        end
+        human_size
+      end
+
       def self.extract_size(disk_value)
         size=extract_option('size', disk_value)
 	      size ? self.to_bytes(size) : "1G"

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

@@ -0,0 +1,100 @@
+# 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 'resolv'
+require 'fog/proxmox/hash'
+
+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')}"
+      CIDRv4_REGEXP = Regexp.new("\\A(#{IPv4_SRC})(\/#{CIDRv4_PREFIX})?\\z")
+      CIDRv6_PREFIX = '(\d+)'
+      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
+
+      def self.cidr6?(ip)
+        CIDRv6_REGEXP.match?(ip)
+      end
+
+      def self.prefix(ip)
+        if cidr = CIDRv4_REGEXP.match(ip)
+          cidr[7]
+        end
+      end
+
+      def self.prefix6(ip)
+        if cidr = CIDRv6_REGEXP.match(ip)
+          cidr[3]
+        end
+      end
+
+      def self.ip?(ip)
+        Resolv::IPv4::Regex.match?(ip)
+      end
+
+      def self.ip6?(ip)
+        Resolv::IPv6::Regex.match?(ip)
+      end
+
+      def self.cidr_prefix?(prefix)
+        CIDRv4_PREFIX_REGEXP.match?(prefix)
+      end
+
+      def self.cidr6_prefix?(prefix)
+        CIDRv6_PREFIX_REGEXP.match?(prefix) && prefix.to_i >= 0 && prefix.to_i <= 128
+      end
+
+      def self.ip(ip)
+        if cidr = CIDRv4_REGEXP.match(ip)
+          cidr[1]
+        end
+      end
+
+      def self.ip6(ip)
+        if cidr = CIDRv6_REGEXP.match(ip)
+          cidr[1]
+        end
+      end
+
+      def self.to_cidr(ip,prefix = nil)
+        return nil unless self.ip?(ip) && (!prefix || self.cidr_prefix?(prefix))
+        cidr = "#{ip}"
+        cidr += "/#{prefix}" if self.cidr_prefix?(prefix)
+        cidr
+      end
+
+      def self.to_cidr6(ip,prefix = nil)
+        return nil unless self.ip6?(ip) && (!prefix || self.cidr6_prefix?(prefix))
+        cidr = "#{ip}"
+        cidr += "/#{prefix}" if self.cidr6_prefix?(prefix)
+        cidr
+      end
+    end
+  end
+end