foreman_nutanix 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11a2607891ac7dfcfd5d892b2b3277f9eeea5ab6dda221181e4e47b0b98bea80
-  data.tar.gz: 2ad7001192225388db255b26d314b964e06d5b82b5f93f294953ba133f2430f5
+  metadata.gz: f2fe33e8b9f7999fbd374d6dfa10f3c52005004299dfe6b7003c297d46e46d3a
+  data.tar.gz: ca98e7a92c0a5867d1c637d41e825df7c840e515098f75246a6d2fe7cc57a5fd
 SHA512:
-  metadata.gz: f9da93bb721b2b838eee320ff779b4594040c5e9d7b165b839d9d936926bf412c390eb46617878902d2f5b31b4c9c4be4e53d2334fde7b854d96261ec0a79748
-  data.tar.gz: '062282c3d249c3333b414e5f592156b26611454410db2569e5bc473d97c50966638270406043fb1dcc5bae0561ee8801f4e4287e0f582eed7e891eef145b0847'
+  metadata.gz: 48bd46610653b7629b1c28c1cd3fceb44bd65e3131d36964c1b6f9376db1810d116a935072f31aa074faaefbcf8d94cd6d27baaabf1dc4035719bc66b2a0686e
+  data.tar.gz: 45a9ee8ce535a062ed664264533ecb17e28e24c5b8eec1956d27dfd9dbbfa82d288e0b0b1bfcb24d5d4458b84fa800d335eb47ecf47c9290f25b5997da18a2f0

data/app/lib/foreman_nutanix/nutanix_adapter.rb

@@ -23,6 +23,10 @@ module ForemanNutanix
         NutanixCompute.new(@cluster, attrs)
       end
 
+      def each(&block)
+        all.each(&block)
+      end
+
       def get(uuid)
         Rails.logger.info "=== NUTANIX: ServersCollection::get called with uuid: #{uuid} ==="
 
@@ -43,12 +47,16 @@ module ForemanNutanix
           vm = NutanixCompute.new(@cluster, {
             identity: data['ext_id'],
             name: data['name'],
+            description: data['description'],
             cpus: total_cpus,
             memory: memory_gb,
             power_state: data['power_state'],
             mac_address: data['mac_address'],
             ip_addresses: data['ip_addresses'] || [],
             create_time: data['create_time'],
+            boot_method: data['boot_method'],
+            secure_boot: data['secure_boot'],
+            gpus: data['gpus'],
           })
           vm.instance_variable_set(:@persisted, true)
           vm
@@ -85,6 +93,7 @@ module ForemanNutanix
           vm = NutanixCompute.new(@cluster, {
             identity: vm_data['ext_id'],
             name: vm_data['name'],
+            description: vm_data['description'],
             cpus: total_cpus,
             memory: memory_gb,
             power_state: vm_data['power_state'],
@@ -102,4 +111,3 @@ module ForemanNutanix
     end
   end
 end
-

data/app/models/foreman_nutanix/nutanix.rb

@@ -70,6 +70,13 @@ module ForemanNutanix
       []
     end
 
+    def available_boot_methods
+      [
+        OpenStruct.new({ id: 'uefi', name: 'UEFI' }),
+        OpenStruct.new({ id: 'bios', name: 'BIOS' }),
+      ]
+    end
+
     # Available networks for VMs
     def available_networks
       Rails.logger.info '=== NUTANIX: Fetching available networks from shim server ==='
@@ -149,13 +156,6 @@ module ForemanNutanix
       nil
     end
 
-    # Available machine types/flavors
-    def available_flavors
-      Rails.logger.info '=== NUTANIX: Returning available flavors ==='
-      [OpenStruct.new({ id: 'small', name: 'Small (2 CPU, 4GB RAM)' })]
-    end
-    alias_method :machine_types, :available_flavors
-
     # Available images
     def available_images(_opts = {})
       Rails.logger.info '=== NUTANIX: Fetching available images from shim server ==='

data/app/models/foreman_nutanix/nutanix_compute.rb

@@ -1,7 +1,13 @@
 module ForemanNutanix
   class NutanixCompute
     attr_reader :identity, :name, :hostname, :cluster, :args
-    attr_accessor :zone, :machine_type, :network, :image_id, :associate_external_ip, :cpus, :memory, :power_state, :subnet_ext_id, :storage_container_ext_id, :num_sockets, :num_cores_per_socket, :disk_size_bytes, :description, :network_id, :storage_container, :disk_size_gb, :power_on, :mac_address, :vm_ip_addresses, :create_time
+    attr_accessor :zone, :machine_type,
+      :network, :image_id, :associate_external_ip,
+      :cpus, :memory, :power_state, :subnet_ext_id,
+      :storage_container_ext_id, :num_sockets, :num_cores_per_socket,
+      :disk_size_bytes, :description, :network_id, :storage_container,
+      :disk_size_gb, :power_on, :mac_address, :vm_ip_addresses, :create_time,
+      :boot_method, :secure_boot, :gpus
 
     def initialize(cluster = nil, args = {})
       Rails.logger.info "=== NUTANIX: NutanixCompute::initialize cluster=#{cluster} args=#{args} ==="
@@ -36,6 +42,13 @@ module ForemanNutanix
       @mac_address = args[:mac_address]
       @vm_ip_addresses = args[:ip_addresses] || []
       @create_time = args[:create_time]
+
+      # Boot config
+      @boot_method = args[:boot_method]
+      @secure_boot = args[:secure_boot]
+
+      # GPUs
+      @gpus = args[:gpus]
     end
 
     # Required by Foreman - indicates if VM exists
@@ -77,6 +90,8 @@ module ForemanNutanix
         disk_size_bytes: actual_disk_bytes.to_i,
         description: @description || '',
         power_on: @power_on.nil? || @power_on, # Default to true if not set
+        secure_boot: @secure_boot,
+        boot_method: @boot_method,
       }
 
       Rails.logger.info "=== NUTANIX: Provisioning VM with request: #{provision_request} ==="
@@ -308,13 +323,14 @@ module ForemanNutanix
     # Required by Foreman - pretty machine type
     def pretty_machine_type
       Rails.logger.info '=== NUTANIX: NutanixCompute::pretty_machine_type called ==='
-      "#{@cpus} CPUs, #{memory}GB RAM"
+      "#{@cpus} CPUs \t|\t #{memory}GB RAM \t|\t #{disk_size_gb}GB Disk"
     end
 
     # Required by Foreman - volumes/disks
     def volumes
       Rails.logger.info '=== NUTANIX: NutanixCompute::volumes called ==='
-      [OpenStruct.new({ name: 'disk-1', size_gb: 20 })]
+      # [OpenStruct.new({ name: 'disk-1', size_gb: 20 })]
+      []
     end
 
     # Required by Foreman - volumes_attributes setter
@@ -367,4 +383,3 @@ module ForemanNutanix
     end
   end
 end
-

data/app/views/compute_resources/show/_nutanix.html.erb

@@ -53,9 +53,6 @@
       |
       <strong>Images:</strong>
       <%= @compute_resource.available_images.count %>
-      |
-      <strong>Flavors:</strong>
-      <%= @compute_resource.available_flavors.count %>
     </td>
   </tr>
 </table>

data/app/views/compute_resources_vms/form/nutanix/_base.html.erb

@@ -1,6 +1,11 @@
 <%= compute_specific_js(compute_resource, "host_edit") %>
 <%= javascript "hosts", "host_edit", "host_edit_interfaces" %>
 
+<%= text_f f,
+:description,
+label: _("Description"),
+help_inline: _("Description for VM in Nutanix") %>
+
 <%= select_f f,
 :image_id,
 compute_resource.available_images,
@@ -31,14 +36,6 @@ compute_resource.available_storage_containers,
   help_inline: _("Storage container for VM disks"),
 } %>
 
-<%= select_f f,
-:machine_type,
-compute_resource.available_flavors,
-:id,
-:name,
-{ include_blank: _("Select Flavor") },
-{ label: _("Machine Type"), help_inline: _("VM size template (optional)") } %>
-
 <%= counter_f f,
 :cpus,
 { label: _("CPUs"), help_inline: _("Number of CPU cores"), min: 1, max: 32 } %>
@@ -52,12 +49,13 @@ compute_resource.available_flavors,
   max: 64,
 } %>
 
-<%= text_f f,
+<%= counter_f f,
 :disk_size_gb,
 {
   label: _("Disk Size (GB)"),
   help_inline: _("Size of the boot disk in GB"),
-  value: 50,
+  min: 2,
+  max: 10_000,
 } %>
 
 <%= checkbox_f f,
@@ -70,3 +68,32 @@ compute_resource.available_flavors,
     ),
   checked: true,
 } %>
+
+<%= select_f f,
+:boot_method,
+compute_resource.available_boot_methods,
+:id,
+:name,
+{ include_blank: _("Select boot method") },
+{
+  label: _("Boot method"),
+  help_inline: _("Select boot method"),
+  id: "boot-method-select",
+} %>
+
+<div id="uefi-options" class="hidden">
+  <%= checkbox_f f,
+  :secure_boot,
+  { label: _("Secure Boot"), help_inline: _("Enable secure boot") } %>
+</div>
+
+<script>
+  var $bootMethod = $('#boot-method-select');
+
+  function toggleUefiOptions() {
+    $('#uefi-options').toggleClass('hidden', $bootMethod.val() !== 'uefi');
+  }
+
+  toggleUefiOptions();
+  $bootMethod.on('change', toggleUefiOptions);
+</script>

data/app/views/compute_resources_vms/index/_nutanix.html.erb

@@ -1,7 +1,11 @@
 <thead>
   <tr>
     <th><%= _("Name") %></th>
-    <th><%= _("Type") %></th>
+    <th><%= _("Description") %></th>
+    <th><%= _("CPUs") %></th>
+    <th><%= _("Memory (GB)") %></th>
+    <th><%= _("Disk Size (GB)") %></th>
+    <th><%= _("GPUs") %></th>
     <th><%= _("State") %></th>
     <th><%= _("Actions") %></th>
   </tr>
@@ -26,7 +30,17 @@
       ) %>
     <tr>
       <td><%= link_to_if_authorized vm.name, view_path %></td>
-      <td><%= vm.pretty_machine_type %></td>
+      <td><%= vm.description %></td>
+      <td><%= vm.cpus %></td>
+      <td><%= vm.memory %></td>
+      <td><%= vm.disk_size_gb %></td>
+      <td>
+        <% if vm.gpus.empty? %>
+          <input type="checkbox" disabled/>&nbsp;
+        <% else %>
+          <input type="checkbox" disabled checked/>&nbsp;
+        <% end %>
+      </td>
       <td><%= vm.status.downcase %></td>
       <td>
         <%= action_buttons(

data/app/views/compute_resources_vms/show/_nutanix.html.erb

@@ -6,6 +6,10 @@
       <td><%= _("Name") %></td>
       <td><%= @vm.name %></td>
     </tr>
+    <tr>
+      <td><%= _("Description") %></td>
+      <td><%= @vm.description %></td>
+    </tr>
     <tr>
       <td><%= _("Created") %></td>
       <td><%= if @vm.creation_timestamp
@@ -39,6 +43,18 @@
       <td><%= _("IP Addresses") %></td>
       <td><%= @vm.ip_addresses.join(", ") if @vm.ip_addresses.any? %></td>
     </tr>
+    <tr>
+      <td><%= _("Boot Method") %></td>
+      <td><%= @vm.boot_method %></td>
+    </tr>
+    <tr>
+      <td><%= _("Secure Boot Enabled (UEFI only)") %></td>
+      <td><%= @vm.secure_boot %></td>
+    </tr>
+    <tr>
+      <td><%= _("GPUs") %></td>
+      <td><%= @vm.gpus %></td>
+    </tr>
   </tbody>
 </table>
 

data/lib/foreman_nutanix/version.rb

@@ -1,3 +1,3 @@
 module ForemanNutanix
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_nutanix
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
-- The Foreman Team
+- Miles Granger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-28 00:00:00.000000000 Z
+date: 2025-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -26,7 +26,7 @@ dependencies:
         version: '0'
 description: Nutanix compute resource plugin for Foreman
 email:
-- dev@community.theforeman.org
+- mgra@norceresearch.no
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -48,7 +48,6 @@ files:
 - app/views/compute_resources/form/_nutanix.html.erb
 - app/views/compute_resources/show/_nutanix.html.erb
 - app/views/compute_resources_vms/form/nutanix/_base.html.erb
-- app/views/compute_resources_vms/form/nutanix/_volume.html.erb
 - app/views/compute_resources_vms/index/_nutanix.html.erb
 - app/views/compute_resources_vms/show/_nutanix.html.erb
 - config/initializers/zeitwerk.rb

data/app/views/compute_resources_vms/form/nutanix/_volume.html.erb

@@ -1 +0,0 @@
-<%= text_f f, :size_gb, class: "col-md-2", label: _("Size (GB)"), label_size: "col-md-2", onchange: 'tfm.computeResource.capacityEdit(this)' %>