foreman_xen 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 252a85f3d108973f856c0e3a60cf03baa59614d1
-  data.tar.gz: a2e2bfd8fe410b24048747ec484cae6224658ad4
+  metadata.gz: 6ec91f411f72a1ff46a7ec6a185e22e842866736
+  data.tar.gz: 30682ce9742b077e2f9a62a448209a30d189f72d
 SHA512:
-  metadata.gz: 78b409752919f56e5103edd9622e5b380f9fce7ff5cc0186f95fa8f97fb11f9b49349212b59132e345d2cd5e1a850a45914299b38686dfe7bfe17a7c5f169286
-  data.tar.gz: 23f9bd44e6b29436b8820887281000d98d254a96dc6b1a2b3893b3b75226f7c5c45c73bcc9e091177d6fdbd093841a9c28e40387b146518e0252161367f50a5b
+  metadata.gz: adcc6e188b5df8ab67e07199a6a590699ea87908797f01d9a569e0d61a8d8f802abc5994fe689cb6f1f141d4123b3b8a5824056c69c50edaff0d00a161dd157e
+  data.tar.gz: e7dcb42fd309b4ee4a03a73d722d92fb8c16b1e04af0f6389d03a22d9833c739c210b761219d64afdb87dec21a8bdc44a6eb1df7a3fb6568f771ae020a4a797f

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

data/app/models/foreman_xen/xenserver.rb

@@ -151,7 +151,7 @@ module ForemanXen
     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)
@@ -204,8 +204,8 @@ module ForemanXen
         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')
-        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

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

@@ -18,16 +18,16 @@
    end
 
 -%>
-
+<%= javascript_tag("$(document).on('ContentLoad', tfm.numFields.initAll)"); %>
 <!-- VM Initial Settings -->
 <div class="children_fields">
   <fieldset id="vm_profile">
     <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 => 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' %>
+      <%= counter_f f,   :vcpus_max,  :disabled => !fields_enabled, :label => _('vCPUs'),      :label_size => 'col-md-2', :'data-soft-max' => compute_resource.max_cpu_count %>
+      <%= byte_size_f f, :memory_min, :disabled => !fields_enabled, :label => _('Memory Min'), :label_size => "col-md-2", :'data-soft-max' => compute_resource.max_memory %>
+      <%= byte_size_f f, :memory_max, :disabled => !fields_enabled, :label => _('Memory Max'), :label_size => "col-md-2", :'data-soft-max' => compute_resource.max_memory %>
     </div>
   </fieldset>
 </div>
@@ -190,8 +190,3 @@
         }
     })
 </script>
-
-<!--
-<%= debug params -%>
-<%= debug compute_attributes -%>
--->

data/lib/foreman_xen/version.rb

@@ -1,3 +1,3 @@
 module ForemanXen
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_xen
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Pavel Nemirovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 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