foreman_xen 0.7.1 → 1.0.0

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

@@ -0,0 +1,15 @@
+<%= selectable_f_with_cache_invalidation f, :sr,
+      options_from_collection_for_select(
+        compute_resource.storage_pools, :uuid, :display_name, (f.object.sr.uuid rescue nil)
+      ),
+      {},
+      { class: 'span2',
+        label: _("Storage 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' }
+%>
+
+<%= text_f f, :virtual_size_gb, :class => "input-mini", :label => _("Size (GB)"), :value => (f.object.virtual_size.to_i / 1_073_741_824) %>

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

@@ -11,7 +11,7 @@
   <tbody>
   <% @vms.each do |vm| -%>
       <tr>
-        <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity) %></td>
+        <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.uuid) %></td>
         <td><%= vm.vcpus_max %></td>
         <td><%= (vm.memory_static_max.to_i / 1073741824).to_s %> GB</td>
         <td><%= vm.power_state %> </td>

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

@@ -0,0 +1,4 @@
+<%= text_f f, :username, :value => @image.username || "root", :help_inline => _("The user that is used to ssh into the instance, normally cloud-user, ec2-user, ubuntu, root etc") %>
+<%= checkbox_f f, :user_data, :help_inline => _("Does this image support user data input (e.g. via cloud-init)?") %>
+<%= password_f f, :password, :help_inline => _("Password to authenticate with - used for SSH finish step.") %>
+<%= image_field(f, :label => _("Image UUID"), :help_inline => _("UUID to template")) %>

data/lib/foreman_xen/engine.rb

@@ -17,10 +17,10 @@ module ForemanXen
 
     initializer 'foreman_xen.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_xen do
-        requires_foreman '>= 1.18'
+        requires_foreman '>= 1.20'
         # Register xen compute resource in foreman
         compute_resource ForemanXen::Xenserver
-        parameter_filter(ComputeResource, :uuid)
+        parameter_filter(ComputeResource, :uuid, :iso_library_mountpoint)
       end
     end
 
@@ -43,11 +43,22 @@ module ForemanXen
       begin
         # extend fog xen server and image models.
         require 'fog/xenserver/compute/models/server'
+        require 'fog/xenserver/compute/models/host'
+        require 'fog/xenserver/compute/models/vdi'
+        require 'fog/xenserver/compute/models/storage_repository'
         require File.expand_path('../../app/models/concerns/fog_extensions/xenserver/server', __dir__)
+        require File.expand_path('../../app/models/concerns/fog_extensions/xenserver/host', __dir__)
+        require File.expand_path('../../app/models/concerns/fog_extensions/xenserver/vdi', __dir__)
+        require File.expand_path('../../app/models/concerns/fog_extensions/xenserver/storage_repository', __dir__)
         require File.expand_path('../../app/models/concerns/foreman_xen/host_helper_extensions', __dir__)
+        require File.expand_path('../../app/models/concerns/foreman_xen/host_extensions', __dir__)
 
-        Fog::XenServer::Compute::Server.send(:include, ::FogExtensions::Xenserver::Server)
+        Fog::XenServer::Compute::Models::Server.send(:include, ::FogExtensions::Xenserver::Server)
+        Fog::XenServer::Compute::Models::Host.send(:include, ::FogExtensions::Xenserver::Host)
+        Fog::XenServer::Compute::Models::Vdi.send(:include, ::FogExtensions::Xenserver::Vdi)
+        Fog::XenServer::Compute::Models::StorageRepository.send(:include, ::FogExtensions::Xenserver::StorageRepository)
         ::HostsHelper.send(:include, ForemanXen::HostHelperExtensions)
+        ::Host::Managed.send(:prepend, ForemanXen::HostExtensions)
       rescue => e
         Rails.logger.warn "Foreman-Xen: skipping engine hook (#{e})"
       end

data/lib/foreman_xen/version.rb

@@ -1,3 +1,3 @@
 module ForemanXen
-  VERSION = '0.7.1'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/test/test_helper.rb

@@ -10,6 +10,4 @@ Rails.backtrace_cleaner.remove_silencers!
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path('fixtures', __dir__)
-end
+ActiveSupport::TestCase.fixture_path = File.expand_path('fixtures', __dir__) if ActiveSupport::TestCase.method_defined?(:fixture_path=)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Pavel Nemirovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-xenserver
@@ -51,11 +51,14 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/foreman_xen/xenserver/cache_refresh.js
-- app/assets/javascripts/foreman_xen/xenserver/populate_fields.js
 - app/controllers/foreman_xen/cache_controller.rb
 - app/controllers/foreman_xen/snapshots_controller.rb
 - app/helpers/xen_compute_helper.rb
+- app/models/concerns/fog_extensions/xenserver/host.rb
 - app/models/concerns/fog_extensions/xenserver/server.rb
+- app/models/concerns/fog_extensions/xenserver/storage_repository.rb
+- app/models/concerns/fog_extensions/xenserver/vdi.rb
+- app/models/concerns/foreman_xen/host_extensions.rb
 - app/models/concerns/foreman_xen/host_helper_extensions.rb
 - app/models/foreman_xen/xenserver.rb
 - app/views/api/v1/compute_resources/xenserver.json.rabl
@@ -63,15 +66,19 @@ files:
 - app/views/compute_resources/form/_xenserver.html.erb
 - app/views/compute_resources/show/_xenserver.html.erb
 - app/views/compute_resources_vms/form/_hypervisors.html.erb
-- app/views/compute_resources_vms/form/_network.html.erb
+- app/views/compute_resources_vms/form/_image_provisioning.html.erb
+- app/views/compute_resources_vms/form/_isos.html.erb
+- app/views/compute_resources_vms/form/_network_provisioning.html.erb
+- app/views/compute_resources_vms/form/_profile.html.erb
 - app/views/compute_resources_vms/form/_templates.html.erb
-- app/views/compute_resources_vms/form/_volume.html.erb
-- app/views/compute_resources_vms/form/_xenstore.html.erb
 - app/views/compute_resources_vms/form/xenserver/_base.html.erb
+- app/views/compute_resources_vms/form/xenserver/_network.html.erb
+- app/views/compute_resources_vms/form/xenserver/_volume.html.erb
 - app/views/compute_resources_vms/index/_xenserver.html.erb
 - app/views/compute_resources_vms/show/_xenserver.html.erb
 - app/views/foreman_xen/snapshots/new.html.erb
 - app/views/foreman_xen/snapshots/show.html.erb
+- app/views/images/form/_xenserver.html.erb
 - config/routes.rb
 - lib/foreman_xen.rb
 - lib/foreman_xen/engine.rb
@@ -101,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Provision and manage XEN Server from Foreman

data/app/assets/javascripts/foreman_xen/xenserver/populate_fields.js

@@ -1,32 +0,0 @@
-function xenPopulateNetworks(network_list){
-    $('#host_compute_attributes_VIFs_print').children().remove();
-    for (var i = 0; i < network_list.length; i++) {
-        network = network_list[i];
-        $('#host_compute_attributes_VIFs_print').append('<option id=' + network['name'] + '>' + network['name'] + '</option>');
-    }
-}
-
-function xenPopulateStoragePools(results){
-    $('#host_compute_attributes_VBDs_sr_uuid').children().remove();
-    for (var i = 0; i < results.length; i++) {
-        result = results[i];
-        $('#host_compute_attributes_VBDs_sr_uuid').append('<option id=' + result['uuid'] + '>' + result['name'] + '</option>');
-    }
-}
-
-function xenPopulateCustomTemplates(custom_templates){
-    xenPopulateTemplates(custom_templates, '#host_compute_attributes_custom_template_name');
-}
-
-function xenPopulateBuiltinTemplates(builtin_templates){
-    xenPopulateTemplates(builtin_templates, '#host_compute_attributes_builtin_template_name');
-}
-
-function xenPopulateTemplates(results, selector){
-    $(selector).children().remove();
-    $(selector).append('<option>No template</option>');
-    for (var i = 0; i < results.length; i++) {
-        result = results[i];
-        $(selector).append('<option id=' + result['name'] + '>' + result['name'] + '</option>');
-    }
-}

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

@@ -1,20 +0,0 @@
-<div class="fields">
-  <div id='nat' class=''>
-    <%= selectable_f_with_cache_invalidation f, :print,
-                     compute_resource.networks.map(&:name),
-                     {  :include_blank => compute_resource.networks.any? ? false : _('No networks'),
-                        :selected      => attribute_map[:network_selected]
-                     },
-                     {  :class         => 'span2',
-                        :label         => _('Network')
-                     },
-                     {
-                         :callback               => 'xenPopulateNetworks',
-                         :title                  => 'Refresh available networks',
-                         :url                    => '/foreman_xen/cache/refresh',
-                         :computer_resource_id   => compute_resource.id,
-                         :attribute              => 'networks'
-                     }
-    %>
-  </div>
-</div>

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

@@ -1,18 +0,0 @@
-<div class="fields">
-  <%= selectable_f_with_cache_invalidation f, :sr_uuid,
-        xen_storage_pool_map(compute_resource),
-        { :selected => attribute_map[:volume_selected] },
-        { :class => "span2",
-         :label => _("Storage Repository"),
-        },
-        {
-           :callback               => 'xenPopulateStoragePools',
-           :title                  => 'Refresh available storage repositories',
-           :url                    => '/foreman_xen/cache/refresh',
-           :computer_resource_id   => compute_resource.id,
-           :attribute              => 'storage_pools'
-        }
-  %>
-
-  <%= text_f f, :physical_size, :class => "input-mini", :label => _("Size (GB)"), :value => attribute_map[:volume_size] %>
-</div>

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

@@ -1,119 +0,0 @@
-<%
-
-   if params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:xenstore]
-     vmdata = params[:host][:compute_attributes][:xenstore]['vm-data']
-   else
-     vmdata = init_vmdata
-   end
-
-   disabled = 'readonly'
-
-%>
-
-<div class="children_fields">
-
-  <div class="fields">
-
-    <div class="form-group">
-      <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-ip">vm-data/ifs/0/ip</label>
-
-      <div class="col-md-4">
-        <div class="controls">
-          <input <%= disabled %> id="xenstore-vm-data-ifs-0-ip" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][ip]" class="form-control input-mini" value="<%= vmdata[:ifs]['0'][:ip] %>">
-        </div>
-      </div>
-    </div>
-
-    <div class="form-group">
-      <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-gateway">vm-data/ifs/0/gateway</label>
-
-      <div class="col-md-4">
-        <div class="controls">
-          <input <%= disabled %> id="xenstore-vm-data-ifs-0-gateway" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][gateway]" class="form-control input-mini" value="<%= vmdata[:ifs]['0'][:gateway] %>">
-        </div>
-      </div>
-    </div>
-
-    <div class="form-group">
-      <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-netmask">vm-data/ifs/0/netmask</label>
-
-      <div class="col-md-4">
-        <div class="controls">
-          <input <%= disabled %> id="xenstore-vm-data-ifs-0-netmask" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][netmask]" class="form-control input-mini" value="<%= vmdata[:ifs]['0'][:netmask] %>">
-        </div>
-      </div>
-    </div>
-
-    <div class="form-group">
-      <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver1">vm-data/nameserver1</label>
-
-      <div class="col-md-4">
-        <input <%= disabled %> id="xenstore-vm-data-nameserver1" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver1]" class="form-control input-mini" value="<%= vmdata[:nameserver1] %>">
-      </div>
-    </div>
-
-    <div class="form-group">
-      <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver2">vm-data/nameserver2</label>
-
-      <div class="col-md-4">
-        <input <%= disabled %> id="xenstore-vm-data-nameserver2" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver2]" class="form-control input-mini" value="<%= vmdata[:nameserver2] %>">
-      </div>
-    </div>
-
-    <div class="form-group">
-      <label class="col-md-2 control-label" for="xenstore-vm-data-environment">vm-data/environment</label>
-
-      <div class="col-md-4">
-        <input <%= disabled %> id="xenstore-vm-data-environment" type="text" name="host[compute_attributes][xenstore][vm-data][environment]" class="form-control input-mini" value="<%= vmdata[:environment] %>">
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<script type="text/javascript">
-    function autocomplete_xenstore(subnet_id) {
-        url = "/subnets/" + subnet_id + "/edit";
-        $.get(url, function (data) {
-            fields = $('#primary', data);
-            $('#xenstore-vm-data-ifs-0-gateway').val($('#subnet_gateway', fields).val());
-            $('#xenstore-vm-data-ifs-0-netmask').val($('#subnet_mask', fields).val());
-            $('#xenstore-vm-data-nameserver1').val($('#subnet_dns_primary', fields).val());
-            $('#xenstore-vm-data-nameserver2').val($('#subnet_dns_secondary', fields).val());
-            $('#xenstore-vm-data-ifs-0-ip').val($('#host_interfaces_attributes_0_ip').val());
-            $('#xenstore-vm-data-environment').val($('#host_environment_id option:selected').text())
-        })
-    }
-
-    subnet_id = $('#host_interfaces_attributes_0_subnet_id option:selected').val();
-
-    if (subnet_id) {
-        autocomplete_xenstore(subnet_id)
-    }
-
-    $(document).off('change.xenstore', '#host_interfaces_attributes_0_subnet_id');
-    $(document).on('change.xenstore', '#host_interfaces_attributes_0_subnet_id', function (data) {
-        subnet_id = $('option:selected', data.target).val();
-        if (subnet_id) {
-            autocomplete_xenstore(subnet_id)
-        }
-    });
-
-    $('#xenstore-vm-data-environment').val($('#host_environment_id option:selected').text());
-
-    $(document).off('change.xenstore', '#host_environment_id');
-    $(document).on('change.xenstore', '#host_environment_id', function (data) {
-        env = $('option:selected', data.target).text();
-        $('#xenstore-vm-data-environment').val(env)
-    });
-
-    $(document).off('click.xenstore', '#compute_resource_tab a');
-    $(document).on('click.xenstore', '#compute_resource_tab a', function (data) {
-        subnet_id = $('#host_interfaces_attributes_0_subnet_id option:selected').val();
-
-        if (subnet_id) {
-            autocomplete_xenstore(subnet_id)
-        }
-    })
-
-</script>