beaker-hostgenerator 1.1.24 → 1.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39cc9b69e55fec84a0e797c023eb2de130440028
-  data.tar.gz: 4638cce2af230c6f08b4994bd86efa116c1a34e9
+  metadata.gz: f9ec0f62cd53894b1235937709ff9b686cf33ae8
+  data.tar.gz: 317ffd0a1a70de086b6930a8f01f46385952f5ed
 SHA512:
-  metadata.gz: b6b9b90eebfe07944114aacd7ac5b2afca33cde84289f261af07d82eeb0c5f4a845b37ba4563b524994e3ca1ebbc86247bbb0dfdf42ad8e7b1b032bdb85a74d8
-  data.tar.gz: 54d974a389496923c57c2f0267d356423fcf7e3ec5122a00ca2edf5e82bd3dbf359e14a1f33ad2846229986a41d3ac099837117db23f4d6acab6b5eb8938c941
+  metadata.gz: 20812e4e1cd762ea6f4b3c4dfd15538bd49c24399cc13a4c3987aca1128c884aa65e48befc53ac36b5b8f54be2e4be2c16249ea53b9773d70dd1b5d6338bf566
+  data.tar.gz: 5df19f73742c052f280fb188a895d25a875464c6833be0091647532b89b59ed0405a25038154100cb06f581d6ff213fad27370d8aa6b4bc4c46a6dba9bde88a9

data/lib/beaker-hostgenerator/hypervisor.rb

@@ -26,12 +26,8 @@ module BeakerHostGenerator
     #                          create.
     def self.create(node_info, options)
       name = node_info['host_settings']['hypervisor'] || options[:hypervisor]
-      hypervisor = builtin_hypervisors[name]
-      if hypervisor
-        hypervisor.new
-      else
-        BeakerHostGenerator::Hypervisor::Unknown.new(name)
-      end
+      hypervisor = builtin_hypervisors[name] || BeakerHostGenerator::Hypervisor::Unknown
+      hypervisor.new(name)
     end
 
     # Returns a map of all built-in hypervisor implementations, where the keys
@@ -54,6 +50,10 @@ module BeakerHostGenerator
     end
 
     class Interface
+      def initialize(name)
+        @name = name
+      end
+
       # Returns a map containing any general configuration required by this
       # hypervisor. This map will be merged into the 'CONFIG' section of the
       # final hosts configuration output.
@@ -88,6 +88,19 @@ module BeakerHostGenerator
       def generate_node(node_info, base_config, bhg_version)
         raise "Method 'generate_node' not implemented!"
       end
+
+      private
+
+      def base_generate_node(node_info, base_config, bhg_version, *hypervisors)
+        platform = node_info['platform']
+        hypervisors.map do |hypervisor|
+          base_config.deep_merge! get_platform_info(bhg_version, platform, hypervisor)
+        end
+
+        base_config['hypervisor'] = @name
+
+        return base_config
+      end
     end
   end
 end

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

@@ -15,21 +15,12 @@ module BeakerHostGenerator
       include BeakerHostGenerator::Data
 
       def generate_node(node_info, base_config, bhg_version)
-        base_config['hypervisor'] = 'abs'
-
         # Grab vmpooler data for this platform and any hardware (ABS) data.
         # The assumption here is that these are mutually exclusive; that is,
         # any given platform will have *either* :vmpooler data or :abs data
         # so we're not worried about one overriding the other when we merge
         # the hashes together.
-        platform = node_info['platform']
-        vmpooler_platform_info = get_platform_info(bhg_version, platform, :vmpooler)
-        abs_platform_info = get_platform_info(bhg_version, platform, :abs)
-
-        base_config.deep_merge! vmpooler_platform_info
-        base_config.deep_merge! abs_platform_info
-
-        return base_config
+        return base_generate_node(node_info, base_config, bhg_version, :vmpooler, :abs)
       end
     end
   end

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

@@ -8,16 +8,11 @@ module BeakerHostGenerator
       include BeakerHostGenerator::Data
 
       def generate_node(node_info, base_config, bhg_version)
-        base_config['hypervisor'] = 'docker'
         base_config['docker_cmd'] = ['/sbin/init']
         base_config['image'] = node_info['ostype'].sub(/(\d)/, ':\1')
         base_config['image'].sub!(/(\d{2})/, '\1.') if node_info['ostype'] =~ /^ubuntu/
 
-        platform = node_info['platform']
-        platform_info = get_platform_info(bhg_version, platform, :docker)
-        base_config.deep_merge! platform_info
-
-        return base_config
+        return base_generate_node(node_info, base_config, bhg_version, :docker)
       end
     end
   end

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

@@ -6,16 +6,8 @@ module BeakerHostGenerator::Hypervisor
   class Unknown < BeakerHostGenerator::Hypervisor::Interface
     include BeakerHostGenerator::Data
 
-    def initialize(name)
-      @name = name
-    end
-
     def generate_node(node_info, base_config, bhg_version)
-      platform = node_info['platform']
-      general_info = get_platform_info(bhg_version, platform, :general)
-      base_config.deep_merge! general_info
-      base_config['hypervisor'] = @name
-      return base_config
+      return base_generate_node(node_info, base_config, bhg_version, :general)
     end
   end
 end

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

@@ -8,8 +8,6 @@ module BeakerHostGenerator
       include BeakerHostGenerator::Data
 
       def generate_node(node_info, base_config, bhg_version)
-        base_config['hypervisor'] = 'vagrant'
-
         if node_info['ostype'] =~ /^centos/
           base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1')
         elsif node_info['ostype'] =~ /^fedora/
@@ -21,11 +19,7 @@ module BeakerHostGenerator
         # We don't use this by default
         base_config['synced_folder'] = 'disabled'
 
-        platform = node_info['platform']
-        platform_info = get_platform_info(bhg_version, platform, :vagrant)
-        base_config.deep_merge! platform_info
-
-        return base_config
+        return base_generate_node(node_info, base_config, bhg_version, :vagrant)
       end
     end
   end

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

@@ -15,12 +15,7 @@ module BeakerHostGenerator
       end
 
       def generate_node(node_info, base_config, bhg_version)
-        # set hypervisor
-        base_config['hypervisor'] = 'vmpooler'
-
-        platform = node_info['platform']
-        platform_info = get_platform_info(bhg_version, platform, :vmpooler)
-        base_config.deep_merge! platform_info
+        base_config = base_generate_node(node_info, base_config, bhg_version, :vmpooler)
 
         # Some vmpooler/vsphere platforms have special requirements.
         # We munge the node host config here if that is necessary.

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.1.24'
+    STRING = '1.1.25'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.1.24
+  version: 1.1.25
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest