fog-proxmox 0.9.0 → 0.13.0

data/spec/helpers/controller_helper_spec.rb

@@ -23,11 +23,14 @@ require 'fog/proxmox/helpers/controller_helper'
     describe Fog::Proxmox::ControllerHelper do
             
         let(:net) do 
-            { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1,mp=/opt/path' }
+            { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
         end
         let(:net_no_options) do 
             { net0: 'virtio=66:89:C5:59:AA:96' }
-        end   
+        end 
+        let(:net_lxc) do 
+            { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1,ip=192.168.56.100/31,ip6=2001:0000:1234:0000:0000:C1C0:ABCD:0876/31' }
+        end  
         let(:scsi) do 
             { scsi10: 'local-lvm:1,cache=none' }
         end
@@ -62,6 +65,14 @@ require 'fog/proxmox/helpers/controller_helper'
                 path = Fog::Proxmox::ControllerHelper.extract('mp',mp[:mp0])
                 assert_equal '/opt/path', path
             end
+            it "returns cidr ip" do
+                path = Fog::Proxmox::ControllerHelper.extract('ip',net_lxc[:net0])
+                assert_equal '192.168.56.100/31', path
+            end
+            it "returns cidr ip6" do
+                path = Fog::Proxmox::ControllerHelper.extract('ip6',net_lxc[:net0])
+                assert_equal '2001:0000:1234:0000:0000:C1C0:ABCD:0876/31', path
+            end
         end
 
         describe '#extract_index' do

data/spec/helpers/cpu_helper_spec.rb

@@ -23,7 +23,7 @@ require 'fog/proxmox/helpers/cpu_helper'
     describe Fog::Proxmox::CpuHelper do
             
         let(:cpu) do 
-            'cputype=kvm64,flags=+spec-ctrl;+pcid'
+            'cputype=Skylake-Client,flags=+spec-ctrl;+pcid'
         end
         let(:cpu_nocputype) do 
             'kvm64,flags=+spec-ctrl;+pcid'
@@ -38,7 +38,7 @@ require 'fog/proxmox/helpers/cpu_helper'
         describe '#extract_type' do
             it "returns string" do
                 result = Fog::Proxmox::CpuHelper.extract_type(cpu)
-                assert_equal('kvm64', result)
+                assert_equal('Skylake-Client', result)
             end
             it "returns string" do
                 result = Fog::Proxmox::CpuHelper.extract_type(cpu_nocputype)

data/spec/helpers/disk_helper_spec.rb

@@ -195,4 +195,16 @@ require 'fog/proxmox/helpers/disk_helper'
                 assert !Fog::Proxmox::DiskHelper.cdrom?('local:iso/alpine-virt-3.7.0-x86_64.iso')
             end
         end
+
+        describe '#to_bytes' do
+            it "1Gb returns 1 073 741 824" do
+                assert_equal Fog::Proxmox::DiskHelper.to_bytes('1Gb'), 1073741824
+            end
+        end
+
+        describe '#to_human_bytes' do
+            it "1 073 741 824 returns 1Gb" do
+                assert_equal '1Gb', Fog::Proxmox::DiskHelper.to_human_bytes(1073741824)
+            end
+        end
     end

data/spec/helpers/ip_helper_spec.rb

@@ -0,0 +1,160 @@
+# 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/helpers/ip_helper'
+
+    describe Fog::Proxmox::IpHelper do
+            
+        let(:ip) do 
+            { ip: '192.168.56.100/31' }
+        end
+
+        let(:invalid_ip) do 
+            { ip: '192.168.56.100/sfsdfsdfdsf' }
+        end
+
+        let(:ip6) do 
+            { ip: '2001:0000:1234:0000:0000:C1C0:ABCD:0876/31' }
+        end
+
+        let(:invalid_ip6) do 
+            { ip: '2001:0000:1234:0000:0000:C1C0:ABCD:0876/sfsdfsdfdsf' }
+        end
+
+        describe '#cidr?' do
+            it "192.168.56.100/31 returns true" do
+                assert_equal true, Fog::Proxmox::IpHelper.cidr?(ip[:ip])
+            end
+            it "192.168.56.100/sfsdfsdfdsf returns false" do
+                assert_equal false, Fog::Proxmox::IpHelper.cidr?(invalid_ip[:ip])
+            end
+        end
+
+        describe '#cidr6?' do
+            it "2001:0000:1234:0000:0000:C1C0:ABCD:0876/31 returns true" do
+                assert_equal true, Fog::Proxmox::IpHelper.cidr6?(ip6[:ip])
+            end
+            it "2001:0000:1234:0000:0000:C1C0:ABCD:0876/sfsdfsdfdsf returns false" do
+                assert_equal false, Fog::Proxmox::IpHelper.cidr6?(invalid_ip6[:ip])
+            end
+        end
+
+        describe '#prefix' do
+            it "192.168.56.100/31 returns 31" do
+                assert_equal '31', Fog::Proxmox::IpHelper.prefix(ip[:ip])
+            end
+            it "192.168.56.100/sfsdfsdfdsf returns nil" do
+                assert_nil Fog::Proxmox::IpHelper.prefix(invalid_ip[:ip])
+            end
+        end
+
+        describe '#prefix6' do
+            it "2001:0000:1234:0000:0000:C1C0:ABCD:0876/31 returns 31" do
+                assert_equal '31', Fog::Proxmox::IpHelper.prefix6(ip6[:ip])
+            end
+            it "2001:0000:1234:0000:0000:C1C0:ABCD:0876/sfsdfsdfdsf returns nil" do
+                assert_nil Fog::Proxmox::IpHelper.prefix6(invalid_ip6[:ip])
+            end
+        end
+
+        describe '#ip' do
+            it "192.168.56.100/31 returns 192.168.56.100" do
+                assert_equal '192.168.56.100', Fog::Proxmox::IpHelper.ip(ip[:ip])
+            end
+            it "192.168.56.100/sfsdfsdfdsf returns nil" do
+                assert_nil Fog::Proxmox::IpHelper.ip(invalid_ip[:ip])
+            end
+        end
+
+        describe '#ip6' do
+            it "2001:0000:1234:0000:0000:C1C0:ABCD:0876/31 returns 2001:0000:1234:0000:0000:C1C0:ABCD:0876" do
+                assert_equal '2001:0000:1234:0000:0000:C1C0:ABCD:0876', Fog::Proxmox::IpHelper.ip6(ip6[:ip])
+            end
+            it "2001:0000:1234:0000:0000:C1C0:ABCD:0876/sfsdfsdfdsf returns nil" do
+                assert_nil Fog::Proxmox::IpHelper.ip6(invalid_ip6[:ip])
+            end
+        end
+
+        describe '#to_cidr' do
+            it "192.168.56.100 returns 192.168.56.100" do
+                assert_equal '192.168.56.100', Fog::Proxmox::IpHelper.to_cidr('192.168.56.100')
+            end
+            it "192.168.56.100,31 returns 192.168.56.100/31" do
+                assert_equal '192.168.56.100/31', Fog::Proxmox::IpHelper.to_cidr('192.168.56.100','31')
+            end
+            it "192,31 returns nil" do
+                assert_nil Fog::Proxmox::IpHelper.to_cidr('192','31')
+            end
+            it "192.168.56.100,56 returns nil" do
+                assert_nil Fog::Proxmox::IpHelper.to_cidr('192.168.56.100','56')
+            end
+        end
+
+        describe '#to_cidr6' do
+            it "2001:0000:1234:0000:0000:C1C0:ABCD:0876 returns 2001:0000:1234:0000:0000:C1C0:ABCD:0876" do
+                assert_equal '2001:0000:1234:0000:0000:C1C0:ABCD:0876', Fog::Proxmox::IpHelper.to_cidr6('2001:0000:1234:0000:0000:C1C0:ABCD:0876')
+            end
+            it "2001:0000:1234:0000:0000:C1C0:ABCD:0876,31 returns 2001:0000:1234:0000:0000:C1C0:ABCD:0876/31" do
+                assert_equal '2001:0000:1234:0000:0000:C1C0:ABCD:0876/31', Fog::Proxmox::IpHelper.to_cidr6('2001:0000:1234:0000:0000:C1C0:ABCD:0876','31')
+            end
+            it "2001:0000:1234:0000:0000:C1C0:ABCD:0876,158 returns nil" do
+                assert_nil Fog::Proxmox::IpHelper.to_cidr6('2001:0000:1234:0000:0000:C1C0:ABCD:0876','158')
+            end
+            it "192,31 returns nil" do
+                assert_nil Fog::Proxmox::IpHelper.to_cidr6('192','31')
+            end
+        end
+
+        describe '#ip?' do
+            it "192.168.56.100 returns true" do
+                assert_equal true, Fog::Proxmox::IpHelper.ip?('192.168.56.100')
+            end
+            it "541536 returns false" do
+                assert_equal false, Fog::Proxmox::IpHelper.ip?('541536')
+            end
+        end
+
+        describe '#ip6?' do
+            it "2001:0000:1234:0000:0000:C1C0:ABCD:0876 returns true" do
+                assert_equal true, Fog::Proxmox::IpHelper.ip6?('2001:0000:1234:0000:0000:C1C0:ABCD:0876')
+            end
+            it "541536 returns false" do
+                assert_equal false, Fog::Proxmox::IpHelper.ip6?('541536')
+            end
+        end
+
+        describe '#cidr_prefix?' do
+            it "31 returns true" do
+                assert_equal true, Fog::Proxmox::IpHelper.cidr_prefix?('31')
+            end
+            it "56 returns false" do
+                assert_equal false, Fog::Proxmox::IpHelper.cidr_prefix?('56')
+            end
+        end
+
+        describe '#cidr6_prefix?' do
+            it "100 returns true" do
+                assert_equal true, Fog::Proxmox::IpHelper.cidr6_prefix?('100')
+            end
+            it "158 returns false" do
+                assert_equal false, Fog::Proxmox::IpHelper.cidr6_prefix?('158')
+            end
+        end
+    end

data/spec/helpers/nic_helper_spec.rb

@@ -31,15 +31,15 @@ require 'fog/proxmox/helpers/nic_helper'
         end
 
         let(:net_lxc) do 
-            { net0: 'eth0=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+            { net0: 'eth0=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1,ip=192.168.56.100/31' }
         end
 
         let(:net_lxc_create) do 
-            { net0: 'name=eth0,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+            { net0: 'name=eth0,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1,ip=192.168.56.100/31' }
         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 }
+            { id: 'net0', name: 'eth0', macaddr: '66:89:C5:59:AA:96', bridge: 'vmbr0', firewall: 1, link_down: 1, queues: 1, rate: 1, tag: 1, ip: '192.168.56.100/31' }
         end
 
         let(:qemu_nic) do 
@@ -115,8 +115,22 @@ require 'fog/proxmox/helpers/nic_helper'
                 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' }
+                flat_lxc = { net0: 'eth0=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1,ip=192.168.56.100/31' }
                 assert_equal flat_lxc ,Fog::Proxmox::NicHelper.flatten(lxc_nic)
             end
         end
+
+        describe '#has_ip?' do
+            it "returns true" do
+                ip = Fog::Proxmox::NicHelper.has_ip?(net_lxc[:net0])
+                assert_equal true, ip
+            end
+        end
+
+        describe '#extract_ip' do
+            it "returns lxc ip cidr" do
+                ip = Fog::Proxmox::NicHelper.extract_ip(net_lxc[:net0])
+                assert_equal '192.168.56.100/31', ip
+            end
+        end
     end

data/spec/identity_spec.rb

@@ -300,6 +300,11 @@ describe Fog::Proxmox::Identity do
       # Add storage as member
       pool.add_server 100 # do nothing if server does not exist
       pool.add_storage 'local-lvm'
+      _(pool.members).wont_be_nil
+      _(pool.members).wont_be_empty
+      _(pool.members.size).must_equal 1 # no vm 100
+      _(pool.has_server?(100)).must_equal false
+      _(pool.has_storage?('local-lvm')).must_equal true
       # all pools
       pools_all = @service.pools.all
       _(pools_all).wont_be_nil
@@ -308,6 +313,7 @@ describe Fog::Proxmox::Identity do
       # Delete
       pool.remove_server 100
       pool.remove_storage 'local-lvm'
+      _(pool.members).must_be_empty
       pool.destroy
       pool = @service.pools.get pool_hash[:poolid]
       _(pool).must_be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Tristan Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement
@@ -196,16 +196,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -304,22 +304,21 @@ files:
 - ".github/CODE_OF_CONDUCT.md"
 - ".github/CONTRIBUTING.md"
 - ".github/CONTRIBUTORS.md"
+- ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/SUPPORT.md"
 - ".github/fogproxmox.png"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".gitlab-ci.yml"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".solargraph.yml"
-- ".travis.yml"
 - ".vscode/launch.json"
 - ".vscode/settings.json"
 - ".vscode/tasks.json"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -453,6 +452,7 @@ files:
 - lib/fog/proxmox/helpers/controller_helper.rb
 - lib/fog/proxmox/helpers/cpu_helper.rb
 - lib/fog/proxmox/helpers/disk_helper.rb
+- lib/fog/proxmox/helpers/ip_helper.rb
 - lib/fog/proxmox/helpers/nic_helper.rb
 - lib/fog/proxmox/json.rb
 - lib/fog/proxmox/string.rb
@@ -484,6 +484,7 @@ files:
 - spec/helpers/controller_helper_spec.rb
 - spec/helpers/cpu_helper_spec.rb
 - spec/helpers/disk_helper_spec.rb
+- spec/helpers/ip_helper_spec.rb
 - spec/helpers/nic_helper_spec.rb
 - spec/identity_spec.rb
 - spec/network_spec.rb
@@ -501,7 +502,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -538,6 +539,7 @@ test_files:
 - spec/helpers/controller_helper_spec.rb
 - spec/helpers/cpu_helper_spec.rb
 - spec/helpers/disk_helper_spec.rb
+- spec/helpers/ip_helper_spec.rb
 - spec/helpers/nic_helper_spec.rb
 - spec/identity_spec.rb
 - spec/network_spec.rb

data/.gitlab-ci.yml

@@ -1,50 +0,0 @@
-dependency_scanning:
-  image: docker:stable
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env DEP_SCAN_DISABLE_REMOTE_CHECKS="${DEP_SCAN_DISABLE_REMOTE_CHECKS:-false}"
-        --volume "$PWD:/code"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
-  artifacts:
-    paths: [gl-dependency-scanning-report.json]
-
-rubocop:
-  image: ruby:2.5.1
-  script:
-    - bundle install --binstubs
-    - rubocop
-
-test-ruby-2.3.7:
-  image: ruby:2.3.7
-  script:
-    - bundle install --binstubs
-    - bundle exec rake test
-    - bundle exec rake spec
-
-test-ruby-2.4.4:
-  image: ruby:2.4.4
-  script:
-    - bundle install --binstubs
-    - bundle exec rake test
-    - bundle exec rake spec
-
-test-ruby-2.5.1:
-  image: ruby:2.5.1
-  script:
-    - bundle install --binstubs
-    - bundle exec rake test
-    - bundle exec rake spec
-
-test-ruby-2.6.2:
-  image: ruby:2.6.2
-  script:
-    - bundle install --binstubs
-    - bundle exec rake test
-    - bundle exec rake spec