util.rb in beaker-hostgenerator-0.6.0

- old
+ new

@@ -1,38 +1,27 @@
 require 'beaker-hostgenerator/data'
-require 'beaker-hostgenerator/data/vmpooler'
+require 'beaker-hostgenerator/roles'
+require 'beaker-hostgenerator/hypervisor/vmpooler'
 require 'deep_merge'
 
 module BeakerHostGenerator
   module Utils
-    include BeakerHostGenerator::Data
-    include BeakerHostGenerator::Data::Vmpooler
+    module_function
 
     def pe_dir(version, family)
-      # If our version is the same as our family, we're installing a
-      # released version. Use the archive path. Otherwise, we want to use
-      # the development build path.
-      if version && family
-        if version == family
-          return "http://enterprise.delivery.puppetlabs.net/archives/releases/#{family}/"
-        else
-          return "http://enterprise.delivery.puppetlabs.net/#{family}/ci-ready"
-        end
-      end
+      BeakerHostGenerator::Data.pe_dir(version, family)
     end
 
     def fixup_node(cfg)
-      # PE 2.8 doesn't exist for EL 4. We use 2.0 instead.
-      if cfg['platform'] =~ /el-4/ and pe_version =~ /2\.8/
-        cfg['pe_ver'] = "2.0.3"
-      end
+      BeakerHostGenerator::Data.fixup_node(cfg)
     end
 
     def dump_hosts(hosts, path)
+      vmpooler_hypervisor = BeakerHostGenerator::Hypervisor::Vmpooler.new
       config = {}
-      config.deep_merge! BASE_CONFIG
-      config.deep_merge! VMPOOLER_CONFIG
+      config.deep_merge! BeakerHostGenerator::Data.BASE_CONFIG
+      config['CONFIG'].deep_merge! vmpooler_hypervisor.global_config()
 
       hosts.each do |host|
         config['HOSTS'][host.node_name] = {
           'roles' => host['roles'],
           'hypervisor' => "#{host['hypervisor']}",
@@ -44,21 +33,13 @@
         file.write(config.to_yaml)
       end
     end
 
     def get_platforms(hypervisor_type='vmpooler', bhg_version=0)
-      case hypervisor_type
-      when /vmpooler/
-        osinfo = BeakerHostGenerator::Data::Vmpooler.get_osinfo(bhg_version)
-      else
-        raise "Invalid hypervisor #{hypervisor_type}"
-      end
-      return osinfo
+      BeakerHostGenerator::Data.get_platforms(bhg_version)
     end
 
     def get_roles
-      return BeakerHostGenerator::Data::ROLES
+      BeakerHostGenerator::Roles.ROLES
     end
-
-    module_function :get_roles, :get_platforms, :dump_hosts, :fixup_node, :pe_dir
   end
 end