(IMAGES-1125) Add new Windows 10 and 2019 Definitions (#158)

* (MAINT) Remove unused windows definitions

Remove the following windows definitions as there are no corresponding
vmpooler pools for them.

- Windows 2003/2003r2
- Windows 8
- Windows Vista

* (IMAGES-1125) Add New Win10/2019 pools

Adding beaker host generator definitions for the following new
vmpooler pools that were either added in the recent June 2019 Refresh
or were previously added to vmpooler but not updated here:
- win-10-next-x86_64
- win-10-next-i386
- win-10-1511-x86_64
- win-10-1607-x86_64
- win-10-1809-x86_64
- win-2019-fr-x86_64
- win-2019-ja-x86_64

lib/beaker-hostgenerator/data.rb

@@ -1335,56 +1335,6 @@ def osinfo
             'template' => 'vro-74-x86_64'
           }
         },
-        'windows2003-64' => {
-          :general => {
-            'platform'           => 'windows-2003-64',
-            'packaging_platform' => 'windows-2012-x64',
-            'ruby_arch' => 'x64'
-          },
-          :vmpooler => {
-            'template' => 'win-2003-x86_64'
-          }
-        },
-        'windows2003-6432' => {
-          :general => {
-            'platform'           => 'windows-2003-64',
-            'packaging_platform' => 'windows-2012-x64',
-            'ruby_arch' => 'x86'
-          },
-          :vmpooler => {
-            'template' => 'win-2003-x86_64'
-          }
-        },
-        'windows2003r2-32' => {
-          :general => {
-            'platform'           => 'windows-2003r2-32',
-            'packaging_platform' => 'windows-2012-x86',
-            'ruby_arch' => 'x86'
-          },
-          :vmpooler => {
-            'template' => 'win-2003r2-i386'
-          }
-        },
-        'windows2003r2-64' => {
-          :general => {
-            'platform'           => 'windows-2003r2-64',
-            'packaging_platform' => 'windows-2012-x64',
-            'ruby_arch' => 'x64'
-          },
-          :vmpooler => {
-            'template' => 'win-2003r2-x86_64'
-          }
-        },
-        'windows2003r2-6432' => {
-          :general => {
-            'platform'           => 'windows-2003r2-64',
-            'packaging_platform' => 'windows-2012-x64',
-            'ruby_arch' => 'x86'
-          },
-          :vmpooler => {
-            'template' => 'win-2003r2-x86_64'
-          }
-        },
         'windows2008-64' => {
           :general => {
             'platform'           => 'windows-2008-64',
@@ -1619,6 +1569,48 @@ def osinfo
             'template' => 'win-2019-x86_64'
           }
         },
+        'windows2019_ja-64' => {
+          :general => {
+            'platform'           => 'windows-2019-64',
+            'packaging_platform' => 'windows-2012-x64',
+            'ruby_arch' => 'x64'
+          },
+          :vmpooler => {
+            'template' => 'win-2019-ja-x86_64'
+          }
+        },
+        'windows2019_ja-6432' => {
+          :general => {
+            'platform'           => 'windows-2019-64',
+            'packaging_platform' => 'windows-2012-x64',
+            'ruby_arch' => 'x86'
+          },
+          :vmpooler => {
+            'template' => 'win-2019-ja-x86_64'
+          }
+        },
+        'windows2019_fr-64' => {
+          :general => {
+            'platform'           => 'windows-2019-64',
+            'packaging_platform' => 'windows-2012-x64',
+            'ruby_arch' => 'x64'
+          },
+          :vmpooler => {
+            'template' => 'win-2019-fr-x86_64',
+            'user'     => 'Administrateur'
+          }
+        },
+        'windows2019_fr-6432' => {
+          :general => {
+            'platform'           => 'windows-2019-64',
+            'packaging_platform' => 'windows-2012-x64',
+            'ruby_arch' => 'x86'
+          },
+          :vmpooler => {
+            'template' => 'win-2019-fr-x86_64',
+            'user'     => 'Administrateur'
+          }
+        },
         'windows2019_core-64' => {
           :general => {
             'platform'           => 'windows-2019-64',
@@ -1649,54 +1641,54 @@ def osinfo
             'template' => 'win-7-x86_64'
           }
         },
-        'windows8-64' => {
+        'windows81-64' => {
           :general => {
-            'platform'           => 'windows-8-64',
+            'platform'           => 'windows-8.1-64',
             'packaging_platform' => 'windows-2012-x64',
             'ruby_arch' => 'x64'
           },
           :vmpooler => {
-            'template' => 'win-8-x86_64'
+            'template' => 'win-81-x86_64'
           }
         },
-        'windows81-64' => {
+        'windows10ent-32' => {
           :general => {
-            'platform'           => 'windows-8.1-64',
-            'packaging_platform' => 'windows-2012-x64',
-            'ruby_arch' => 'x64'
+            'platform'           => 'windows-10ent-32',
+            'packaging_platform' => 'windows-2012-x86',
+            'ruby_arch' => 'x86'
           },
           :vmpooler => {
-            'template' => 'win-81-x86_64'
+            'template' => 'win-10-ent-i386'
           }
         },
-        'windowsvista-64' => {
+        'windows10ent-64' => {
           :general => {
-            'platform'           => 'windows-vista-64',
+            'platform'           => 'windows-10ent-64',
             'packaging_platform' => 'windows-2012-x64',
             'ruby_arch' => 'x64'
           },
           :vmpooler => {
-            'template' => 'win-vista-x86_64'
+            'template' => 'win-10-ent-x86_64'
           }
         },
-        'windows10ent-32' => {
+        'windows10next-32' => {
           :general => {
             'platform'           => 'windows-10ent-32',
             'packaging_platform' => 'windows-2012-x86',
             'ruby_arch' => 'x86'
           },
           :vmpooler => {
-            'template' => 'win-10-ent-i386'
+            'template' => 'win-10-next-i386'
           }
         },
-        'windows10ent-64' => {
+        'windows10next-64' => {
           :general => {
             'platform'           => 'windows-10ent-64',
             'packaging_platform' => 'windows-2012-x64',
             'ruby_arch' => 'x64'
           },
           :vmpooler => {
-            'template' => 'win-10-ent-x86_64'
+            'template' => 'win-10-next-x86_64'
           }
         },
         'windows10pro-64' => {
@@ -1707,7 +1699,37 @@ def osinfo
           },
           :vmpooler => {
             'template' => 'win-10-pro-x86_64'
+          }
+        },
+        'windows10_1511-64' => {
+          :general => {
+            'platform'           => 'windows-10ent-64',
+            'packaging_platform' => 'windows-2012-x64',
+            'ruby_arch' => 'x64'
+          },
+          :vmpooler => {
+            'template' => 'win-10-1511-x86_64'
+          }
+        },
+        'windows10_1607-64' => {
+          :general => {
+            'platform'           => 'windows-10ent-64',
+            'packaging_platform' => 'windows-2012-x64',
+            'ruby_arch' => 'x64'
+          },
+          :vmpooler => {
+            'template' => 'win-10-1607-x86_64'
+          }
+        },
+        'windows10_1809-64' => {
+          :general => {
+            'platform'           => 'windows-10ent-64',
+            'packaging_platform' => 'windows-2012-x64',
+            'ruby_arch' => 'x64'
           },
+          :vmpooler => {
+            'template' => 'win-10-1809-x86_64'
+          }
         }
       }
     end

test/fixtures/generated/default/windows2003r2-64m → test/fixtures/generated/default/windows10_1511-64a

@@ -1,21 +1,20 @@
 ---
-arguments_string: windows2003r2-64m
+arguments_string: windows10_1511-64a
 environment_variables: {}
 expected_hash:
   HOSTS:
-    windows2003r2-64-1:
+    windows10_1511-64-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: windows-2003r2-64
+      platform: windows-10ent-64
       packaging_platform: windows-2012-x64
       ruby_arch: x64
-      template: win-2003r2-x86_64
+      template: win-10-1511-x86_64
       roles:
       - agent
-      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

test/fixtures/generated/default/windows10_1607-64a

@@ -0,0 +1,22 @@
+---
+arguments_string: windows10_1607-64a
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows10_1607-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-10ent-64
+      packaging_platform: windows-2012-x64
+      ruby_arch: x64
+      template: win-10-1607-x86_64
+      roles:
+      - agent
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

test/fixtures/generated/default/windows10_1809-64a

@@ -0,0 +1,22 @@
+---
+arguments_string: windows10_1809-64a
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows10_1809-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-10ent-64
+      packaging_platform: windows-2012-x64
+      ruby_arch: x64
+      template: win-10-1809-x86_64
+      roles:
+      - agent
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

test/fixtures/generated/default/windows2003r2-32f → test/fixtures/generated/default/windows10next-32a

@@ -1,21 +1,20 @@
 ---
-arguments_string: windows2003r2-32f
+arguments_string: windows10next-32a
 environment_variables: {}
 expected_hash:
   HOSTS:
-    windows2003r2-32-1:
+    windows10next-32-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: windows-2003r2-32
+      platform: windows-10ent-32
       packaging_platform: windows-2012-x86
       ruby_arch: x86
-      template: win-2003r2-i386
+      template: win-10-next-i386
       roles:
       - agent
-      - frictionless
   CONFIG:
     nfs_server: none
     consoleport: 443

test/fixtures/generated/default/windowsvista-64a → test/fixtures/generated/default/windows10next-64a

@@ -1,18 +1,18 @@
 ---
-arguments_string: windowsvista-64a
+arguments_string: windows10next-64a
 environment_variables: {}
 expected_hash:
   HOSTS:
-    windowsvista-64-1:
+    windows10next-64-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: windows-vista-64
+      platform: windows-10ent-64
       packaging_platform: windows-2012-x64
       ruby_arch: x64
-      template: win-vista-x86_64
+      template: win-10-next-x86_64
       roles:
       - agent
   CONFIG:

test/fixtures/generated/osinfo-version-0/windows2003-6432d → test/fixtures/generated/default/windows2019_fr-6432f

@@ -1,21 +1,22 @@
 ---
-arguments_string: "--osinfo-version 0 windows2003-6432d"
+arguments_string: windows2019_fr-6432f
 environment_variables: {}
 expected_hash:
   HOSTS:
-    windows2003-6432-1:
-      pe_dir: 
-      pe_ver: 
-      pe_upgrade_dir: 
-      pe_upgrade_ver: 
+    windows2019_fr-6432-1:
+      pe_dir:
+      pe_ver:
+      pe_upgrade_dir:
+      pe_upgrade_ver:
       hypervisor: vmpooler
-      platform: windows-2003-64
+      platform: windows-2019-64
       packaging_platform: windows-2012-x64
       ruby_arch: x86
-      template: win-2003-x86_64
+      template: win-2019-fr-x86_64
+      user: Administrateur
       roles:
       - agent
-      - database
+      - frictionless
   CONFIG:
     nfs_server: none
     consoleport: 443