foreman_xen 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf86d445212406a7e6272d38901bbf3775dabae3
-  data.tar.gz: f8fcff62613110e76de79caebed200cb3b210293
+  metadata.gz: c50ccd826ef2ecbcf80ba0e0a30d20386b1866c2
+  data.tar.gz: 4b917f127777166ba7f1811815c5d31efc840df5
 SHA512:
-  metadata.gz: 6baec9017286dbfcd59f5ed4a1a4bc9898ce5d0c4077748fc5e349c724481614b618d0126ddd4533d68b4d062ab2313d164b60b36aa1e2ac58f07c79069190f4
-  data.tar.gz: 3e6f83333a0912229e3ef87a2b1f9feb21be179f4b05e9843d7aeed82422cfd6a3125abcc47dbd297d6a852e4980dd9080c71e8bf708af158303bd4dbc22ff8e
+  metadata.gz: eef516f319dd09e05b4741d6e87be4d88fd18f258889cbeeb5b5b3fd0a7cb5b7e34194634d6ee90c39b307b3aedc1636356c7d28a07f65698a0f0228d5b4bb36
+  data.tar.gz: 3f53be8b059ff013e13660db23774cb215534aac874a760133a0ca7b33cd81e661d73c6ef44f2c804320a9d4b4492ca49f1da33805cb6a34825eeeb4f46f45a7

data/app/helpers/xen_compute_helper.rb

@@ -41,23 +41,19 @@ module XenComputeHelper
       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
+      attribute_map[:cpu_count] = new.vcpus_max ? new.vcpus_max : nil
+      attribute_map[:memory_min] = new.memory_static_min ? new.memory_static_min : nil
+      attribute_map[:memory_max] = new.memory_static_max ? new.memory_static_max : nil
       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
+        vdi = new.vbds.first.vdi
+        if vdi
+          attribute_map[:volume_selected] = vdi.sr.uuid ? vdi.sr.uuid : nil
+          attribute_map[:volume_size] = vdi.virtual_size ? (vdi.virtual_size.to_i / 1073741824).to_s : nil
+        end
       end
       if new.__vifs
-        attribute_map[:network_selected] = new.__vifs['print'] ? new.__vifs['print'] : nil
+        attribute_map[:network_selected] = new.networks.first.name ? new.networks.first.name : nil
       end
     end
     attribute_map

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

@@ -7,7 +7,6 @@
    end
    
    if controller_name == 'hosts'
-      compute_attributes = compute_resource.compute_profile_attributes_for(params['host']['compute_profile_id'])   
 	  fields_enabled = true
 	  start_enable 	 = true
 	elsif controller_name == 'compute_attributes'
@@ -74,7 +73,7 @@
 <!-- Startup -->
 <div class="children_fields" id="xenserver-vm-start" style="<%= hide_raw %>">
   <%= field_set_tag 'VM Startup Options', :id => 'vm_starup_options', :title => _('Power ON VM') do -%>
-	<%= checkbox_f f, :start, :checked => (compute_attributes['start'] == '1' || start_enable), :label => _("Power ON VM") %>
+	<%= checkbox_f f, :start, :checked => (attribute_map[:power_on] == '1' || start_enable), :label => _("Power ON VM") %>
   <% end -%>
 </div>
 

data/lib/foreman_xen/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Pavel Nemirovsky, Michal Piotrowski, Avi Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake