foreman_xen 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2df01d8a9f3e43bd910e4597a70b24e38f6dd7d9
-  data.tar.gz: b6707ccb696495513f969f8168e27f7dd8a3456a
+  metadata.gz: 71c64d229b548689dcbf45ef493820fd716f92e5
+  data.tar.gz: 51fb7425447a3c4a634117220cc5fb7fe9977f8a
 SHA512:
-  metadata.gz: 7a9bf52e332b9413d0b2502b4d41c921ebaa20af439f5257afcbcadbdb8bc40433d61b76db6ef31279d8fc0ce3aea7fc4aad46ff5f1e0d3b3ffa9931e036d9c0
-  data.tar.gz: 2138939601ccad3c2950061173ee665e416c89c651f0a47ad1b07d8b18a0e74d958b5ea9893f4084df2658a8a908ef2f298e71a2113049783a09d52a6a87d4bb
+  metadata.gz: c9bebfa016325fd8f0875e2d07fe60fdde95bcc27adfff0de0f7c05d5cd9949990c0a046109112767f4e1cf71c419ef7f49a25c5d7ce548ea930f8c71c9d9590
+  data.tar.gz: 63ab48377088db4916ea6e3eb5efb50ca60461bc8ffd278e249e44a4565c3ef53c2796f165c77ac3f67fc40761974fba2f7f49778723c048d02cf3eeaf51d9d7

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.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 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