foreman_fog_proxmox 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e90a84b09846642c70bbaf6332fb71f65952a9d8a34ebe622230b53e39dacbc
-  data.tar.gz: 58bd39bcc6cf49c526507418e183ab9ba93e60e1d2f43bd4cebd0243fe2cb0a1
+  metadata.gz: 4c422b2ba09e7b1cd71a0dec7ec72398c71f4653a0b8386d4949ea15932df346
+  data.tar.gz: e870f6684243b1a7f7ee061648d0ad6efd1a1e51a466861f2c1e60f13bc6bc10
 SHA512:
-  metadata.gz: f2f6bea23161fbf3de643311ed2d14320acc1cbec8c2b1bf3aa697227d1839ace643fc751e86388f595444fcb35584df69720973e0934066ad1a3ffd33e3fe64
-  data.tar.gz: 1ccd8f20cba817c008bbae6a5bf8906a891d11fa897573c1cfcb38c9310aa2992aff2bd91dc7726681d14004b5240676ffa9b94ea04b00c5c24f33c7483d0824
+  metadata.gz: eede4a7f2e4a098e90737ba71c389d979254720fbd876d5a5c73e792302fc6b59a69e37ec8736fa4fd31da982384b6bde8bd9651131ec71035338460c6bb4c26
+  data.tar.gz: 315fc305b50d96704ac6637d9a8689af9cc7d43ec93afe0c2804755b2b14a35183754a212be2f33cec25c1b37c0b124e9c20f0e0ed12a397560749115c88907c

data/README.md

@@ -28,6 +28,7 @@ You can support the plugin development via the following methods:
 |<=0.8 |<6.0|>=0.7|>=1.22|>=2.3|
 |<0.9 |<6.0|=0.9|>=1.22|>=2.3|
 |>=0.9 |>=5.4|>=0.9.1|>=1.22|>=2.3|
+|>=0.10 |>=5.4|>=0.9.4|>=1.22|>=2.5|
 
 ## Installation
 
@@ -110,7 +111,7 @@ Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.thef
 ### Prerequisites
 
 * You need a Proxmox VE 5.4+ server running.
-* You need ruby >= 2.3. You can install it with [rbenv](https://github.com/rbenv/rbenv).
+* You need ruby >= 2.5. You can install it with [rbenv](https://github.com/rbenv/rbenv).
 * You also need nodejs in your dev machine to run webpack-dev-server. You can install it with [nvm](https://github.com/creationix/nvm).
 
 ### Platform
@@ -182,6 +183,12 @@ export DISABLE_SPRING=true
 bundle exec bin/rake test TEST=test/functional/compute_resources_controller_test.rb
 ```
 
+* Check code syntax with rubocop and foreman rules:
+
+```shell
+bundle exec bin/rake foreman_fog_proxmox:rubocop
+```
+
 * See deface overrides result:
 
 ```shell

data/app/helpers/proxmox_container_helper.rb

@@ -150,6 +150,8 @@ module ProxmoxContainerHelper
       nic.store(:bridge, interface_attributes['bridge'].to_s) if interface_attributes['bridge']
       nic.store(:ip, interface_attributes['ip'].to_s) if interface_attributes['ip']
       nic.store(:ip6, interface_attributes['ip6'].to_s) if interface_attributes['ip6']
+      nic.store(:gw, interface_attributes['gw'].to_s) if interface_attributes['gw']
+      nic.store(:gw6, interface_attributes['gw6'].to_s) if interface_attributes['gw6']
       nic.store(:rate, interface_attributes['rate'].to_i) if interface_attributes['rate']
       nic.store(:tag, interface_attributes['tag'].to_i) if interface_attributes['tag']
       logger.debug("parse_container_interface(): add nic=#{nic}")

data/app/models/concerns/fog_extensions/proxmox/interface.rb

@@ -17,13 +17,24 @@
 # You should have received a copy of the GNU General Public License
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
+require 'fog/proxmox/helpers/ip_helper'
+
 module FogExtensions
   module Proxmox
     module Interface
       extend ActiveSupport::Concern
+      attr_accessor :dhcpv4, :dhcpv6, :gwv4, :gwv6
       def mac
         macaddr
       end
+
+      def cidrv4_prefix
+        Fog::Proxmox::IpHelper.prefix(ip) if ip
+      end
+
+      def cidrv6_prefix
+        Fog::Proxmox::IpHelper.prefix6(ip) if ip
+      end
     end
   end
 end

data/app/models/concerns/host_ext/proxmox/interfaces.rb

@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
+require 'fog/proxmox/helpers/ip_helper'
+
 module HostExt
   module Proxmox
     module Interfaces
@@ -33,11 +35,16 @@ module HostExt
         end
       end
 
+      def cidr_ip(interface_attributes)
+        Fog::Proxmox::IpHelper.to_cidr(interface_attributes['ip'], interface_attributes['compute_attributes']['cidr_suffix'])
+      end
+
       def add_interface_to_compute_attributes(index, interface_attributes, compute_attributes)
         compute_attributes[index] = {}
         compute_attributes[index].store('id', interface_attributes['identifier'])
         compute_attributes[index].store('_delete', interface_attributes['_destroy'])
         compute_attributes[index].store('macaddr', interface_attributes['mac'])
+        compute_attributes[index].store('ip', cidr_ip(interface_attributes))
         compute_attributes[index].merge!(interface_attributes['compute_attributes'].reject { |k, _v| k == 'id' })
       end
     end

data/app/models/foreman_fog_proxmox/proxmox_interfaces.rb

@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
+require 'fog/proxmox/helpers/ip_helper'
+
 module ForemanFogProxmox
   module ProxmoxInterfaces
     def editable_network_interfaces?
@@ -41,6 +43,45 @@ module ForemanFogProxmox
       raise ::Foreman::Exception, _(format('Invalid name interface[%<index>s]. Must be eth[n] with n integer >= 0', index: index)) unless container_nic_name_valid?(nic)
     end
 
+    def cidr_prefix(nic_compute_attributes, v6 = false)
+      attr_name = 'cidrv'
+      attr_name += v6 ? '6' : '4'
+      attr_name += '_prefix'
+      nic_compute_attributes[attr_name] if nic_compute_attributes[attr_name].presence
+    end
+
+    def set_ip(host, nic, nic_compute_attributes, v6 = false)
+      return 'dhcp' if dhcp?(nic_compute_attributes, v6)
+
+      ip = v6 ? nic.ip6 : nic.ip
+      return ip unless container?(host) || cidr_prefix(nic_compute_attributes, v6)
+
+      valid = v6 ? Fog::Proxmox::IpHelper.cidr6_prefix?(cidr_prefix(nic_compute_attributes, v6)) : Fog::Proxmox::IpHelper.cidr_prefix?(cidr_prefix(nic_compute_attributes, v6))
+      ipv = v6 ? 'IPv6' : 'IPv4'
+      max = v6 ? 128 : 32
+      unless valid
+        raise ::Foreman::Exception, _(format('Invalid Interface Proxmox CIDR %<ip>s. If %<ip>s is not empty, Proxmox CIDR prefix must be an integer between 0 and %<max>i.', ip: ipv, max: max))
+      end
+
+      v6 ? Fog::Proxmox::IpHelper.to_cidr6(nic.ip6, cidr_prefix(nic_compute_attributes, v6)) : Fog::Proxmox::IpHelper.to_cidr(nic.ip, cidr_prefix(nic_compute_attributes, v6))
+    end
+
+    def set_gw(nic_compute_attributes, v6 = false)
+      attr_name = 'gwv'
+      attr_name += v6 ? '6' : '4'
+      nic_compute_attributes[attr_name] if nic_compute_attributes[attr_name].presence
+    end
+
+    def to_boolean(value)
+      [1, true, '1', 'true'].include?(value)
+    end
+
+    def dhcp?(nic_compute_attributes, v6 = false)
+      attr_name = 'dhcpv'
+      attr_name += v6 ? '6' : '4'
+      to_boolean(nic_compute_attributes[attr_name]) if nic_compute_attributes[attr_name].present?
+    end
+
     def host_interfaces_attrs(host)
       host.interfaces.select(&:physical?).each.with_index.reduce({}) do |hash, (nic, index)|
         set_nic_identifier(nic, index)
@@ -51,8 +92,10 @@ module ForemanFogProxmox
         nic_compute_attributes.store(:macaddr, mac) if mac.present?
         interface_compute_attributes = host.compute_attributes['interfaces_attributes'] ? host.compute_attributes['interfaces_attributes'].select { |_k, v| v['id'] == nic.identifier } : {}
         nic_compute_attributes.store(:_delete, interface_compute_attributes[interface_compute_attributes.keys[0]]['_delete']) unless interface_compute_attributes.empty?
-        nic_compute_attributes.store(:ip, nic.ip) if nic.ip.present?
-        nic_compute_attributes.store(:ip6, nic.ip6) if nic.ip6.present?
+        nic_compute_attributes.store(:ip, set_ip(host, nic, nic_compute_attributes))
+        nic_compute_attributes.store(:gw, set_gw(nic_compute_attributes))
+        nic_compute_attributes.store(:ip6, set_ip(host, nic, nic_compute_attributes, true))
+        nic_compute_attributes.store(:gw6, set_gw(nic_compute_attributes, true))
         hash.merge(index.to_s => nic_compute_attributes)
       end
     end

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_nic_provider_specific_form.html.erb

@@ -15,7 +15,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% if @host.compute_resource.class == ForemanFogProxmox::Proxmox %>
-<% compute_attributes = f.options[:parent_builder].object.compute_attributes %>
+<% compute_attributes = f.object.compute_attributes %>
 <% vm_type = compute_attributes ? compute_attributes['type'] : f.object.type %>
 
 <%= f.fields_for 'compute_attributes', OpenStruct.new(f.object.compute_attributes) do |f| %>

data/app/views/compute_resources_vms/form/proxmox/container/_network.html.erb

@@ -20,6 +20,12 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= field_set_tag _("Nic"), :id => "container_network_#{f.index}", :style => ('display: none;' unless container), :disabled => !container do %>  
     <%= f.hidden_field :id if !new_vm %>
     <%= text_f f, :name, :label => _('Name'), :label_size => "col-md-2" %>
+    <%= checkbox_f f, :dhcpv4, :label => _('DHCP IPv4') %>
+    <%= text_f f, :cidrv4_prefix, :label => _('CIDR IPv4 prefix'), :label_size => "col-md-2" %>
+    <%= text_f f, :gwv4, :label => _('Gateway IPv4'), :label_size => "col-md-2" %>
+    <%= checkbox_f f, :dhcpv6, :label => _('DHCP IPv6') %>
+    <%= text_f f, :cidrv6_prefix, :label => _('CIDR IPv6 prefix'), :label_size => "col-md-2" %>
+    <%= text_f f, :gwv6, :label => _('Gateway IPv6'), :label_size => "col-md-2" %>
     <%= counter_f f, :tag, :class => "input-mini", :label => _('VLAN tag'), :label_size => "col-md-2" %>
     <%= counter_f f, :rate, :class => "input-mini", :label => _('Rate limit'), :label_size => "col-md-2" %>
     <%= select_f f, :bridge, compute_resource.bridges, :iface, :iface, { }, :label => _('Bridge'), :label_size => "col-md-2" %>

data/lib/foreman_fog_proxmox/version.rb

@@ -18,5 +18,5 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ForemanFogProxmox
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb

@@ -56,8 +56,8 @@ module ForemanFogProxmox
             '1' => { 'id' => 'mp0', 'storage' => 'local-lvm', 'size' => '1073741824', 'mp' => '/opt/path' }
           },
           'interfaces_attributes' => {
-            '0' => { 'id' => 'net0', 'name' => 'eth0', 'bridge' => 'vmbr0', 'ip' => 'dhcp', 'ip6' => 'dhcp', 'rate' => '' },
-            '1' => { 'id' => 'net1', 'name' => 'eth1', 'bridge' => 'vmbr0', 'ip' => 'dhcp', 'ip6' => 'dhcp' }
+            '0' => { 'id' => 'net0', 'name' => 'eth0', 'bridge' => 'vmbr0', 'ip' => 'dhcp', 'ip6' => 'dhcp', 'rate' => '', 'gw' => '192.168.56.100', 'gw6' => '2001:0:1234::c1c0:abcd:876' },
+            '1' => { 'id' => 'net1', 'name' => 'eth1', 'bridge' => 'vmbr0', 'ip' => 'dhcp', 'ip6' => 'dhcp', 'gw' => '192.168.56.100', 'gw6' => '2001:0:1234::c1c0:abcd:876' }
           } }
       end
 
@@ -82,8 +82,8 @@ module ForemanFogProxmox
           'password' => 'proxmox01',
           :rootfs => 'local-lvm:1073741824',
           :mp0 => 'local-lvm:1073741824,mp=/opt/path',
-          'net0' => 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp',
-          'net1' => 'model=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp' }
+          'net0' => 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876',
+          'net1' => 'model=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876' }
       end
 
       let(:host_delete) do
@@ -125,7 +125,7 @@ module ForemanFogProxmox
         vm = parse_container_vm(host)
         assert_equal 536_870_912, vm[:memory]
         assert_equal 'local-lvm:1073741824', vm[:rootfs]
-        assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp', vm[:net0]
+        assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876', vm[:net0]
         assert_not vm.key?(:config)
         assert_not vm.key?(:node)
         assert_not vm.key?(:type)
@@ -145,8 +145,8 @@ module ForemanFogProxmox
           :ostemplate => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
           :ostemplate_file => 'local:vztmpl/alpine-3.7-default_20171211_amd64.tar.xz',
           :ostemplate_storage => 'local',
-          :net0 => 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp',
-          :net1 => 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp',
+          :net0 => 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876',
+          :net1 => 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876',
           :rootfs => 'local-lvm:1073741824',
           :mp0 => 'local-lvm:1073741824,mp=/opt/path'
         )
@@ -171,7 +171,7 @@ module ForemanFogProxmox
         add_container_interface(host['interfaces_attributes']['0'], deletes, nics)
         assert 1, nics.length
         assert nics[0].key?(:net0)
-        assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp', nics[0][:net0]
+        assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876', nics[0][:net0]
       end
 
       test '#interface with name eth1 and bridge' do
@@ -180,7 +180,7 @@ module ForemanFogProxmox
         add_container_interface(host['interfaces_attributes']['1'], deletes, nics)
         assert 1, nics.length
         assert nics[0].key?(:net1)
-        assert_equal 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp', nics[0][:net1]
+        assert_equal 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876', nics[0][:net1]
       end
 
       test '#interface delete net0' do
@@ -196,8 +196,8 @@ module ForemanFogProxmox
         interfaces_to_add, interfaces_to_delete = parse_container_interfaces(host['interfaces_attributes'])
         assert interfaces_to_delete.empty?
         assert_equal 2, interfaces_to_add.length
-        assert interfaces_to_add.include?(net0: 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp')
-        assert interfaces_to_add.include?(net1: 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp')
+        assert interfaces_to_add.include?(net0: 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876')
+        assert interfaces_to_add.include?(net1: 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876')
       end
     end
   end

data/test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb

@@ -61,7 +61,7 @@ module ForemanFogProxmox
       end
 
       it 'sets container hostname with host name' do
-        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :primary => true)
+        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :primary => true, :compute_attributes => { 'dhcpv4' => '1', 'dhcpv6' => '1' })
         host = FactoryBot.build(
           :host_empty,
           :interfaces => [physical_nic],

data/test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb

@@ -46,8 +46,8 @@ module ForemanFogProxmox
         assert err.message.end_with?('Invalid identifier interface[0]. Must be net[n] with n integer >= 0')
       end
 
-      it 'sets compute id with identifier, ip and ip6' do
-        ip = IPAddr.new(1, Socket::AF_INET).to_s
+      it 'sets server compute id with identifier, ip and ip6' do
+        ip = '192.168.56.100'
         ip6 = Array.new(4) { format('%<x>s', x: rand(16**4)) }.join(':') + '::1'
         physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6)
         host = FactoryBot.build(
@@ -66,6 +66,52 @@ module ForemanFogProxmox
         assert_equal ip, nic_attr[:ip]
         assert_equal ip6, nic_attr[:ip6]
       end
+
+      it 'sets container compute id with identifier, ip/CIDR, gw and ip6' do
+        ip = '192.168.56.100'
+        cidr_suffix = '31'
+        ip6 = Array.new(4) { format('%<x>s', x: rand(16**4)) }.join(':') + '::1'
+        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6, :compute_attributes => { 'cidrv4_prefix' => cidr_suffix, 'gwv4' => ip, 'dhcpv6' => '1' })
+        host = FactoryBot.build(
+          :host_empty,
+          :interfaces => [physical_nic],
+          :compute_attributes => {
+            'type' => 'lxc',
+            'interfaces_attributes' => {
+              '0' => physical_nic
+            }
+          }
+        )
+        nic_attributes = @cr.host_interfaces_attrs(host).values.select(&:present?)
+        nic_attr = nic_attributes.first
+        assert_equal 'net0', nic_attr[:id]
+        assert_equal Fog::Proxmox::IpHelper.to_cidr(ip, cidr_suffix), nic_attr[:ip]
+        assert_equal ip, nic_attr[:gw]
+        assert_equal 'dhcp', nic_attr[:ip6]
+      end
+
+      it 'sets container compute id with identifier, ip DHCP, gw6 and ip6' do
+        ip = '192.168.56.100'
+        cidr6_suffix = '100'
+        ip6 = '2001:0:1234::c1c0:abcd:876'
+        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6, :compute_attributes => { 'cidrv6_prefix' => cidr6_suffix, 'dhcpv4' => '1', 'gwv6' => ip6 })
+        host = FactoryBot.build(
+          :host_empty,
+          :interfaces => [physical_nic],
+          :compute_attributes => {
+            'type' => 'lxc',
+            'interfaces_attributes' => {
+              '0' => physical_nic
+            }
+          }
+        )
+        nic_attributes = @cr.host_interfaces_attrs(host).values.select(&:present?)
+        nic_attr = nic_attributes.first
+        assert_equal 'net0', nic_attr[:id]
+        assert_equal 'dhcp', nic_attr[:ip]
+        assert_equal Fog::Proxmox::IpHelper.to_cidr6(ip6, cidr6_suffix), nic_attr[:ip6]
+        assert_equal ip6, nic_attr[:gw6]
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Tristan Robert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement