beaker-hostgenerator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmEyNzhhZWZjYzg5ZDYyN2QxNDkyZDFlMjNiYWU5Y2ZhYTQyNWQ5MA==
+    YTYwOGVlNTRhNmRiOWIwMjFhNTYzOTg0ZThkOGVlM2Y2ZWM5MjIxYQ==
   data.tar.gz: !binary |-
-    MGRjOWVkMjk4YTRiMThmZDFhMDFhZWEyNjE4M2VmZmUyYjMwOTJjNw==
+    YjMyMmM4OTc5MWNjZDZlZmVlYzNhZmQ2MWI5OThiOTc3ZWZiMjg1MQ==
 SHA512:
   metadata.gz: !binary |-
-    NjA4NWQ5NWU1NTk2YjMzYjJjZjE5ZTJkM2E3NGEyMmQxOGU3YmE2MzdiOGIy
-    OWViM2RjM2I3NmNiYTNjYjMyNDY5NmEwNWNlNWRjMWUyMDNjYzc5NDdlOGVl
-    N2Y2ZmFiOGU4ZjQyNDgzOGVmMzNkOTEwOThhOWVhZTA0OWIxMDU=
+    NDU3Y2U5MzVjODBlYzlmYjE4ZTcyYzE4YTQ5MDc4MGIyOTI1ZmFjZmI4Y2E0
+    MTNlMmQ2MWQwMjJkZWMwMjk2MmNmMGFlMDNlZjEzNDQ5YmYzNTk2YjViY2E5
+    MDIxNWRjOTM4NTRiZWY1YzFmYjBkNGViNTBjNzUwZjVmZWM5YTQ=
   data.tar.gz: !binary |-
-    ODg5YThkMjRhZjIxZmM5YmVkYjYzYzNjNjI4YTg2Zjk5MThmM2YyZWZjOTdl
-    YzZlZGY5ODA0NTU4OGFhNjQzNTU5MDg4Zjk0MzM2NzE5NzI2ZTcyNGEzODg5
-    ODc0YWZlNTQyOGMzNTM1N2I4ZDc2MGY4MWVkZTRmY2QxYjBlMGY=
+    N2M1NTdiYjAxNzZmY2QyMjgyNDBlMDU4ZGRiZTBlYWVlYTNjNjZlOGQ4MTBl
+    NmIyYzI4ZTAxN2E2YWZkMDU2MDc4NTczZjIzNTIwNDA4YTYyNWNjZDE0NDY0
+    YmRiNmMzY2NjZjZmZjYxMDJjODUyODFhNzM4ZjFlYThiZWYxOTA=

data/CHANGELOG.md

@@ -4,6 +4,40 @@ All notable changes to this project will be documented in this file.
 This project makes a strong effort to adhere to [Semantic
 Versioning](http://semver.org).
 
+## [Unreleased][unreleased]
+### Changed
+- Updated this changelog for recent beaker-hostgenerator releases.
+
+## [0.2.0] - 2015-12-22
+- Add platforms:
+  - Cumulus 2.5 (x86_64)
+  - Cisco NXOS 5 (x86_64)
+  - Cisco eXR 7 (x86_64)
+- Fix platforms:
+  - Arista 4 (i386); spec string previously did not include version number.
+
+## [0.1.0] - 2015-12-21
+- Add platforms:
+  - Arista 4 (i386)
+  - windows 2012r2 (x86_64); 32 bit agent
+    - sets ruby_arch=x32
+  - windows 2008r2 (x86_64); 32 bit agent
+    - sets ruby_arch=x32
+  - windows 2008 (x86_64); 32 bit agent
+    - sets ruby_arch=x32
+  - windows 2003r2 (x86_64); 32 bit agent
+    - sets ruby_arch=x32
+- Set ruby_arch=x64 on a bunch of 64 bit windows platforms.
+- Allow beaker-hostgenerator to be called programmatically.
+- Fix bug in module/class namespaces that prevented both `beaker` and
+`beaker-hostgenerator` from being required.
+
+## [0.0.1] - 2015-10-07
+Test beaker-hostgenerator release pipeline (not intended to be a functional
+release)
+
+# sqa-utils (old Gem)
+
 ## [Unreleased][unreleased]
 ### Changed
 - Updated this changelog for 0.13.3

data/HISTORY.md

@@ -1,11 +1,63 @@
 # default - History
 ## Tags
-* [LATEST - 22 Dec, 2015 (1194df93)](#LATEST)
+* [LATEST - 30 Dec, 2015 (5bc2d40b)](#LATEST)
+* [0.2.0 - 22 Dec, 2015 (dfa33e5f)](#0.2.0)
 * [0.1.0 - 21 Dec, 2015 (474f4ccb)](#0.1.0)
 * [0.0.1 - 7 Oct, 2015 (d99251e6)](#0.0.1)
 
 ## Details
-### <a name = "LATEST">LATEST - 22 Dec, 2015 (1194df93)
+### <a name = "LATEST">LATEST - 30 Dec, 2015 (5bc2d40b)
+
+* (GEM) update beaker-hostgenerator version to 0.3.0 (5bc2d40b)
+
+* Merge pull request #18 from puppetlabs/qeng-3335 (323ed794)
+
+
+```
+Merge pull request #18 from puppetlabs/qeng-3335
+
+(QENG-3335) Don't identify centos as el in 'platform'
+```
+* (QENG-3335) Fix typo in osinfo version deprecation message. (b4903f78)
+
+* (QENG-3335) Fix the OSINFO deprecation warning. (e364bd97)
+
+
+```
+(QENG-3335) Fix the OSINFO deprecation warning.
+
+Assignment to the "warning" variable was incorrect, also it appears that one
+cannot print to STDERR within the OptionParser.new block...
+```
+* (QENG-3335) Add OSINFO v0 deprecation warning. (4336126a)
+
+* (QENG-3335) s/bgh/bhg/ s/BGH/BHG/ (bfb95f05)
+
+* (QENG-3335) Cast osinfo-version to integer. (4e9d8088)
+
+* (QENG-3335) Don't forget to use the bgh_version. (c9dec1b7)
+
+* (QENG-3335) Actually, don't change the original datastructure name. (e1f4cd4a)
+
+* (QENG-3335) Actually, use '--osinfo-version' flag instead. (391fdd68)
+
+* (QENG-3335) Add 'enable-unambiguous-platform-names' flag. (888f8d40)
+
+* (QENG-3335) Don't identify centos as el in 'platform' (520028e2)
+
+* Merge pull request #17 from puppetlabs/maint (3fc629e4)
+
+
+```
+Merge pull request #17 from puppetlabs/maint
+
+(MAINT) Update Changelog for recent releases.
+```
+* (MAINT) Update Changelog for recent releases. (2ae32038)
+
+### <a name = "0.2.0">0.2.0 - 22 Dec, 2015 (dfa33e5f)
+
+* (HISTORY) update beaker-hostgenerator history for gem release 0.2.0 (dfa33e5f)
 
 * (GEM) update beaker-hostgenerator version to 0.2.0 (1194df93)
 

data/lib/beaker-hostgenerator/cli.rb

@@ -12,6 +12,7 @@ module BeakerHostGenerator
         list_platforms_and_roles: false,
         disable_default_role: false,
         disable_role_config: false,
+        osinfo_version: 0,
         hypervisor: 'vmpooler',
       }
 
@@ -73,6 +74,18 @@ Usage: beaker-hostgenerator [options] <layout>
           @options[:disable_default_role] = true
         end
 
+        opts.on('--osinfo-version MAJOR_VERSION',
+                "Use OSINFO for specified beaker-hostgenerator version. " <<
+                "Allows early access to future version of OSINFO data structure " <<
+                "used to generate host configs.") do |version|
+          version = version.to_i
+          if not [0, 1].include? version
+              raise "Invalid beaker-hostgenerator version: #{version}"
+          end
+
+          @options[:osinfo_version] = version
+        end
+
         opts.on('-h',
                 '--help',
                 'Display command help.') do
@@ -90,11 +103,24 @@ Usage: beaker-hostgenerator [options] <layout>
 
       # Tokenizing the config definition for great justice
       @tokens = argv[0].split('-')
+
+      if @options[:osinfo_version] === 0
+        warning = <<-eow
+WARNING: Starting with beaker-hostgenerator 1.x platform strings for "el" hosts
+will correspond to the actual linux distribution name. ie, the platform string
+corresponding to a host specified as "centos4_64a" will be "centos-4-x86_64"
+rather than "el-4-x86_64". It is recommended that you update your project's test
+suites ASAP or be forced to do so when beaker-hostgenerator development moves on
+to the 1.x series. We don't intend to backport features or platforms to 0.x.
+eow
+        STDERR.puts(warning)
+      end
     end
 
     def print_platforms_and_roles
       puts "valid beaker-hostgenerator platforms:  "
-      osinfo = BeakerHostGenerator::Utils.get_platforms
+      osinfo = BeakerHostGenerator::Utils.get_platforms(@options[:hypervisor],
+                                                        @options[:osinfo_version])
       osinfo.each do |k,v|
         puts "   #{k}"
       end

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

@@ -397,6 +397,105 @@ module BeakerHostGenerator
         },
       }
 
+      OSINFO_BHGv1 = {
+        'centos4-32' => {
+          'platform' => 'centos-4-i386',
+          'template' => 'centos-4-i386'
+        },
+        'centos4-64' => {
+          'platform' => 'centos-4-x86_64',
+          'template' => 'centos-4-x86_64'
+        },
+        'centos5-32' => {
+          'platform' => 'centos-5-i386',
+          'template' => 'centos-5-i386'
+        },
+        'centos5-64' => {
+          'platform' => 'centos-5-x86_64',
+          'template' => 'centos-5-x86_64'
+        },
+        'centos6-32' => {
+          'platform' => 'centos-6-i386',
+          'template' => 'centos-6-i386'
+        },
+        'centos6-64' => {
+          'platform' => 'centos-6-x86_64',
+          'template' => 'centos-6-x86_64'
+        },
+        'centos7-64' => {
+          'platform' => 'centos-7-x86_64',
+          'template' => 'centos-7-x86_64'
+        },
+        'oracle5-32' => {
+          'platform' => 'oracle-5-i386',
+          'template' => 'oracle-5-i386'
+        },
+        'oracle5-64' => {
+          'platform' => 'oracle-5-x86_64',
+          'template' => 'oracle-5-x86_64'
+        },
+        'oracle6-32' => {
+          'platform' => 'oracle-6-i386',
+          'template' => 'oracle-6-i386'
+        },
+        'oracle6-64' => {
+          'platform' => 'oracle-6-x86_64',
+          'template' => 'oracle-6-x86_64'
+        },
+        'oracle7-64' => {
+          'platform' => 'oracle-7-x86_64',
+          'template' => 'oracle-7-x86_64'
+        },
+        'redhat4-32' => {
+          'platform' => 'redhat-4-i386',
+          'template' => 'redhat-4-i386'
+        },
+        'redhat4-64' => {
+          'platform' => 'redhat-4-x86_64',
+          'template' => 'redhat-4-x86_64'
+        },
+        'redhat5-32' => {
+          'platform' => 'redhat-5-i386',
+          'template' => 'redhat-5-i386'
+        },
+        'redhat5-64' => {
+          'platform' => 'redhat-5-x86_64',
+          'template' => 'redhat-5-x86_64'
+        },
+        'redhat6-32' => {
+          'platform' => 'redhat-6-i386',
+          'template' => 'redhat-6-i386'
+        },
+        'redhat6-64' => {
+          'platform' => 'redhat-6-x86_64',
+          'template' => 'redhat-6-x86_64'
+        },
+        'redhat7-64' => {
+          'platform' => 'redhat-7-x86_64',
+          'template' => 'redhat-7-x86_64'
+        },
+        'scientific5-32' => {
+          'platform' => 'scientific-5-i386',
+          'template' => 'scientific-5-i386'
+        },
+        'scientific5-64' => {
+          'platform' => 'scientific-5-x86_64',
+          'template' => 'scientific-5-x86_64'
+        },
+        'scientific6-32' => {
+          'platform' => 'scientific-6-i386',
+          'template' => 'scientific-6-i386'
+        },
+        'scientific6-64' => {
+          'platform' => 'scientific-6-x86_64',
+          'template' => 'scientific-6-x86_64'
+        },
+        'scientific7-64' => {
+          'platform' => 'scientific-7-x86_64',
+          'template' => 'scientific-7-x86_64'
+        },
+      }
+
       VMPOOLER_CONFIG = {
         'HOSTS' => {},
         'CONFIG' => {
@@ -404,6 +503,20 @@ module BeakerHostGenerator
         }
       }
 
+      def get_osinfo(bhg_version=0)
+        case bhg_version
+        when 0
+          osinfo = OSINFO
+        when 1
+          osinfo = OSINFO
+          osinfo.deep_merge! OSINFO_BHGv1
+        else
+          raise "Invalid beaker-hostgenerator version: #{bhg_version}"
+        end
+        return osinfo
+      end
+
+      module_function :get_osinfo
     end
   end
 end

data/lib/beaker-hostgenerator/generator.rb

@@ -43,7 +43,7 @@ module BeakerHostGenerator
       ostype = nil
 
       tokens.each do |token|
-        if is_ostype_token?(token)
+        if is_ostype_token?(token, @options[:osinfo_version])
           if nodeid[ostype] == 1 and ostype != nil
             raise "Error: no nodes generated for #{ostype}"
           end
@@ -56,7 +56,8 @@ module BeakerHostGenerator
         node_info['ostype'] = ostype
         node_info['nodeid'] = nodeid[ostype]
 
-        host_name, host_config = generate_node(node_info, BASE_HOST_CONFIG)
+        host_name, host_config = generate_node(
+          node_info, BASE_HOST_CONFIG, bhg_version=@options[:osinfo_version])
 
         if PE_USE_WIN32 && ostype =~ /windows/ && node_info['bits'] == "64"
           host_config['ruby_arch'] = 'x86'

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

@@ -15,7 +15,7 @@ module BeakerHostGenerator
       super(options)
     end
 
-    def generate_node node_info, base_config
+    def generate_node node_info, base_config, bhg_version=0
       host_config = {}
       host_config.deep_merge! base_config
 
@@ -30,7 +30,8 @@ module BeakerHostGenerator
       platform = "#{ostype}-#{bits}"
       name = "#{platform}-#{nodeid}"
 
-      host_config.deep_merge! OSINFO[platform]
+      osinfo = get_osinfo(bhg_version)
+      host_config.deep_merge! osinfo[platform]
 
       # Some vmpooler/vsphere platforms have special requirements. We munge the
       # node host_config here if that is necessary.
@@ -39,8 +40,9 @@ module BeakerHostGenerator
       return name, host_config
     end
 
-    def is_ostype_token? token
-      OSINFO.each do |key,value|
+    def is_ostype_token? token, bhg_version=0
+      osinfo = get_osinfo(bhg_version)
+      osinfo.each do |key,value|
 
         ostype = key.split('-')[0]
 

data/lib/beaker-hostgenerator/util.rb

@@ -45,10 +45,10 @@ module BeakerHostGenerator
       end
     end
 
-    def get_platforms(hypervisor_type='vmpooler')
+    def get_platforms(hypervisor_type='vmpooler', bhg_version=0)
       case hypervisor_type
       when /vmpooler/
-        osinfo = BeakerHostGenerator::Data::Vmpooler::OSINFO
+        osinfo = BeakerHostGenerator::Data::Vmpooler.get_osinfo(bhg_version)
       else
         raise "Invalid hypervisor #{hypervisor_type}"
       end

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '0.2.0'
+    STRING = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Branan Purvine-Riley