beaker-hostgenerator 0.7.3 → 0.7.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjFlNTc2ZTgxMDlhOTBmOGUyMmM3ZWE5YTFiNmU2YWFlMGNjMmZhOQ==
+    NmYzMjRkMWE1ZGRiNjY2YjRlMjkwMTBiNmNlNzI3ZWY3ZmU1MjgwOA==
   data.tar.gz: !binary |-
-    ZTUwNWUzYjcwOTZhZDI5NWZjNTMyZWI4MzdkOTgyZWRhNjZkYmQzOA==
+    ZTZhZTg5ODkzNmMyZWU5YjczZDg1ZGU2NDkzM2RmOGFkYTU1NDQ2OA==
 SHA512:
   metadata.gz: !binary |-
-    NDkzM2M5YTRlMzA2ZDAxYmY5OWEyN2UyOGFlNjk1MTI3MjE4ZGE0NTZkMGVh
-    YmVkMzIwNzY5MjcyOGFmZTI3NzJmMThkZmEyNGUwMjEyZmE2YmYyN2Q2ODE0
-    ODJhMmE2YTBlMzVhZDZjZDE5ZTg5MDIwOTY4MmE2MDRiZDVlOWM=
+    ZjVkODg1NjNhZjNmYmRmMWQ4YTY2ZDBiNTNjZDMyZjdlYTZhOWZjOTFmZmIx
+    OTUwMmM0MTliOTM2MWRmZDQ3NTM0ODRlMTc3OTAwM2YzYjczOTRhZDM4OGRl
+    NWY3MjdkMmQxNzIzOTZhZjk1MWU0NTYzMGRmODk4YzUxNmE4NWI=
   data.tar.gz: !binary |-
-    YWRlNGIwNWY3NDRhY2I2YzJlMzkwZDc4OTE0OWJjOTA0NTVmODAzNTlmZjNi
-    MWNhYmIxZDVjNWExZjM2OGI5MDEzYjA5MzhiNTY0MjJkMTBkNGM3YWM4ZDYx
-    MDgyMDZhZTFkN2FkY2I0MDM1ZWIwY2ZhNWRkYmNlMDZlYTA3MWY=
+    YzIzMWQzMzc3OWJlODc5NzQwNDFlZDI3ZjZlNTUwYTU3OTM4YTFhMmUwYWQy
+    ODhmZTViMWVhOGNkMTI3Mjg4MDRhNmNhOTcxN2JlZTA3MWY3Nzk4M2M2ODYz
+    MmRiYmMwNGRjZTM1Yjc3YTFhN2Q5YjczMzlmOGE0YmIyYTZhNmI=

data/CHANGELOG.md

@@ -7,6 +7,15 @@ Versioning](http://semver.org).
 ## [Unreleased][unreleased]
 ### Changed
 
+## [0.7.4] - 2016-9-26
+- Add platforms:
+  - OSX 10.12
+  - Windows 2016
+- Support for CI.next:
+  - Add AlwaysBeScheduling hypervisor
+  - Add CLI flag '--templates-only' to reduce the generated output to include
+    only the template values from the HOSTS
+
 ## [0.7.3] - 2016-8-11
 - Add platform:
   - HuaweiOS 6 powerpc

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 11 Aug, 2016 (9ad5f770)](#LATEST)
+* [LATEST - 26 Sep, 2016 (09c62ae1)](#LATEST)
+* [0.7.3 - 11 Aug, 2016 (87c75523)](#0.7.3)
 * [0.7.2 - 13 Jul, 2016 (cee53bcc)](#0.7.2)
 * [0.7.1 - 29 Jun, 2016 (be332325)](#0.7.1)
 * [0.7.0 - 13 Jun, 2016 (f0aafe8d)](#0.7.0)
@@ -16,7 +17,104 @@
 * [0.0.1 - 7 Oct, 2015 (d99251e6)](#0.0.1)
 
 ## Details
-### <a name = "LATEST">LATEST - 11 Aug, 2016 (9ad5f770)
+### <a name = "LATEST">LATEST - 26 Sep, 2016 (09c62ae1)
+
+* (GEM) update beaker-hostgenerator version to 0.7.4 (09c62ae1)
+
+* Merge pull request #56 from puppetlabs/maint (44882551)
+
+
+```
+Merge pull request #56 from puppetlabs/maint
+
+(MAINT) Prepare for 0.7.4 release
+```
+* (QENG-4407) Return proper JSON map (88581c56)
+
+
+```
+(QENG-4407) Return proper JSON map
+
+Previously the --templates-only switch would output a custom CSV-style
+format, plus it repeated platforms rather than tallying them up.
+
+This commit changes the output format to be a JSON map, with the
+platforms as keys and the total counts as values.
+```
+* Merge pull request #53 from puppetlabs/add-maintainers-file (126620cf)
+
+
+```
+Merge pull request #53 from puppetlabs/add-maintainers-file
+
+(MAINT) Add MAINTAINERS file
+```
+* (MAINT) Add MAINTAINERS file (b73a2ede)
+
+* (MAINT) Prepare for 0.7.4 release (1cc9c3fc)
+
+* Merge pull request #51 from puppetlabs/qeng4204/add-templates-only-cli (a7196b52)
+
+
+```
+Merge pull request #51 from puppetlabs/qeng4204/add-templates-only-cli
+
+(QENG-4204) Add CLI flag to only generate templates
+```
+* (QENG-4204) Add CLI flag to only generate templates (7c4342f8)
+
+
+```
+(QENG-4204) Add CLI flag to only generate templates
+
+This adds a CLI switch '--templates-only' that will reduce the generated
+output to include only the template values from the HOSTS.
+```
+* Merge pull request #48 from puppetlabs/qeng4204/create-abs-hypervisor (ec1b80d2)
+
+
+```
+Merge pull request #48 from puppetlabs/qeng4204/create-abs-hypervisor
+
+(QENG-4204) Add AlwaysBeScheduling hypervisor
+```
+* Merge pull request #50 from puppetlabs/qeng-4176 (aecb44a6)
+
+
+```
+Merge pull request #50 from puppetlabs/qeng-4176
+
+(QENG-4176 & QENG-4180) Add OSX 10.12 and Windows 2016
+```
+* (QENG-4176 & QENG-4180) Add OSX 10.12 and Windows 2016 (0d8ad08a)
+
+
+```
+(QENG-4176 & QENG-4180) Add OSX 10.12 and Windows 2016
+
+Added OSX 10.12 (Sierra) and Windows Server 2016 to
+supported beaker-hostgenerator platforms
+```
+* (QENG-4204) Add AlwaysBeScheduling hypervisor (87559142)
+
+
+```
+(QENG-4204) Add AlwaysBeScheduling hypervisor
+
+This commit adds a new hypervisor called 'abs' that will support
+generating configurations necessary for working with CI.next and the
+AlwaysBeScheduling service.
+
+Currently, the behavior of the abs hypervisor is basically the same as
+the vmpooler hypervisor. The only difference is it doesn't fixup the
+nodes to support old PE versions.
+
+Having a built-in hypervisor for ABS alleviates the need for users to
+manually override the hypervisor key on each node.
+```
+### <a name = "0.7.3">0.7.3 - 11 Aug, 2016 (87c75523)
+
+* (HISTORY) update beaker-hostgenerator history for gem release 0.7.3 (87c75523)
 
 * (GEM) update beaker-hostgenerator version to 0.7.3 (9ad5f770)
 

data/MAINTAINERS

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "file_format": "This MAINTAINERS file format is described at http://pup.pt/maintainers",
+  "issues": "https://tickets.puppetlabs.com/browse/QENG",
+  "people": [
+    {
+      "github": "nwolfe",
+      "email": "nwolfe@puppet.com",
+      "name": "Nate Wolfe"
+    },
+    {
+      "github": "waynr",
+      "email": "wayne@puppet.com",
+      "name": "Wayne Warren"
+    }
+  ]
+}

data/README.md

@@ -31,9 +31,10 @@ input. See the [Custom hypervisor](#custom-hypervisor) example for more
 information.
 
 It currently provides built-in configuration for Puppets' internal
-[vmpooler][vmpooler] hypervisor and static (non-provisioned) nodes, and is
-designed in a way that makes it possible to easily add support for additional
-hypervisors (any hypervisor type supported by [beaker][beaker]).
+[vmpooler][vmpooler] hypervisor, [always-be-scheduling][always-be-scheduling]
+hypervisor, static (non-provisioned) nodes, and is designed in a way that makes
+it possible to easily add support for additional hypervisors
+(any hypervisor type supported by [beaker][beaker]).
 
 To see the list of built-in hypervisors you can run:
 ```
@@ -379,3 +380,4 @@ If you have questions or comments, please contact the Beaker team at the
 [license]: LICENSE
 [contributing]: CONTRIBUTING.md
 [apache-v2]: http://www.apache.org/licenses/LICENSE-2.0.html
+[always-be-scheduling]: https://github.com/puppetlabs/always-be-scheduling

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

@@ -0,0 +1,30 @@
+module BeakerHostGenerator
+  # Utility functions for supporting CI.next and the AlwaysBeScheduling hypervisor.
+  module AbsSupport
+    module_function
+
+    # Given an existing, fully-specified host configuration, count the number of
+    # hosts using each template, and return a map of template name to host count.
+    #
+    # For example, given the following config (parts omitted for brevity):
+    #    {"HOSTS"=>
+    #     {"centos6-64-1"=>
+    #        {"template"=>"centos-6-x86_64", ...},
+    #      "redhat7-64-1"=>
+    #        {"template"=>"redhat-7-x86_64", ...},
+    #      "centos6-64-2"=>
+    #        {"template"=>"centos-6-x86_64", ...}},
+    #     ...
+    #    }}
+    #
+    # Returns the following map:
+    #     {"centos-6-x86_64"=>2, "redhat-7-x86_64"=>1}
+    #
+    def extract_templates(config)
+      templates_hosts = config['HOSTS'].values.group_by { |h| h['template'] }
+      templates_hosts.each do |template, hosts|
+        templates_hosts[template] = hosts.count
+      end
+    end
+  end
+end

data/lib/beaker-hostgenerator/cli.rb

@@ -2,7 +2,9 @@ require 'beaker-hostgenerator/generator'
 require 'beaker-hostgenerator/hypervisor'
 require 'beaker-hostgenerator/roles'
 require 'beaker-hostgenerator/version'
+require 'beaker-hostgenerator/abs-support'
 require 'optparse'
+require 'yaml'
 
 module BeakerHostGenerator
   class CLI
@@ -66,6 +68,11 @@ Usage: beaker-hostgenerator [options] <layout>
           @options[:list_supported_values] = true
         end
 
+        opts.on('--templates-only',
+               'Generate a reduced output including only the templates from each host.') do
+          @options[:templates_only] = true
+        end
+
         opts.on('-t',
                 '--hypervisor HYPERVISOR',
                 'Set beaker-hostgenerator default hypervisor. ') do |h|
@@ -144,9 +151,15 @@ Usage: beaker-hostgenerator [options] <layout>
         BeakerHostGenerator::Version::STRING
       elsif @options[:list_supported_values]
         supported_values_help_text
+      elsif @options[:templates_only]
+        require 'json'
+        config = BeakerHostGenerator::Generator.new.generate(@layout, @options)
+        templates = BeakerHostGenerator::AbsSupport.extract_templates(config)
+        templates.to_json
       else
         print_warnings
-        BeakerHostGenerator::Generator.new.generate(@layout, @options)
+        config = BeakerHostGenerator::Generator.new.generate(@layout, @options)
+        config.to_yaml
       end
     end
 

data/lib/beaker-hostgenerator/data.rb

@@ -424,6 +424,14 @@ module BeakerHostGenerator
             'template' => 'osx-1011-x86_64'
           }
         },
+        'osx1012-64' => {
+          :general => {
+            'platform' => 'osx-10.12-x86_64'
+          },
+          :vmpooler => {
+            'template' => 'osx-1012-x86_64'
+          }
+        },
         'redhat4-32' => {
           :general => {
             'platform' => 'el-4-i386'
@@ -851,6 +859,24 @@ module BeakerHostGenerator
             'template' => 'win-2012r2-x86_64'
           }
         },
+        'windows2016-64' => {
+          :general => {
+            'platform' => 'windows-2016-64',
+            'ruby_arch' => 'x64'
+          },
+          :vmpooler => {
+            'template' => 'win-2016-x86_64'
+          }
+        },
+        'windows2016-6432' => {
+          :general => {
+            'platform' => 'windows-2016-64',
+            'ruby_arch' => 'x86'
+          },
+          :vmpooler => {
+            'template' => 'win-2016-x86_64'
+          }
+        },
         'windows7-64' => {
           :general => {
             'platform' => 'windows-7-64',

data/lib/beaker-hostgenerator/generator.rb

@@ -3,24 +3,22 @@ require 'beaker-hostgenerator/roles'
 require 'beaker-hostgenerator/hypervisor'
 require 'beaker-hostgenerator/parser'
 
-require 'yaml'
-
 module BeakerHostGenerator
   class Generator
     include BeakerHostGenerator::Data
     include BeakerHostGenerator::Parser
     include BeakerHostGenerator::Roles
 
-    # Main host generation entry point, returns a YAML map as a string for the
-    # given host specification and optional configuration.
+    # Main host generation entry point, returns a Ruby map for the given host
+    # specification and optional configuration.
     #
     # @param layout [String] The raw hosts specification user input.
     #                        For example `"centos6-64m-redhat7-64a"`.
     # @param options [Hash] Global, optional configuration such as the default
     #                       hypervisor or OS info version.
     #
-    # @returns [String] A complete YAML map as a string defining the HOSTS and
-    #                   CONFIG sections as required by Beaker.
+    # @returns [Hash] A complete Ruby map as defining the HOSTS and CONFIG
+    #                 sections as required by Beaker.
     def generate(layout, options)
       layout = prepare_layout(layout)
       tokens = tokenize_layout(layout)
@@ -82,7 +80,7 @@ module BeakerHostGenerator
       # Munge non-string scalar values into proper data types
       unstringify_values!(config)
 
-      return config.to_yaml
+      return config
     end
 
     def get_host_roles(node_info)

data/lib/beaker-hostgenerator/hypervisor.rb

@@ -45,7 +45,8 @@ module BeakerHostGenerator
     #                                                and their implementations.
     def self.builtin_hypervisors()
       {
-        'vmpooler' => BeakerHostGenerator::Hypervisor::Vmpooler
+        'vmpooler' => BeakerHostGenerator::Hypervisor::Vmpooler,
+        'abs' => BeakerHostGenerator::Hypervisor::ABS
       }
     end
 
@@ -94,3 +95,4 @@ end
 # hypervisor implementation files.
 require 'beaker-hostgenerator/hypervisor/unknown'
 require 'beaker-hostgenerator/hypervisor/vmpooler'
+require 'beaker-hostgenerator/hypervisor/abs'

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

@@ -0,0 +1,31 @@
+require 'beaker-hostgenerator/data'
+require 'beaker-hostgenerator/hypervisor'
+require 'deep_merge'
+
+module BeakerHostGenerator
+  module Hypervisor
+    # AlwaysBeScheduling implementation to support CI.next.
+    #
+    # The ABS services requires the vmpooler template values as input to
+    # 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.
+    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
+        platform = node_info['platform']
+        platform_info = get_platform_info(bhg_version, platform, :vmpooler)
+
+        base_config.deep_merge! platform_info
+
+        return base_config
+      end
+    end
+  end
+end

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '0.7.3'
+    STRING = '0.7.4'
   end
 end

data/spec/beaker-hostgenerator/abs-support_spec.rb

@@ -0,0 +1,14 @@
+require 'beaker-hostgenerator/cli'
+require 'json'
+
+module BeakerHostGenerator
+  describe AbsSupport do
+    describe 'extract_templates' do
+      it 'Returns a JSON map with template counts' do
+        input = ['--templates-only', 'centos6-64m-centos6-64m-redhat7-64m']
+        expect( JSON.load(BeakerHostGenerator::CLI.new(input).execute) ).
+          to eq({"centos-6-x86_64" => 2, "redhat-7-x86_64" => 1})
+      end
+    end
+  end
+end

data/test/fixtures/generated/default/osx1012-64m

@@ -0,0 +1,21 @@
+---
+arguments_string: osx1012-64m
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx1012-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: osx-10.12-x86_64
+      template: osx-1012-x86_64
+      roles:
+      - agent
+      - master
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/default/windows2016-6432m

@@ -0,0 +1,22 @@
+---
+arguments_string: windows2016-6432m
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows2016-6432-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x86
+      template: win-2016-x86_64
+      roles:
+      - agent
+      - master
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/default/windows2016-64f

@@ -0,0 +1,22 @@
+---
+arguments_string: windows2016-64f
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows2016-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x64
+      template: win-2016-x86_64
+      roles:
+      - agent
+      - frictionless
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/multiplatform/centos5-64aulcdfm-windows2016-6432-centos5-64a

@@ -0,0 +1,47 @@
+---
+arguments_string: centos5-64aulcdfm-windows2016-6432-centos5-64a
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    centos5-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: el-5-x86_64
+      template: centos-5-x86_64
+      roles:
+      - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
+    windows2016-6432-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x86
+      template: win-2016-x86_64
+      roles:
+      - agent
+    centos5-64-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: el-5-x86_64
+      template: centos-5-x86_64
+      roles:
+      - agent
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/multiplatform/centos6-32a-windows2016-64-centos6-32aulcdfm

@@ -0,0 +1,47 @@
+---
+arguments_string: centos6-32a-windows2016-64-centos6-32aulcdfm
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    centos6-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: el-6-i386
+      template: centos-6-i386
+      roles:
+      - agent
+    windows2016-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x64
+      template: win-2016-x86_64
+      roles:
+      - agent
+    centos6-32-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: el-6-i386
+      template: centos-6-i386
+      roles:
+      - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/multiplatform/osx1012-64m-sles10-32-osx1012-64u

@@ -0,0 +1,42 @@
+---
+arguments_string: osx1012-64m-sles10-32-osx1012-64u
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx1012-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: osx-10.12-x86_64
+      template: osx-1012-x86_64
+      roles:
+      - agent
+      - master
+    sles10-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: sles-10-i386
+      template: sles-10-i386
+      roles:
+      - agent
+    osx1012-64-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: osx-10.12-x86_64
+      template: osx-1012-x86_64
+      roles:
+      - agent
+      - ca
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/multiplatform/osx1012-64m-sles11-32-osx1012-64u

@@ -0,0 +1,42 @@
+---
+arguments_string: osx1012-64m-sles11-32-osx1012-64u
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx1012-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: osx-10.12-x86_64
+      template: osx-1012-x86_64
+      roles:
+      - agent
+      - master
+    sles11-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: sles-11-i386
+      template: sles-11-i386
+      roles:
+      - agent
+    osx1012-64-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: osx-10.12-x86_64
+      template: osx-1012-x86_64
+      roles:
+      - agent
+      - ca
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/multiplatform/sles10-32f-osx1012-64-sles10-32l

@@ -0,0 +1,42 @@
+---
+arguments_string: sles10-32f-osx1012-64-sles10-32l
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    sles10-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: sles-10-i386
+      template: sles-10-i386
+      roles:
+      - agent
+      - frictionless
+    osx1012-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: osx-10.12-x86_64
+      template: osx-1012-x86_64
+      roles:
+      - agent
+    sles10-32-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: sles-10-i386
+      template: sles-10-i386
+      roles:
+      - agent
+      - classifier
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/multiplatform/sles11-32aulcdfm-osx1012-64-sles11-32a

@@ -0,0 +1,46 @@
+---
+arguments_string: sles11-32aulcdfm-osx1012-64-sles11-32a
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    sles11-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: sles-11-i386
+      template: sles-11-i386
+      roles:
+      - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
+    osx1012-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: osx-10.12-x86_64
+      template: osx-1012-x86_64
+      roles:
+      - agent
+    sles11-32-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: sles-11-i386
+      template: sles-11-i386
+      roles:
+      - agent
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/multiplatform/windows2016-6432m-centos5-64-windows2016-6432u

@@ -0,0 +1,44 @@
+---
+arguments_string: windows2016-6432m-centos5-64-windows2016-6432u
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows2016-6432-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x86
+      template: win-2016-x86_64
+      roles:
+      - agent
+      - master
+    centos5-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: el-5-x86_64
+      template: centos-5-x86_64
+      roles:
+      - agent
+    windows2016-6432-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x86
+      template: win-2016-x86_64
+      roles:
+      - agent
+      - ca
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/multiplatform/windows2016-64f-centos6-32-windows2016-64l

@@ -0,0 +1,44 @@
+---
+arguments_string: windows2016-64f-centos6-32-windows2016-64l
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows2016-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x64
+      template: win-2016-x86_64
+      roles:
+      - agent
+      - frictionless
+    centos6-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: el-6-i386
+      template: centos-6-i386
+      roles:
+      - agent
+    windows2016-64-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x64
+      template: win-2016-x86_64
+      roles:
+      - agent
+      - classifier
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/osinfo-version-0/osx1012-64m

@@ -0,0 +1,21 @@
+---
+arguments_string: "--osinfo-version 0 osx1012-64m"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx1012-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: osx-10.12-x86_64
+      template: osx-1012-x86_64
+      roles:
+      - agent
+      - master
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/osinfo-version-0/windows2016-6432m

@@ -0,0 +1,22 @@
+---
+arguments_string: "--osinfo-version 0 windows2016-6432m"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows2016-6432-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x86
+      template: win-2016-x86_64
+      roles:
+      - agent
+      - master
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/osinfo-version-0/windows2016-64f

@@ -0,0 +1,22 @@
+---
+arguments_string: "--osinfo-version 0 windows2016-64f"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows2016-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x64
+      template: win-2016-x86_64
+      roles:
+      - agent
+      - frictionless
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/osinfo-version-1/osx1012-64m

@@ -0,0 +1,21 @@
+---
+arguments_string: "--osinfo-version 1 osx1012-64m"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx1012-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: osx-10.12-x86_64
+      template: osx-1012-x86_64
+      roles:
+      - agent
+      - master
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/osinfo-version-1/windows2016-6432m

@@ -0,0 +1,22 @@
+---
+arguments_string: "--osinfo-version 1 windows2016-6432m"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows2016-6432-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x86
+      template: win-2016-x86_64
+      roles:
+      - agent
+      - master
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/osinfo-version-1/windows2016-64f

@@ -0,0 +1,22 @@
+---
+arguments_string: "--osinfo-version 1 windows2016-64f"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows2016-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2016-64
+      ruby_arch: x64
+      template: win-2016-x86_64
+      roles:
+      - agent
+      - frictionless
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/per-host-settings/every-hypervisor.yaml

@@ -1,5 +1,5 @@
 ---
-arguments_string: centos6-64m{hypervisor=vmpooler}-debian8-32a{hypervisor=none}
+arguments_string: centos6-64m{hypervisor=vmpooler}-debian8-32a{hypervisor=none}-redhat7-64f{hypervisor=abs}
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -23,6 +23,17 @@ expected_hash:
       hypervisor: none
       roles:
       - agent
+    redhat7-64-1:
+      pe_dir:
+      pe_ver:
+      pe_upgrade_dir:
+      pe_upgrade_ver:
+      hypervisor: abs
+      platform: el-7-x86_64
+      template: redhat-7-x86_64
+      roles:
+      - agent
+      - frictionless
   CONFIG:
     nfs_server: none
     consoleport: 443

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -183,6 +183,7 @@ files:
 - Gemfile
 - HISTORY.md
 - LICENSE
+- MAINTAINERS
 - README.md
 - Rakefile
 - acceptance/config/nodes/vagrant-ubuntu-1404.yml
@@ -191,17 +192,20 @@ files:
 - bin/beaker-hostgenerator
 - bin/genconfig2
 - lib/beaker-hostgenerator.rb
+- lib/beaker-hostgenerator/abs-support.rb
 - lib/beaker-hostgenerator/cli.rb
 - lib/beaker-hostgenerator/data.rb
 - lib/beaker-hostgenerator/exceptions.rb
 - lib/beaker-hostgenerator/generator.rb
 - lib/beaker-hostgenerator/hypervisor.rb
+- lib/beaker-hostgenerator/hypervisor/abs.rb
 - lib/beaker-hostgenerator/hypervisor/unknown.rb
 - lib/beaker-hostgenerator/hypervisor/vmpooler.rb
 - lib/beaker-hostgenerator/parser.rb
 - lib/beaker-hostgenerator/roles.rb
 - lib/beaker-hostgenerator/util.rb
 - lib/beaker-hostgenerator/version.rb
+- spec/beaker-hostgenerator/abs-support_spec.rb
 - spec/beaker-hostgenerator/generator_spec.rb
 - spec/beaker-hostgenerator/parser_spec.rb
 - spec/helpers.rb
@@ -251,6 +255,7 @@ files:
 - test/fixtures/generated/default/oracle7-64u
 - test/fixtures/generated/default/osx1010-64c
 - test/fixtures/generated/default/osx1011-64d
+- test/fixtures/generated/default/osx1012-64m
 - test/fixtures/generated/default/osx109-64l
 - test/fixtures/generated/default/redhat4-32f
 - test/fixtures/generated/default/redhat4-64m
@@ -309,6 +314,8 @@ files:
 - test/fixtures/generated/default/windows2012-64aulcdfm
 - test/fixtures/generated/default/windows2012r2-6432l
 - test/fixtures/generated/default/windows2012r2-64u
+- test/fixtures/generated/default/windows2016-6432m
+- test/fixtures/generated/default/windows2016-64f
 - test/fixtures/generated/default/windows7-64c
 - test/fixtures/generated/default/windows8-64d
 - test/fixtures/generated/default/windows81-64f
@@ -324,7 +331,9 @@ files:
 - test/fixtures/generated/multiplatform/centos4-64f-windows8-64-centos4-64l
 - test/fixtures/generated/multiplatform/centos5-32m-windows7-64-centos5-32u
 - test/fixtures/generated/multiplatform/centos5-64aulcdfm-windows2012r2-6432-centos5-64a
+- test/fixtures/generated/multiplatform/centos5-64aulcdfm-windows2016-6432-centos5-64a
 - test/fixtures/generated/multiplatform/centos6-32a-windows2012r2-64-centos6-32aulcdfm
+- test/fixtures/generated/multiplatform/centos6-32a-windows2016-64-centos6-32aulcdfm
 - test/fixtures/generated/multiplatform/centos6-64u-windows2012-6432-centos6-64m
 - test/fixtures/generated/multiplatform/centos7-64l-windows2012-64-centos7-64f
 - test/fixtures/generated/multiplatform/cisconx-64c-windows2008r2-6432-cisconx-64d
@@ -361,6 +370,8 @@ files:
 - test/fixtures/generated/multiplatform/oracle7-64u-sles12-64-oracle7-64m
 - test/fixtures/generated/multiplatform/osx1010-64c-sles11-64-osx1010-64d
 - test/fixtures/generated/multiplatform/osx1011-64d-sles11-32-osx1011-64c
+- test/fixtures/generated/multiplatform/osx1012-64m-sles10-32-osx1012-64u
+- test/fixtures/generated/multiplatform/osx1012-64m-sles11-32-osx1012-64u
 - test/fixtures/generated/multiplatform/osx109-64l-sles11-S390X-osx109-64f
 - test/fixtures/generated/multiplatform/redhat4-32f-sles10-64-redhat4-32l
 - test/fixtures/generated/multiplatform/redhat4-64m-sles10-32-redhat4-64u
@@ -377,7 +388,9 @@ files:
 - test/fixtures/generated/multiplatform/scientific6-64u-redhat5-64-scientific6-64m
 - test/fixtures/generated/multiplatform/scientific7-64l-redhat5-32-scientific7-64f
 - test/fixtures/generated/multiplatform/sles10-32c-redhat4-64-sles10-32d
+- test/fixtures/generated/multiplatform/sles10-32f-osx1012-64-sles10-32l
 - test/fixtures/generated/multiplatform/sles10-64d-redhat4-32-sles10-64c
+- test/fixtures/generated/multiplatform/sles11-32aulcdfm-osx1012-64-sles11-32a
 - test/fixtures/generated/multiplatform/sles11-32f-osx1011-64-sles11-32l
 - test/fixtures/generated/multiplatform/sles11-64m-osx1010-64-sles11-64u
 - test/fixtures/generated/multiplatform/sles11-S390Xaulcdfm-osx109-64-sles11-S390Xa
@@ -420,6 +433,8 @@ files:
 - test/fixtures/generated/multiplatform/windows2012-64aulcdfm-centos7-64-windows2012-64a
 - test/fixtures/generated/multiplatform/windows2012r2-6432l-centos5-64-windows2012r2-6432f
 - test/fixtures/generated/multiplatform/windows2012r2-64u-centos6-32-windows2012r2-64m
+- test/fixtures/generated/multiplatform/windows2016-6432m-centos5-64-windows2016-6432u
+- test/fixtures/generated/multiplatform/windows2016-64f-centos6-32-windows2016-64l
 - test/fixtures/generated/multiplatform/windows7-64c-centos5-32-windows7-64d
 - test/fixtures/generated/multiplatform/windows8-64d-centos4-64-windows8-64c
 - test/fixtures/generated/multiplatform/windows81-64f-centos4-32-windows81-64l
@@ -469,6 +484,7 @@ files:
 - test/fixtures/generated/osinfo-version-0/oracle7-64u
 - test/fixtures/generated/osinfo-version-0/osx1010-64c
 - test/fixtures/generated/osinfo-version-0/osx1011-64d
+- test/fixtures/generated/osinfo-version-0/osx1012-64m
 - test/fixtures/generated/osinfo-version-0/osx109-64l
 - test/fixtures/generated/osinfo-version-0/redhat4-32f
 - test/fixtures/generated/osinfo-version-0/redhat4-64m
@@ -527,6 +543,8 @@ files:
 - test/fixtures/generated/osinfo-version-0/windows2012-64aulcdfm
 - test/fixtures/generated/osinfo-version-0/windows2012r2-6432l
 - test/fixtures/generated/osinfo-version-0/windows2012r2-64u
+- test/fixtures/generated/osinfo-version-0/windows2016-6432m
+- test/fixtures/generated/osinfo-version-0/windows2016-64f
 - test/fixtures/generated/osinfo-version-0/windows7-64c
 - test/fixtures/generated/osinfo-version-0/windows8-64d
 - test/fixtures/generated/osinfo-version-0/windows81-64f
@@ -576,6 +594,7 @@ files:
 - test/fixtures/generated/osinfo-version-1/oracle7-64u
 - test/fixtures/generated/osinfo-version-1/osx1010-64c
 - test/fixtures/generated/osinfo-version-1/osx1011-64d
+- test/fixtures/generated/osinfo-version-1/osx1012-64m
 - test/fixtures/generated/osinfo-version-1/osx109-64l
 - test/fixtures/generated/osinfo-version-1/redhat4-32f
 - test/fixtures/generated/osinfo-version-1/redhat4-64m
@@ -634,6 +653,8 @@ files:
 - test/fixtures/generated/osinfo-version-1/windows2012-64aulcdfm
 - test/fixtures/generated/osinfo-version-1/windows2012r2-6432l
 - test/fixtures/generated/osinfo-version-1/windows2012r2-64u
+- test/fixtures/generated/osinfo-version-1/windows2016-6432m
+- test/fixtures/generated/osinfo-version-1/windows2016-64f
 - test/fixtures/generated/osinfo-version-1/windows7-64c
 - test/fixtures/generated/osinfo-version-1/windows8-64d
 - test/fixtures/generated/osinfo-version-1/windows81-64f