foreman_xen 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f1adce9377bfddcc90e390be4aa635db21f6c60
-  data.tar.gz: 7c2030f9848d832fc4cdffa24b498f4f10ecc748
+  metadata.gz: 7970c57af652a76865ce11386d3f96d2ad5cd789
+  data.tar.gz: 8b7a10b16676968ce4a50fcb3d3bc59c5f3248c1
 SHA512:
-  metadata.gz: 524c2b085d36a462d32c8c7d6ec3105739da12881a17a6ec8fe8ff9e6a1d906e9fbe7630211b5d5912380bbdf26aa205ec4d4153d7b3abf680bf10681639ba44
-  data.tar.gz: 8618ce64c4381cb460af72b5443efb079b88014a37547f4c53b211705106015291c014bf7682417f01dcdb03a664ec3cc18586999c1bbe56a8c56cb97d7e51a5
+  metadata.gz: 1e45718f60595e04ccf5b634df462952bf7494881966b4519c2120ebae45a2f5c3a080f525236fff92f2625eb16146d0e62f1ff4b827692fbfc8d259965ee1d5
+  data.tar.gz: c3106ac70bdc20df5c749d63d89dd26234700f3a6e2005645870e5883209408befbbbfcf357bc68b0727e81b69faf18c7e5d2f8987afaf8e0f13001d3d1a0297

data/app/helpers/xen_compute_helper.rb

@@ -30,31 +30,31 @@ module XenComputeHelper
     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
+        attribute_map[:volume_size]     = compute_attributes['VBDs']['physical_size']
+        attribute_map[:volume_selected] = compute_attributes['VBDs']['sr_uuid']
       end
       if compute_attributes['VIFs']
-        attribute_map[:network_selected] = compute_attributes['VIFs']['print'] ? compute_attributes['VIFs']['print'] : nil
+        attribute_map[:network_selected] = compute_attributes['VIFs']['print']
       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
+      attribute_map[:template_selected_custom]  = compute_attributes['custom_template_name']
+      attribute_map[:template_selected_builtin] = compute_attributes['builtin_template_name']
+      attribute_map[:cpu_count]                 = compute_attributes['vcpus_max']
+      attribute_map[:memory_min]                = compute_attributes['memory_min']
+      attribute_map[:memory_max]                = compute_attributes['memory_max']
+      attribute_map[:power_on]                  = compute_attributes['start']
     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
+      if new.vbds
         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 / 1_073_741_824).to_s : nil
         end
       end
-      if new.__vifs
-        attribute_map[:network_selected] = new.networks.first.name ? new.networks.first.name : nil
+      if new.vifs
+        attribute_map[:network_selected] = new.vifs.first.network.name ? new.vifs.first.network.name : nil
       end
     end
     attribute_map
@@ -69,18 +69,18 @@ module XenComputeHelper
     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
+        attribute_map[:volume_size]     = compute_attributes['VBDs']['physical_size']
+        attribute_map[:volume_selected] = compute_attributes['VBDs']['sr_uuid']
       end
       if compute_attributes['VIFs']
-        attribute_map[:network_selected] = compute_attributes['VIFs']['print'] ? compute_attributes['VIFs']['print'] : nil
+        attribute_map[:network_selected] = compute_attributes['VIFs']['print']
       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
+      attribute_map[:template_selected_custom]  = compute_attributes['custom_template_name']
+      attribute_map[:template_selected_builtin] = compute_attributes['builtin_template_name']
+      attribute_map[:cpu_count]                 = compute_attributes['vcpus_max']
+      attribute_map[:memory_min]                = compute_attributes['memory_min']
+      attribute_map[:memory_max]                = compute_attributes['memory_max']
+      attribute_map[:power_on]                  = compute_attributes['start']
     end
     attribute_map
   end

data/app/models/foreman_xen/xenserver.rb

@@ -2,10 +2,13 @@ module ForemanXen
   class Xenserver < ComputeResource
     validates :url, :user, :password, :presence => true
 
+    attr_accessible :uuid
+
     def provided_attributes
       super.merge(
         :uuid => :reference,
-        :mac  => :mac)
+        :mac  => :mac
+      )
     end
 
     def capabilities
@@ -89,13 +92,12 @@ module ForemanXen
         found      = 0
 
         hosts.each do |host|
-          if sr.reference == host.suspend_image_sr
-            found                     = 1
-            subresults[:name]         = sr.name
-            subresults[:display_name] = sr.name + '(' + host.hostname + ')'
-            subresults[:uuid]         = sr.uuid
-            break
-          end
+          next unless sr.reference == host.suspend_image_sr
+          found                     = 1
+          subresults[:name]         = sr.name
+          subresults[:display_name] = sr.name + '(' + host.hostname + ')'
+          subresults[:uuid]         = sr.uuid
+          break
         end
 
         if found == 0
@@ -190,10 +192,8 @@ module ForemanXen
     end
 
     def create_vm(args = {})
-      custom_template_name  = args[:custom_template_name]
-      builtin_template_name = args[:builtin_template_name]
-      custom_template_name  = custom_template_name.to_s
-      builtin_template_name = builtin_template_name.to_s
+      custom_template_name  = args[:custom_template_name].to_s
+      builtin_template_name = args[:builtin_template_name].to_s
 
       if builtin_template_name != '' && custom_template_name != ''
         logger.info "custom_template_name: #{custom_template_name}"
@@ -201,20 +201,13 @@ module ForemanXen
         raise 'you can select at most one template type'
       end
       begin
-        vm = nil
         logger.info "create_vm(): custom_template_name: #{custom_template_name}"
         logger.info "create_vm(): builtin_template_name: #{builtin_template_name}"
         vm = (custom_template_name != '') ? create_vm_from_custom(args) : create_vm_from_builtin(args)
         vm.set_attribute('name_description', 'Provisioned by Foreman')
-        cpus = args[:vcpus_max]
-        if vm.vcpus_max.to_i < cpus.to_i
-          vm.set_attribute('VCPUs_max', cpus)
-          vm.set_attribute('VCPUs_at_startup', cpus)
-        else
-          vm.set_attribute('VCPUs_at_startup', cpus)
-          vm.set_attribute('VCPUs_max', cpus)
-        end
-        vm.refresh
+        vm.set_attribute('VCPUs_at_startup', args[:vcpus_max])
+        vm.set_attribute('VCPUs_max', args[:vcpus_max])
+        vm.reload
         return vm
       rescue => e
         logger.info e
@@ -321,13 +314,13 @@ module ForemanXen
                               :memory_dynamic_min => mem_min
 
       vm.save :auto_start => false
-      client.vbds.create :server => vm, :vdi => vdi
+      client.vbds.create :vm => vm, :vdi => vdi
 
       create_network(vm, args)
 
       vm.provision
       vm.set_attribute('HVM_boot_policy', 'BIOS order')
-      vm.refresh
+      vm.reload
       vm
     end
 
@@ -335,7 +328,7 @@ module ForemanXen
       vm = find_vm_by_uuid(uuid)
       raise 'VM is not running!' unless vm.ready?
 
-      console = vm.service.consoles.find { |c| c.__vm == vm.reference && c.protocol == 'rfb' }
+      console = vm.service.consoles.find { |c| c.vm && c.vm.reference == vm.reference && c.protocol == 'rfb' }
       raise "No console for vm #{vm.name}" if console.nil?
 
       session_ref = (vm.service.instance_variable_get :@connection).instance_variable_get :@credentials
@@ -387,17 +380,17 @@ module ForemanXen
     def create_network(vm, args)
       net        = client.networks.find { |n| n.name == args[:VIFs][:print] }
       net_config = {
-        'MAC_autogenerated'    => 'True',
-        'VM'                   => vm.reference,
+        'mac_autogenerated'    => 'True',
+        'vm'                   => vm.reference,
         'network'              => net.reference,
-        'MAC'                  => '',
+        'mac'                  => '',
         'device'               => '0',
-        'MTU'                  => '0',
+        'mtu'                  => '0',
         'other_config'         => {},
         'qos_algorithm_type'   => 'ratelimit',
         'qos_algorithm_params' => {}
       }
-      client.create_vif_custom net_config
+      vm.vifs = client.vifs.create net_config
       vm.reload
     end
 

data/lib/foreman_xen/engine.rb

@@ -13,7 +13,7 @@ module ForemanXen
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
-    initializer 'foreman_xen.register_plugin', :after => :finisher_hook do |app|
+    initializer 'foreman_xen.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_xen do
         requires_foreman '>= 1.11'
         # Register xen compute resource in foreman

data/lib/foreman_xen/version.rb

@@ -1,3 +1,3 @@
 module ForemanXen
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Pavel Nemirovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-xenserver
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provision and manage XEN Server from Foreman