From 01981ebc5bd901ac63715cd391c480ed55b218f3 Mon Sep 17 00:00:00 2001
From: Abel Coronado <acoronado@opennebula.org>
Date: Mon, 12 Feb 2018 14:17:31 +0100
Subject: [PATCH] B #1716: Check KVM_MACHINES & CPU_MODELS (#1732)

---
 .../form-panels/create/wizard-tabs/os.js      |  9 ++------
 src/sunstone/sunstone-server.rb               | 22 ++++++++++---------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js
index 883f895541..d230ef64e4 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js
@@ -276,13 +276,8 @@ define(function(require) {
       success: function (request, kvmInfo){
         var m = $("#machine-type").html();
         if (m === undefined){
-          if (kvmInfo.length !== 0){
-            machines = kvmInfo[0].set_kvm_machines;
-            cpus = kvmInfo[0].set_cpu_models;
-          } else {
-            machines = kvmInfo;
-            cpus = kvmInfo;
-          }
+          machines = kvmInfo[0].set_kvm_machines;
+          cpus = kvmInfo[0].set_cpu_models;
 
           var html = "<select id=\"machine-type\" wizard_field=\"MACHINE\">";
           html += '<option value="">' + " " + '</option>';
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index 107b8dd774..24719f12d8 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -631,24 +631,26 @@ get '/infrastructure' do
 
     set = Set.new
 
-    if !xml['HOST/TEMPLATE/CUSTOMIZATION'].nil?
-        xml.each('HOST/TEMPLATE/CUSTOMIZATION') do |customization|
-            set.add(customization['NAME'])
-        end
+    xml.each('HOST/TEMPLATE/CUSTOMIZATION') do |customization|
+        set.add(customization['NAME'])
+    end
 
-        infrastructure[:vcenter_customizations] = set.to_a
+    infrastructure[:vcenter_customizations] = set.to_a
 
-        set_cpu_models = Set.new
-        set_kvm_machines = Set.new
+    set_cpu_models = Set.new
+    set_kvm_machines = Set.new
 
-        xml.each('HOST/TEMPLATE') do |kvm|
+    xml.each('HOST/TEMPLATE') do |kvm|
+        if !kvm['KVM_CPU_MODELS'].nil?
             set_cpu_models += kvm['KVM_CPU_MODELS'].split(" ")
+        end
+        if !kvm['KVM_MACHINES'].nil?
             set_kvm_machines += kvm['KVM_MACHINES'].split(" ")
         end
-
-        infrastructure[:kvm_info] = { :set_cpu_models => set_cpu_models.to_a, :set_kvm_machines => set_kvm_machines.to_a }
     end
 
+    infrastructure[:kvm_info] = { :set_cpu_models => set_cpu_models.to_a, :set_kvm_machines => set_kvm_machines.to_a }
+
     [200, infrastructure.to_json]
 end