foreman_fog_proxmox 0.17.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4521dde2dff786a4f14fcf50c4eb68cd412596029a0f2ee32d54bd8154c51135
-  data.tar.gz: 6e316973c79ab4e51f95578e3c282a0d5345dde397afb5d14ad9ac011a8fc9d0
+  metadata.gz: ed21bae26c68450f3f8c540f27b8ec6a11b2e11d1f26eaa02e57e8713fab3ff0
+  data.tar.gz: b1bf45f6b722c7ff7a54fbb2eeefd3323a4a3050a0d0add477357295d8b620c9
 SHA512:
-  metadata.gz: 9d034e8a37538e334329ab3a8df9447325ca7d2809a0b185819bc0fe62757fc39cee691799fa8699802d50855da41d3e4f8df17a3a2ffe1924376dfbcbacfc20
-  data.tar.gz: '09e3bd0ebb1cd6ece7103cc0d07f0d0c5a0c02598a8f72787359599ee8a8004c6c3add7d9d43a7ffdd9b2486c4fe2faeb5fa28b05ddc83cf290fe0ff55211b5a'
+  metadata.gz: 6f5a6cf6d75b4e839b434b2e14ee6ef91be7b22844858fa8330eff6ce9ca862c9d75d6f610e5d696dfee9aee6f249051880486df2a534305bbef12842f6de17c
+  data.tar.gz: 4d6c56f0f54b6fc5cac4e42784f34fddb8bb99fb8e7dbead14b0230fb6c5931acb25a47ec88f59022251ccddda73c2f7878ad2475eda10454149674c8f74c1eb

data/README.md

@@ -34,7 +34,7 @@ You can support the plugin development via the following methods:
 |>=0.12 |>=6.1|>=0.11|>=2.0|>=2.5|
 |>=0.14 |>=6.2|=0.13.0|>=2.4|>=2.7|
 |>=0.14 |>=6.2|>=0.13.1|>=2.3|>=2.5|
-|>=0.14 |>=6.2|>=0.14.0|>=2.5|>=2.5|
+|>=0.14 |>=6.2,<8.0|>=0.14.0|>=2.5|>=2.5|
 
 ## Installation
 

data/app/helpers/proxmox_vm_attrs_helper.rb

@@ -62,7 +62,7 @@ module ProxmoxVMAttrsHelper
         keys = ['id', 'volid', 'storage', 'size', 'storage_type']
         type = 'rootfs'
       elsif vol.hard_disk?
-        keys = ['id', 'volid', 'storage_type', 'storage', 'controller', 'device', 'cache', 'size']
+        keys = ['id', 'volid', 'storage_type', 'storage', 'controller', 'device', 'cache', 'size', '_delete']
         type = 'hard_disk'
       elsif  vol.cdrom?
         keys = ['id', 'storage_type', 'cdrom', 'storage', 'volid']
@@ -82,7 +82,7 @@ module ProxmoxVMAttrsHelper
   def vol_keys(param_scope, keys, vol, id)
     attrs = ActiveSupport::HashWithIndifferentAccess.new
     keys.each do |key|
-      camel_key = key.to_s.include?('_') ? snake_to_camel(key.to_s).to_sym : key
+      camel_key = key.to_s.include?('_') && key.to_s != '_delete' ? snake_to_camel(key.to_s).to_sym : key
       attrs[camel_key] = { :name => "#{param_scope}[volumes_attributes][#{id}][#{key}]", :value => vol.public_send(key) }
     end
     attrs

data/app/models/foreman_fog_proxmox/proxmox_connection.rb

@@ -56,11 +56,11 @@ module ForemanFogProxmox
       identity_client
       version_suitable?
     rescue StandardError => e
-      errors[:base] << e.message
+      errors.add(:base, e.message)
       if e.message.include?('SSL')
-        errors[:ssl_certs] << e.message
+        errors.add(:ssl_certs, e.message)
       else
-        errors[:url] << e.message
+        errors.add(:url, e.message)
       end
     end
 

data/app/models/foreman_fog_proxmox/proxmox_interfaces.rb

@@ -18,7 +18,6 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 require 'fog/proxmox/helpers/ip_helper'
-require 'net/validations'
 
 module ForemanFogProxmox
   module ProxmoxInterfaces

data/app/overrides/compute_resources_vms/form/add_from_profile_to_compute_attributes_form.rb

@@ -20,7 +20,8 @@
 Deface::Override.new(
   virtual_path: 'compute_attributes/_compute_form',
   name: 'remove_networks_and_volumes_partial',
-  remove: "erb[loud]:contains('compute_resources_vms/form/networks'), erb[loud]:contains('compute_resources_vms/form/volumes')"
+  surround: "erb[loud]:contains('compute_resources_vms/form/networks'), erb[loud]:contains('compute_resources_vms/form/volumes')",
+  text: "<% unless compute_resource.class == ForemanFogProxmox::Proxmox %><%= render_original %><% end %>"
 )
 
 Deface::Override.new(

data/app/overrides/compute_resources_vms/form/update_react_component_to_host_form.rb

@@ -21,5 +21,6 @@ Deface::Override.new(
   :virtual_path => 'hosts/_compute',
   :name => 'update_react_component_to_virtual_machine_tab',
   :replace => "erb[loud]:contains('hosts/compute_detail')",
-  :partial => 'compute_resources_vms/form/proxmox/update_react_component_to_host_form'
+  :partial => 'compute_resources_vms/form/proxmox/update_react_component_to_host_form',
+  :original => 'c71aceb245363af92515509d25cac0c066bd58ed'
 )

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

@@ -23,4 +23,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
             locals: { f: compute, host: host, compute_resource: compute_resource, new_host: host.new_record?, new_vm: !compute.object.persisted?,
                      arch: host.architecture_id, os: host.operatingsystem_id } %>
+
+<!--Storage-->
+<%= render :partial => 'compute_resources_vms/form/volumes', :locals => { :f => compute, :compute_resource => compute_resource, :new_host => !compute.object.persisted?, :new_vm => !compute.object.persisted?, :item_layout => 'removable' } %>
 <% end %>

data/app/views/templates/provisioning/user_data/proxmox_user_data.erb

@@ -110,7 +110,7 @@ ethernets:
     addresses:
       - <%= @host.ip %>/<%= @host.subnet.cidr %>
     routes:
-      - to: 0.0.0.0
+      - to: 0.0.0.0/0
         via: <%= @host.subnet.gateway %>
     nameservers:
       addresses:

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.17.0'
+  VERSION = '0.18.1'
 end

data/package.json

@@ -28,7 +28,6 @@
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@testing-library/react": "^10.4.9",
     "@theforeman/builder": ">= 12.0.1",
     "@theforeman/eslint-plugin-foreman": ">= 12.0.1",
     "@theforeman/find-foreman": ">= 12.0.1",

data/webpack/components/ProxmoxContainer/MountPoint.js

@@ -53,7 +53,7 @@ const MountPoint = ({ id, data, storagesMap }) => {
       <InputField
         label={__('Device')}
         name={mp?.device?.name}
-        disabled
+        readOnly
         value={mp?.device?.value}
         onChange={handleChange}
         tooltip={__('Device value is set automatically.')}

data/webpack/components/ProxmoxServer/ProxmoxServerStorage.js

@@ -140,6 +140,7 @@ const ProxmoxServerStorage = ({ storage, storages, paramScope, nodeId }) => {
           storages,
           data: initHdd,
           disks: storage,
+          isNew: !isPreExisting,
         };
         setHardDisks(prevHardDisks => [...prevHardDisks, newHardDisk]);
         return newNextId;
@@ -149,9 +150,11 @@ const ProxmoxServerStorage = ({ storage, storages, paramScope, nodeId }) => {
   );
 
   const removeHardDisk = idToRemove => {
-    const newHardDisks = hardDisks.filter(
-      hardDisk => hardDisk.id !== idToRemove
-    );
+    const newHardDisks = hardDisks
+      .filter(hardDisk => !(hardDisk.id === idToRemove && hardDisk.isNew))
+      .map(hardDisk =>
+        hardDisk.id === idToRemove ? { ...hardDisk, hidden: true } : hardDisk
+      );
     setHardDisks(newHardDisks);
   };
 
@@ -224,7 +227,13 @@ const ProxmoxServerStorage = ({ storage, storages, paramScope, nodeId }) => {
           />
         )}
         {hardDisks.map(hardDisk => (
-          <div style={{ position: 'relative' }}>
+          <div
+            key={hardDisk.id}
+            style={{
+              position: 'relative',
+              display: hardDisk.hidden ? 'none' : 'block',
+            }}
+          >
             <div
               style={{
                 marginTop: '10px',
@@ -247,6 +256,7 @@ const ProxmoxServerStorage = ({ storage, storages, paramScope, nodeId }) => {
               disks={hardDisk.disks}
               updateHardDiskData={updateHardDiskData}
               createUniqueDevice={createUniqueDevice}
+              hidden={hardDisk.hidden ? true : ''}
             />
           </div>
         ))}

data/webpack/components/ProxmoxServer/components/HardDisk.js

@@ -13,6 +13,7 @@ const HardDisk = ({
   disks,
   updateHardDiskData,
   createUniqueDevice,
+  hidden,
   nodeId,
 }) => {
   const [hdd, setHdd] = useState(data);
@@ -107,7 +108,7 @@ const HardDisk = ({
         name={hdd?.device?.name}
         value={hdd?.device?.value}
         onChange={handleChange}
-        disabled
+        readOnly
         tooltip={__('Device value is set automatically.')}
       />
       <InputField
@@ -125,6 +126,7 @@ const HardDisk = ({
         value={hdd?.size?.value}
         onChange={handleChange}
       />
+      <input name={hdd?._delete?.name} type="hidden" value={hidden} />
     </div>
   );
 };
@@ -134,6 +136,7 @@ HardDisk.propTypes = {
   data: PropTypes.object,
   storages: PropTypes.array,
   disks: PropTypes.array,
+  hidden: PropTypes.bool,
   updateHardDiskData: PropTypes.func,
   createUniqueDevice: PropTypes.func,
   nodeId: PropTypes.string,
@@ -144,6 +147,7 @@ HardDisk.defaultProps = {
   storages: [],
   disks: [],
   nodeId: '',
+  hidden: 'false',
   updateHardDiskData: Function.prototype,
   createUniqueDevice: Function.prototype,
 };

data/webpack/components/common/FormInputs.js

@@ -13,6 +13,7 @@ const InputField = ({
   required,
   type,
   disabled,
+  readOnly,
   options,
   checked,
   error,
@@ -40,6 +41,7 @@ const InputField = ({
       renderComponent = (
         <select
           disabled={disabled}
+          readOnly={readOnly}
           name={name}
           className="without_select2 form-control"
           value={value}
@@ -59,6 +61,7 @@ const InputField = ({
           checked={checked}
           onChange={onChange}
           disabled={disabled}
+          readOnly={readOnly}
         />
       );
       break;
@@ -71,6 +74,7 @@ const InputField = ({
           value={value}
           onChange={onChange}
           disabled={disabled}
+          readOnly={readOnly}
         />
       );
       break;
@@ -122,6 +126,7 @@ InputField.propTypes = {
     'checkbox',
   ]),
   disabled: PropTypes.bool,
+  readOnly: PropTypes.bool,
   checked: PropTypes.bool,
   options: PropTypes.arrayOf(
     PropTypes.shape({
@@ -142,6 +147,7 @@ InputField.defaultProps = {
   required: false,
   type: 'text',
   disabled: false,
+  readOnly: false,
   checked: false,
   options: [],
   error: '',

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Tristan Robert
 - The Foreman Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2025-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +273,7 @@ homepage: https://github.com/theforeman/foreman_fog_proxmox
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -289,33 +289,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files:
-- test/functional/compute_resources_controller_test.rb
-- test/unit/foreman_fog_proxmox/semver_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb
+- test/test_plugin_helper.rb
+- test/factories/foreman_fog_proxmox/proxmox_server_mock_factory.rb
+- test/factories/foreman_fog_proxmox/proxmox_node_mock_factory.rb
+- test/factories/foreman_fog_proxmox/proxmox_container_mock_factory.rb
+- test/factories/proxmox_factory.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_version_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_images_test.rb
+- test/unit/foreman_fog_proxmox/semver_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_version_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_images_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
-- test/test_plugin_helper.rb
-- test/factories/proxmox_factory.rb
-- test/factories/foreman_fog_proxmox/proxmox_server_mock_factory.rb
-- test/factories/foreman_fog_proxmox/proxmox_container_mock_factory.rb
-- test/factories/foreman_fog_proxmox/proxmox_node_mock_factory.rb
+- test/functional/compute_resources_controller_test.rb