fog-proxmox 0.13.0 → 0.15.0

data/spec/helpers/ip_helper_spec.rb

@@ -20,141 +20,158 @@
 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
+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

@@ -20,117 +20,125 @@
 require 'spec_helper'
 require 'fog/proxmox/helpers/nic_helper'
 
-    describe Fog::Proxmox::NicHelper do
-            
-        let(:net_vm) do 
-            { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
-        end
-
-        let(:net_vm_create) do 
-            { net0: 'model=virtio,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
-        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,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,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, ip: '192.168.56.100/31' }
-        end
-
-        let(:qemu_nic) do 
-            { id: 'net1', model: 'virtio', macaddr: '66:89:C5:59:AA:96', bridge: 'vmbr0', firewall: 1, link_down: 1, queues: 1, rate: 1, tag: 1 }
-        end
-
-        let(:qemu_nic_create) do 
-            { id: 'net1', model: 'virtio', bridge: 'vmbr0', firewall: 1, link_down: 1, queues: 1, rate: 1, tag: 1 }
-        end
-
-        describe '#extract_model' do
-            it "returns model card" do
-                model = Fog::Proxmox::NicHelper.extract_nic_id(net_vm[:net0])
-                assert_equal 'virtio', model
-            end
-            it "returns model card creation" do
-                model = Fog::Proxmox::NicHelper.extract_nic_id(net_vm_create[:net0])
-                assert_equal 'virtio', model
-            end
-        end
-
-        describe '#extract_name' do
-            it "returns lxc name" do
-                model = Fog::Proxmox::NicHelper.extract_nic_id(net_lxc[:net0])
-                assert_equal 'eth0', model
-            end
-            it "returns lxc name creation" do
-                model = Fog::Proxmox::NicHelper.extract_nic_id(net_lxc_create[:net0])
-                assert_equal 'eth0', model
-            end
-        end
-
-        describe '#extract_mac_address' do
-            it "returns vm mac address" do
-                mac_address = Fog::Proxmox::NicHelper.extract_mac_address(net_vm[:net0])
-                assert_equal '66:89:C5:59:AA:96', mac_address
-            end
-            it "returns lxc mac address" do
-                mac_address = Fog::Proxmox::NicHelper.extract_mac_address(net_lxc[:net0])
-                assert_equal '66:89:C5:59:AA:96', mac_address
-            end
-        end
-
-        describe '#nic?' do
-            it "returns true" do
-                assert Fog::Proxmox::NicHelper.nic?('net0')
-            end
-            it "returns false" do
-                assert !Fog::Proxmox::NicHelper.nic?('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
-
-        describe '#flatten' do
-            it "returns qemu nic string" do
-                flat_qemu = { net1: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
-                assert_equal flat_qemu ,Fog::Proxmox::NicHelper.flatten(qemu_nic)
-            end
-            it "returns qemu nic create string" do
-                flat_qemu = { net1: 'model=virtio,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
-                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,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
+describe Fog::Proxmox::NicHelper do
+  let(:net_vm) do
+    { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+  end
+
+  let(:net_vm_create) do
+    { net0: 'model=virtio,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+  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,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,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, ip: '192.168.56.100/31' }
+  end
+
+  let(:qemu_nic) do
+    { id: 'net1', model: 'virtio', macaddr: '66:89:C5:59:AA:96', bridge: 'vmbr0', firewall: 1, link_down: 1, queues: 1,
+      rate: 1, tag: 1 }
+  end
+
+  let(:qemu_nic_create) do
+    { id: 'net1', model: 'virtio', bridge: 'vmbr0', firewall: 1, link_down: 1, queues: 1, rate: 1, tag: 1 }
+  end
+
+  describe '#extract_model' do
+    it 'returns model card' do
+      model = Fog::Proxmox::NicHelper.extract_nic_id(net_vm[:net0])
+      assert_equal 'virtio', model
+    end
+
+    it 'returns model card creation' do
+      model = Fog::Proxmox::NicHelper.extract_nic_id(net_vm_create[:net0])
+      assert_equal 'virtio', model
+    end
+  end
+
+  describe '#extract_name' do
+    it 'returns lxc name' do
+      model = Fog::Proxmox::NicHelper.extract_nic_id(net_lxc[:net0])
+      assert_equal 'eth0', model
+    end
+
+    it 'returns lxc name creation' do
+      model = Fog::Proxmox::NicHelper.extract_nic_id(net_lxc_create[:net0])
+      assert_equal 'eth0', model
+    end
+  end
+
+  describe '#extract_mac_address' do
+    it 'returns vm mac address' do
+      mac_address = Fog::Proxmox::NicHelper.extract_mac_address(net_vm[:net0])
+      assert_equal '66:89:C5:59:AA:96', mac_address
+    end
+
+    it 'returns lxc mac address' do
+      mac_address = Fog::Proxmox::NicHelper.extract_mac_address(net_lxc[:net0])
+      assert_equal '66:89:C5:59:AA:96', mac_address
+    end
+  end
+
+  describe '#nic?' do
+    it 'returns true' do
+      assert Fog::Proxmox::NicHelper.nic?('net0')
+    end
+
+    it 'returns false' do
+      assert !Fog::Proxmox::NicHelper.nic?('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
+
+  describe '#flatten' do
+    it 'returns qemu nic string' do
+      flat_qemu = { net1: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+      assert_equal flat_qemu, Fog::Proxmox::NicHelper.flatten(qemu_nic)
+    end
+
+    it 'returns qemu nic create string' do
+      flat_qemu = { net1: 'model=virtio,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+      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,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