foreman_opennebula 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda5882a295555eb9c4e145959787fee3af1c522681ac2ca1d7d85ae35ac4d14
-  data.tar.gz: 7f9a76c97effc394aed06300c501ddeaf09d7a706fab6f2e28d4a228cc9147b2
+  metadata.gz: 0d7b045930e7933b1f22554eef853d485eab53ed36958dab6567f59fe752b953
+  data.tar.gz: b1d1f20dc6a50809a452563c9fff2fa2a275d8496d69d0fe735ae68f3834d610
 SHA512:
-  metadata.gz: 1f2011131086920a71f02a797d545e9d097cb3c05a042106015dd2bdc25b9bc5d4eb7a0300095bfbacf4cea459608e3126eec1dfdf21cc28d7dc908cc78ff582
-  data.tar.gz: 7916313a9f48a3c22753030a29e0a0eeb9047a8d124dd3d211a0ed2285cd2b5e01e49c5254bb2cf547883687e0df313eb310f31e69bba22f1b125c803df76189
+  metadata.gz: 8aed536860c30ae369157c7ef9c89160cbeaf120af70884261cd44657628f2efb1f91be05a77a8ba240f8ada2fdaa182cc2ec36fde71030722965c5ddcf8cd4c
+  data.tar.gz: 05b7ae4aea5ec6d676199d36188e2d3b090aed6208fc955bfee16941c0ec84373c2c91af9865ddf671931e2705c02456101b209f5cadf3c85e19735b0403585a

data/app/models/concerns/fog_extensions/open_nebula/server.rb

@@ -4,8 +4,8 @@ module FogExtensions
       extend ActiveSupport::Concern
       include ActionView::Helpers::NumberHelper
 
-      attr_writer :template_id, :image_id, :disk_size, :vmgroup_id,
-        :vmgroup_role, :scheduler_hint_filter, :scheduler_hint_data
+      attr_writer :template_id, :image_id, :disk_size, :vmgroup_id, :vmgroup_role,
+        :user_template_attributes, :scheduler_hint_filter, :scheduler_hint_data
 
       included do
         def cpu
@@ -47,8 +47,19 @@ module FogExtensions
         onevm_object.present? ? onevm_object['TEMPLATE/VMGROUP/ROLE'] : @vmgroup_role
       end
 
+      def user_template
+        return if onevm_object.nil?
+        standard_attributes = %w[SCHED_DS_REQUIREMENTS SCHED_RANK SCHED_REQUIREMENTS]
+        user_attributes = onevm_object.to_hash['VM']['USER_TEMPLATE'].filter do |name, _|
+          !standard_attributes.include?(name)
+        end
+        user_attributes.map do |name, value|
+          OpenStruct.new({:name => name, :value => value})
+        end
+      end
+
       def sched_requirements
-        return unless onevm_object
+        return if onevm_object.nil?
         onevm_object['USER_TEMPLATE/SCHED_REQUIREMENTS']
       end
 

data/app/models/foreman_opennebula/opennebula.rb

@@ -116,6 +116,15 @@ module ForemanOpennebula
         vm_attrs[:flavor].vmgroup = { 'VMGROUP_ID' => args[:vmgroup_id], 'ROLE' => args[:vmgroup_role] }
       end
 
+      if args[:user_template_attributes].present?
+        user_template_attributes = args[:user_template_attributes].values.filter do |attribute|
+          attribute[:name].present? && attribute[:_delete].empty?
+        end
+        vm_attrs[:flavor].user_variables = user_template_attributes.reduce({}) do |user_variables, attribute|
+          user_variables.merge({attribute[:name] => attribute[:value]})
+        end
+      end
+
       if args['provision_method'] == 'image' && args['image_id'].present?
         [vm_attrs[:flavor].disk].flatten.compact.first.delete('IMAGE')
         [vm_attrs[:flavor].disk].flatten.compact.first['IMAGE_ID'] = args[:image_id]

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

@@ -83,3 +83,23 @@
   <%= javascript_include_tag 'foreman_opennebula/vmgroup_selected' %>
   <%= javascript_include_tag 'foreman_opennebula/scheduler_hint_filter_selected' %>
 <% end %>
+
+<div class="row">
+  <%= label_tag(:user_template, _("Custom attributes"), :class => 'col-md-2 control-label') %>
+  <div class="col-md-4">
+    <table id="opennebula_custom_attributes" class="<%= table_css_classes %>">
+      <tbody>
+        <%= f.fields_for :user_template, f.object.user_template do |fields| %>
+          <%= render "compute_resources_vms/form/opennebula/custom_attribute", f: fields, new_vm: new_vm %>
+        <% end %>
+      </tbody>
+    </table>
+    <% if new_vm %>
+      <%= link_to_add_fields(_("Add attribute"), f, :user_template, "compute_resources_vms/form/opennebula/custom_attribute", {
+        :target => '#opennebula_custom_attributes tbody',
+        :class  => 'w-100',
+        :object => [OpenStruct.new({:name => '', :value => ''})],
+        :locals => { new_vm: new_vm } }) %>
+    <% end %>
+  </div>
+</div>

data/app/views/compute_resources_vms/form/opennebula/_custom_attribute.html.erb

@@ -0,0 +1,13 @@
+<tr class="fields">
+  <td>
+    <%= f.text_field(:name, class: "form-control", disabled: !new_vm, placeholder: _("Name")) %>
+  </td>
+  <td>
+    <%= f.text_field(:value, class: "form-control", disabled: !new_vm, placeholder: _("Value")) %>
+  </td>
+  <% if new_vm %>
+    <td>
+      <%= link_to_remove_fields('', f, title: _('Remove')) %>
+    </td>
+  <% end %>
+</tr>

data/lib/foreman_opennebula/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpennebula
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_opennebula
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Vitaly Pyslar
@@ -149,6 +149,7 @@ files:
 - app/views/compute_resources/form/_opennebula.html.erb
 - app/views/compute_resources/show/_opennebula.html.erb
 - app/views/compute_resources_vms/form/opennebula/_base.html.erb
+- app/views/compute_resources_vms/form/opennebula/_custom_attribute.html.erb
 - app/views/compute_resources_vms/form/opennebula/_network.html.erb
 - app/views/compute_resources_vms/form/opennebula/_scheduler_hint_data.html.erb
 - app/views/compute_resources_vms/form/opennebula/_vmgroup_role.html.erb