beaker-hostgenerator 0.5.0 → 0.6.0

data/lib/beaker-hostgenerator/roles.rb

@@ -1,22 +1,29 @@
-require 'beaker-hostgenerator/data'
-require 'beaker-hostgenerator/data/vmpooler'
-require 'deep_merge'
-
 module BeakerHostGenerator
-  class Roles
+  module Roles
 
-    def initialize
-    end
+    ROLES = {
+      'a' => 'agent',
+      'u' => 'ca',
+      'l' => 'classifier',
+      'c' => 'dashboard',
+      'd' => 'database',
+      'f' => 'frictionless',
+      'm' => 'master',
+    }
 
-    def compile_master
-      return {
-        'frictionless_options' => {
-          'main' => {
-            'dns_alt_names' => 'puppet',
-            'environmentpath' => '/etc/puppetlabs/puppet/environments',
-          }
+    ROLE_CONFIG = {
+      'compile_master' => {
+        'main' => {
+          'dns_alt_names' => 'puppet',
+          'environmentpath' => '/etc/puppetlabs/puppet/environments',
         }
       }
+    }
+
+    module_function
+
+    def get_role_config(role)
+      ROLE_CONFIG[role] || {}
     end
   end
 end

data/lib/beaker-hostgenerator/util.rb

@@ -1,36 +1,25 @@
 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] = {
@@ -46,19 +35,11 @@ module BeakerHostGenerator
     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

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '0.5.0'
+    STRING = '0.6.0'
   end
 end

data/spec/beaker-hostgenerator/generator_spec.rb

@@ -6,125 +6,89 @@ require 'beaker-hostgenerator'
 require 'util/generator_helpers'
 
 module BeakerHostGenerator
-      describe Generator do
-        let(:options) {
-          {
-            list_platforms_and_roles: false,
-            disable_default_role: false,
-            disable_role_config: false,
-            hypervisor: 'vmpooler',
-          }
-        }
-        let(:generator) { BeakerHostGenerator::Generator.new(options) }
+  describe Generator do
+    let(:generator) { BeakerHostGenerator::Generator.new }
 
-        describe '__generate_host_roles' do
-          it 'Generates a list of roles' do
-            {
-              {
-                "roles" => "aulcdfm",
-                "arbitrary_roles" => [],
-              } => [
-                'agent',
-                'ca',
-                'classifier',
-                'dashboard',
-                'database',
-                'frictionless',
-                'master',
-                ],
-              {
-                "roles" => "a",
-                "arbitrary_roles" => ["meow","hello","compile_master"],
-              } => [
-                'agent',
-                'meow',
-                'hello',
-                'compile_master',
-                ],
-              {
-                "roles" => "",
-                "arbitrary_roles" => ["compile_master"],
-              } => [
-                'compile_master'
-                ],
-              {
-                "roles" => "",
-                "arbitrary_roles" => [],
-              } => [],
-            }.each do |node_info, roles|
-              expect( generator.__generate_host_roles(node_info) ).to eq( roles )
-            end
-          end
+    describe 'get_host_roles' do
+      it 'Expands default roles and merges in arbitrary roles' do
+        {
+          {
+            "roles" => "aulcdfm",
+            "arbitrary_roles" => [],
+          } => [
+            'agent',
+            'ca',
+            'classifier',
+            'dashboard',
+            'database',
+            'frictionless',
+            'master',
+          ],
+          {
+            "roles" => "a",
+            "arbitrary_roles" => ["meow","hello","compile_master"],
+          } => [
+            'agent',
+            'meow',
+            'hello',
+            'compile_master',
+          ],
+          {
+            "roles" => "",
+            "arbitrary_roles" => ["compile_master"],
+          } => [
+            'compile_master'
+          ],
+          {
+            "roles" => "",
+            "arbitrary_roles" => [],
+          } => [],
+        }.each do |node_info, roles|
+          expect( generator.get_host_roles(node_info) ).to eq( roles )
         end
+      end
+    end
 
-        describe '__parse_node_info_token' do
-
-          it 'Raises InvalidNodeSpecError for invalid tokens.' do
-            expect{ generator.__parse_node_info_token("64compile_master") }.to \
-              raise_error(BeakerHostGenerator::Exceptions::InvalidNodeSpecError)
-          end
-
-          it 'Supports no roles in the spec.' do
-            node_info = generator.__parse_node_info_token("64")
-            expect( node_info ).to eq({
-              "roles" => "",
-              "arbitrary_roles" => [],
-              "bits" => "64",
-            })
-          end
-
-          it 'Supports the use of arbitrary roles.' do
-            node_info = generator.__parse_node_info_token("64compile_master,ca,blah.mad")
-            expect( node_info ).to eq({
-              "roles" => "mad",
-              "arbitrary_roles" => ["compile_master", "ca", "blah"],
-              "bits" => "64",
-            })
-          end
+    shared_examples "fixtures" do |fixture_hash|
+      arguments = fixture_hash["arguments_string"]
+      it "beaker-hostgenerator #{arguments}" do
+        arguments = arguments.split
+        STDERR.reopen("stderr.txt", "w")
+        fixture_hash['environment_variables'].each do |key, value|
+          ENV[key] = value
+        end
 
-          context 'When using arbitrary roles'do
-            it 'Fails without a role-type delimiter (a period)' do
-              expect{ generator.__parse_node_info_token("64compile_master,ca,blah") }.to \
-                raise_error(BeakerHostGenerator::Exceptions::InvalidNodeSpecError)
-            end
-            it 'It supports no static roles.' do
-              node_info = generator.__parse_node_info_token("64compile_master,ca,blah.")
-              expect( node_info ).to eq({
-                "roles" => "",
-                "arbitrary_roles" => ["compile_master", "ca", "blah"],
-                "bits" => "64",
-              })
-            end
+        cli = BeakerHostGenerator::CLI.new(arguments)
+        if fixture_hash['expected_exception']
+          # Turn fully-qualified classname string into actual Class object.
+          # We have to manually descend into each Module that makes up the
+          # fully-qualified path to the error class.
+          qualified_classname = fixture_hash['expected_exception'].split('::')
+          expected_class = qualified_classname.reduce(Object) do |accum, e|
+            accum.const_get(e)
           end
+          expect { cli.execute }.to raise_error(expected_class)
+        else
+          test_hash = YAML.load(cli.execute)
+          expect(test_hash).to eq(fixture_hash['expected_hash'])
         end
 
-        shared_examples "fixtures" do |fixture_hash|
-          arguments = fixture_hash["arguments_string"]
-          it "beaker-hostgenerator #{arguments}" do
-            arguments = arguments.split
-            STDERR.reopen("stderr.txt", "w")
-            fixture_hash['environment_variables'].each do |key, value| 
-              ENV[key] = value
-            end
-            cli = BeakerHostGenerator::CLI.new(arguments)
-            test_hash = YAML.load(cli.execute)
-            fixture_hash['environment_variables'].each_key do |key|
-              ENV[key] = nil
-            end
-            expect(test_hash).to eq(fixture_hash["expected_hash"])
-          end
+        fixture_hash['environment_variables'].each_key do |key|
+          ENV[key] = nil
         end
+      end
+    end
 
-        context "Fixtures" do
-          Find.find 'test/fixtures' do |f|
-            context "#{f}" do
-              if File.directory?(f)
-                next
-              end
-              include_examples "fixtures", YAML.load_file(f)
-            end
+    context "Fixtures" do
+      Find.find 'test/fixtures' do |f|
+        context "#{f}" do
+          if File.directory?(f)
+            next
           end
+          include_examples "fixtures", YAML.load_file(f)
         end
-
       end
+    end
+
+  end
 end

data/spec/beaker-hostgenerator/parser_spec.rb

@@ -0,0 +1,84 @@
+require 'beaker-hostgenerator/parser'
+
+module BeakerHostGenerator
+  describe Parser do
+    include BeakerHostGenerator::Parser
+
+    describe 'parse_node_info_token' do
+
+      it 'Raises InvalidNodeSpecError for invalid tokens.' do
+        expect { parse_node_info_token("64compile_master") }.
+          to raise_error(BeakerHostGenerator::Exceptions::InvalidNodeSpecError)
+      end
+
+      it 'Supports no roles in the spec.' do
+        expect( parse_node_info_token("64") ).
+          to eq({
+                  "roles" => "",
+                  "arbitrary_roles" => [],
+                  "bits" => "64",
+                  "host_settings" => {}
+                })
+      end
+
+      it 'Supports the use of arbitrary roles.' do
+        expect( parse_node_info_token("64compile_master,ca,blah.mad") ).
+          to eq({
+                  "roles" => "mad",
+                  "arbitrary_roles" => ["compile_master", "ca", "blah"],
+                  "bits" => "64",
+                  "host_settings" => {}
+                })
+      end
+
+      context 'When using arbitrary roles' do
+
+        it 'Fails without a role-type delimiter (a period)' do
+          expect { parse_node_info_token("64compile_master,ca,blah") }.
+            to raise_error(BeakerHostGenerator::Exceptions::InvalidNodeSpecError)
+        end
+
+        it 'It supports no static roles.' do
+          expect( parse_node_info_token("64compile_master,ca,blah.") ).
+            to eq({
+                    "roles" => "",
+                    "arbitrary_roles" => ["compile_master", "ca", "blah"],
+                    "bits" => "64",
+                    "host_settings" => {}
+                  })
+        end
+      end
+
+      context 'When using arbitrary host settings' do
+        it 'Supports arbitrary whitespace' do
+          expect( parse_node_info_token("64{ k1=v1, k2=v2,  k3 = v3 ,  k4  =v4  }") ).
+            to eq({
+                    "roles" => "",
+                    "arbitrary_roles" => [],
+                    "bits" => "64",
+                    "host_settings" => {
+                      "k1" => "v1",
+                      "k2" => "v2",
+                      "k3" => "v3",
+                      "k4" => "v4"
+                    }
+                  })
+        end
+
+        it 'Raises InvalidNodeSpecError for malformed key-value pairs' do
+          expect { parse_node_info_token("64{foo=bar=baz}") }.
+            to raise_error(BeakerHostGenerator::Exceptions::InvalidNodeSpecError)
+
+          expect { parse_node_info_token("64{foo=}") }.
+            to raise_error(BeakerHostGenerator::Exceptions::InvalidNodeSpecError)
+
+          expect { parse_node_info_token("64{=bar}") }.
+            to raise_error(BeakerHostGenerator::Exceptions::InvalidNodeSpecError)
+
+          expect { parse_node_info_token("64{=}") }.
+            to raise_error(BeakerHostGenerator::Exceptions::InvalidNodeSpecError)
+        end
+      end
+    end
+  end
+end

data/test/fixtures/default/cisconx-64a

@@ -10,10 +10,10 @@ expected_hash:
       pe_upgrade_ver: 
       hypervisor: vmpooler
       platform: cisco_nexus-7-x86_64
-      template: cisco-nxos-9k-x86_64
       vrf: management
       ssh:
         user: beaker
+      template: cisco-nxos-9k-x86_64
       roles:
       - agent
   CONFIG:

data/test/fixtures/default/windows10ent-32d

@@ -0,0 +1,22 @@
+---
+arguments_string: windows10ent-32d
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windows10ent-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: windows-10ent-32
+      ruby_arch: x86
+      template: win-10-ent-i386
+      roles:
+      - agent
+      - database
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/default/windows10ent-64f

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