beaker-hostgenerator 0.8.4 → 0.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjg5OWZhZmZkODRlZjA1MDAzYjYxZGExMzc2MmQ0YTQ1NjY5MjEyNw==
+    ODVjZTk2ZjQxN2JkMDlkYTMyNDQ3OTU2YTNkNTcyMjQ3MzYyNGQ4Nw==
   data.tar.gz: !binary |-
-    MDZjY2VlOWQwODQzNjI0ZjNmZTk2NDZkOTJhYWQ2MmY5ODk4MzhhYg==
+    MmYzZjJhNWEwYmViZTU2MjY3YmM3MDFjZDE1ODA4OGIwY2ZmMWQxNg==
 SHA512:
   metadata.gz: !binary |-
-    YjI5OGM4YmE5OWUzNGQ0YmY3NzhiYTUzYmVhN2RmYjNjM2M1OThlZjU2MjVi
-    OTYxMzhjOTlkZTJlNzYyZTQ3NmQxYTk2YmM2MjY3MjJiNTc4NzJhZDQ1OWVj
-    MzFlZTEyYTBmMmIzZjE0OWIzNzdhNjk4OGEwMGU0OWJmMGY1NDM=
+    YWM2ZjI2MGQ2ODI4MTc1YWY2OTNkZDYxN2E5ZjkwZmQ3NmZlMGUwNjk0Yzg1
+    YWJjOTc4MWRkYmJiNzA3MGQyNDBmMDE3OGMyN2UzYWUwZWM3NTc5MGE2OWIx
+    NzJhMmJmYzU4NjYwNmZjYjU0ZGI0ZWJkNWRhNmE1ZGEwODIzNjE=
   data.tar.gz: !binary |-
-    ZGZhOWJhYzY5ZThiNjRlMDM4OWZkMjAxYTBlMjUwYTcxNjAxYjM5NTY4MDY2
-    N2NmMjQxNjFjM2I4M2YzZTk1NzU3ZDBmYmQ0YWRhNjNmYjU0ZTVjZjkzM2Mz
-    MWU2NjQxZWY1MTI5N2NmNjZiODEyYTZiN2NiOTMyMjkzOWY4NTg=
+    NDIzMzJiZjE2ZDEyNTQxNDIyZDI5MGE4ZThhMGNhNDY2OTc3OWYwYTNkY2Qw
+    ZDFjYzBkMDlkYTkxMWQwOWFjNWE4MWEwMTVlODk2NjIxYzY0MzI4ZmNjOWQ0
+    YWUxYjVmY2NkZDFlZjU1YzNlYzkwZjI1NmQzMDQzZGU0ZGEyZWE=

data/CHANGELOG.md

@@ -6,6 +6,16 @@ Versioning](http://semver.org).
 
 ## [Unreleased][unreleased]
 
+## [0.9.0] - 2017-6-7
+- Add list data structure support to arbitrary settings, which previously only
+  supported primitive data types.
+- Add ability to override default hypervisor settings in the global config
+  section.
+- Add support for hardware platforms to the ABS hypervisor.
+- Add platforms:
+  - vro6-64
+  - vro7-64
+
 ## [0.8.4] - 2017-4-6
 - Add platform:
   - windows2012r2_wmf5-64

data/HISTORY.md

@@ -1,6 +1,7 @@
 # worker - History
 ## Tags
-* [LATEST - 6 Apr, 2017 (d80eb358)](#LATEST)
+* [LATEST - 7 Jun, 2017 (06b6a0da)](#LATEST)
+* [0.8.4 - 6 Apr, 2017 (77943fb2)](#0.8.4)
 * [0.8.3 - 7 Feb, 2017 (79e8d717)](#0.8.3)
 * [0.8.2 - 3 Jan, 2017 (a61487bf)](#0.8.2)
 * [0.8.1 - 21 Dec, 2016 (2648029d)](#0.8.1)
@@ -22,7 +23,100 @@
 * [0.0.1 - 7 Oct, 2015 (d99251e6)](#0.0.1)
 
 ## Details
-### <a name = "LATEST">LATEST - 6 Apr, 2017 (d80eb358)
+### <a name = "LATEST">LATEST - 7 Jun, 2017 (06b6a0da)
+
+* (GEM) update beaker-hostgenerator version to 0.9.0 (06b6a0da)
+
+* Merge pull request #80 from puppetlabs/prepare-for-release (b7a83889)
+
+
+```
+Merge pull request #80 from puppetlabs/prepare-for-release
+
+(MAINT) Update CHANGELOG for 0.9.0 release
+```
+* (MAINT) Update CHANGELOG for 0.9.0 release (aae2e698)
+
+* (MAINT) Fix rendering issue in README and update TOC (bc92bd07)
+
+* (QENG-4945) Add support for arbitrary lists (e75f1e7e)
+
+
+```
+(QENG-4945) Add support for arbitrary lists
+
+Before, we had no way to add lists to configurations. This adds
+a new bracket syntax within arbitrary settings in order to parse out any lists the user may want to
+add in.
+```
+* Merge pull request #79 from puppetlabs/qeng-5041 (990b6081)
+
+
+```
+Merge pull request #79 from puppetlabs/qeng-5041
+
+(QENG-5041) Add vRO to support platforms
+```
+* (QENG-5041) Add vRO to support platforms (22b7c670)
+
+
+```
+(QENG-5041) Add vRO to support platforms
+
+This adds both vro-6-x86_64 and vro-7-x86_64. The templates
+already exist within vmpooler
+```
+* Merge pull request #77 from puppetlabs/fix-default-config-hypervisors (988476e1)
+
+
+```
+Merge pull request #77 from puppetlabs/fix-default-config-hypervisors
+
+(maint) The hypervisor defaults are not overwritable
+```
+* Merge pull request #76 from puppetlabs/qeng4965/add-abs-hardware-support (874f473f)
+
+
+```
+Merge pull request #76 from puppetlabs/qeng4965/add-abs-hardware-support
+
+(QENG-4965) Add ABS support for hardware platforms
+```
+* (MAINT) Delete duplicate keys from test helper hash (0fe2c0ac)
+
+* (MAINT) Prefer underscores over dashes in file names (efe8b7b1)
+
+
+```
+(MAINT) Prefer underscores over dashes in file names
+
+Ruby prefers that you not use dashes in your .rb filenames, so this commit
+renames abs-support.rb to abs_support.rb
+```
+* (maint) The hypervisor defaults are not overwritable (1a44141b)
+
+
+```
+(maint) The hypervisor defaults are not overwritable
+Before this change the code would pull and merge the hypervisor defaults on top of any
+user provided --global-config block. This reverses the logic to use defaults only
+if the key is not specified in the --global-config section. This specifically
+enables overwritting the pooling_api for the vmpooler hypervisor, as it is the
+only one with a default global_config() method implementation. Also added it's
+respective test
+```
+* (QENG-4965) Add ABS support for hardware platforms (a9ddf44b)
+
+
+```
+(QENG-4965) Add ABS support for hardware platforms
+
+This commit makes the hardware platforms compatible with the ABS hypervisor and
+the --templates-only switch to enable hardware support in Jenkins via ABS.
+```
+### <a name = "0.8.4">0.8.4 - 6 Apr, 2017 (77943fb2)
+
+* (HISTORY) update beaker-hostgenerator history for gem release 0.8.4 (77943fb2)
 
 * (GEM) update beaker-hostgenerator version to 0.8.4 (d80eb358)
 

data/README.md

@@ -12,6 +12,7 @@ host config files using a compact command line SUT specification.
         - [Simple two-host layout](#simple-two-host-layout)
         - [Single host with Arbitrary Roles](#single-host-with-arbitrary-roles)
         - [Two hosts with multiple hypervisors and arbitrary host settings](#two-hosts-with-multiple-hypervisors-and-arbitrary-host-settings)
+        - [Two hosts with arbitrary host settings with arbitrary lists](#two-hosts-with-arbitrary-host-settings-with-arbitrary-lists)
         - [Arbitrary global configuration settings](#arbitrary-global-configuration-settings)
         - [Custom hypervisor](#custom-hypervisor)
         - [URL-encoded input](#url-encoded-input)
@@ -157,6 +158,49 @@ CONFIG:
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
 ```
 
+### Two hosts with arbitrary host settings with arbitrary lists
+
+```
+$ beaker-hostgenerator centos6-64m{disks=\[16\]-redhat7-64a{disks=\[8\,16\]}
+```
+
+Will generate
+
+```yaml
+---
+HOSTS:
+  centos6-64-1:
+    pe_dir:
+    pe_ver:
+    pe_upgrade_dir:
+    pe_upgrade_ver:
+    platform: el-6-x86_64
+    hypervisor: vmpooler
+    disks:
+    - 16
+    roles:
+    - agent
+    - master
+  redhat7-64-1:
+    pe_dir:
+    pe_ver:
+    pe_upgrade_dir:
+    pe_upgrade_ver:
+    hypervisor: vmpooler
+    platform: el-7-x86_64
+    template: redhat-7-x86_64
+    disks:
+    - 8
+    - 16
+    roles:
+    - agent
+CONFIG:
+  nfs_server: none
+  consoleport: 443
+  pooling_api: http://vmpooler.delivery.puppetlabs.net/
+```
+
+
 ### Arbitrary global configuration settings
 
 ```
@@ -227,12 +271,14 @@ It may be necessary to URL-encode the input in order for it to properly be used
 in certain contexts, such as Jenkins.
 
 In most cases it will only be necessary to escape the characters that support
-arbitrary settings, which means the following four characters:
+arbitrary settings, which means the following characters:
 
 - `{` is `%7B`
 - `,` is `%2C`
 - `}` is `%7D`
 - ` ` is `%20`
+- `[` is `%5B`
+- `]` is `%5D`
 
 For a full URL encoding reference see: http://www.w3schools.com/tags/ref_urlencode.asp
 

data/lib/beaker-hostgenerator/cli.rb

@@ -2,7 +2,7 @@ require 'beaker-hostgenerator/generator'
 require 'beaker-hostgenerator/hypervisor'
 require 'beaker-hostgenerator/roles'
 require 'beaker-hostgenerator/version'
-require 'beaker-hostgenerator/abs-support'
+require 'beaker-hostgenerator/abs_support'
 require 'optparse'
 require 'yaml'
 
@@ -54,6 +54,16 @@ Usage: beaker-hostgenerator [options] <layout>
    1 CentOS 6 64 bit node with roles = master, hypervisor = none, node name = static1, and my-key = my-value
    1 CentOS 6 32 bit node with roles = agent and the default hypervisor
 
+ example of a list within arbitrary host settings:
+  centos6-64m{hostname=static1\\,disks=[8,16],my-list=[my-value1]}-32a
+   1 CentOS 6 64 bit node with roles = master, node name = static1 and lists:
+      disks:
+         - 8
+         - 16
+       my-list:
+         - my-value1
+   1 CentOS 6 32 bit node with roles = agent and the default hypervisor
+
  Generally, it is expected that beaker-hostgenerator output will be redirected to a file, for example:
   beaker-hostgenerator centos6-64ma > host.cfg
 

data/lib/beaker-hostgenerator/data.rb

@@ -62,26 +62,46 @@ module BeakerHostGenerator
       }
     end
 
+    # This is where all the information for all platforms lives, irrespective
+    # of the hypervisor(s).
+    # This hash contains every OS that BHG supports as keys, and the values are
+    # hashes that contain hypervisor-specific data about that OS.
+    # Every OS also has a special "general" section for data that should always
+    # be included regardless of the hypervisor.
+    # Hypervisor implementations will then grab specific bits of data out of
+    # this hash and combine them to produce the generated hosts output.
     def osinfo
       {
         'aix53-POWER' => {
           :general => {
             'platform' => 'aix-5.3-power'
+          },
+          :abs => {
+            'template' => 'aix-5.3-power'
           }
         },
         'aix61-POWER' => {
           :general => {
             'platform' => 'aix-6.1-power'
+          },
+          :abs => {
+            'template' => 'aix-6.1-power'
           }
         },
         'aix71-POWER' => {
           :general => {
             'platform' => 'aix-7.1-power'
+          },
+          :abs => {
+            'template' => 'aix-7.1-power'
           }
         },
         'aix72-POWER' => {
           :general => {
             'platform' => 'aix-7.2-power'
+          },
+          :abs => {
+            'template' => 'aix-7.2-power'
           }
         },
         'arista4-32' => {
@@ -363,6 +383,9 @@ module BeakerHostGenerator
         'huaweios6-POWER' => {
           :general => {
             'platform' => 'huaweios-6-powerpc'
+          },
+          :abs => {
+            'template' => 'huaweios-6-powerpc'
           }
         },
         'opensuse11-32' => {
@@ -628,6 +651,9 @@ module BeakerHostGenerator
         'solaris10-SPARC' => {
           :general => {
             'platform' => 'solaris-10-sparc'
+          },
+          :abs => {
+            'template' => 'solaris-10-sparc'
           }
         },
         'solaris11-32' => {
@@ -649,6 +675,9 @@ module BeakerHostGenerator
         'solaris11-SPARC' => {
           :general => {
             'platform' => 'solaris-11-sparc'
+          },
+          :abs => {
+            'template' => 'solaris-11-sparc'
           }
         },
         'solaris112-32' => {
@@ -779,6 +808,22 @@ module BeakerHostGenerator
             'template' => 'ubuntu-1610-x86_64'
           }
         },
+        'vro6-64' => {
+          :general => {
+            'platform' => 'sles-11-x86_64'
+          },
+          :vmpooler => {
+            'template' => 'vro-6-x86_64'
+          }
+        },
+        'vro7-64' => {
+          :general => {
+            'platform' => 'sles-11-x86_64'
+          },
+          :vmpooler => {
+            'template' => 'vro-7-x86_64'
+          }
+        },
         'windows2003-64' => {
           :general => {
             'platform' => 'windows-2003-64',

data/lib/beaker-hostgenerator/generator.rb

@@ -27,13 +27,6 @@ module BeakerHostGenerator
       ostype = nil
       bhg_version = options[:osinfo_version] || 0
 
-      # Merge in global configuration settings
-      if options[:global_config]
-        decoded = prepare(options[:global_config])
-        global_config = settings_string_to_map(decoded)
-        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
@@ -78,6 +71,13 @@ module BeakerHostGenerator
         nodeid[ostype] += 1
       end
 
+      # Merge in global configuration settings after the hypervisor defaults
+      if options[:global_config]
+        decoded = prepare(options[:global_config])
+        global_config = settings_string_to_map(decoded)
+        config['CONFIG'].deep_merge!(global_config)
+      end
+
       # Munge non-string scalar values into proper data types
       unstringify_values!(config)
 
@@ -118,30 +118,36 @@ module BeakerHostGenerator
     end
 
     # Passes over all the values of config['HOSTS'] and config['CONFIG'] and
-    # converts any numbers and booleans into proper integer and boolean types.
+    # subsequent arrays to convert numbers or booleans into proper integer
+    # or 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)
+          config['HOSTS'][host][k] = unstringify_value(v)
         end
       end
       config['CONFIG'].each do |k, v|
-        config['CONFIG'][k] = unstringify_number_or_boolean(v)
+        config['CONFIG'][k] = unstringify_value(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.
+    # integer and boolean types. If value is an array, it will recurse
+    # through those values.
+    # 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)
+    def unstringify_value(value)
       result = Integer(value) rescue value
       if value == 'true'
         result = true
       elsif value == 'false'
         result = false
+      elsif value.kind_of?(Array)
+        value.each_with_index do |v, i|
+          result[i] = unstringify_value(v)
+        end
       end
       result
     end

data/lib/beaker-hostgenerator/hypervisor/abs.rb

@@ -10,19 +10,24 @@ module BeakerHostGenerator
     # determine the type of platform that's being requested.
     #
     # Therefore, this hypervisor just reuses the vmpooler hypervisor template
-    # values, and in the future will likely contain the fake template values to
-    # use for non-vmpooler platforms like AIX.
+    # values, in addition to ABS-only values for hardware platforms.
     class ABS < BeakerHostGenerator::Hypervisor::Interface
       include BeakerHostGenerator::Data
 
       def generate_node(node_info, base_config, bhg_version)
         base_config['hypervisor'] = 'abs'
 
-        # For now, we just reuse the vmpooler data
+        # Grab vmpooler data for this platform and any hardware (ABS) data.
+        # The assumption here is that these are mutually exclusive; that is,
+        # any given platform will have *either* :vmpooler data or :abs data
+        # so we're not worried about one overriding the other when we merge
+        # the hashes together.
         platform = node_info['platform']
-        platform_info = get_platform_info(bhg_version, platform, :vmpooler)
+        vmpooler_platform_info = get_platform_info(bhg_version, platform, :vmpooler)
+        abs_platform_info = get_platform_info(bhg_version, platform, :abs)
 
-        base_config.deep_merge! platform_info
+        base_config.deep_merge! vmpooler_platform_info
+        base_config.deep_merge! abs_platform_info
 
         return base_config
       end

data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb

@@ -7,6 +7,7 @@ module BeakerHostGenerator
     class Vmpooler < BeakerHostGenerator::Hypervisor::Interface
       include BeakerHostGenerator::Data
 
+      # default global configuration keys
       def global_config()
         {
           'pooling_api' => 'http://vmpooler.delivery.puppetlabs.net/'

data/lib/beaker-hostgenerator/parser.rb

@@ -28,7 +28,7 @@ module BeakerHostGenerator
     #                      Examples: m, mdca
     #
     #   * host_settings    Any character (see `settings_string_to_map` for details)
-    #                      Examples: {hostname=foo-bar, ip.address=123.4.5.6}
+    #                      Examples: {hostname=foo-bar, ip.address=123.4.5.6, foo=[bar,baz]}
     #
     # This regex is the main workhorse for parsing input to beaker-hostgenerator.
     # There is a bit of pre and post parsing that happens before and after this
@@ -100,11 +100,11 @@ module BeakerHostGenerator
       #   "centos6-64m{hostname=foo|bar}-debian8-32"
       #
       # Which we can then simply split on - into:
-      #   ["centos6", "64{hostname=foo|bar}", "debian8", "32"]
+      #   ["centos6", "64m{hostname=foo|bar}", "debian8", "32"]
       #
       # And then finally turn the | back into - now that we've
       # properly decomposed the spec string:
-      #   ["centos6", "64{hostname=foo-bar}", "debian8", "32"]
+      #   ["centos6", "64m{hostname=foo-bar}", "debian8", "32"]
       #
       # NOTE we've specifically chosen to use the pipe character |
       # due to its unlikely occurrence in the user input string.
@@ -197,7 +197,7 @@ module BeakerHostGenerator
     # to a proper hash map data structure for merging into the host
     # configuration.
     #
-    # The string is expected to be of the form "{key1=value1,key2=value2,...}".
+    # The string is expected to be of the form "{key1=value1,key2=[v2,v3],...}".
     # Whitespace is expected to be properly quoted as it will not be treated
     # any different than non-whitespace characters.
     #
@@ -206,13 +206,14 @@ module BeakerHostGenerator
     # @param host_settings [String] Non-nil user input string that defines host
     #                               specific settings.
     #
-    # @returns [Hash{String=>String}] The host_settings string as a map.
+    # @returns [Hash{String=>String|Array}] The host_settings string as a map.
     def settings_string_to_map(host_settings)
       # Strip it down to a list of pairs
+      # Splitting on all commas except inside `[]`
       settings_pairs =
         host_settings.
         delete('{}').
-        split(',').
+        split(/,(?=[^\]]*(?:\[|$))/).
         map { |keyvalue| keyvalue.split('=') }
 
       # Validate they're actually pairs, and that all keys are non-empty
@@ -227,6 +228,15 @@ module BeakerHostGenerator
         end
       end
 
+      # Replace the remaining `,` to make array for arbitrary list if brackets exist
+      settings_pairs.each do |pair|
+        if pair[1].include?("[")
+          pair[1] = pair[1].
+            delete('[]').
+            split(',')
+        end
+      end
+
       Hash[settings_pairs]
     end
   end

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '0.8.4'
+    STRING = '0.9.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -204,7 +204,7 @@ files:
 - bin/beaker-hostgenerator
 - bin/genconfig2
 - lib/beaker-hostgenerator.rb
-- lib/beaker-hostgenerator/abs-support.rb
+- lib/beaker-hostgenerator/abs_support.rb
 - lib/beaker-hostgenerator/cli.rb
 - lib/beaker-hostgenerator/data.rb
 - lib/beaker-hostgenerator/exceptions.rb