beaker-hostgenerator 0.6.0 → 0.7.0

data/lib/beaker-hostgenerator/data.rb

@@ -64,6 +64,21 @@ module BeakerHostGenerator
 
     def osinfo
       {
+        'aix53-POWER' => {
+          :general => {
+            'platform' => 'aix-5.3-power'
+          }
+        },
+        'aix61-POWER' => {
+          :general => {
+            'platform' => 'aix-6.1-power'
+          }
+        },
+        'aix71-POWER' => {
+          :general => {
+            'platform' => 'aix-7.1-power'
+          }
+        },
         'arista4-32' => {
           :general => {
             'platform' => 'eos-4-i386'
@@ -220,228 +235,228 @@ module BeakerHostGenerator
             'template' => 'debian-9-x86_64'
           }
         },
-        'oracle5-32' => {
+        'fedora14-32' => {
           :general => {
-            'platform' => 'el-5-i386'
+            'platform' => 'fedora-14-i386'
           },
           :vmpooler => {
-            'template' => 'oracle-5-i386'
+            'template' => 'fedora-14-i386'
           }
         },
-        'oracle5-64' => {
+        'fedora19-32' => {
           :general => {
-            'platform' => 'el-5-x86_64'
+            'platform' => 'fedora-19-i386'
           },
           :vmpooler => {
-            'template' => 'oracle-5-x86_64'
+            'template' => 'fedora-19-i386'
           }
         },
-        'oracle6-32' => {
+        'fedora19-64' => {
           :general => {
-            'platform' => 'el-6-i386'
+            'platform' => 'fedora-19-x86_64'
           },
           :vmpooler => {
-            'template' => 'oracle-6-i386'
+            'template' => 'fedora-19-x86_64'
           }
         },
-        'oracle6-64' => {
+        'fedora20-32' => {
           :general => {
-            'platform' => 'el-6-x86_64'
+            'platform' => 'fedora-20-i386'
           },
           :vmpooler => {
-            'template' => 'oracle-6-x86_64'
+            'template' => 'fedora-20-i386'
           }
         },
-        'oracle7-64' => {
+        'fedora20-64' => {
           :general => {
-            'platform' => 'el-7-x86_64'
+            'platform' => 'fedora-20-x86_64'
           },
           :vmpooler => {
-            'template' => 'oracle-7-x86_64'
+            'template' => 'fedora-20-x86_64'
           }
         },
-        'osx109-64' => {
+        'fedora21-32' => {
           :general => {
-            'platform' => 'osx-10.9-x86_64'
+            'platform' => 'fedora-21-i386'
           },
           :vmpooler => {
-            'template' => 'osx-109-x86_64'
+            'template' => 'fedora-21-i386'
           }
         },
-        'osx1010-64' => {
+        'fedora21-64' => {
           :general => {
-            'platform' => 'osx-10.10-x86_64'
+            'platform' => 'fedora-21-x86_64'
           },
           :vmpooler => {
-            'template' => 'osx-1010-x86_64'
+            'template' => 'fedora-21-x86_64'
           }
         },
-        'osx1011-64' => {
+        'fedora22-32' => {
           :general => {
-            'platform' => 'osx-10.11-x86_64'
+            'platform' => 'fedora-22-i386'
           },
           :vmpooler => {
-            'template' => 'osx-1011-x86_64'
+            'template' => 'fedora-22-i386'
           }
         },
-        'redhat4-32' => {
+        'fedora22-64' => {
           :general => {
-            'platform' => 'el-4-i386'
+            'platform' => 'fedora-22-x86_64'
           },
           :vmpooler => {
-            'template' => 'redhat-4-i386'
+            'template' => 'fedora-22-x86_64'
           }
         },
-        'redhat4-64' => {
+        'fedora23-32' => {
           :general => {
-            'platform' => 'el-4-x86_64'
+            'platform' => 'fedora-23-i386'
           },
           :vmpooler => {
-            'template' => 'redhat-4-x86_64'
+            'template' => 'fedora-23-i386'
           }
         },
-        'redhat5-32' => {
+        'fedora23-64' => {
           :general => {
-            'platform' => 'el-5-i386'
+            'platform' => 'fedora-23-x86_64'
           },
           :vmpooler => {
-            'template' => 'redhat-5-i386'
+            'template' => 'fedora-23-x86_64'
           }
         },
-        'redhat5-64' => {
+        'opensuse11-32' => {
           :general => {
-            'platform' => 'el-5-x86_64'
+            'platform' => 'opensuse-11-i386'
           },
           :vmpooler => {
-            'template' => 'redhat-5-x86_64'
+            'template' => 'opensuse-11-i386'
           }
         },
-        'redhat6-32' => {
+        'opensuse11-64' => {
           :general => {
-            'platform' => 'el-6-i386'
+            'platform' => 'opensuse-11-x86_64'
           },
           :vmpooler => {
-            'template' => 'redhat-6-i386'
+            'template' => 'opensuse-11-x86_64'
           }
         },
-        'redhat6-64' => {
+        'oracle5-32' => {
           :general => {
-            'platform' => 'el-6-x86_64'
+            'platform' => 'el-5-i386'
           },
           :vmpooler => {
-            'template' => 'redhat-6-x86_64'
+            'template' => 'oracle-5-i386'
           }
         },
-        'redhat7-64' => {
+        'oracle5-64' => {
           :general => {
-            'platform' => 'el-7-x86_64'
+            'platform' => 'el-5-x86_64'
           },
           :vmpooler => {
-            'template' => 'redhat-7-x86_64'
+            'template' => 'oracle-5-x86_64'
           }
         },
-        'fedora14-32' => {
+        'oracle6-32' => {
           :general => {
-            'platform' => 'fedora-14-i386'
+            'platform' => 'el-6-i386'
           },
           :vmpooler => {
-            'template' => 'fedora-14-i386'
+            'template' => 'oracle-6-i386'
           }
         },
-        'fedora19-32' => {
+        'oracle6-64' => {
           :general => {
-            'platform' => 'fedora-19-i386'
+            'platform' => 'el-6-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-19-i386'
+            'template' => 'oracle-6-x86_64'
           }
         },
-        'fedora19-64' => {
+        'oracle7-64' => {
           :general => {
-            'platform' => 'fedora-19-x86_64'
+            'platform' => 'el-7-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-19-x86_64'
+            'template' => 'oracle-7-x86_64'
           }
         },
-        'fedora20-32' => {
+        'osx109-64' => {
           :general => {
-            'platform' => 'fedora-20-i386'
+            'platform' => 'osx-10.9-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-20-i386'
+            'template' => 'osx-109-x86_64'
           }
         },
-        'fedora20-64' => {
+        'osx1010-64' => {
           :general => {
-            'platform' => 'fedora-20-x86_64'
+            'platform' => 'osx-10.10-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-20-x86_64'
+            'template' => 'osx-1010-x86_64'
           }
         },
-        'fedora21-32' => {
+        'osx1011-64' => {
           :general => {
-            'platform' => 'fedora-21-i386'
+            'platform' => 'osx-10.11-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-21-i386'
+            'template' => 'osx-1011-x86_64'
           }
         },
-        'fedora21-64' => {
+        'redhat4-32' => {
           :general => {
-            'platform' => 'fedora-21-x86_64'
+            'platform' => 'el-4-i386'
           },
           :vmpooler => {
-            'template' => 'fedora-21-x86_64'
+            'template' => 'redhat-4-i386'
           }
         },
-        'fedora22-32' => {
+        'redhat4-64' => {
           :general => {
-            'platform' => 'fedora-22-i386'
+            'platform' => 'el-4-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-22-i386'
+            'template' => 'redhat-4-x86_64'
           }
         },
-        'fedora22-64' => {
+        'redhat5-32' => {
           :general => {
-            'platform' => 'fedora-22-x86_64'
+            'platform' => 'el-5-i386'
           },
           :vmpooler => {
-            'template' => 'fedora-22-x86_64'
+            'template' => 'redhat-5-i386'
           }
         },
-        'fedora23-32' => {
+        'redhat5-64' => {
           :general => {
-            'platform' => 'fedora-23-i386'
+            'platform' => 'el-5-x86_64'
           },
           :vmpooler => {
-            'template' => 'fedora-23-i386'
+            'template' => 'redhat-5-x86_64'
           }
         },
-        'fedora23-64' => {
+        'redhat6-32' => {
           :general => {
-            'platform' => 'fedora-23-x86_64'
+            'platform' => 'el-6-i386'
           },
           :vmpooler => {
-            'template' => 'fedora-23-x86_64'
+            'template' => 'redhat-6-i386'
           }
         },
-        'opensuse11-32' => {
+        'redhat6-64' => {
           :general => {
-            'platform' => 'opensuse-11-i386'
+            'platform' => 'el-6-x86_64'
           },
           :vmpooler => {
-            'template' => 'opensuse-11-i386'
+            'template' => 'redhat-6-x86_64'
           }
         },
-        'opensuse11-64' => {
+        'redhat7-64' => {
           :general => {
-            'platform' => 'opensuse-11-x86_64'
+            'platform' => 'el-7-x86_64'
           },
           :vmpooler => {
-            'template' => 'opensuse-11-x86_64'
+            'template' => 'redhat-7-x86_64'
           }
         },
         'scientific5-32' => {
@@ -540,6 +555,11 @@ module BeakerHostGenerator
             'template' => 'solaris-10-x86_64'
           }
         },
+        'solaris10-SPARC' => {
+          :general => {
+            'platform' => 'solaris-10-sparc'
+          }
+        },
         'solaris11-32' => {
           :general => {
             'platform' => 'solaris-11-i386'
@@ -556,6 +576,11 @@ module BeakerHostGenerator
             'template' => 'solaris-11-x86_64'
           }
         },
+        'solaris11-SPARC' => {
+          :general => {
+            'platform' => 'solaris-11-sparc'
+          }
+        },
         'solaris112-32' => {
           :general => {
             'platform' => 'solaris-11.2-i386'

data/lib/beaker-hostgenerator/generator.rb

@@ -28,6 +28,12 @@ module BeakerHostGenerator
       ostype = nil
       bhg_version = options[:osinfo_version] || 0
 
+      # Merge in global configuration settings
+      if options[:global_config]
+        global_config = settings_string_to_map(options[:global_config])
+        config['CONFIG'].deep_merge!(global_config)
+      end
+
       tokens.each do |token|
         if is_ostype_token?(token, bhg_version)
           if nodeid[ostype] == 1 and ostype != nil
@@ -72,6 +78,9 @@ module BeakerHostGenerator
         nodeid[ostype] += 1
       end
 
+      # Munge non-string scalar values into proper data types
+      unstringify_values!(config)
+
       return config.to_yaml
     end
 
@@ -107,5 +116,34 @@ module BeakerHostGenerator
         end
       end
     end
+
+    # Passes over all the values of config['HOSTS'] and config['CONFIG'] and
+    # converts any numbers and booleans into proper integer and boolean types.
+    def unstringify_values!(config)
+      config['HOSTS'].each do |host, settings|
+        settings.each do |k, v|
+          config['HOSTS'][host][k] = unstringify_number_or_boolean(v)
+        end
+      end
+      config['CONFIG'].each do |k, v|
+        config['CONFIG'][k] = unstringify_number_or_boolean(v)
+      end
+    end
+
+    # Attempts to convert numeric strings and boolean strings into proper
+    # integer and boolean types. Returns the input value if it's not a
+    # number string or boolean string.
+    # For example "123" would be converted to 123, and "true"/"false" would be
+    # converted to true/false.
+    # The only valid boolean-strings are "true" and "false".
+    def unstringify_number_or_boolean(value)
+      result = Integer(value) rescue value
+      if value == 'true'
+        result = true
+      elsif value == 'false'
+        result = false
+      end
+      result
+    end
   end
 end

data/lib/beaker-hostgenerator/hypervisor.rb

@@ -5,7 +5,7 @@ module BeakerHostGenerator
   # the appropriate hypervisor implementation.
   #
   # New hypervisor implementations must define the methods in the Interface
-  # class, and add a new element to the `supported_hypervisors` map.
+  # class, and add a new element to the `builtin_hypervisors` map.
   #
   # Any number of hypervisors are used by a single Generator during host
   # generation in the `BeakerHostGenerator::Generator#generate` method.
@@ -16,26 +16,26 @@ module BeakerHostGenerator
 
     # Static factory method to instantiate the appropriate hypervisor for the
     # given node. If no hypervisor is specified in the node info, then the
-    # hypervisor specified in the options will be created.
+    # hypervisor specified in the options will be created. If the hypervisor is
+    # not a built-in implementation, then an `Unknown` instance will be used.
     #
     # @param node_info [Hash{String=>Object}] Node data parsed from the input
     #                                         spec string.
     #
     # @option options [String] :hypervisor The string name of the hypervisor to
-    #                          create. An exception will be thrown if the
-    #                          hypervisor is unrecognized.
+    #                          create.
     def self.create(node_info, options)
       name = node_info['host_settings']['hypervisor'] || options[:hypervisor]
-      hypervisor = supported_hypervisors[name]
+      hypervisor = builtin_hypervisors[name]
       if hypervisor
         hypervisor.new
       else
-        raise "Invalid hypervisor: #{name}"
+        BeakerHostGenerator::Hypervisor::Unknown.new(name)
       end
     end
 
-    # Returns a map of all valid hypervisor implementations, where the keys are
-    # the string names and the values are the implementation classes.
+    # Returns a map of all built-in hypervisor implementations, where the keys
+    # are the string names and the values are the implementation classes.
     #
     # The string names are part of the beaker-hostgenerator API as they are
     # used for specifying the default or per-host hypervisor in the layout
@@ -43,9 +43,8 @@ module BeakerHostGenerator
     #
     # @returns [Hash{String=>Hypervisor::Interface}] A map of hypervisor names
     #                                                and their implementations.
-    def self.supported_hypervisors()
+    def self.builtin_hypervisors()
       {
-        'none' => BeakerHostGenerator::Hypervisor::None,
         'vmpooler' => BeakerHostGenerator::Hypervisor::Vmpooler
       }
     end
@@ -93,5 +92,5 @@ end
 # in the `create` factory method. We need to put these require statements at the
 # bottom of this file to avoid circular references between this file and the
 # hypervisor implementation files.
+require 'beaker-hostgenerator/hypervisor/unknown'
 require 'beaker-hostgenerator/hypervisor/vmpooler'
-require 'beaker-hostgenerator/hypervisor/none'