fog-proxmox 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0808e35cf05f51aeb72e25ccbfb66c9cb0176364e0d4b298e5e09a9237c0f940'
-  data.tar.gz: 012e341f0dfe2c74108f65fb68d9cc29b03b2003b9ca7335fe6aa1038e930bc9
+  metadata.gz: 62bda3253f9a17347772bf6895a2658b8d47d3822d6addeadb674d779c396c1b
+  data.tar.gz: 3cb6401715a785b87a2f06dd1a75eaab0c47051d1a8f09c763a417dbe7769269
 SHA512:
-  metadata.gz: 6ab7a7772ade522ab830167f8ca3909a4a32cd6eea3954cfec40243cfab9dd345693fe226fd98d552b848c2b0f506393f25c295ca0169fe1df8c4ca95ea7d92b
-  data.tar.gz: 6a87af1859adc1c4deda619d0eb706369384dda48778531f0366cfc934945b20e6ae3230384e25423a82e405d6fd095e7ffad494d18e33e09a1777d5d8ead31c
+  metadata.gz: 01b38e8e7c7b9c576c36ea337ad51f2ee3502290bf71393dcf7cfa80c2187414217e434fa741a22f6993a1bd05d0180a31a2879f17f06b756377d377a27c082d
+  data.tar.gz: 733048733bad0ea948e271a70317e7731dfd6929b35e980b8831bfe862e555c67554135e89332b7b513c5eaffdec673d19b7cb30736a645b858e23b32dec9417

data/.gitlab-ci.yml

@@ -16,6 +16,7 @@ dependency_scanning:
     paths: [gl-dependency-scanning-report.json]
 
 rubocop:
+  image: ruby:2.5.1
   script:
     - bundle install --binstubs
     - rubocop
@@ -39,4 +40,4 @@ test-ruby-2.5.1:
   script:
     - bundle install --binstubs
     - bundle exec rake test
-    - bundle exec rake spec
+    - bundle exec rake spec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog-proxmox (0.5.4)
+    fog-proxmox (0.5.5)
       fog-core (~> 1.45)
       fog-json (~> 1.0)
       ipaddress (~> 0.8)
@@ -143,4 +143,4 @@ DEPENDENCIES
   webmock (~> 3.4)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

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

@@ -57,9 +57,10 @@ module Fog
       end
 
       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)$/)
-        creation = disk_value.match(/^(([\w-]+)[:]{1}([\d]+))/)
+        creation = disk_value.split(',')[0].match(/^(([\w-]+)[:]{1}([\d]+))$/)
         values = values_a.first if values_a
         if no_cdrom
           if creation
@@ -79,8 +80,22 @@ module Fog
         [storage, volid, size]
       end
 
+      def self.to_bytes(size)
+        val=size.match(/\d+(\w?)/)
+        m=0
+        case val[1] 
+          when "K" then m=1
+          when "M" then m=2
+          when "G" then m=3
+          when "T" then m=4
+          when "P" then m=5
+        end
+        val[0].to_i*1024**m
+      end
+
       def self.extract_size(disk_value)
-        extract_option('size', disk_value).to_i
+        size=extract_option('size', disk_value)
+	self.to_bytes(size)
       end
     end
   end

data/lib/fog/proxmox/version.rb

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

data/spec/helpers/disk_helper_spec.rb

@@ -34,6 +34,14 @@ require 'fog/proxmox/helpers/disk_helper'
             { scsi0: 'local-lvm:vm-100-disk-1,size=8G,cache=none'}
         end
 
+        let(:virtio1) do
+	    { 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(:cdrom_none) do 
             { ide2: 'none,media=cdrom'}
         end
@@ -54,7 +62,11 @@ require 'fog/proxmox/helpers/disk_helper'
         end
 
         describe '#extract_controller' do
-            it "returns controller" do
+            it "returns virtio controller" do
+                controller = Fog::Proxmox::DiskHelper.extract_controller(virtio1[:id])
+                assert_equal('virtio', controller)
+            end
+            it "returns scsi controller" do
                 controller = Fog::Proxmox::DiskHelper.extract_controller(scsi0[:id])
                 assert_equal('scsi', controller)
             end
@@ -72,7 +84,13 @@ require 'fog/proxmox/helpers/disk_helper'
                 storage, volid, size = Fog::Proxmox::DiskHelper.extract_storage_volid_size(scsi[:scsi0])
                 assert_equal('local-lvm', storage)
                 assert_equal('local-lvm:vm-100-disk-1', volid)
-                assert_equal(8, size)
+                assert_equal(8589934592, size)
+            end
+            it "returns virtio get local storage volid and size" do
+                storage, volid, size = Fog::Proxmox::DiskHelper.extract_storage_volid_size(virtio[:virtio1])
+                assert_equal('local', storage)
+                assert_equal('local:108/vm-108-disk-1.qcow2', volid)
+                assert_equal(245, size)
             end
             it "returns scsi0 creation storage and volid" do
                 disk = Fog::Proxmox::DiskHelper.flatten(scsi0)
@@ -94,11 +112,14 @@ require 'fog/proxmox/helpers/disk_helper'
                 assert_nil size
             end
         end
-
         describe '#extract_size' do
             it "returns size" do
                 size = Fog::Proxmox::DiskHelper.extract_size(scsi[:scsi0])
-                assert_equal(8, size)
+                assert_equal(8589934592, size)
+            end
+            it "returns size" do
+                size = Fog::Proxmox::DiskHelper.extract_size(virtio[:virtio1])
+                assert_equal(245, size)
             end
         end
-    end
+    end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Tristan Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2019-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler