foreman_xen 0.7.1 → 1.0.0

data/app/views/api/v1/compute_resources/xenserver.json.rabl

@@ -1 +1 @@
-attributes :user
+attributes :user, :iso_library_mountpoint

data/app/views/api/v2/compute_resources/xenserver.json.rabl

@@ -1 +1 @@
-attributes :user
+attributes :user, :iso_library_mountpoint

data/app/views/compute_resources/form/_xenserver.html.erb

@@ -1,11 +1,9 @@
 <%= text_f f, :url, :class => "input-xlarge", :help_block => _("e.g. x.x.x.x") %>
 <%= text_f f, :user %>
 <%= password_f f, :password %>
-
+<%= text_f f, :iso_library_mountpoint %>
 <% hypervisor = f.object.hypervisor.uuid rescue nil %>
 <% if hypervisor -%>
     <%= f.hidden_field :uuid, :value => hypervisor %>
 <% end -%>
-<%= link_to_function _("Test Connection"), "testConnection(this)", :class => "btn + #{hypervisor.nil? ? "btn-default" : "btn-success"}", :'data-url' => test_connection_compute_resources_path %>
-
-<%= hidden_spinner('', :id => 'test_connection_indicator') %>
+<%= test_connection_button_f(f, !hypervisor.nil?) %>

data/app/views/compute_resources_vms/form/_hypervisors.html.erb

@@ -1,12 +1,16 @@
-<div id='templates' class=''>
-  <div class="form-group">
-    <%= selectable_f f, :hypervisor_host,
-                     [[_("Automatic allocation"), ""]] + xen_hypervisor_map(compute_resource),
-                     {},
-                     { :class => 'form-control span2',
-                       :disabled => (controller_name != 'hosts'),
-                       :label => 'Hypervisor'
-                     }
-    %>
-  </div>
+<div id='hypervisor_selection'>
+  <%= selectable_f_with_cache_invalidation(f, :hypervisor_host,
+        options_from_collection_for_select(
+          compute_resource.available_hypervisors, :uuid, :display_name
+        ),
+        { include_blank: 'Automatic allocation' },
+        { class: "span2",
+          disabled: (controller_name != 'hosts'),
+          label: _("Hypervisor"), },
+        { title: 'Refresh available hypervisors',
+          url: url_for(controller: "foreman_xen/cache",
+                       action: "refresh", only_path: true),
+          compute_resource_id: compute_resource.id,
+          attribute: 'available_hypervisors' }
+      ) %>
 </div>

data/app/views/compute_resources_vms/form/_image_provisioning.html.erb

@@ -0,0 +1,49 @@
+<div class="image_fields" style="display:none">
+  <div id='image_selection'>
+    <%= select_f f, :image_id, images, :uuid, :name,
+                 { :include_blank => (images.empty? || images.size == 1) ? false : _('Please select an image') },
+                 { :disabled => images.empty?, :label => _('Image'), :label_size => "col-md-2" } %>
+  </div>
+  <div id="target_sr_selection">
+    <%= selectable_f_with_cache_invalidation(f, :target_sr,
+          options_from_collection_for_select(
+            compute_resource.storage_pools, :uuid, :display_name
+          ),
+          {},
+          { class: "span2",
+            label: _("Target Repository"), },
+          { title: 'Refresh available storage repositories',
+            url: url_for(controller: "foreman_xen/cache",
+                         action: "refresh", only_path: true),
+            compute_resource_id: compute_resource.id,
+            attribute: 'storage_pools' }
+        ) %>
+  </div>
+
+<% if compute_resource.iso_library_mountpoint %>
+
+  <div id="configdrive">
+    <%= checkbox_f(f, :configdrive,
+                   { checked: true, label: _('Metadata ISO'),
+                     help_inline: 'Attach cloud-init compatible configdrive' }
+                  )%>
+  </div>
+  <%= javascript_tag("
+    $(document).on('change', '#host_provision_method_image', function(){
+      if ($('#host_provision_method_image').is(':checked')) {
+        $('#configdrive').appendTo($('#image_provisioning'));
+        $('#configdrive').show();
+      }
+    });
+  ") %>
+
+<%end%>
+</div>
+<%= javascript_tag("
+$(document).on('change', '#host_provision_method_image', function(){
+  if ($('#host_provision_method_image').is(':checked')) {
+    $('#target_sr_selection').appendTo($('#image_provisioning'));
+    $('#target_sr_selection').show();
+  }
+});
+"); %>

data/app/views/compute_resources_vms/form/_isos.html.erb

@@ -0,0 +1,15 @@
+<div id="iso_selection">
+  <%= selectable_f_with_cache_invalidation(f, :iso,
+        options_from_collection_for_select(
+          compute_resource.isos, :uuid, :name, compute_attributes.dig(:iso)
+        ),
+        { prompt: 'Select ISO to attach' },
+        { class: "span2",
+          label: _('Attach ISO'), },
+        { title: 'Refresh available storage repositories',
+          url: url_for(controller: "foreman_xen/cache",
+                       action: "refresh", only_path: true),
+          compute_resource_id: compute_resource.id,
+          attribute: 'isos' }
+      ) %>
+</div>

data/app/views/compute_resources_vms/form/_network_provisioning.html.erb

@@ -0,0 +1,26 @@
+<!-- VM Template -->
+<div class="network_fields" style="display:none">
+  <div id="vm_template_selection">
+    <%= selectable_f_with_cache_invalidation(f, :builtin_template,
+          options_from_collection_for_select(
+            compute_resource.builtin_templates, :uuid, :name
+          ),
+          { selected: nil, #TODO
+            prompt: 'No Template'},
+          { class: 'span2', label: 'VM Template' },
+          { title: 'Refresh available builtin templates',
+            url: url_for(controller: "foreman_xen/cache",
+                         action: "refresh", only_path: true),
+            compute_resource_id: compute_resource.id,
+            attribute: 'builtin_templates' }
+         ) %>
+  </div>
+</div>
+<%= javascript_tag("
+$(document).ready(function(){
+  if (!$('#network_provisioning').has('#vm_template_selection').length) {
+    $('#vm_template_selection').appendTo($('#network_provisioning'));
+    $('#vm_template_selection').show();
+  }
+});
+") %>

data/app/views/compute_resources_vms/form/_profile.html.erb

@@ -0,0 +1,5 @@
+<div class="fields">
+  <%= counter_f f, :vcpus_max, :label => _('vCPUs'), :label_size => 'col-md-2', :'data-soft-max' => compute_resource.max_cpu_count %>
+  <%= byte_size_f f, :memory_min, :label => _('Memory Min'), :label_size => "col-md-2", :'data-soft-max' => compute_resource.max_memory %>
+  <%= byte_size_f f, :memory_max, :label => _('Memory Max'), :label_size => "col-md-2", :'data-soft-max' => compute_resource.max_memory %>
+</div>

data/app/views/compute_resources_vms/form/_templates.html.erb

@@ -1,39 +1,18 @@
 <div class="fields">
-  <div id='templates' class=''>
-    <div class="form-group">
-      <%= selectable_f_with_cache_invalidation f,
-                       :custom_template_name,
-                       [[_("No template"), ""]] + xen_custom_template_map(compute_resource),
-                       { :selected => attribute_map[:template_selected_custom] },
-                       { :class => 'form-control span2',
-                         :label => 'Custom Template'
-                       },
-                       {
-                         :callback               => 'xenPopulateCustomTemplates',
-                         :title                  => 'Refresh available custom templates',
-                         :url                    => '/foreman_xen/cache/refresh',
-                         :computer_resource_id   => compute_resource.id,
-                         :attribute              => 'custom_templates'
-                       }
-      %>
-    </div>
-
+  <div id='templates'>
     <div class="form-group ">
-      <%= selectable_f_with_cache_invalidation f,
-                                               :builtin_template_name,
-                                               [[_("No template"), ""]] + xen_builtin_template_map(compute_resource),
-                                               { :selected => attribute_map[:template_selected_builtin] },
-                                               { :class => 'form-control span2',
-                                                 :label => 'Builtin Template'
-                                               },
-                                               {
-                                                   :callback               => 'xenPopulateBuiltinTemplates',
-                                                   :title                  => 'Refresh available builtin templates',
-                                                   :url                    => '/foreman_xen/cache/refresh',
-                                                   :computer_resource_id   => compute_resource.id,
-                                                   :attribute              => 'builtin_templates'
-                                               }
-      %>
+      <%= selectable_f_with_cache_invalidation(f, :builtin_template,
+            options_from_collection_for_select(
+              compute_resource.builtin_templates, :uuid, :name
+            ),
+            { prompt: 'Select a Template'},
+            { class: 'span2', label: 'Builtin Template' },
+            { title: 'Refresh available builtin templates',
+              url: url_for(controller: "foreman_xen/cache",
+                           action: "refresh", only_path: true),
+              compute_resource_id: compute_resource.id,
+              attribute: 'builtin_templates' }
+           ) %>
     </div>
   </div>
 </div>

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

@@ -1,196 +1,40 @@
-<% new = f.object
-   attribute_map = compute_attribute_map(params, compute_resource, new)
-
-   hide_raw = ''
-   if params && params['host'] && params['host']['compute_attributes'] && params['host']['compute_attributes']['custom_template_name'] != ''
-     hide_raw = 'display:none;'
-   end
-
-   if controller_name == 'hosts'
-     fields_enabled = true
-     start_enable   = true
-   elsif controller_name == 'compute_attributes'
-     fields_enabled     = true
-     compute_attributes = compute_resource.compute_profile_attributes_for(params['compute_profile_id'])
-     name               = compute_attributes['name']
-   else
-     fields_enabled = false
-   end
-
--%>
+<% compute_attributes = compute_attributes_from_params(compute_resource) -%>
+<%= javascript_include_tag 'foreman_xen/xenserver/cache_refresh' %>
 <%= javascript_tag("$(document).on('ContentLoad', tfm.numFields.initAll)"); %>
-<!-- VM Initial Settings -->
-<div class="children_fields">
-  <fieldset id="vm_profile">
-    <legend>VM Profile</legend>
-    <div class="fields">
-      <!--<%= text_f f, :name, :disabled => !fields_enabled, :value => name, :label => 'Name' if controller_name != 'hosts' %>-->
-      <%= counter_f f,   :vcpus_max,  :disabled => !fields_enabled, :label => _('vCPUs'),      :label_size => 'col-md-2', :'data-soft-max' => compute_resource.max_cpu_count %>
-      <%= byte_size_f f, :memory_min, :disabled => !fields_enabled, :label => _('Memory Min'), :label_size => "col-md-2", :'data-soft-max' => compute_resource.max_memory %>
-      <%= byte_size_f f, :memory_max, :disabled => !fields_enabled, :label => _('Memory Max'), :label_size => "col-md-2", :'data-soft-max' => compute_resource.max_memory %>
-    </div>
-  </fieldset>
-</div>
 
-<!-- Templates -->
+<!-- VM Profile -->
 <div class="children_fields">
-  <%= field_set_tag 'VM Template', :id => 'xen_templates', :title => _('Template') do -%>
-      <%= render 'compute_resources_vms/form/templates', :f => f, :compute_resource => compute_resource, :new => new, :attribute_map => attribute_map %>
-  <% end -%>
-</div>
-
-<!-- XenStore Data -->
-<div class="children_fields" id="xenserver-xenstore-data">
-  <%= field_set_tag 'Xen Store Data', :id => 'xen_store_data', :title => _('Xen Store Data') do -%>
-      <%= render 'compute_resources_vms/form/xenstore', :f => f, :compute_resource => compute_resource, :new => new, :attribute_map => attribute_map %>
-  <% end %>
-</div>
-
-<!-- Storage -->
-<div class="children_fields xenserver-raw" id="xenserver-storage" style="<%= hide_raw %>">
-  <%= field_set_tag 'Storage', :id => 'storage_volumes', :title => _('Storage') do -%>
-      <%= f.fields_for :VBDs do |i| %>
-          <%= render 'compute_resources_vms/form/volume', :f => i, :compute_resource => compute_resource, :new => new, :attribute_map => attribute_map %>
-      <% end -%>
+  <%= field_set_tag 'VM Profile', :id => 'vm_profile', :title => _('VM Profile') do -%>
+      <%= render 'compute_resources_vms/form/profile', :f => f, :compute_resource => compute_resource %>
   <% end -%>
-  <%= checkbox_f f, :xstools, :checked => false, :label => _('Insert XS Tools ISO Drive') %>
 </div>
 
-<!-- Network -->
-<div class="children_fields" id="xenserver-network" style="<%= hide_raw %>">
-  <%= field_set_tag 'Network interfaces', :id => 'network_interfaces', :title => _('Networks') do -%>
-      <%= f.fields_for :VIFs do |i| %>
-          <%= render 'compute_resources_vms/form/network', :f => i, :compute_resource => compute_resource, :new => new, :attribute_map => attribute_map %>
-      <% end -%>
+<!-- ISOs -->
+<div class="children_fields">
+  <%= field_set_tag 'Attach ISO', :id => 'xen_isos', :title => _('ISOs') do -%>
+      <%= render 'compute_resources_vms/form/isos', :f => f, :compute_resource => compute_resource, compute_attributes: compute_attributes %>
   <% end -%>
 </div>
 
-<div class="children_fields" id="xenserver-hosts" style="<%= hide_raw %>">
+<!-- Hypervisor -->
+<div class="children_fields" id="xenserver-hosts">
   <%= field_set_tag 'Start on server', :id => 'xen_hypervisors', :title => _('Start on server') do -%>
-      <%= render 'compute_resources_vms/form/hypervisors', :f => f, :compute_resource => compute_resource, :new => new, :attribute_map => attribute_map %>
+      <%= render 'compute_resources_vms/form/hypervisors', :f => f, :compute_resource => compute_resource %>
   <% end -%>
 </div>
 
 <!-- Startup -->
-<div class="children_fields" id="xenserver-vm-start" style="<%= hide_raw %>">
+<% start_checked = compute_attributes.dig(:start) == '0' ? false : true -%>
+<div class="children_fields" id="xenserver-vm-start">
   <%= field_set_tag 'VM Startup Options', :id => 'vm_startup_options', :title => _('Power ON VM') do -%>
-      <%= checkbox_f f, :start, :checked => (attribute_map[:power_on] == '1' || start_enable), :label => _("Power ON VM") %>
+      <%= checkbox_f f, :start, :checked => start_checked, :label => _("Power ON VM") %>
   <% end -%>
 </div>
 
-<script type="text/javascript">
-
-    // Check if its a computer resource template then just do not show the form of XenStore
-    if ($("#compute_attribute_compute_profile_id").length > 0) {
-        $('#xenserver-xenstore-data').hide(1)
-    }
-
-    // Check if custom template in use then do now show SR settings
-    if ($("#compute_attribute_vm_attrs_builtin_template_name").val() == "" && $("#compute_attribute_vm_attrs_custom_template_name").val() != "") {
-        $('.xenserver-raw').hide(1);
-    }
-
-    // Check which template are in use
-    if ($("#compute_attribute_vm_attrs_builtin_template_name").val() != "") {
-        $('#compute_attribute_vm_attrs_custom_template_name').val($("#compute_attribute_vm_attrs_custom_template_name option:contains('No template')").val());
-        // IE and Chrome
-        $('#compute_attribute_vm_attrs_custom_template_name').attr("disabled", 'disabled');
-        $('.custom_template_name').prop("disabled", true);
-    }
-
-    if ($("#compute_attribute_vm_attrs_custom_template_name").val() != "") {
-        $('#compute_attribute_vm_attrs_builtin_template_name').val($("#compute_attribute_vm_attrs_custom_template_name option:contains('No template')").val());
-        // IE and Chrome
-        $('#compute_attribute_vm_attrs_builtin_template_name').attr("disabled", 'disabled');
-        $('.builtin_templates').prop("disabled", true);
-    }
-
-    // Computer Profile Templates
-    $(document).off('change.xenserver', '#compute_attribute_vm_attrs_custom_template_name');
-    $(document).on('change.xenserver', '#compute_attribute_vm_attrs_custom_template_name', function (data) {
-        if ($('option:selected', data.target).val() == "") {
-            $('.xenserver-raw').show(1000);
-            // IE and Chrome
-            $('.builtin_templates').prop("disabled", false);
-            $('#compute_attribute_vm_attrs_builtin_template_name').removeAttr('disabled');
-        } else {
-            $('.xenserver-raw').hide(1000);
-            $('#compute_attribute_vm_attrs_builtin_template_name').val($("#compute_attribute_vm_attrs_builtin_template_name option:contains('No template')").val());
-            // IE and Chrome
-            $('#compute_attribute_vm_attrs_builtin_template_name').attr("disabled", 'disabled');
-            $('.builtin_templates').prop("disabled", true);
-
-        }
-
-    });
-
-    $(document).off('change.xenserver', '#compute_attribute_vm_attrs_builtin_template_name');
-    $(document).on('change.xenserver', '#compute_attribute_vm_attrs_builtin_template_name', function (data) {
-        if ($('option:selected', data.target).val() == "") {
-            // IE and Chrome
-            $('.builtin_templates').prop("disabled", false);
-            $('#compute_attribute_vm_attrs_custom_template_name').removeAttr('disabled');
-        } else {
-            $('#compute_attribute_vm_attrs_custom_template_name').val($("#compute_attribute_vm_attrs_custom_template_name option:contains('No template')").val());
-            // IE and Chrome
-            $('#compute_attribute_vm_attrs_custom_template_name').attr("disabled", 'disabled');
-            $('.custom_template_name').prop("disabled", true);
-
-        }
-
-    });
-
-
-    // Host Profile Forms
-
-    // Check which template are in use
-    if ($("#host_compute_attributes_custom_template_name").val() != "") {
-        $('#host_compute_attributes_builtin_template_name').val($("#host_compute_attributes_builtin_template_name option:contains('No template')").val());
-        // IE and Chrome
-        $('#host_compute_attributes_builtin_template_name').attr("disabled", 'disabled');
-        $('.builtin_templates').prop("disabled", true);
-    }
-
-    if ($("#host_compute_attributes_builtin_template_name").val() != "") {
-        $('#host_compute_attributes_custom_template_name').val($("#host_compute_attributes_custom_template_name option:contains('No template')").val());
-        // IE and Chrome
-        $('#host_compute_attributes_custom_template_name').attr("disabled", 'disabled');
-        $('.custom_template_name').prop("disabled", true);
-    }
-
-    $(document).off('change.xenserver', '#host_compute_attributes_custom_template_name');
-    $(document).on('change.xenserver', '#host_compute_attributes_custom_template_name', function (data) {
-        if ($('option:selected', data.target).val() == "") {
-            $('.xenserver-raw').show(1000);
-            // IE and Chrome
-            $('.builtin_templates').prop("disabled", false);
-            $('#host_compute_attributes_builtin_template_name').removeAttr('disabled');
-        } else {
-            $('.xenserver-raw').hide(1000);
-            $('#host_compute_attributes_builtin_template_name').val($("#host_compute_attributes_builtin_template_name option:contains('No template')").val());
-            // IE and Chrome
-            $('#host_compute_attributes_builtin_template_name').attr("disabled", 'disabled');
-            $('.builtin_templates').prop("disabled", true);
-
-        }
-
-    });
-
-    $(document).off('change.xenserver', '#host_compute_attributes_builtin_template_name');
-    $(document).on('change.xenserver', '#host_compute_attributes_builtin_template_name', function (data) {
-        if ($('option:selected', data.target).val() == "") {
-            // IE and Chrome
-            $('.builtin_templates').prop("disabled", false);
-            $('#host_compute_attributes_custom_template_name').removeAttr('disabled');
-        } else {
-            $('#host_compute_attributes_custom_template_name').val($("#host_compute_attributes_builtin_template_name option:contains('No template')").val());
-            // IE and Chrome
-            $('#host_compute_attributes_custom_template_name').attr("disabled", 'disabled');
-            $('.custom_template_name').prop("disabled", true);
-
-        }
-    })
-</script>
-
-<%= compute_specific_js(compute_resource, 'foreman_xen/cache_refresh') %>
-<%= compute_specific_js(compute_resource, 'foreman_xen/populate_fields') %>
+<!-- Provisioning -->
+<%
+   arch ||= nil ; os ||= nil
+   images = possible_images(compute_resource, arch, os)
+%>
+<%= render 'compute_resources_vms/form/image_provisioning', f: f, compute_resource: compute_resource, images: images %>
+<%= render 'compute_resources_vms/form/network_provisioning', f: f, compute_resource: compute_resource %>

data/app/views/compute_resources_vms/form/xenserver/_network.html.erb

@@ -0,0 +1,23 @@
+<div class="fields">
+  <div id='xenserver_network'>
+    <%= selectable_f_with_cache_invalidation f, :network,
+          options_from_collection_for_select(
+            compute_resource.networks, :uuid, :name
+          ),
+          { include_blank: compute_resource.networks.any? ? false : _('No networks') },
+          { class: 'span2',
+            label: _('Network'),
+            label_size: 'col-md-3',
+            sizer: 'col-md-8',
+            disabled: (controller_name != 'hosts') },
+          { title: 'Refresh available networks',
+            url: url_for(controller: "foreman_xen/cache",
+                         action: "refresh", only_path: true),
+            compute_resource_id: compute_resource.id,
+            attribute: 'networks' }
+    %>
+  </div>
+</div>
+<%= javascript_tag("
+$(document).ready(function(){ $('#network_interfaces').hide(); });
+") if controller_name != 'hosts' %>