beaker-hostgenerator 0.3.3 → 0.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/CHANGELOG.md +17 -0
- data/Gemfile +4 -0
- data/HISTORY.md +201 -2
- data/README.md +91 -0
- data/Rakefile +27 -1
- data/beaker-hostgenerator.gemspec +0 -1
- data/bin/beaker-hostgenerator +5 -1
- data/bin/genconfig2 +5 -1
- data/lib/beaker-hostgenerator/cli.rb +28 -8
- data/lib/beaker-hostgenerator/data/vmpooler.rb +3 -2
- data/lib/beaker-hostgenerator/data.rb +15 -5
- data/lib/beaker-hostgenerator/exceptions.rb +7 -0
- data/lib/beaker-hostgenerator/generator.rb +16 -9
- data/lib/beaker-hostgenerator/util.rb +2 -2
- data/lib/beaker-hostgenerator/version.rb +1 -1
- data/spec/beaker-hostgenerator/generator_spec.rb +35 -3
- data/test/fixtures/default/arista4-32a +20 -0
- data/test/fixtures/default/centos4-32u +21 -0
- data/test/fixtures/default/centos4-64l +21 -0
- data/test/fixtures/default/centos5-32c +21 -0
- data/test/fixtures/default/centos5-64d +21 -0
- data/test/fixtures/default/centos6-32f +21 -0
- data/test/fixtures/default/centos6-64m +21 -0
- data/test/fixtures/default/centos7-64aulcdfm +26 -0
- data/test/fixtures/default/ciscoexr7-64u +22 -0
- data/test/fixtures/default/cisconxos5-64a +23 -0
- data/test/fixtures/default/cumulus25-64l +21 -0
- data/test/fixtures/default/debian6-32c +21 -0
- data/test/fixtures/default/debian6-64d +21 -0
- data/test/fixtures/default/debian7-32f +21 -0
- data/test/fixtures/default/debian7-64m +21 -0
- data/test/fixtures/default/debian8-32aulcdfm +26 -0
- data/test/fixtures/default/debian8-64a +20 -0
- data/test/fixtures/default/debian9-32u +21 -0
- data/test/fixtures/default/debian9-64l +21 -0
- data/test/fixtures/default/fedora14-32l +21 -0
- data/test/fixtures/default/fedora19-32c +21 -0
- data/test/fixtures/default/fedora19-64d +21 -0
- data/test/fixtures/default/fedora20-32f +21 -0
- data/test/fixtures/default/fedora20-64m +21 -0
- data/test/fixtures/default/fedora21-32aulcdfm +26 -0
- data/test/fixtures/default/fedora21-64a +20 -0
- data/test/fixtures/default/fedora22-32u +21 -0
- data/test/fixtures/default/fedora22-64l +21 -0
- data/test/fixtures/default/fedora23-32c +21 -0
- data/test/fixtures/default/fedora23-64d +21 -0
- data/test/fixtures/default/opensuse11-32f +21 -0
- data/test/fixtures/default/opensuse11-64m +21 -0
- data/test/fixtures/default/oracle5-32c +21 -0
- data/test/fixtures/default/oracle5-64d +21 -0
- data/test/fixtures/default/oracle6-32f +21 -0
- data/test/fixtures/default/oracle6-64m +21 -0
- data/test/fixtures/default/oracle7-64aulcdfm +26 -0
- data/test/fixtures/default/osx1010-64u +21 -0
- data/test/fixtures/default/osx1011-64l +21 -0
- data/test/fixtures/default/osx109-64a +20 -0
- data/test/fixtures/default/redhat4-32c +21 -0
- data/test/fixtures/default/redhat4-64d +21 -0
- data/test/fixtures/default/redhat5-32f +21 -0
- data/test/fixtures/default/redhat5-64m +21 -0
- data/test/fixtures/default/redhat6-32aulcdfm +26 -0
- data/test/fixtures/default/redhat6-64a +20 -0
- data/test/fixtures/default/redhat7-64u +21 -0
- data/test/fixtures/default/scientific5-32aulcdfm +26 -0
- data/test/fixtures/default/scientific5-64a +20 -0
- data/test/fixtures/default/scientific6-32u +21 -0
- data/test/fixtures/default/scientific6-64l +21 -0
- data/test/fixtures/default/scientific7-64c +21 -0
- data/test/fixtures/default/sles10-32d +21 -0
- data/test/fixtures/default/sles10-64f +21 -0
- data/test/fixtures/default/sles11-32m +21 -0
- data/test/fixtures/default/sles11-64aulcdfm +26 -0
- data/test/fixtures/default/sles12-64a +20 -0
- data/test/fixtures/default/solaris10-32u +21 -0
- data/test/fixtures/default/solaris10-64l +21 -0
- data/test/fixtures/default/solaris11-32c +21 -0
- data/test/fixtures/default/solaris11-64d +21 -0
- data/test/fixtures/default/solaris112-32f +21 -0
- data/test/fixtures/default/solaris112-64m +21 -0
- data/test/fixtures/default/ubuntu1004-32aulcdfm +26 -0
- data/test/fixtures/default/ubuntu1004-64a +20 -0
- data/test/fixtures/default/ubuntu1204-32u +21 -0
- data/test/fixtures/default/ubuntu1204-64l +21 -0
- data/test/fixtures/default/ubuntu1404-32c +21 -0
- data/test/fixtures/default/ubuntu1404-64d +21 -0
- data/test/fixtures/default/ubuntu1504-32f +21 -0
- data/test/fixtures/default/ubuntu1504-64m +21 -0
- data/test/fixtures/default/ubuntu1510-32aulcdfm +26 -0
- data/test/fixtures/default/ubuntu1510-64a +20 -0
- data/test/fixtures/default/windows10ent-32l +22 -0
- data/test/fixtures/default/windows10ent-64c +22 -0
- data/test/fixtures/default/windows10pro-64d +22 -0
- data/test/fixtures/default/windows2003-6432l +22 -0
- data/test/fixtures/default/windows2003-64u +22 -0
- data/test/fixtures/default/windows2003r2-32c +22 -0
- data/test/fixtures/default/windows2003r2-6432f +22 -0
- data/test/fixtures/default/windows2003r2-64d +22 -0
- data/test/fixtures/default/windows2008-6432aulcdfm +27 -0
- data/test/fixtures/default/windows2008-64m +22 -0
- data/test/fixtures/default/windows2008r2-6432u +22 -0
- data/test/fixtures/default/windows2008r2-64a +21 -0
- data/test/fixtures/default/windows2012-6432c +22 -0
- data/test/fixtures/default/windows2012-64l +22 -0
- data/test/fixtures/default/windows2012r2-6432f +22 -0
- data/test/fixtures/default/windows2012r2-64d +22 -0
- data/test/fixtures/default/windows7-64m +22 -0
- data/test/fixtures/default/windows8-64aulcdfm +27 -0
- data/test/fixtures/default/windows81-64a +21 -0
- data/test/fixtures/default/windowsvista-64u +22 -0
- data/test/fixtures/environment_variable_tests/pe_version_and_pe_family/centos6-32a +24 -0
- data/test/fixtures/environment_variable_tests/pe_version_and_pe_family_no_upgrade/centos6-32a +22 -0
- data/test/fixtures/environment_variable_tests/pe_version_and_pe_family_upgrade_only/centos6-32a +22 -0
- data/test/fixtures/osinfo-version-0/arista4-32a +20 -0
- data/test/fixtures/osinfo-version-0/centos4-32u +21 -0
- data/test/fixtures/osinfo-version-0/centos4-64l +21 -0
- data/test/fixtures/osinfo-version-0/centos5-32c +21 -0
- data/test/fixtures/osinfo-version-0/centos5-64d +21 -0
- data/test/fixtures/osinfo-version-0/centos6-32f +21 -0
- data/test/fixtures/osinfo-version-0/centos6-64m +21 -0
- data/test/fixtures/osinfo-version-0/centos7-64aulcdfm +26 -0
- data/test/fixtures/osinfo-version-0/ciscoexr7-64u +22 -0
- data/test/fixtures/osinfo-version-0/cisconxos5-64a +23 -0
- data/test/fixtures/osinfo-version-0/cumulus25-64l +21 -0
- data/test/fixtures/osinfo-version-0/debian6-32c +21 -0
- data/test/fixtures/osinfo-version-0/debian6-64d +21 -0
- data/test/fixtures/osinfo-version-0/debian7-32f +21 -0
- data/test/fixtures/osinfo-version-0/debian7-64m +21 -0
- data/test/fixtures/osinfo-version-0/debian8-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-0/debian8-64a +20 -0
- data/test/fixtures/osinfo-version-0/debian9-32u +21 -0
- data/test/fixtures/osinfo-version-0/debian9-64l +21 -0
- data/test/fixtures/osinfo-version-0/fedora14-32l +21 -0
- data/test/fixtures/osinfo-version-0/fedora19-32c +21 -0
- data/test/fixtures/osinfo-version-0/fedora19-64d +21 -0
- data/test/fixtures/osinfo-version-0/fedora20-32f +21 -0
- data/test/fixtures/osinfo-version-0/fedora20-64m +21 -0
- data/test/fixtures/osinfo-version-0/fedora21-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-0/fedora21-64a +20 -0
- data/test/fixtures/osinfo-version-0/fedora22-32u +21 -0
- data/test/fixtures/osinfo-version-0/fedora22-64l +21 -0
- data/test/fixtures/osinfo-version-0/fedora23-32c +21 -0
- data/test/fixtures/osinfo-version-0/fedora23-64d +21 -0
- data/test/fixtures/osinfo-version-0/opensuse11-32f +21 -0
- data/test/fixtures/osinfo-version-0/opensuse11-64m +21 -0
- data/test/fixtures/osinfo-version-0/oracle5-32c +21 -0
- data/test/fixtures/osinfo-version-0/oracle5-64d +21 -0
- data/test/fixtures/osinfo-version-0/oracle6-32f +21 -0
- data/test/fixtures/osinfo-version-0/oracle6-64m +21 -0
- data/test/fixtures/osinfo-version-0/oracle7-64aulcdfm +26 -0
- data/test/fixtures/osinfo-version-0/osx1010-64u +21 -0
- data/test/fixtures/osinfo-version-0/osx1011-64l +21 -0
- data/test/fixtures/osinfo-version-0/osx109-64a +20 -0
- data/test/fixtures/osinfo-version-0/redhat4-32c +21 -0
- data/test/fixtures/osinfo-version-0/redhat4-64d +21 -0
- data/test/fixtures/osinfo-version-0/redhat5-32f +21 -0
- data/test/fixtures/osinfo-version-0/redhat5-64m +21 -0
- data/test/fixtures/osinfo-version-0/redhat6-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-0/redhat6-64a +20 -0
- data/test/fixtures/osinfo-version-0/redhat7-64u +21 -0
- data/test/fixtures/osinfo-version-0/scientific5-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-0/scientific5-64a +20 -0
- data/test/fixtures/osinfo-version-0/scientific6-32u +21 -0
- data/test/fixtures/osinfo-version-0/scientific6-64l +21 -0
- data/test/fixtures/osinfo-version-0/scientific7-64c +21 -0
- data/test/fixtures/osinfo-version-0/sles10-32d +21 -0
- data/test/fixtures/osinfo-version-0/sles10-64f +21 -0
- data/test/fixtures/osinfo-version-0/sles11-32m +21 -0
- data/test/fixtures/osinfo-version-0/sles11-64aulcdfm +26 -0
- data/test/fixtures/osinfo-version-0/sles12-64a +20 -0
- data/test/fixtures/osinfo-version-0/solaris10-32u +21 -0
- data/test/fixtures/osinfo-version-0/solaris10-64l +21 -0
- data/test/fixtures/osinfo-version-0/solaris11-32c +21 -0
- data/test/fixtures/osinfo-version-0/solaris11-64d +21 -0
- data/test/fixtures/osinfo-version-0/solaris112-32f +21 -0
- data/test/fixtures/osinfo-version-0/solaris112-64m +21 -0
- data/test/fixtures/osinfo-version-0/ubuntu1004-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-0/ubuntu1004-64a +20 -0
- data/test/fixtures/osinfo-version-0/ubuntu1204-32u +21 -0
- data/test/fixtures/osinfo-version-0/ubuntu1204-64l +21 -0
- data/test/fixtures/osinfo-version-0/ubuntu1404-32c +21 -0
- data/test/fixtures/osinfo-version-0/ubuntu1404-64d +21 -0
- data/test/fixtures/osinfo-version-0/ubuntu1504-32f +21 -0
- data/test/fixtures/osinfo-version-0/ubuntu1504-64m +21 -0
- data/test/fixtures/osinfo-version-0/ubuntu1510-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-0/ubuntu1510-64a +20 -0
- data/test/fixtures/osinfo-version-0/windows10ent-32l +22 -0
- data/test/fixtures/osinfo-version-0/windows10ent-64c +22 -0
- data/test/fixtures/osinfo-version-0/windows10pro-64d +22 -0
- data/test/fixtures/osinfo-version-0/windows2003-6432l +22 -0
- data/test/fixtures/osinfo-version-0/windows2003-64u +22 -0
- data/test/fixtures/osinfo-version-0/windows2003r2-32c +22 -0
- data/test/fixtures/osinfo-version-0/windows2003r2-6432f +22 -0
- data/test/fixtures/osinfo-version-0/windows2003r2-64d +22 -0
- data/test/fixtures/osinfo-version-0/windows2008-6432aulcdfm +27 -0
- data/test/fixtures/osinfo-version-0/windows2008-64m +22 -0
- data/test/fixtures/osinfo-version-0/windows2008r2-6432u +22 -0
- data/test/fixtures/osinfo-version-0/windows2008r2-64a +21 -0
- data/test/fixtures/osinfo-version-0/windows2012-6432c +22 -0
- data/test/fixtures/osinfo-version-0/windows2012-64l +22 -0
- data/test/fixtures/osinfo-version-0/windows2012r2-6432f +22 -0
- data/test/fixtures/osinfo-version-0/windows2012r2-64d +22 -0
- data/test/fixtures/osinfo-version-0/windows7-64m +22 -0
- data/test/fixtures/osinfo-version-0/windows8-64aulcdfm +27 -0
- data/test/fixtures/osinfo-version-0/windows81-64a +21 -0
- data/test/fixtures/osinfo-version-0/windowsvista-64u +22 -0
- data/test/fixtures/osinfo-version-1/arista4-32a +20 -0
- data/test/fixtures/osinfo-version-1/centos4-32u +21 -0
- data/test/fixtures/osinfo-version-1/centos4-64l +21 -0
- data/test/fixtures/osinfo-version-1/centos5-32c +21 -0
- data/test/fixtures/osinfo-version-1/centos5-64d +21 -0
- data/test/fixtures/osinfo-version-1/centos6-32f +21 -0
- data/test/fixtures/osinfo-version-1/centos6-64m +21 -0
- data/test/fixtures/osinfo-version-1/centos7-64aulcdfm +26 -0
- data/test/fixtures/osinfo-version-1/ciscoexr7-64u +22 -0
- data/test/fixtures/osinfo-version-1/cisconxos5-64a +23 -0
- data/test/fixtures/osinfo-version-1/cumulus25-64l +21 -0
- data/test/fixtures/osinfo-version-1/debian6-32c +21 -0
- data/test/fixtures/osinfo-version-1/debian6-64d +21 -0
- data/test/fixtures/osinfo-version-1/debian7-32f +21 -0
- data/test/fixtures/osinfo-version-1/debian7-64m +21 -0
- data/test/fixtures/osinfo-version-1/debian8-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-1/debian8-64a +20 -0
- data/test/fixtures/osinfo-version-1/debian9-32u +21 -0
- data/test/fixtures/osinfo-version-1/debian9-64l +21 -0
- data/test/fixtures/osinfo-version-1/fedora14-32l +21 -0
- data/test/fixtures/osinfo-version-1/fedora19-32c +21 -0
- data/test/fixtures/osinfo-version-1/fedora19-64d +21 -0
- data/test/fixtures/osinfo-version-1/fedora20-32f +21 -0
- data/test/fixtures/osinfo-version-1/fedora20-64m +21 -0
- data/test/fixtures/osinfo-version-1/fedora21-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-1/fedora21-64a +20 -0
- data/test/fixtures/osinfo-version-1/fedora22-32u +21 -0
- data/test/fixtures/osinfo-version-1/fedora22-64l +21 -0
- data/test/fixtures/osinfo-version-1/fedora23-32c +21 -0
- data/test/fixtures/osinfo-version-1/fedora23-64d +21 -0
- data/test/fixtures/osinfo-version-1/opensuse11-32f +21 -0
- data/test/fixtures/osinfo-version-1/opensuse11-64m +21 -0
- data/test/fixtures/osinfo-version-1/oracle5-32c +21 -0
- data/test/fixtures/osinfo-version-1/oracle5-64d +21 -0
- data/test/fixtures/osinfo-version-1/oracle6-32f +21 -0
- data/test/fixtures/osinfo-version-1/oracle6-64m +21 -0
- data/test/fixtures/osinfo-version-1/oracle7-64aulcdfm +26 -0
- data/test/fixtures/osinfo-version-1/osx1010-64u +21 -0
- data/test/fixtures/osinfo-version-1/osx1011-64l +21 -0
- data/test/fixtures/osinfo-version-1/osx109-64a +20 -0
- data/test/fixtures/osinfo-version-1/redhat4-32c +21 -0
- data/test/fixtures/osinfo-version-1/redhat4-64d +21 -0
- data/test/fixtures/osinfo-version-1/redhat5-32f +21 -0
- data/test/fixtures/osinfo-version-1/redhat5-64m +21 -0
- data/test/fixtures/osinfo-version-1/redhat6-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-1/redhat6-64a +20 -0
- data/test/fixtures/osinfo-version-1/redhat7-64u +21 -0
- data/test/fixtures/osinfo-version-1/scientific5-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-1/scientific5-64a +20 -0
- data/test/fixtures/osinfo-version-1/scientific6-32u +21 -0
- data/test/fixtures/osinfo-version-1/scientific6-64l +21 -0
- data/test/fixtures/osinfo-version-1/scientific7-64c +21 -0
- data/test/fixtures/osinfo-version-1/sles10-32d +21 -0
- data/test/fixtures/osinfo-version-1/sles10-64f +21 -0
- data/test/fixtures/osinfo-version-1/sles11-32m +21 -0
- data/test/fixtures/osinfo-version-1/sles11-64aulcdfm +26 -0
- data/test/fixtures/osinfo-version-1/sles12-64a +20 -0
- data/test/fixtures/osinfo-version-1/solaris10-32u +21 -0
- data/test/fixtures/osinfo-version-1/solaris10-64l +21 -0
- data/test/fixtures/osinfo-version-1/solaris11-32c +21 -0
- data/test/fixtures/osinfo-version-1/solaris11-64d +21 -0
- data/test/fixtures/osinfo-version-1/solaris112-32f +21 -0
- data/test/fixtures/osinfo-version-1/solaris112-64m +21 -0
- data/test/fixtures/osinfo-version-1/ubuntu1004-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-1/ubuntu1004-64a +20 -0
- data/test/fixtures/osinfo-version-1/ubuntu1204-32u +21 -0
- data/test/fixtures/osinfo-version-1/ubuntu1204-64l +21 -0
- data/test/fixtures/osinfo-version-1/ubuntu1404-32c +21 -0
- data/test/fixtures/osinfo-version-1/ubuntu1404-64d +21 -0
- data/test/fixtures/osinfo-version-1/ubuntu1504-32f +21 -0
- data/test/fixtures/osinfo-version-1/ubuntu1504-64m +21 -0
- data/test/fixtures/osinfo-version-1/ubuntu1510-32aulcdfm +26 -0
- data/test/fixtures/osinfo-version-1/ubuntu1510-64a +20 -0
- data/test/fixtures/osinfo-version-1/windows10ent-32l +22 -0
- data/test/fixtures/osinfo-version-1/windows10ent-64c +22 -0
- data/test/fixtures/osinfo-version-1/windows10pro-64d +22 -0
- data/test/fixtures/osinfo-version-1/windows2003-6432l +22 -0
- data/test/fixtures/osinfo-version-1/windows2003-64u +22 -0
- data/test/fixtures/osinfo-version-1/windows2003r2-32c +22 -0
- data/test/fixtures/osinfo-version-1/windows2003r2-6432f +22 -0
- data/test/fixtures/osinfo-version-1/windows2003r2-64d +22 -0
- data/test/fixtures/osinfo-version-1/windows2008-6432aulcdfm +27 -0
- data/test/fixtures/osinfo-version-1/windows2008-64m +22 -0
- data/test/fixtures/osinfo-version-1/windows2008r2-6432u +22 -0
- data/test/fixtures/osinfo-version-1/windows2008r2-64a +21 -0
- data/test/fixtures/osinfo-version-1/windows2012-6432c +22 -0
- data/test/fixtures/osinfo-version-1/windows2012-64l +22 -0
- data/test/fixtures/osinfo-version-1/windows2012r2-6432f +22 -0
- data/test/fixtures/osinfo-version-1/windows2012r2-64d +22 -0
- data/test/fixtures/osinfo-version-1/windows7-64m +22 -0
- data/test/fixtures/osinfo-version-1/windows8-64aulcdfm +27 -0
- data/test/fixtures/osinfo-version-1/windows81-64a +21 -0
- data/test/fixtures/osinfo-version-1/windowsvista-64u +22 -0
- data/test/fixtures/pe_dir/centos6-64mdc +23 -0
- data/test/fixtures/pe_upgrade_dir/centos6-64mdc +23 -0
- data/test/fixtures/pe_upgrade_ver/centos6-64mdc +23 -0
- data/test/fixtures/pe_ver/centos6-64mdc +23 -0
- data/test/test_cli.rb +20 -0
- data/test/test_generator.rb +27 -0
- data/test/test_stdout.rb +24 -0
- data/test/test_util.rb +26 -0
- data/test/util/generator_helpers.rb +150 -0
- metadata +294 -3
- data/lib/beaker-hostgenerator/error.rb +0 -6
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows10pro-64d"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows10pro-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-10pro-64
|
13
|
+
template: win-10-pro-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- database
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2003-6432l"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2003-6432-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2003-64
|
13
|
+
template: win-2003-x86_64
|
14
|
+
ruby_arch: x86
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- classifier
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2003-64u"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2003-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2003-64
|
13
|
+
template: win-2003-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- ca
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2003r2-32c"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2003r2-32-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2003r2-32
|
13
|
+
template: win-2003r2-i386
|
14
|
+
ruby_arch: x86
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- dashboard
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2003r2-6432f"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2003r2-6432-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2003r2-64
|
13
|
+
template: win-2003r2-x86_64
|
14
|
+
ruby_arch: x86
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- frictionless
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2003r2-64d"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2003r2-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2003r2-64
|
13
|
+
template: win-2003r2-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- database
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,27 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2008-6432aulcdfm"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2008-6432-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2008-64
|
13
|
+
template: win-2008-x86_64
|
14
|
+
ruby_arch: x86
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- ca
|
18
|
+
- classifier
|
19
|
+
- dashboard
|
20
|
+
- database
|
21
|
+
- frictionless
|
22
|
+
- master
|
23
|
+
CONFIG:
|
24
|
+
nfs_server: none
|
25
|
+
consoleport: 443
|
26
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
27
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2008-64m"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2008-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2008-64
|
13
|
+
template: win-2008-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- master
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2008r2-6432u"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2008r2-6432-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2008r2-64
|
13
|
+
template: win-2008r2-x86_64
|
14
|
+
ruby_arch: x86
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- ca
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,21 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2008r2-64a"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2008r2-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2008r2-64
|
13
|
+
template: win-2008r2-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
CONFIG:
|
18
|
+
nfs_server: none
|
19
|
+
consoleport: 443
|
20
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
21
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2012-6432c"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2012-6432-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2012-64
|
13
|
+
template: win-2012-x86_64
|
14
|
+
ruby_arch: x86
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- dashboard
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2012-64l"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2012-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2012-64
|
13
|
+
template: win-2012-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- classifier
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2012r2-6432f"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2012r2-6432-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2012r2-64
|
13
|
+
template: win-2012r2-x86_64
|
14
|
+
ruby_arch: x86
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- frictionless
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows2012r2-64d"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows2012r2-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-2012r2-64
|
13
|
+
template: win-2012r2-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- database
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows7-64m"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows7-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-7-64
|
13
|
+
template: win-7-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- master
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,27 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows8-64aulcdfm"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows8-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-8-64
|
13
|
+
template: win-8-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- ca
|
18
|
+
- classifier
|
19
|
+
- dashboard
|
20
|
+
- database
|
21
|
+
- frictionless
|
22
|
+
- master
|
23
|
+
CONFIG:
|
24
|
+
nfs_server: none
|
25
|
+
consoleport: 443
|
26
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
27
|
+
expected_exception:
|
@@ -0,0 +1,21 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windows81-64a"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windows81-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-8.1-64
|
13
|
+
template: win-81-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
CONFIG:
|
18
|
+
nfs_server: none
|
19
|
+
consoleport: 443
|
20
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
21
|
+
expected_exception:
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--osinfo-version 1 windowsvista-64u"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
windowsvista-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: windows-vista-64
|
13
|
+
template: win-vista-x86_64
|
14
|
+
ruby_arch: x64
|
15
|
+
roles:
|
16
|
+
- agent
|
17
|
+
- ca
|
18
|
+
CONFIG:
|
19
|
+
nfs_server: none
|
20
|
+
consoleport: 443
|
21
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
22
|
+
expected_exception:
|
@@ -0,0 +1,23 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--pe_dir /opt/hello centos6-64mdc"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
centos6-64-1:
|
7
|
+
pe_dir: "/opt/hello"
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: el-6-x86_64
|
13
|
+
template: centos-6-x86_64
|
14
|
+
roles:
|
15
|
+
- agent
|
16
|
+
- master
|
17
|
+
- database
|
18
|
+
- dashboard
|
19
|
+
CONFIG:
|
20
|
+
nfs_server: none
|
21
|
+
consoleport: 443
|
22
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
23
|
+
expected_exception:
|
@@ -0,0 +1,23 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--pe_upgrade_dir /opt/whatever centos6-64mdc"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
centos6-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir: "/opt/whatever"
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: el-6-x86_64
|
13
|
+
template: centos-6-x86_64
|
14
|
+
roles:
|
15
|
+
- agent
|
16
|
+
- master
|
17
|
+
- database
|
18
|
+
- dashboard
|
19
|
+
CONFIG:
|
20
|
+
nfs_server: none
|
21
|
+
consoleport: 443
|
22
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
23
|
+
expected_exception:
|
@@ -0,0 +1,23 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--pe_upgrade_ver 2020.7.3 centos6-64mdc"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
centos6-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver:
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver: 2020.7.3
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: el-6-x86_64
|
13
|
+
template: centos-6-x86_64
|
14
|
+
roles:
|
15
|
+
- agent
|
16
|
+
- master
|
17
|
+
- database
|
18
|
+
- dashboard
|
19
|
+
CONFIG:
|
20
|
+
nfs_server: none
|
21
|
+
consoleport: 443
|
22
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
23
|
+
expected_exception:
|
@@ -0,0 +1,23 @@
|
|
1
|
+
---
|
2
|
+
arguments_string: "--pe_ver 2020.7 centos6-64mdc"
|
3
|
+
environment_variables: {}
|
4
|
+
expected_hash:
|
5
|
+
HOSTS:
|
6
|
+
centos6-64-1:
|
7
|
+
pe_dir:
|
8
|
+
pe_ver: '2020.7'
|
9
|
+
pe_upgrade_dir:
|
10
|
+
pe_upgrade_ver:
|
11
|
+
hypervisor: vmpooler
|
12
|
+
platform: el-6-x86_64
|
13
|
+
template: centos-6-x86_64
|
14
|
+
roles:
|
15
|
+
- agent
|
16
|
+
- master
|
17
|
+
- database
|
18
|
+
- dashboard
|
19
|
+
CONFIG:
|
20
|
+
nfs_server: none
|
21
|
+
consoleport: 443
|
22
|
+
pooling_api: http://vmpooler.delivery.puppetlabs.net/
|
23
|
+
expected_exception:
|
data/test/test_cli.rb
ADDED
@@ -0,0 +1,20 @@
|
|
1
|
+
require 'minitest/autorun'
|
2
|
+
|
3
|
+
require 'beaker-hostgenerator/cli'
|
4
|
+
|
5
|
+
class TestUtil < Minitest::Test
|
6
|
+
|
7
|
+
def setup
|
8
|
+
@stderr = StringIO.new
|
9
|
+
@stdout = StringIO.new
|
10
|
+
|
11
|
+
$stderr = @stderr
|
12
|
+
$stdout = @stdout
|
13
|
+
end
|
14
|
+
|
15
|
+
def test_new_with_list_option
|
16
|
+
assert_raises(BeakerHostGenerator::Exceptions::SafeEarlyExit) do
|
17
|
+
BeakerHostGenerator::CLI.new(['--list'])
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
require "find"
|
2
|
+
require "yaml"
|
3
|
+
|
4
|
+
require "minitest/autorun"
|
5
|
+
|
6
|
+
require 'util/generator_helpers'
|
7
|
+
|
8
|
+
class TestGenerator < Minitest::Test
|
9
|
+
include GeneratorTestHelpers
|
10
|
+
|
11
|
+
def setup
|
12
|
+
@default_options = [
|
13
|
+
'centos6-64mdca',
|
14
|
+
]
|
15
|
+
end
|
16
|
+
|
17
|
+
def test_default_options
|
18
|
+
hash = run_cli_with_options(@default_options)
|
19
|
+
hosts = hash['HOSTS']
|
20
|
+
|
21
|
+
assert_includes(hosts, "centos6-64-1")
|
22
|
+
centos6 = hosts['centos6-64-1']
|
23
|
+
["master", "database", "dashboard", "agent"].each do |role|
|
24
|
+
assert_includes(centos6['roles'], role)
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
data/test/test_stdout.rb
ADDED
@@ -0,0 +1,24 @@
|
|
1
|
+
require 'minitest/autorun'
|
2
|
+
|
3
|
+
class TestStdout < Minitest::Test
|
4
|
+
|
5
|
+
def setup
|
6
|
+
@stderr = StringIO.new
|
7
|
+
@stdout = StringIO.new
|
8
|
+
|
9
|
+
$stderr = @stderr
|
10
|
+
$stdout = @stdout
|
11
|
+
end
|
12
|
+
|
13
|
+
def test_default_list_output
|
14
|
+
begin
|
15
|
+
BeakerHostGenerator::CLI.new(['--list'])
|
16
|
+
rescue BeakerHostGenerator::Exceptions::SafeEarlyExit
|
17
|
+
end
|
18
|
+
|
19
|
+
osinfo = BeakerHostGenerator::Data::Vmpooler.get_osinfo()
|
20
|
+
osinfo.each_key do |spec_key|
|
21
|
+
assert_match(/.*#{spec_key}.*/, @stdout.string)
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
data/test/test_util.rb
ADDED
@@ -0,0 +1,26 @@
|
|
1
|
+
require 'minitest/autorun'
|
2
|
+
|
3
|
+
require 'beaker-hostgenerator/util'
|
4
|
+
|
5
|
+
class TestUtil < Minitest::Test
|
6
|
+
|
7
|
+
def setup
|
8
|
+
@stderr = StringIO.new
|
9
|
+
@stdout = StringIO.new
|
10
|
+
|
11
|
+
$stderr = @stderr
|
12
|
+
$stdout = @stdout
|
13
|
+
end
|
14
|
+
|
15
|
+
def test_get_platforms_vmpooler_osinfo_v0
|
16
|
+
expected = BeakerHostGenerator::Data::Vmpooler.get_osinfo(0)
|
17
|
+
actual = BeakerHostGenerator::Utils.get_platforms('vmpooler', 0)
|
18
|
+
assert_equal(expected, actual)
|
19
|
+
end
|
20
|
+
|
21
|
+
def test_get_platforms_vmpooler_osinfo_v1
|
22
|
+
expected = BeakerHostGenerator::Data::Vmpooler.get_osinfo(1)
|
23
|
+
actual = BeakerHostGenerator::Utils.get_platforms('vmpooler', 1)
|
24
|
+
assert_equal(expected, actual)
|
25
|
+
end
|
26
|
+
end
|