foreman_xen 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e0a8037b7d50886ca41a1a27654908d86ba7248
-  data.tar.gz: 530c4267118cbbc311220ec6bac82511eda39988
+  metadata.gz: bf86d445212406a7e6272d38901bbf3775dabae3
+  data.tar.gz: f8fcff62613110e76de79caebed200cb3b210293
 SHA512:
-  metadata.gz: 8f46685f806d8c23c41313199e17b877adc1af6adc8f5ce6bc3840d44871cb8dd4f79dbf8c4b105072636d8dd5e7c1ec4e01a7038869f6531fc94c8f9236d845
-  data.tar.gz: 74c808448e47efa80a67ab2e112c8bb648838303e3546e59d927bf273579b65ca8d10c77d4143be8771504331284ea6d85b622ecfae2b46d0d6cbed0d8e0a537
+  metadata.gz: 6baec9017286dbfcd59f5ed4a1a4bc9898ce5d0c4077748fc5e349c724481614b618d0126ddd4533d68b4d062ab2313d164b60b36aa1e2ac58f07c79069190f4
+  data.tar.gz: 3e6f83333a0912229e3ef87a2b1f9feb21be179f4b05e9843d7aeed82422cfd6a3125abcc47dbd297d6a852e4980dd9080c71e8bf708af158303bd4dbc22ff8e

data/README.md

@@ -15,7 +15,8 @@ Please see the Foreman manual for further instructions:
 | Foreman Version | Plugin Version |
 |:--------------- |:-------------- |
 | >=1.5, <1.8     | 0.0.x          |
-| >=1.8.1         | 0.1.x          |
+| >=1.8.1, <1.10  | 0.1.x          |
+| >=1.10          | 0.2.x          |
 
 ## Support
 

data/app/helpers/xen_compute_helper.rb

@@ -0,0 +1,102 @@
+module XenComputeHelper
+  def compute_attribute_map(params, compute_resource, new)
+    if controller_name == 'hosts'
+      attribute_map = hosts_controller_compute_attribute_map(params, compute_resource, new)
+    elsif controller_name == 'compute_attributes'
+      attribute_map = compute_resource_controller_attribute_map(params, compute_resource)
+    end
+    attribute_map
+  end
+
+  def init_vmdata()
+    vmdata = { :ifs         =>
+                   { '0' => {
+                       :ip      => '',
+                       :gateway => '',
+                       :netmask => ''
+                   }
+                   },
+               :nameserver1 => '',
+               :nameserver2 => '',
+               :environment => ''
+    }
+  end
+
+  private
+
+  def hosts_controller_compute_attribute_map(params, compute_resource, new)
+    attribute_map = empty_attribute_map
+    if new_host?(new)
+      compute_attributes = compute_resource.compute_profile_attributes_for(params['host']['compute_profile_id'])
+      if compute_attributes['VBDs']
+        attribute_map[:volume_size] = compute_attributes['VBDs']['physical_size'] ? compute_attributes['VBDs']['physical_size'] : nil
+        attribute_map[:volume_selected] = compute_attributes['VBDs']['sr_uuid'] ? compute_attributes['VBDs']['sr_uuid'] : nil
+      end
+      if compute_attributes['VIFs']
+        attribute_map[:network_selected] = compute_attributes['VIFs']['print'] ? compute_attributes['VIFs']['print'] : nil
+      end
+      attribute_map[:template_selected_custom] = compute_attributes['custom_template_name'] ? compute_attributes['custom_template_name'] : nil
+      attribute_map[:template_selected_builtin] = compute_attributes['builtin_template_name'] ? compute_attributes['custom_template_name'] : nil
+      attribute_map[:cpu_count] = compute_attributes['vcpus_max'] ? compute_attributes['vcpus_max'] : nil
+      attribute_map[:memory_min] = compute_attributes['memory_min'] ? compute_attributes['memory_min'] : nil
+      attribute_map[:memory_max] = compute_attributes['memory_max'] ? compute_attributes['memory_max'] : nil
+      attribute_map[:power_on] = compute_attributes['start'] ? compute_attributes['start'] : nil
+    elsif params && params['host'] && params['host']['compute_attributes']
+      if params['host']['compute_attributes']['VBDs']
+        attribute_map[:volume_size] = (params['host']['compute_attributes']['VBDs']['physical_size']) ? params['host']['compute_attributes']['VBDs']['physical_size'] : nil
+        attribute_map[:volume_selected] = (params['host']['compute_attributes']['VBDs']['sr_uuid']) ? params['host']['compute_attributes']['VBDs']['sr_uuid'] : nil
+      end
+      if params['host']['compute_attributes']['VIFs']
+        attribute_map[:network_selected] = params['host']['compute_attributes']['VIFs']['print'] ? params['host']['compute_attributes']['VIFs']['print'] : nil
+      end
+      attribute_map[:template_selected_custom] = params['host']['compute_attributes']['custom_template_name'] ? params['host']['compute_attributes']['custom_template_name'] : nil
+      attribute_map[:template_selected_builtin] = params['host']['compute_attributes']['builtin_template_name'] ? params['host']['compute_attributes']['builtin_template_name'] : nil
+    elsif new
+      if new.__vbds
+        attribute_map[:volume_selected] = new.__vbds['sr_uuid'] ? new.__vbds['sr_uuid'] : nil
+        attribute_map[:volume_size] = new.__vbds['physical_size'] ? new.__vbds['physical_size'] : nil
+      end
+      if new.__vifs
+        attribute_map[:network_selected] = new.__vifs['print'] ? new.__vifs['print'] : nil
+      end
+    end
+    attribute_map
+  end
+
+  def compute_resource_controller_attribute_map(params, compute_resource)
+    attribute_map = empty_attribute_map
+    if params && params['compute_profile_id']
+      compute_attributes = compute_resource.compute_profile_attributes_for(params['compute_profile_id'])
+    elsif params && params['host'] && params['host']['compute_profile_id']
+      compute_attributes = compute_resource.compute_profile_attributes_for(params['host']['compute_profile_id'])
+    end
+    if compute_attributes
+      if compute_attributes['VBDs']
+        attribute_map[:volume_size] = compute_attributes['VBDs']['physical_size'] ? compute_attributes['VBDs']['physical_size'] : nil
+        attribute_map[:volume_selected] = compute_attributes['VBDs']['sr_uuid'] ? compute_attributes['VBDs']['sr_uuid'] : nil
+      end
+      if compute_attributes['VIFs']
+        attribute_map[:network_selected] = compute_attributes['VIFs']['print'] ? compute_attributes['VIFs']['print'] : nil
+      end
+      attribute_map[:template_selected_custom] = compute_attributes['custom_template_name'] ? compute_attributes['custom_template_name'] : nil
+      attribute_map[:template_selected_builtin] = compute_attributes['builtin_template_name'] ? compute_attributes['builtin_template_name'] : nil
+      attribute_map[:cpu_count] = compute_attributes['vcpus_max'] ? compute_attributes['vcpus_max'] : nil
+      attribute_map[:memory_min] = compute_attributes['memory_min'] ? compute_attributes['memory_min'] : nil
+      attribute_map[:memory_max] = compute_attributes['memory_max'] ? compute_attributes['memory_max'] : nil
+      attribute_map[:power_on] = compute_attributes['start'] ? compute_attributes['start'] : nil
+    end
+    attribute_map
+  end
+
+  def empty_attribute_map
+    {:volume_size => nil,
+     :volume_selected => nil,
+     :network_selected => nil,
+     :template_selected_custom => nil,
+     :template_selected_builtin => nil,
+     :cpu_count => nil,
+     :memory_min => nil,
+     :memory_max => nil,
+     :power_on => nil}
+  end
+end

data/app/models/foreman_xen/xenserver.rb

@@ -48,7 +48,7 @@ module ForemanXen
 
     def test_connection(options = {})
       super
-      errors[:url].empty? and hypervisor
+      errors[:url].empty? and errors[:user].empty? and errors[:password].empty? and hypervisor
     rescue => e
       disconnect rescue nil
       errors[:base] << e.message
@@ -200,20 +200,17 @@ module ForemanXen
     end
 
     def create_vm_from_custom(args)
-
-	  hypervisor_host  = args[:hypervisor_host]
-	  hypervisor_host  = hypervisor_host.to_s
 	
 	  mem_max = args[:memory_max]
       mem_min = args[:memory_min]
 	  
-      if args[:hypervisor_host]
+	  if args[:hypervisor_host] != ''
 		host  = client.hosts.find { |host| host.name == args[:hypervisor_host] }
-		logger.info "create_vm_from_builtin: host : #{ hypervisor_host }"
-	  elsif 
+		logger.info "create_vm_from_builtin: host : #{ host.name }"    
+	  elsif   
 		host  = client.hosts.first
-		logger.info "create_vm_from_builtin: host : #{ host }"
-	  end
+		logger.info "create_vm_from_builtin: host : #{ host.name }"
+	  end 
 	  
       raise 'Memory max cannot be lower than Memory min' if mem_min.to_i > mem_max.to_i
       vm = client.servers.new :name          => args[:name],
@@ -255,20 +252,17 @@ module ForemanXen
     end
 
     def create_vm_from_builtin(args)
-	
-	  hypervisor_host  = args[:hypervisor_host]
-	  hypervisor_host  = hypervisor_host.to_s
-	  
+		  
       builtin_template_name = args[:builtin_template_name]
 	  builtin_template_name = builtin_template_name.to_s
 	
-      if args[:hypervisor_host]
+	  if args[:hypervisor_host] != ''
 		host  = client.hosts.find { |host| host.name == args[:hypervisor_host] }
-		logger.info "create_vm_from_builtin: host : #{ hypervisor_host }"
-	  elsif 
+		logger.info "create_vm_from_builtin: host : #{ host.name }"    
+	  elsif   
 		host  = client.hosts.first
-		logger.info "create_vm_from_builtin: host : #{ host }"
-	  end
+		logger.info "create_vm_from_builtin: host : #{ host.name }"
+	  end 
 
       storage_repository = client.storage_repositories.find { |sr| sr.uuid == "#{args[:VBDs][:sr_uuid]}" }
 

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

@@ -6,6 +6,8 @@
 <% if hypervisor -%>
   <%= f.hidden_field :uuid, :value => hypervisor %>
 <% end -%>
-<%= link_to_function _("Test Connection"), "testConnection(this)", :class => "btn + #{hypervisor.nil? ? "" : "btn-success"}", :'data-url' => test_connection_compute_resources_path %>
+<%= link_to_function _("Test Connection"), "testConnection(this)", :class => "btn + #{hypervisor.nil? ? "btn-default" : "btn-success"}", :'data-url' => test_connection_compute_resources_path %>
 
 <%= image_tag('/assets/spinner.gif', :id => 'test_connection_indicator', :class => 'hide') %>
+
+

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

@@ -1,29 +1,12 @@
 <div class="fields">
   <%
      nat = compute_resource.networks
-     selected = ""
-	 
-	 if controller_name == 'hosts'
-		 compute_attributes = compute_resource.compute_profile_attributes_for(params['host']['compute_profile_id'])   
-		 if params && params['host']['compute_profile_id'] != ""
-			selected  = compute_attributes['VIFs']['print']
-		 elsif params && params['host'] && params['host']['compute_attributes']
-			selected = params['host']['compute_attributes']['VIFs']['print']
-		 elsif new.__vifs
-			selected = new.__vifs['print']
-		 end
-	 elsif controller_name == 'compute_attributes'
-		 compute_attributes = compute_resource.compute_profile_attributes_for(params['compute_profile_id'])   
-		 if compute_attributes['VIFs'] && compute_attributes['VIFs']['print']
-			selected  = compute_attributes['VIFs']['print']
-		 end
-	 end
   -%>
 
   <div id='nat' class=''>
     <%= selectable_f f, :print, nat.map(&:name),
                      { :include_blank => nat.any? ? false : _("No networks"),
-                       :selected      => selected },
+                       :selected      => attribute_map[:network_selected] },
                      { :class => "span2", :label => _("Network") } %>
   </div>
 </div>

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

@@ -1,36 +1,11 @@
 <div class="fields">
-  <%
-	 selected_item_c = ''
-     selected_item_b = ''
-	 
-	 if controller_name == 'hosts'
-		 compute_attributes = compute_resource.compute_profile_attributes_for(params['host']['compute_profile_id'])   
-		 if params && params['host']['compute_profile_id'] != ""  
-			selected_item_c  = compute_attributes['custom_template_name']
-			selected_item_b  = compute_attributes['builtin_template_name']		 
-		 elsif params && params['host'] && params['host']['compute_attributes']
-			selected_item_c = params['host']['compute_attributes']['custom_template_name']
-		    selected_item_b = params['host']['compute_attributes']['builtin_template_name']
-		 end
-	 
-	 elsif controller_name == 'compute_attributes'
-		compute_attributes = compute_resource.compute_profile_attributes_for(params['compute_profile_id'])
-		if compute_attributes['custom_template_name']
-			selected_item_c  = compute_attributes['custom_template_name']
-		end 
-		if compute_attributes['builtin_template_name']
-			selected_item_b  = compute_attributes['builtin_template_name']
-		end
-	 end
-  -%>
-
   <div id='templates' class=''>
     <div class="form-group">
-      <%= selectable_f f, :custom_template_name,[[_("No template"), ""]] + compute_resource.custom_templates.map { |t| [t.name, t.name] }, { :selected => selected_item_c }, :class => 'form-control span2', :label => 'Custom Template' %>
+      <%= selectable_f f, :custom_template_name,[[_("No template"), ""]] + compute_resource.custom_templates.map { |t| [t.name, t.name] }, { :selected => attribute_map[:template_selected_custom] }, :class => 'form-control span2', :label => 'Custom Template' %>
     </div>
 
     <div class="form-group ">
-      <%= selectable_f f, :builtin_template_name,[[_("No template"), ""]] + compute_resource.builtin_templates.map { |t| [t.name, t.name] }, { :selected => selected_item_b }, :class => 'form-control span2', :label => 'Builtin Template' %>
+      <%= selectable_f f, :builtin_template_name,[[_("No template"), ""]] + compute_resource.builtin_templates.map { |t| [t.name, t.name] }, { :selected => attribute_map[:template_selected_builtin] }, :class => 'form-control span2', :label => 'Builtin Template' %>
     </div>
   </div>
 </div>

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

@@ -1,34 +1,6 @@
 <div class="fields">
-  <%
-     selected = ""
-     size = ""
-	 	
-	 if controller_name == 'hosts'
-		 compute_attributes = compute_resource.compute_profile_attributes_for(params['host']['compute_profile_id'])   
-		 if params && params['host']['compute_profile_id'] != ""
-			   size 	= compute_attributes['VBDs']['physical_size']
-			   selected = compute_attributes['VBDs']['sr_uuid']
-		 elsif params && params['host'] && params['host']['compute_attributes'] && params['host']['compute_attributes']['VBDs']['physical_size'] != ""
-			   selected = params['host']['compute_attributes']['VBDs']['print']
-			   size     = params['host']['compute_attributes']['VBDs']['physical_size']
-		 elsif new.__vbds
-			   selected = new.__vbds['print']
-			   size     = new.__vbds['physical_size']
-		 end
-	 elsif controller_name == 'compute_attributes'
-		 compute_attributes = compute_resource.compute_profile_attributes_for(params['compute_profile_id'])   
-		 if compute_attributes['VBDs'] && compute_attributes['VBDs']['physical_size']
-			size 		= compute_attributes['VBDs']['physical_size']
-		 end
-		 if compute_attributes['VBDs'] && compute_attributes['VBDs']['sr_uuid']
-			selected 	= compute_attributes['VBDs']['sr_uuid']
-		 end
 
-	 end
-  -%>
-  
+  <%= selectable_f f, :sr_uuid, compute_resource.storage_pools.map{ |item| [item[:display_name], item[:uuid]]}, { :selected => attribute_map[:volume_selected] }, :class => "span2", :label => _("Storage Repository") %>
 
-  <%= selectable_f f, :sr_uuid, compute_resource.storage_pools.map{ |item| [item[:display_name], item[:uuid]]}, { :selected => selected }, :class => "span2", :label => _("Storage Repository") %>
-
-  <%= text_f f, :physical_size, :class => "input-mini", :label => _("Size (GB)"), :value => size %>
+  <%= 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,28 +1,11 @@
 <%
-   vmdata = { :ifs         =>
-                      { '0' => {
-                              :ip      => '',
-                              :gateway => '',
-                              :netmask => ''
-                      }
-                      },
-              :nameserver1 => '',
-              :nameserver2 => '',
-              :environment => ''
-   }
-
 
    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
 
-   ip = vmdata[:ifs]['0'][:ip]
-   gateway = vmdata[:ifs]['0'][:gateway]
-   netmask = vmdata[:ifs]['0'][:netmask]
-   nameserver1 = vmdata[:nameserver1]
-   nameserver2 = vmdata[:nameserver2]
-   environment = vmdata[:environment]
-
    disabled = 'readonly'
 
 %>
@@ -35,7 +18,7 @@
       <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="<%= ip %>">
+          <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>
@@ -44,7 +27,7 @@
       <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="<%= gateway %>">
+          <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>
@@ -53,7 +36,7 @@
       <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="<%= netmask %>">
+          <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>
@@ -61,21 +44,21 @@
     <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="<%= nameserver1 %>">
+        <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="<%= nameserver2 %>">
+        <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="<%= environment %>">
+        <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>

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

@@ -1,4 +1,6 @@
 <% 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;'
@@ -12,9 +14,6 @@
 	  fields_enabled = true	
 	  compute_attributes = compute_resource.compute_profile_attributes_for(params['compute_profile_id'])
 	  name 			= compute_attributes['name']
-	  vcpus_max 	= compute_attributes['vcpus_max']
-	  memory_min 	= compute_attributes['memory_min']
-	  memory_max	= compute_attributes['memory_max']
    else
      fields_enabled = false
    end
@@ -27,9 +26,9 @@
     <legend>VM Profile</legend>
     <div class="fields">
       <!--<%= text_f f, :name, :disabled => !fields_enabled, :value => name, :label => 'Name' if controller_name != 'hosts' %>-->
-      <%= selectable_f f, :vcpus_max, 1..compute_resource.max_cpu_count, {:selected  => vcpus_max}, :class => 'input-mini', :disabled => !fields_enabled, :label => 'vCPUs' %>
-      <%= selectable_f f, :memory_min, memory_options(compute_resource.max_memory), {:selected  => memory_min}, :class => 'form-control span2', :disabled => !fields_enabled, :label => 'Memory Min' %>
-      <%= selectable_f f, :memory_max, memory_options(compute_resource.max_memory), {:selected  => memory_max}, :class => 'form-control span2', :disabled => !fields_enabled, :label => 'Memory Max' %>
+      <%= selectable_f f, :vcpus_max, 1..compute_resource.max_cpu_count, {:selected  => attribute_map[:cpu_count]}, :class => 'input-mini', :disabled => !fields_enabled, :label => 'vCPUs' %>
+      <%= selectable_f f, :memory_min, memory_options(compute_resource.max_memory), {:selected  => attribute_map[:memory_min]}, :class => 'form-control span2', :disabled => !fields_enabled, :label => 'Memory Min' %>
+      <%= selectable_f f, :memory_max, memory_options(compute_resource.max_memory), {:selected  => attribute_map[:memory_max]}, :class => 'form-control span2', :disabled => !fields_enabled, :label => 'Memory Max' %>
     </div>
   </fieldset>
 </div>
@@ -37,14 +36,14 @@
 <!-- Templates -->
 <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 %>
+      <%= 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 %>
+      <%= render 'compute_resources_vms/form/xenstore', :f => f, :compute_resource => compute_resource, :new => new, :attribute_map => attribute_map %>
   <% end %>
 </div>
 
@@ -52,7 +51,7 @@
 <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 %>
+          <%= render 'compute_resources_vms/form/volume', :f => i, :compute_resource => compute_resource, :new => new, :attribute_map => attribute_map %>
       <% end -%>
   <% end -%>
 </div>
@@ -61,14 +60,14 @@
 <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 %>
+          <%= render 'compute_resources_vms/form/network', :f => i, :compute_resource => compute_resource, :new => new, :attribute_map => attribute_map %>
       <% end -%>
   <% end -%>
 </div>
 
 <div class="children_fields" id="xenserver-hosts" style="<%= hide_raw %>">
   <%= 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 %>
+      <%= render 'compute_resources_vms/form/hypervisors', :f => f, :compute_resource => compute_resource, :new => new, :attribute_map => attribute_map %>
   <% end -%>
 </div>
 

data/lib/foreman_xen/version.rb

@@ -1,3 +1,3 @@
 module ForemanXen
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Pavel Nemirovsky, Michal Piotrowski, Avi Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -49,6 +49,7 @@ files:
 - README.md
 - Rakefile
 - app/controllers/foreman_xen/snapshots_controller.rb
+- app/helpers/xen_compute_helper.rb
 - app/models/concerns/fog_extensions/xenserver/server.rb
 - app/models/concerns/foreman_xen/host_helper_extensions.rb
 - app/models/foreman_xen/xenserver.rb
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provision and manage XEN Server from Foreman