foreman_xen 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7970c57af652a76865ce11386d3f96d2ad5cd789
-  data.tar.gz: 8b7a10b16676968ce4a50fcb3d3bc59c5f3248c1
+  metadata.gz: 8d4e7a7c9e4fabcd5946a7b155453661efd872f2
+  data.tar.gz: 30ced528a243b7267340ba682f01d27e3e8400db
 SHA512:
-  metadata.gz: 1e45718f60595e04ccf5b634df462952bf7494881966b4519c2120ebae45a2f5c3a080f525236fff92f2625eb16146d0e62f1ff4b827692fbfc8d259965ee1d5
-  data.tar.gz: c3106ac70bdc20df5c749d63d89dd26234700f3a6e2005645870e5883209408befbbbfcf357bc68b0727e81b69faf18c7e5d2f8987afaf8e0f13001d3d1a0297
+  metadata.gz: 4cb8a8f9329784a6bdf9ca7d2869ddabdb1becda7e355b195511bc5173df093c775e1f9c30ca0e712f1f24f60b246f4d5b0ef37d1d7b56dfb6347e0f0b12cb0b
+  data.tar.gz: d0bbbec49fd6d0c921aed943cd46e7a45006b135a3a31a0650cc45d5bfba3918ac60db26429ee6955a1680551d2d6c2bfbfa41b2d35959d8a5c7e40bbfe1cf79

data/app/controllers/foreman_xen/snapshots_controller.rb

@@ -36,7 +36,7 @@ module ForemanXen
           vm.revert(ref)
           vm.start
           process_success(
-            :success_msg => "Successfully reverted and powered on #{@host.name}",
+            :success_msg      => "Successfully reverted and powered on #{@host.name}",
             :success_redirect => "/foreman_xen/snapshots/#{id}"
           )
         else
@@ -71,7 +71,7 @@ module ForemanXen
         process_error(:error_msg => "Error retrieving compute resource information for host id: #{id}")
       end
       process_success(
-        :success_msg => "Successfully deleted snapshot: #{name}",
+        :success_msg      => "Successfully deleted snapshot: #{name}",
         :success_redirect => "/foreman_xen/snapshots/#{id}"
       )
     end
@@ -110,7 +110,7 @@ module ForemanXen
         if !vm.nil?
           vm.snapshot(name)
           process_success(
-            :success_msg => "Successfully created snapshot #{name} for #{@host.name}",
+            :success_msg      => "Successfully created snapshot #{name} for #{@host.name}",
             :success_redirect => "/foreman_xen/snapshots/#{id}"
           )
         else

data/app/helpers/xen_compute_helper.rb

@@ -10,7 +10,7 @@ module XenComputeHelper
 
   def init_vmdata
     vmdata = {
-      :ifs => {
+      :ifs         => {
         '0' => {
           :ip      => '',
           :gateway => '',

data/app/models/concerns/fog_extensions/xenserver/server.rb

@@ -12,11 +12,9 @@ module FogExtensions
         name
       end
 
-      def nics_attributes=(attrs)
-      end
+      def nics_attributes=(attrs); end
 
-      def volumes_attributes=(attrs)
-      end
+      def volumes_attributes=(attrs); end
 
       def memory
         memory_static_max.to_i
@@ -26,6 +24,10 @@ module FogExtensions
         reboot
       end
 
+      def stop
+        shutdown
+      end
+
       def ready?
         running?
       end

data/app/models/concerns/foreman_xen/host_helper_extensions.rb

@@ -15,7 +15,8 @@ module ForemanXen
                 _('Xen Snapshots'),
                 "../foreman_xen/snapshots/#{@host.id}/",
                 :title => _('Manage machine snapshots'),
-                :id => :xen_snap_button
+                :id    => :xen_snap_button,
+                :class => 'btn btn-default'
               )
             )
           )

data/app/models/foreman_xen/xenserver.rb

@@ -15,9 +15,10 @@ module ForemanXen
       [:build]
     end
 
-    def find_vm_by_uuid(ref)
-      client.servers.get(ref)
+    def find_vm_by_uuid(uuid)
+      client.servers.get(uuid)
     rescue Fog::XenServer::RequestFailed => e
+      Foreman::Logging.exception("Failed retrieving xenserver vm by uuid #{uuid}", e)
       raise(ActiveRecord::RecordNotFound) if e.message.include?('HANDLE_INVALID')
       raise(ActiveRecord::RecordNotFound) if e.message.include?('VM.get_record: ["SESSION_INVALID"')
       raise e
@@ -66,7 +67,7 @@ module ForemanXen
       rescue
         []
       end
-      tmps.sort { |a, b| a.name <=> b.name }
+      tmps.sort_by(&:name)
     end
 
     def new_nic(attr = {})
@@ -100,7 +101,7 @@ module ForemanXen
           break
         end
 
-        if found == 0
+        if found.zero?
           subresults[:name]         = sr.name
           subresults[:display_name] = sr.name
           subresults[:uuid]         = sr.uuid
@@ -124,7 +125,7 @@ module ForemanXen
       rescue
         []
       end
-      networks.sort { |a, b| a.name <=> b.name }
+      networks.sort_by(&:name)
     end
 
     def templates
@@ -139,7 +140,7 @@ module ForemanXen
       rescue
         []
       end
-      tmps.sort { |a, b| a.name <=> b.name }
+      tmps.sort_by(&:name)
     end
 
     def builtin_templates
@@ -148,11 +149,11 @@ module ForemanXen
       rescue
         []
       end
-      tmps.sort { |a, b| a.name <=> b.name }
+      tmps.sort_by(&:name)
     end
 
     def associated_host(vm)
-      associate_by('mac', vm.interfaces.map(&:mac))
+      associate_by('mac', vm.interfaces.map(&:mac).map { |mac| Net::Validations.normalize_mac(mac) })
     end
 
     def find_snapshots_for_vm(vm)
@@ -175,7 +176,7 @@ module ForemanXen
       rescue
         []
       end
-      tmps.sort { |a, b| a.name <=> b.name }
+      tmps.sort_by(&:name)
     end
 
     def new_vm(attr = {})
@@ -203,10 +204,10 @@ module ForemanXen
       begin
         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 = custom_template_name != '' ? create_vm_from_custom(args) : create_vm_from_builtin(args)
         vm.set_attribute('name_description', 'Provisioned by Foreman')
-        vm.set_attribute('VCPUs_at_startup', args[:vcpus_max])
         vm.set_attribute('VCPUs_max', args[:vcpus_max])
+        vm.set_attribute('VCPUs_at_startup', args[:vcpus_max])
         vm.reload
         return vm
       rescue => e
@@ -337,9 +338,9 @@ module ForemanXen
       tunnel.start
       logger.info 'VNCTunnel started'
       WsProxy.start(
-        :host => tunnel.host,
+        :host      => tunnel.host,
         :host_port => tunnel.port,
-        :password => ''
+        :password  => ''
       ).merge(
         :type => 'vnc',
         :name => vm.name
@@ -358,10 +359,10 @@ module ForemanXen
 
     def client
       @client ||= ::Fog::Compute.new(
-        :provider => 'XenServer',
-        :xenserver_url => url,
-        :xenserver_username => user,
-        :xenserver_password => password,
+        :provider                     => 'XenServer',
+        :xenserver_url                => url,
+        :xenserver_username           => user,
+        :xenserver_password           => password,
         :xenserver_redirect_to_master => true
       )
     end

data/lib/foreman_xen/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Pavel Nemirovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-12-23 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.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Provision and manage XEN Server from Foreman