beaker-hostgenerator 0.7.0 → 0.7.1

data/test/fixtures/generated/osinfo-version-1/{ubuntu1604-32m → ubuntu1604-32d}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 ubuntu1604-32m
+arguments_string: --osinfo-version 1 ubuntu1604-32d
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,7 +13,7 @@ expected_hash:
       template: ubuntu-1604-i386
       roles:
       - agent
-      - master
+      - database
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{ubuntu1604-64aulcdfm → ubuntu1604-64f}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 ubuntu1604-64aulcdfm
+arguments_string: --osinfo-version 1 ubuntu1604-64f
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,12 +13,7 @@ expected_hash:
       template: ubuntu-1604-x86_64
       roles:
       - agent
-      - ca
-      - classifier
-      - dashboard
-      - database
       - frictionless
-      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{windows10ent-32u → windows10ent-32aulcdfm}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows10ent-32u
+arguments_string: --osinfo-version 1 windows10ent-32aulcdfm
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -15,6 +15,11 @@ expected_hash:
       roles:
       - agent
       - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{windows10ent-64l → windows10ent-64a}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows10ent-64l
+arguments_string: --osinfo-version 1 windows10ent-64a
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,6 @@ expected_hash:
       template: win-10-ent-x86_64
       roles:
       - agent
-      - classifier
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/{osinfo-version-0/windows10pro-64c → osinfo-version-1/windows10pro-64u}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 0 windows10pro-64c
+arguments_string: --osinfo-version 1 windows10pro-64u
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-10-pro-x86_64
       roles:
       - agent
-      - dashboard
+      - ca
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{windows2003-6432u → windows2003-6432aulcdfm}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows2003-6432u
+arguments_string: --osinfo-version 1 windows2003-6432aulcdfm
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -15,6 +15,11 @@ expected_hash:
       roles:
       - agent
       - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{windows2003-64a → windows2003-64m}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows2003-64a
+arguments_string: --osinfo-version 1 windows2003-64m
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,6 +14,7 @@ expected_hash:
       template: win-2003-x86_64
       roles:
       - agent
+      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{windows2003r2-32l → windows2003r2-32a}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows2003r2-32l
+arguments_string: --osinfo-version 1 windows2003r2-32a
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,6 @@ expected_hash:
       template: win-2003r2-i386
       roles:
       - agent
-      - classifier
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/{osinfo-version-0/windows2003r2-6432d → osinfo-version-1/windows2003r2-6432l}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 0 windows2003r2-6432d
+arguments_string: --osinfo-version 1 windows2003r2-6432l
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-2003r2-x86_64
       roles:
       - agent
-      - database
+      - classifier
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{windows2003r2-64c → windows2003r2-64u}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows2003r2-64c
+arguments_string: --osinfo-version 1 windows2003r2-64u
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-2003r2-x86_64
       roles:
       - agent
-      - dashboard
+      - ca
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/{osinfo-version-0/windows2008-6432m → osinfo-version-1/windows2008-6432d}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 0 windows2008-6432m
+arguments_string: --osinfo-version 1 windows2008-6432d
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-2008-x86_64
       roles:
       - agent
-      - master
+      - database
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/{osinfo-version-0/windows2008-64f → osinfo-version-1/windows2008-64c}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 0 windows2008-64f
+arguments_string: --osinfo-version 1 windows2008-64c
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-2008-x86_64
       roles:
       - agent
-      - frictionless
+      - dashboard
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/{osinfo-version-0/windows2008r2-6432a → osinfo-version-1/windows2008r2-6432m}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 0 windows2008r2-6432a
+arguments_string: --osinfo-version 1 windows2008r2-6432m
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,6 +14,7 @@ expected_hash:
       template: win-2008r2-x86_64
       roles:
       - agent
+      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/{osinfo-version-0/windows2008r2-64aulcdfm → osinfo-version-1/windows2008r2-64f}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 0 windows2008r2-64aulcdfm
+arguments_string: --osinfo-version 1 windows2008r2-64f
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,12 +14,7 @@ expected_hash:
       template: win-2008r2-x86_64
       roles:
       - agent
-      - ca
-      - classifier
-      - dashboard
-      - database
       - frictionless
-      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{windows2012-6432l → windows2012-6432a}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows2012-6432l
+arguments_string: --osinfo-version 1 windows2012-6432a
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,6 @@ expected_hash:
       template: win-2012-x86_64
       roles:
       - agent
-      - classifier
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/windows2012-64aulcdfm

@@ -0,0 +1,27 @@
+---
+arguments_string: --osinfo-version 1 windows2012-64aulcdfm
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows2012-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-2012-64
+      ruby_arch: x64
+      template: win-2012-x86_64
+      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/osinfo-version-1/{windows2012r2-6432d → windows2012r2-6432l}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows2012r2-6432d
+arguments_string: --osinfo-version 1 windows2012r2-6432l
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-2012r2-x86_64
       roles:
       - agent
-      - database
+      - classifier
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/{osinfo-version-0/windows2012r2-64c → osinfo-version-1/windows2012r2-64u}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 0 windows2012r2-64c
+arguments_string: --osinfo-version 1 windows2012r2-64u
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-2012r2-x86_64
       roles:
       - agent
-      - dashboard
+      - ca
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{windows7-64f → windows7-64c}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows7-64f
+arguments_string: --osinfo-version 1 windows7-64c
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-7-x86_64
       roles:
       - agent
-      - frictionless
+      - dashboard
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{windows8-64m → windows8-64d}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows8-64m
+arguments_string: --osinfo-version 1 windows8-64d
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-8-x86_64
       roles:
       - agent
-      - master
+      - database
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/osinfo-version-1/{windows81-64aulcdfm → windows81-64f}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows81-64aulcdfm
+arguments_string: --osinfo-version 1 windows81-64f
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,12 +14,7 @@ expected_hash:
       template: win-81-x86_64
       roles:
       - agent
-      - ca
-      - classifier
-      - dashboard
-      - database
       - frictionless
-      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/{osinfo-version-0/windowsvista-64a → osinfo-version-1/windowsvista-64m}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 0 windowsvista-64a
+arguments_string: --osinfo-version 1 windowsvista-64m
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,6 +14,7 @@ expected_hash:
       template: win-vista-x86_64
       roles:
       - agent
+      - master
   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.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -239,73 +239,79 @@ files:
 - test/fixtures/generated/default/fedora22-64m
 - test/fixtures/generated/default/fedora23-32aulcdfm
 - test/fixtures/generated/default/fedora23-64a
-- test/fixtures/generated/default/opensuse11-32u
-- test/fixtures/generated/default/opensuse11-64l
-- test/fixtures/generated/default/oracle5-32c
-- test/fixtures/generated/default/oracle5-64d
-- test/fixtures/generated/default/oracle6-32f
-- test/fixtures/generated/default/oracle6-64m
-- test/fixtures/generated/default/oracle7-64aulcdfm
-- test/fixtures/generated/default/osx1010-64u
-- test/fixtures/generated/default/osx1011-64l
-- test/fixtures/generated/default/osx109-64a
-- test/fixtures/generated/default/redhat4-32c
-- test/fixtures/generated/default/redhat4-64d
-- test/fixtures/generated/default/redhat5-32f
-- test/fixtures/generated/default/redhat5-64m
-- test/fixtures/generated/default/redhat6-32aulcdfm
-- test/fixtures/generated/default/redhat6-64a
-- test/fixtures/generated/default/redhat7-64u
-- test/fixtures/generated/default/scientific5-32l
-- test/fixtures/generated/default/scientific5-64c
-- test/fixtures/generated/default/scientific6-32d
-- test/fixtures/generated/default/scientific6-64f
-- test/fixtures/generated/default/scientific7-64m
-- test/fixtures/generated/default/sles10-32aulcdfm
-- test/fixtures/generated/default/sles10-64a
-- test/fixtures/generated/default/sles11-32u
-- test/fixtures/generated/default/sles11-64l
-- test/fixtures/generated/default/sles12-64c
-- test/fixtures/generated/default/solaris10-32d
-- test/fixtures/generated/default/solaris10-64f
-- test/fixtures/generated/default/solaris10-SPARCm
-- test/fixtures/generated/default/solaris11-32aulcdfm
-- test/fixtures/generated/default/solaris11-64a
-- test/fixtures/generated/default/solaris11-SPARCu
-- test/fixtures/generated/default/solaris112-32l
-- test/fixtures/generated/default/solaris112-64c
-- test/fixtures/generated/default/ubuntu1004-32d
-- test/fixtures/generated/default/ubuntu1004-64f
-- test/fixtures/generated/default/ubuntu1204-32m
-- test/fixtures/generated/default/ubuntu1204-64aulcdfm
-- test/fixtures/generated/default/ubuntu1404-32a
-- test/fixtures/generated/default/ubuntu1404-64u
-- test/fixtures/generated/default/ubuntu1504-32l
-- test/fixtures/generated/default/ubuntu1504-64c
-- test/fixtures/generated/default/ubuntu1510-32d
-- test/fixtures/generated/default/ubuntu1510-64f
-- test/fixtures/generated/default/ubuntu1604-32m
-- test/fixtures/generated/default/ubuntu1604-64aulcdfm
-- test/fixtures/generated/default/windows10ent-32u
-- test/fixtures/generated/default/windows10ent-64l
-- test/fixtures/generated/default/windows10pro-64c
-- test/fixtures/generated/default/windows2003-6432u
-- test/fixtures/generated/default/windows2003-64a
-- test/fixtures/generated/default/windows2003r2-32l
-- test/fixtures/generated/default/windows2003r2-6432d
-- test/fixtures/generated/default/windows2003r2-64c
-- test/fixtures/generated/default/windows2008-6432m
-- test/fixtures/generated/default/windows2008-64f
-- test/fixtures/generated/default/windows2008r2-6432a
-- test/fixtures/generated/default/windows2008r2-64aulcdfm
-- test/fixtures/generated/default/windows2012-6432l
-- test/fixtures/generated/default/windows2012-64u
-- test/fixtures/generated/default/windows2012r2-6432d
-- test/fixtures/generated/default/windows2012r2-64c
-- test/fixtures/generated/default/windows7-64f
-- test/fixtures/generated/default/windows8-64m
-- test/fixtures/generated/default/windows81-64aulcdfm
-- test/fixtures/generated/default/windowsvista-64a
+- test/fixtures/generated/default/fedora24-32u
+- test/fixtures/generated/default/fedora24-64l
+- test/fixtures/generated/default/opensuse11-32c
+- test/fixtures/generated/default/opensuse11-64d
+- test/fixtures/generated/default/oracle5-32f
+- test/fixtures/generated/default/oracle5-64m
+- test/fixtures/generated/default/oracle6-32aulcdfm
+- test/fixtures/generated/default/oracle6-64a
+- test/fixtures/generated/default/oracle7-64u
+- test/fixtures/generated/default/osx1010-64c
+- test/fixtures/generated/default/osx1011-64d
+- test/fixtures/generated/default/osx109-64l
+- test/fixtures/generated/default/redhat4-32f
+- test/fixtures/generated/default/redhat4-64m
+- test/fixtures/generated/default/redhat5-32aulcdfm
+- test/fixtures/generated/default/redhat5-64a
+- test/fixtures/generated/default/redhat6-32u
+- test/fixtures/generated/default/redhat6-64l
+- test/fixtures/generated/default/redhat6-S390Xc
+- test/fixtures/generated/default/redhat7-64d
+- test/fixtures/generated/default/redhat7-S390Xf
+- test/fixtures/generated/default/scientific5-32m
+- test/fixtures/generated/default/scientific5-64aulcdfm
+- test/fixtures/generated/default/scientific6-32a
+- test/fixtures/generated/default/scientific6-64u
+- test/fixtures/generated/default/scientific7-64l
+- test/fixtures/generated/default/sles10-32c
+- test/fixtures/generated/default/sles10-64d
+- test/fixtures/generated/default/sles11-32f
+- test/fixtures/generated/default/sles11-64m
+- test/fixtures/generated/default/sles11-S390Xaulcdfm
+- test/fixtures/generated/default/sles12-64a
+- test/fixtures/generated/default/sles12-S390Xu
+- test/fixtures/generated/default/solaris10-32l
+- test/fixtures/generated/default/solaris10-64c
+- test/fixtures/generated/default/solaris10-SPARCd
+- test/fixtures/generated/default/solaris11-32f
+- test/fixtures/generated/default/solaris11-64m
+- test/fixtures/generated/default/solaris11-SPARCaulcdfm
+- test/fixtures/generated/default/solaris112-32a
+- test/fixtures/generated/default/solaris112-64u
+- test/fixtures/generated/default/ubuntu1004-32l
+- test/fixtures/generated/default/ubuntu1004-64c
+- test/fixtures/generated/default/ubuntu1204-32d
+- test/fixtures/generated/default/ubuntu1204-64f
+- test/fixtures/generated/default/ubuntu1404-32m
+- test/fixtures/generated/default/ubuntu1404-64aulcdfm
+- test/fixtures/generated/default/ubuntu1504-32a
+- test/fixtures/generated/default/ubuntu1504-64u
+- test/fixtures/generated/default/ubuntu1510-32l
+- test/fixtures/generated/default/ubuntu1510-64c
+- test/fixtures/generated/default/ubuntu1604-32d
+- test/fixtures/generated/default/ubuntu1604-64f
+- test/fixtures/generated/default/windows10ent-32aulcdfm
+- test/fixtures/generated/default/windows10ent-64a
+- test/fixtures/generated/default/windows10pro-64u
+- test/fixtures/generated/default/windows2003-6432aulcdfm
+- test/fixtures/generated/default/windows2003-64m
+- test/fixtures/generated/default/windows2003r2-32a
+- test/fixtures/generated/default/windows2003r2-6432l
+- test/fixtures/generated/default/windows2003r2-64u
+- test/fixtures/generated/default/windows2008-6432d
+- test/fixtures/generated/default/windows2008-64c
+- test/fixtures/generated/default/windows2008r2-6432m
+- test/fixtures/generated/default/windows2008r2-64f
+- test/fixtures/generated/default/windows2012-6432a
+- test/fixtures/generated/default/windows2012-64aulcdfm
+- test/fixtures/generated/default/windows2012r2-6432l
+- test/fixtures/generated/default/windows2012r2-64u
+- test/fixtures/generated/default/windows7-64c
+- test/fixtures/generated/default/windows8-64d
+- test/fixtures/generated/default/windows81-64f
+- test/fixtures/generated/default/windowsvista-64m
 - test/fixtures/generated/environment_variable_tests/pe_version_and_pe_family/centos6-32a
 - test/fixtures/generated/environment_variable_tests/pe_version_and_pe_family_no_upgrade/centos6-32a
 - test/fixtures/generated/environment_variable_tests/pe_version_and_pe_family_upgrade_only/centos6-32a
@@ -342,73 +348,79 @@ files:
 - test/fixtures/generated/multiplatform/fedora22-64m-ubuntu1004-64-fedora22-64u
 - test/fixtures/generated/multiplatform/fedora23-32aulcdfm-ubuntu1004-32-fedora23-32a
 - test/fixtures/generated/multiplatform/fedora23-64a-solaris112-64-fedora23-64aulcdfm
-- test/fixtures/generated/multiplatform/opensuse11-32u-solaris112-32-opensuse11-32m
-- test/fixtures/generated/multiplatform/opensuse11-64l-solaris11-SPARC-opensuse11-64f
-- test/fixtures/generated/multiplatform/oracle5-32c-solaris11-64-oracle5-32d
-- test/fixtures/generated/multiplatform/oracle5-64d-solaris11-32-oracle5-64c
-- test/fixtures/generated/multiplatform/oracle6-32f-solaris10-SPARC-oracle6-32l
-- test/fixtures/generated/multiplatform/oracle6-64m-solaris10-64-oracle6-64u
-- test/fixtures/generated/multiplatform/oracle7-64aulcdfm-solaris10-32-oracle7-64a
-- test/fixtures/generated/multiplatform/osx1010-64u-sles11-64-osx1010-64m
-- test/fixtures/generated/multiplatform/osx1011-64l-sles11-32-osx1011-64f
-- test/fixtures/generated/multiplatform/osx109-64a-sles12-64-osx109-64aulcdfm
-- test/fixtures/generated/multiplatform/redhat4-32c-sles10-64-redhat4-32d
-- test/fixtures/generated/multiplatform/redhat4-64d-sles10-32-redhat4-64c
-- test/fixtures/generated/multiplatform/redhat5-32f-scientific7-64-redhat5-32l
-- test/fixtures/generated/multiplatform/redhat5-64m-scientific6-64-redhat5-64u
-- test/fixtures/generated/multiplatform/redhat6-32aulcdfm-scientific6-32-redhat6-32a
-- test/fixtures/generated/multiplatform/redhat6-64a-scientific5-64-redhat6-64aulcdfm
-- test/fixtures/generated/multiplatform/redhat7-64u-scientific5-32-redhat7-64m
-- test/fixtures/generated/multiplatform/scientific5-32l-redhat7-64-scientific5-32f
-- test/fixtures/generated/multiplatform/scientific5-64c-redhat6-64-scientific5-64d
-- test/fixtures/generated/multiplatform/scientific6-32d-redhat6-32-scientific6-32c
-- test/fixtures/generated/multiplatform/scientific6-64f-redhat5-64-scientific6-64l
-- test/fixtures/generated/multiplatform/scientific7-64m-redhat5-32-scientific7-64u
-- test/fixtures/generated/multiplatform/sles10-32aulcdfm-redhat4-64-sles10-32a
-- test/fixtures/generated/multiplatform/sles10-64a-redhat4-32-sles10-64aulcdfm
-- test/fixtures/generated/multiplatform/sles11-32u-osx1011-64-sles11-32m
-- test/fixtures/generated/multiplatform/sles11-64l-osx1010-64-sles11-64f
-- test/fixtures/generated/multiplatform/sles12-64c-osx109-64-sles12-64d
-- test/fixtures/generated/multiplatform/solaris10-32d-oracle7-64-solaris10-32c
-- test/fixtures/generated/multiplatform/solaris10-64f-oracle6-64-solaris10-64l
-- test/fixtures/generated/multiplatform/solaris10-SPARCm-oracle6-32-solaris10-SPARCu
-- test/fixtures/generated/multiplatform/solaris11-32aulcdfm-oracle5-64-solaris11-32a
-- test/fixtures/generated/multiplatform/solaris11-64a-oracle5-32-solaris11-64aulcdfm
-- test/fixtures/generated/multiplatform/solaris11-SPARCu-opensuse11-64-solaris11-SPARCm
-- test/fixtures/generated/multiplatform/solaris112-32l-opensuse11-32-solaris112-32f
-- test/fixtures/generated/multiplatform/solaris112-64c-fedora23-64-solaris112-64d
-- test/fixtures/generated/multiplatform/ubuntu1004-32d-fedora23-32-ubuntu1004-32c
-- test/fixtures/generated/multiplatform/ubuntu1004-64f-fedora22-64-ubuntu1004-64l
-- test/fixtures/generated/multiplatform/ubuntu1204-32m-fedora22-32-ubuntu1204-32u
-- test/fixtures/generated/multiplatform/ubuntu1204-64aulcdfm-fedora21-64-ubuntu1204-64a
-- test/fixtures/generated/multiplatform/ubuntu1404-32a-fedora21-32-ubuntu1404-32aulcdfm
-- test/fixtures/generated/multiplatform/ubuntu1404-64u-fedora20-64-ubuntu1404-64m
-- test/fixtures/generated/multiplatform/ubuntu1504-32l-fedora20-32-ubuntu1504-32f
-- test/fixtures/generated/multiplatform/ubuntu1504-64c-fedora19-64-ubuntu1504-64d
-- test/fixtures/generated/multiplatform/ubuntu1510-32d-fedora19-32-ubuntu1510-32c
-- test/fixtures/generated/multiplatform/ubuntu1510-64f-fedora14-32-ubuntu1510-64l
-- test/fixtures/generated/multiplatform/ubuntu1604-32m-debian9-64-ubuntu1604-32u
-- test/fixtures/generated/multiplatform/ubuntu1604-64aulcdfm-debian9-32-ubuntu1604-64a
-- test/fixtures/generated/multiplatform/windows10ent-32u-aix71-POWER-windows10ent-32m
-- test/fixtures/generated/multiplatform/windows10ent-64l-aix61-POWER-windows10ent-64f
-- test/fixtures/generated/multiplatform/windows10pro-64c-aix53-POWER-windows10pro-64d
-- test/fixtures/generated/multiplatform/windows2003-6432u-debian8-32-windows2003-6432m
-- test/fixtures/generated/multiplatform/windows2003-64a-debian8-64-windows2003-64aulcdfm
-- test/fixtures/generated/multiplatform/windows2003r2-32l-debian7-64-windows2003r2-32f
-- test/fixtures/generated/multiplatform/windows2003r2-6432d-debian6-64-windows2003r2-6432c
-- test/fixtures/generated/multiplatform/windows2003r2-64c-debian7-32-windows2003r2-64d
-- test/fixtures/generated/multiplatform/windows2008-6432m-cumulus25-64-windows2008-6432u
-- test/fixtures/generated/multiplatform/windows2008-64f-debian6-32-windows2008-64l
-- test/fixtures/generated/multiplatform/windows2008r2-6432a-cisconx-64-windows2008r2-6432aulcdfm
-- test/fixtures/generated/multiplatform/windows2008r2-64aulcdfm-ciscoxr-64-windows2008r2-64a
-- test/fixtures/generated/multiplatform/windows2012-6432l-centos6-64-windows2012-6432f
-- test/fixtures/generated/multiplatform/windows2012-64u-centos7-64-windows2012-64m
-- test/fixtures/generated/multiplatform/windows2012r2-6432d-centos5-64-windows2012r2-6432c
-- test/fixtures/generated/multiplatform/windows2012r2-64c-centos6-32-windows2012r2-64d
-- test/fixtures/generated/multiplatform/windows7-64f-centos5-32-windows7-64l
-- test/fixtures/generated/multiplatform/windows8-64m-centos4-64-windows8-64u
-- test/fixtures/generated/multiplatform/windows81-64aulcdfm-centos4-32-windows81-64a
-- test/fixtures/generated/multiplatform/windowsvista-64a-arista4-32-windowsvista-64aulcdfm
+- test/fixtures/generated/multiplatform/fedora24-32u-solaris112-32-fedora24-32m
+- test/fixtures/generated/multiplatform/fedora24-64l-solaris11-SPARC-fedora24-64f
+- test/fixtures/generated/multiplatform/opensuse11-32c-solaris11-64-opensuse11-32d
+- test/fixtures/generated/multiplatform/opensuse11-64d-solaris11-32-opensuse11-64c
+- test/fixtures/generated/multiplatform/oracle5-32f-solaris10-SPARC-oracle5-32l
+- test/fixtures/generated/multiplatform/oracle5-64m-solaris10-64-oracle5-64u
+- test/fixtures/generated/multiplatform/oracle6-32aulcdfm-solaris10-32-oracle6-32a
+- test/fixtures/generated/multiplatform/oracle6-64a-sles12-S390X-oracle6-64aulcdfm
+- 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/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
+- test/fixtures/generated/multiplatform/redhat5-32aulcdfm-scientific7-64-redhat5-32a
+- test/fixtures/generated/multiplatform/redhat5-64a-scientific6-64-redhat5-64aulcdfm
+- test/fixtures/generated/multiplatform/redhat6-32u-scientific6-32-redhat6-32m
+- test/fixtures/generated/multiplatform/redhat6-64l-scientific5-64-redhat6-64f
+- test/fixtures/generated/multiplatform/redhat6-S390Xc-scientific5-32-redhat6-S390Xd
+- test/fixtures/generated/multiplatform/redhat7-64d-redhat7-S390X-redhat7-64c
+- test/fixtures/generated/multiplatform/redhat7-S390Xf-redhat7-64-redhat7-S390Xl
+- test/fixtures/generated/multiplatform/scientific5-32m-redhat6-S390X-scientific5-32u
+- test/fixtures/generated/multiplatform/scientific5-64aulcdfm-redhat6-64-scientific5-64a
+- test/fixtures/generated/multiplatform/scientific6-32a-redhat6-32-scientific6-32aulcdfm
+- 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-64d-redhat4-32-sles10-64c
+- 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
+- test/fixtures/generated/multiplatform/sles12-64a-oracle7-64-sles12-64aulcdfm
+- test/fixtures/generated/multiplatform/sles12-S390Xu-oracle6-64-sles12-S390Xm
+- test/fixtures/generated/multiplatform/solaris10-32l-oracle6-32-solaris10-32f
+- test/fixtures/generated/multiplatform/solaris10-64c-oracle5-64-solaris10-64d
+- test/fixtures/generated/multiplatform/solaris10-SPARCd-oracle5-32-solaris10-SPARCc
+- test/fixtures/generated/multiplatform/solaris11-32f-opensuse11-64-solaris11-32l
+- test/fixtures/generated/multiplatform/solaris11-64m-opensuse11-32-solaris11-64u
+- test/fixtures/generated/multiplatform/solaris11-SPARCaulcdfm-fedora24-64-solaris11-SPARCa
+- test/fixtures/generated/multiplatform/solaris112-32a-fedora24-32-solaris112-32aulcdfm
+- test/fixtures/generated/multiplatform/solaris112-64u-fedora23-64-solaris112-64m
+- test/fixtures/generated/multiplatform/ubuntu1004-32l-fedora23-32-ubuntu1004-32f
+- test/fixtures/generated/multiplatform/ubuntu1004-64c-fedora22-64-ubuntu1004-64d
+- test/fixtures/generated/multiplatform/ubuntu1204-32d-fedora22-32-ubuntu1204-32c
+- test/fixtures/generated/multiplatform/ubuntu1204-64f-fedora21-64-ubuntu1204-64l
+- test/fixtures/generated/multiplatform/ubuntu1404-32m-fedora21-32-ubuntu1404-32u
+- test/fixtures/generated/multiplatform/ubuntu1404-64aulcdfm-fedora20-64-ubuntu1404-64a
+- test/fixtures/generated/multiplatform/ubuntu1504-32a-fedora20-32-ubuntu1504-32aulcdfm
+- test/fixtures/generated/multiplatform/ubuntu1504-64u-fedora19-64-ubuntu1504-64m
+- test/fixtures/generated/multiplatform/ubuntu1510-32l-fedora19-32-ubuntu1510-32f
+- test/fixtures/generated/multiplatform/ubuntu1510-64c-fedora14-32-ubuntu1510-64d
+- test/fixtures/generated/multiplatform/ubuntu1604-32d-debian9-64-ubuntu1604-32c
+- test/fixtures/generated/multiplatform/ubuntu1604-64f-debian9-32-ubuntu1604-64l
+- test/fixtures/generated/multiplatform/windows10ent-32aulcdfm-aix71-POWER-windows10ent-32a
+- test/fixtures/generated/multiplatform/windows10ent-64a-aix61-POWER-windows10ent-64aulcdfm
+- test/fixtures/generated/multiplatform/windows10pro-64u-aix53-POWER-windows10pro-64m
+- test/fixtures/generated/multiplatform/windows2003-6432aulcdfm-debian8-32-windows2003-6432a
+- test/fixtures/generated/multiplatform/windows2003-64m-debian8-64-windows2003-64u
+- test/fixtures/generated/multiplatform/windows2003r2-32a-debian7-64-windows2003r2-32aulcdfm
+- test/fixtures/generated/multiplatform/windows2003r2-6432l-debian6-64-windows2003r2-6432f
+- test/fixtures/generated/multiplatform/windows2003r2-64u-debian7-32-windows2003r2-64m
+- test/fixtures/generated/multiplatform/windows2008-6432d-cumulus25-64-windows2008-6432c
+- test/fixtures/generated/multiplatform/windows2008-64c-debian6-32-windows2008-64d
+- test/fixtures/generated/multiplatform/windows2008r2-6432m-cisconx-64-windows2008r2-6432u
+- test/fixtures/generated/multiplatform/windows2008r2-64f-ciscoxr-64-windows2008r2-64l
+- test/fixtures/generated/multiplatform/windows2012-6432a-centos6-64-windows2012-6432aulcdfm
+- 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/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
+- test/fixtures/generated/multiplatform/windowsvista-64m-arista4-32-windowsvista-64u
 - test/fixtures/generated/osinfo-version-0/aix53-POWERa
 - test/fixtures/generated/osinfo-version-0/aix61-POWERu
 - test/fixtures/generated/osinfo-version-0/aix71-POWERl
@@ -442,73 +454,79 @@ files:
 - test/fixtures/generated/osinfo-version-0/fedora22-64m
 - test/fixtures/generated/osinfo-version-0/fedora23-32aulcdfm
 - test/fixtures/generated/osinfo-version-0/fedora23-64a
-- test/fixtures/generated/osinfo-version-0/opensuse11-32u
-- test/fixtures/generated/osinfo-version-0/opensuse11-64l
-- test/fixtures/generated/osinfo-version-0/oracle5-32c
-- test/fixtures/generated/osinfo-version-0/oracle5-64d
-- test/fixtures/generated/osinfo-version-0/oracle6-32f
-- test/fixtures/generated/osinfo-version-0/oracle6-64m
-- test/fixtures/generated/osinfo-version-0/oracle7-64aulcdfm
-- test/fixtures/generated/osinfo-version-0/osx1010-64u
-- test/fixtures/generated/osinfo-version-0/osx1011-64l
-- test/fixtures/generated/osinfo-version-0/osx109-64a
-- test/fixtures/generated/osinfo-version-0/redhat4-32c
-- test/fixtures/generated/osinfo-version-0/redhat4-64d
-- test/fixtures/generated/osinfo-version-0/redhat5-32f
-- test/fixtures/generated/osinfo-version-0/redhat5-64m
-- test/fixtures/generated/osinfo-version-0/redhat6-32aulcdfm
-- test/fixtures/generated/osinfo-version-0/redhat6-64a
-- test/fixtures/generated/osinfo-version-0/redhat7-64u
-- test/fixtures/generated/osinfo-version-0/scientific5-32l
-- test/fixtures/generated/osinfo-version-0/scientific5-64c
-- test/fixtures/generated/osinfo-version-0/scientific6-32d
-- test/fixtures/generated/osinfo-version-0/scientific6-64f
-- test/fixtures/generated/osinfo-version-0/scientific7-64m
-- test/fixtures/generated/osinfo-version-0/sles10-32aulcdfm
-- test/fixtures/generated/osinfo-version-0/sles10-64a
-- test/fixtures/generated/osinfo-version-0/sles11-32u
-- test/fixtures/generated/osinfo-version-0/sles11-64l
-- test/fixtures/generated/osinfo-version-0/sles12-64c
-- test/fixtures/generated/osinfo-version-0/solaris10-32d
-- test/fixtures/generated/osinfo-version-0/solaris10-64f
-- test/fixtures/generated/osinfo-version-0/solaris10-SPARCm
-- test/fixtures/generated/osinfo-version-0/solaris11-32aulcdfm
-- test/fixtures/generated/osinfo-version-0/solaris11-64a
-- test/fixtures/generated/osinfo-version-0/solaris11-SPARCu
-- test/fixtures/generated/osinfo-version-0/solaris112-32l
-- test/fixtures/generated/osinfo-version-0/solaris112-64c
-- test/fixtures/generated/osinfo-version-0/ubuntu1004-32d
-- test/fixtures/generated/osinfo-version-0/ubuntu1004-64f
-- test/fixtures/generated/osinfo-version-0/ubuntu1204-32m
-- test/fixtures/generated/osinfo-version-0/ubuntu1204-64aulcdfm
-- test/fixtures/generated/osinfo-version-0/ubuntu1404-32a
-- test/fixtures/generated/osinfo-version-0/ubuntu1404-64u
-- test/fixtures/generated/osinfo-version-0/ubuntu1504-32l
-- test/fixtures/generated/osinfo-version-0/ubuntu1504-64c
-- test/fixtures/generated/osinfo-version-0/ubuntu1510-32d
-- test/fixtures/generated/osinfo-version-0/ubuntu1510-64f
-- test/fixtures/generated/osinfo-version-0/ubuntu1604-32m
-- test/fixtures/generated/osinfo-version-0/ubuntu1604-64aulcdfm
-- test/fixtures/generated/osinfo-version-0/windows10ent-32u
-- test/fixtures/generated/osinfo-version-0/windows10ent-64l
-- test/fixtures/generated/osinfo-version-0/windows10pro-64c
-- test/fixtures/generated/osinfo-version-0/windows2003-6432u
-- test/fixtures/generated/osinfo-version-0/windows2003-64a
-- test/fixtures/generated/osinfo-version-0/windows2003r2-32l
-- test/fixtures/generated/osinfo-version-0/windows2003r2-6432d
-- test/fixtures/generated/osinfo-version-0/windows2003r2-64c
-- test/fixtures/generated/osinfo-version-0/windows2008-6432m
-- test/fixtures/generated/osinfo-version-0/windows2008-64f
-- test/fixtures/generated/osinfo-version-0/windows2008r2-6432a
-- test/fixtures/generated/osinfo-version-0/windows2008r2-64aulcdfm
-- test/fixtures/generated/osinfo-version-0/windows2012-6432l
-- test/fixtures/generated/osinfo-version-0/windows2012-64u
-- test/fixtures/generated/osinfo-version-0/windows2012r2-6432d
-- test/fixtures/generated/osinfo-version-0/windows2012r2-64c
-- test/fixtures/generated/osinfo-version-0/windows7-64f
-- test/fixtures/generated/osinfo-version-0/windows8-64m
-- test/fixtures/generated/osinfo-version-0/windows81-64aulcdfm
-- test/fixtures/generated/osinfo-version-0/windowsvista-64a
+- test/fixtures/generated/osinfo-version-0/fedora24-32u
+- test/fixtures/generated/osinfo-version-0/fedora24-64l
+- test/fixtures/generated/osinfo-version-0/opensuse11-32c
+- test/fixtures/generated/osinfo-version-0/opensuse11-64d
+- test/fixtures/generated/osinfo-version-0/oracle5-32f
+- test/fixtures/generated/osinfo-version-0/oracle5-64m
+- test/fixtures/generated/osinfo-version-0/oracle6-32aulcdfm
+- test/fixtures/generated/osinfo-version-0/oracle6-64a
+- 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/osx109-64l
+- test/fixtures/generated/osinfo-version-0/redhat4-32f
+- test/fixtures/generated/osinfo-version-0/redhat4-64m
+- test/fixtures/generated/osinfo-version-0/redhat5-32aulcdfm
+- test/fixtures/generated/osinfo-version-0/redhat5-64a
+- test/fixtures/generated/osinfo-version-0/redhat6-32u
+- test/fixtures/generated/osinfo-version-0/redhat6-64l
+- test/fixtures/generated/osinfo-version-0/redhat6-S390Xc
+- test/fixtures/generated/osinfo-version-0/redhat7-64d
+- test/fixtures/generated/osinfo-version-0/redhat7-S390Xf
+- test/fixtures/generated/osinfo-version-0/scientific5-32m
+- test/fixtures/generated/osinfo-version-0/scientific5-64aulcdfm
+- test/fixtures/generated/osinfo-version-0/scientific6-32a
+- test/fixtures/generated/osinfo-version-0/scientific6-64u
+- test/fixtures/generated/osinfo-version-0/scientific7-64l
+- test/fixtures/generated/osinfo-version-0/sles10-32c
+- test/fixtures/generated/osinfo-version-0/sles10-64d
+- test/fixtures/generated/osinfo-version-0/sles11-32f
+- test/fixtures/generated/osinfo-version-0/sles11-64m
+- test/fixtures/generated/osinfo-version-0/sles11-S390Xaulcdfm
+- test/fixtures/generated/osinfo-version-0/sles12-64a
+- test/fixtures/generated/osinfo-version-0/sles12-S390Xu
+- test/fixtures/generated/osinfo-version-0/solaris10-32l
+- test/fixtures/generated/osinfo-version-0/solaris10-64c
+- test/fixtures/generated/osinfo-version-0/solaris10-SPARCd
+- test/fixtures/generated/osinfo-version-0/solaris11-32f
+- test/fixtures/generated/osinfo-version-0/solaris11-64m
+- test/fixtures/generated/osinfo-version-0/solaris11-SPARCaulcdfm
+- test/fixtures/generated/osinfo-version-0/solaris112-32a
+- test/fixtures/generated/osinfo-version-0/solaris112-64u
+- test/fixtures/generated/osinfo-version-0/ubuntu1004-32l
+- test/fixtures/generated/osinfo-version-0/ubuntu1004-64c
+- test/fixtures/generated/osinfo-version-0/ubuntu1204-32d
+- test/fixtures/generated/osinfo-version-0/ubuntu1204-64f
+- test/fixtures/generated/osinfo-version-0/ubuntu1404-32m
+- test/fixtures/generated/osinfo-version-0/ubuntu1404-64aulcdfm
+- test/fixtures/generated/osinfo-version-0/ubuntu1504-32a
+- test/fixtures/generated/osinfo-version-0/ubuntu1504-64u
+- test/fixtures/generated/osinfo-version-0/ubuntu1510-32l
+- test/fixtures/generated/osinfo-version-0/ubuntu1510-64c
+- test/fixtures/generated/osinfo-version-0/ubuntu1604-32d
+- test/fixtures/generated/osinfo-version-0/ubuntu1604-64f
+- test/fixtures/generated/osinfo-version-0/windows10ent-32aulcdfm
+- test/fixtures/generated/osinfo-version-0/windows10ent-64a
+- test/fixtures/generated/osinfo-version-0/windows10pro-64u
+- test/fixtures/generated/osinfo-version-0/windows2003-6432aulcdfm
+- test/fixtures/generated/osinfo-version-0/windows2003-64m
+- test/fixtures/generated/osinfo-version-0/windows2003r2-32a
+- test/fixtures/generated/osinfo-version-0/windows2003r2-6432l
+- test/fixtures/generated/osinfo-version-0/windows2003r2-64u
+- test/fixtures/generated/osinfo-version-0/windows2008-6432d
+- test/fixtures/generated/osinfo-version-0/windows2008-64c
+- test/fixtures/generated/osinfo-version-0/windows2008r2-6432m
+- test/fixtures/generated/osinfo-version-0/windows2008r2-64f
+- test/fixtures/generated/osinfo-version-0/windows2012-6432a
+- 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/windows7-64c
+- test/fixtures/generated/osinfo-version-0/windows8-64d
+- test/fixtures/generated/osinfo-version-0/windows81-64f
+- test/fixtures/generated/osinfo-version-0/windowsvista-64m
 - test/fixtures/generated/osinfo-version-1/aix53-POWERa
 - test/fixtures/generated/osinfo-version-1/aix61-POWERu
 - test/fixtures/generated/osinfo-version-1/aix71-POWERl
@@ -542,73 +560,79 @@ files:
 - test/fixtures/generated/osinfo-version-1/fedora22-64m
 - test/fixtures/generated/osinfo-version-1/fedora23-32aulcdfm
 - test/fixtures/generated/osinfo-version-1/fedora23-64a
-- test/fixtures/generated/osinfo-version-1/opensuse11-32u
-- test/fixtures/generated/osinfo-version-1/opensuse11-64l
-- test/fixtures/generated/osinfo-version-1/oracle5-32c
-- test/fixtures/generated/osinfo-version-1/oracle5-64d
-- test/fixtures/generated/osinfo-version-1/oracle6-32f
-- test/fixtures/generated/osinfo-version-1/oracle6-64m
-- test/fixtures/generated/osinfo-version-1/oracle7-64aulcdfm
-- test/fixtures/generated/osinfo-version-1/osx1010-64u
-- test/fixtures/generated/osinfo-version-1/osx1011-64l
-- test/fixtures/generated/osinfo-version-1/osx109-64a
-- test/fixtures/generated/osinfo-version-1/redhat4-32c
-- test/fixtures/generated/osinfo-version-1/redhat4-64d
-- test/fixtures/generated/osinfo-version-1/redhat5-32f
-- test/fixtures/generated/osinfo-version-1/redhat5-64m
-- test/fixtures/generated/osinfo-version-1/redhat6-32aulcdfm
-- test/fixtures/generated/osinfo-version-1/redhat6-64a
-- test/fixtures/generated/osinfo-version-1/redhat7-64u
-- test/fixtures/generated/osinfo-version-1/scientific5-32l
-- test/fixtures/generated/osinfo-version-1/scientific5-64c
-- test/fixtures/generated/osinfo-version-1/scientific6-32d
-- test/fixtures/generated/osinfo-version-1/scientific6-64f
-- test/fixtures/generated/osinfo-version-1/scientific7-64m
-- test/fixtures/generated/osinfo-version-1/sles10-32aulcdfm
-- test/fixtures/generated/osinfo-version-1/sles10-64a
-- test/fixtures/generated/osinfo-version-1/sles11-32u
-- test/fixtures/generated/osinfo-version-1/sles11-64l
-- test/fixtures/generated/osinfo-version-1/sles12-64c
-- test/fixtures/generated/osinfo-version-1/solaris10-32d
-- test/fixtures/generated/osinfo-version-1/solaris10-64f
-- test/fixtures/generated/osinfo-version-1/solaris10-SPARCm
-- test/fixtures/generated/osinfo-version-1/solaris11-32aulcdfm
-- test/fixtures/generated/osinfo-version-1/solaris11-64a
-- test/fixtures/generated/osinfo-version-1/solaris11-SPARCu
-- test/fixtures/generated/osinfo-version-1/solaris112-32l
-- test/fixtures/generated/osinfo-version-1/solaris112-64c
-- test/fixtures/generated/osinfo-version-1/ubuntu1004-32d
-- test/fixtures/generated/osinfo-version-1/ubuntu1004-64f
-- test/fixtures/generated/osinfo-version-1/ubuntu1204-32m
-- test/fixtures/generated/osinfo-version-1/ubuntu1204-64aulcdfm
-- test/fixtures/generated/osinfo-version-1/ubuntu1404-32a
-- test/fixtures/generated/osinfo-version-1/ubuntu1404-64u
-- test/fixtures/generated/osinfo-version-1/ubuntu1504-32l
-- test/fixtures/generated/osinfo-version-1/ubuntu1504-64c
-- test/fixtures/generated/osinfo-version-1/ubuntu1510-32d
-- test/fixtures/generated/osinfo-version-1/ubuntu1510-64f
-- test/fixtures/generated/osinfo-version-1/ubuntu1604-32m
-- test/fixtures/generated/osinfo-version-1/ubuntu1604-64aulcdfm
-- test/fixtures/generated/osinfo-version-1/windows10ent-32u
-- test/fixtures/generated/osinfo-version-1/windows10ent-64l
-- test/fixtures/generated/osinfo-version-1/windows10pro-64c
-- test/fixtures/generated/osinfo-version-1/windows2003-6432u
-- test/fixtures/generated/osinfo-version-1/windows2003-64a
-- test/fixtures/generated/osinfo-version-1/windows2003r2-32l
-- test/fixtures/generated/osinfo-version-1/windows2003r2-6432d
-- test/fixtures/generated/osinfo-version-1/windows2003r2-64c
-- test/fixtures/generated/osinfo-version-1/windows2008-6432m
-- test/fixtures/generated/osinfo-version-1/windows2008-64f
-- test/fixtures/generated/osinfo-version-1/windows2008r2-6432a
-- test/fixtures/generated/osinfo-version-1/windows2008r2-64aulcdfm
-- test/fixtures/generated/osinfo-version-1/windows2012-6432l
-- test/fixtures/generated/osinfo-version-1/windows2012-64u
-- test/fixtures/generated/osinfo-version-1/windows2012r2-6432d
-- test/fixtures/generated/osinfo-version-1/windows2012r2-64c
-- test/fixtures/generated/osinfo-version-1/windows7-64f
-- test/fixtures/generated/osinfo-version-1/windows8-64m
-- test/fixtures/generated/osinfo-version-1/windows81-64aulcdfm
-- test/fixtures/generated/osinfo-version-1/windowsvista-64a
+- test/fixtures/generated/osinfo-version-1/fedora24-32u
+- test/fixtures/generated/osinfo-version-1/fedora24-64l
+- test/fixtures/generated/osinfo-version-1/opensuse11-32c
+- test/fixtures/generated/osinfo-version-1/opensuse11-64d
+- test/fixtures/generated/osinfo-version-1/oracle5-32f
+- test/fixtures/generated/osinfo-version-1/oracle5-64m
+- test/fixtures/generated/osinfo-version-1/oracle6-32aulcdfm
+- test/fixtures/generated/osinfo-version-1/oracle6-64a
+- 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/osx109-64l
+- test/fixtures/generated/osinfo-version-1/redhat4-32f
+- test/fixtures/generated/osinfo-version-1/redhat4-64m
+- test/fixtures/generated/osinfo-version-1/redhat5-32aulcdfm
+- test/fixtures/generated/osinfo-version-1/redhat5-64a
+- test/fixtures/generated/osinfo-version-1/redhat6-32u
+- test/fixtures/generated/osinfo-version-1/redhat6-64l
+- test/fixtures/generated/osinfo-version-1/redhat6-S390Xc
+- test/fixtures/generated/osinfo-version-1/redhat7-64d
+- test/fixtures/generated/osinfo-version-1/redhat7-S390Xf
+- test/fixtures/generated/osinfo-version-1/scientific5-32m
+- test/fixtures/generated/osinfo-version-1/scientific5-64aulcdfm
+- test/fixtures/generated/osinfo-version-1/scientific6-32a
+- test/fixtures/generated/osinfo-version-1/scientific6-64u
+- test/fixtures/generated/osinfo-version-1/scientific7-64l
+- test/fixtures/generated/osinfo-version-1/sles10-32c
+- test/fixtures/generated/osinfo-version-1/sles10-64d
+- test/fixtures/generated/osinfo-version-1/sles11-32f
+- test/fixtures/generated/osinfo-version-1/sles11-64m
+- test/fixtures/generated/osinfo-version-1/sles11-S390Xaulcdfm
+- test/fixtures/generated/osinfo-version-1/sles12-64a
+- test/fixtures/generated/osinfo-version-1/sles12-S390Xu
+- test/fixtures/generated/osinfo-version-1/solaris10-32l
+- test/fixtures/generated/osinfo-version-1/solaris10-64c
+- test/fixtures/generated/osinfo-version-1/solaris10-SPARCd
+- test/fixtures/generated/osinfo-version-1/solaris11-32f
+- test/fixtures/generated/osinfo-version-1/solaris11-64m
+- test/fixtures/generated/osinfo-version-1/solaris11-SPARCaulcdfm
+- test/fixtures/generated/osinfo-version-1/solaris112-32a
+- test/fixtures/generated/osinfo-version-1/solaris112-64u
+- test/fixtures/generated/osinfo-version-1/ubuntu1004-32l
+- test/fixtures/generated/osinfo-version-1/ubuntu1004-64c
+- test/fixtures/generated/osinfo-version-1/ubuntu1204-32d
+- test/fixtures/generated/osinfo-version-1/ubuntu1204-64f
+- test/fixtures/generated/osinfo-version-1/ubuntu1404-32m
+- test/fixtures/generated/osinfo-version-1/ubuntu1404-64aulcdfm
+- test/fixtures/generated/osinfo-version-1/ubuntu1504-32a
+- test/fixtures/generated/osinfo-version-1/ubuntu1504-64u
+- test/fixtures/generated/osinfo-version-1/ubuntu1510-32l
+- test/fixtures/generated/osinfo-version-1/ubuntu1510-64c
+- test/fixtures/generated/osinfo-version-1/ubuntu1604-32d
+- test/fixtures/generated/osinfo-version-1/ubuntu1604-64f
+- test/fixtures/generated/osinfo-version-1/windows10ent-32aulcdfm
+- test/fixtures/generated/osinfo-version-1/windows10ent-64a
+- test/fixtures/generated/osinfo-version-1/windows10pro-64u
+- test/fixtures/generated/osinfo-version-1/windows2003-6432aulcdfm
+- test/fixtures/generated/osinfo-version-1/windows2003-64m
+- test/fixtures/generated/osinfo-version-1/windows2003r2-32a
+- test/fixtures/generated/osinfo-version-1/windows2003r2-6432l
+- test/fixtures/generated/osinfo-version-1/windows2003r2-64u
+- test/fixtures/generated/osinfo-version-1/windows2008-6432d
+- test/fixtures/generated/osinfo-version-1/windows2008-64c
+- test/fixtures/generated/osinfo-version-1/windows2008r2-6432m
+- test/fixtures/generated/osinfo-version-1/windows2008r2-64f
+- test/fixtures/generated/osinfo-version-1/windows2012-6432a
+- 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/windows7-64c
+- test/fixtures/generated/osinfo-version-1/windows8-64d
+- test/fixtures/generated/osinfo-version-1/windows81-64f
+- test/fixtures/generated/osinfo-version-1/windowsvista-64m
 - test/fixtures/generated/pe_dir/centos6-64mdc
 - test/fixtures/generated/pe_upgrade_dir/centos6-64mdc
 - test/fixtures/generated/pe_upgrade_ver/centos6-64mdc