beaker 3.14.0 → 3.15.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjhmMGI0YmEzZmIzMGM1MjM3ZjU5MzZiZWE0OGNmMzYyNTc4MmJjZA==
+    NjRlOGQzYjVmMjI1MDFhYTQzZTRhNzZhOTM0Njg1MzI1ZGY1NmU4Nw==
   data.tar.gz: !binary |-
-    Y2IzYjA2YjBiZGQ1MmI4MGFlNDgxNDM0NDFlMTlmY2Q5ZTEyOWM5MA==
+    MzUxODYzYWY0ZWQ0YjM5OWU5ODQzNTY4OGFlOWU4YzlhYTQ3NzM2OQ==
 SHA512:
   metadata.gz: !binary |-
-    OTRlZThiZGY3ODViOWNiZmI0Y2VmZWEwYzRlOGUwZDVkZDQ4ZTdlYTc3NmI3
-    NWQ3NzYyYjU3MDA1YTkwYmViYzk1MWZkNGY0NWYyNjM1NGI0ZDU2YzU4ZWJm
-    ZGMxMDJlNDc5ZWRmMDZjZmU4NjU0OWI2NWRiNjg2Njk0ZDg1N2M=
+    OTY1NmExNTVjODU2OGU1Zjg2Yjk4N2NmYmY2ODBjODNiYjIxZWExZjNjYzM2
+    NDJlNmIwYTcyNTIzOGU3YjUxMTJiODIyOGNjNGYzYTE5NDVlZDBlNzc2NjRj
+    Yjc5NGFkMzNiMDAxOTY2OGNlZWFiMGVhMTgyYjczMzM0YzljN2I=
   data.tar.gz: !binary |-
-    OGNjYjc4NTY1N2ExYTQ4NzlkYjE3NjJkMmYzM2NhZTI0NDc0MWE1MWYwZmFh
-    ODE5OTUwMjA3Mzk0YTJhYWUyZTg3NDkwYTJhYTgyOWYxNjM1Yzk0OTUwZTJk
-    ODhiZDA2YzRkN2ZlOTU5ZmZlOGVkMmU0OGJjYzQ2NTQ2OTE2YzI=
+    N2QzYTg1NjZiOTAxYWY4YjQ3ODdiYjkyNjViN2Q5ZDg2OTA0MmNmMTRhNWVl
+    YTk1MTAwZTBmZTlhMzU2Mzk0NjU5OWUwZjU0YjYyODdjMmE4YWZhNDlmOGYz
+    MzczMjQ5YjVmZWIwMGJmN2RmYTcyNTE3ZjY0YjJlZTViNzY1ZDA=

data/acceptance/pre_suite/puppet_git/install.rb

@@ -56,9 +56,9 @@ hosts.each do |host|
     step "#{host} Selected architecture #{arch}"
 
     revision = if arch == 'x64'
-                 '2.0.0-x64'
+                 '2.1.x-x64'
                else
-                 '1.9.3-x86'
+                 '2.1.x-x86'
                end
 
     step "#{host} Install ruby from git using revision #{revision}"

data/acceptance/tests/base/external_resources_test.rb

@@ -1,9 +1,11 @@
 test_name 'External Resources Test' do
   step 'Verify EPEL resources are up and available' do
     def epel_url_test(el_version)
-      url = "#{options[:epel_url]}/epel-release-latest-#{el_version}.noarch.rpm"
+      url_base = options[:epel_url]
+      url_base = options[:epel_url_archive] if el_version == 5
+      url = "#{url_base}/epel-release-latest-#{el_version}.noarch.rpm"
       curl_headers_result = default.exec(Command.new("curl -I #{url}"))
-      assert_match(/200 OK/, curl_headers_result.stdout, "EPEL #{el_version} should be reachable")
+      assert_match(/200 OK/, curl_headers_result.stdout, "EPEL #{el_version} should be reachable at #{url}")
     end
 
     step 'Verify el_version numbers 5,6,7 are found on the epel resource' do

data/docs/how_to/hypervisors/vmpooler.md

@@ -18,7 +18,24 @@ An example of a `.fog` file with just the vmpooler details is below:
 :default:
   :vmpooler_token: 'randomtokentext'
 ```
+# Additional Disks
+Using the vmpooler API, Beaker enables you to attach additional storage disks in the host configuration file. The disks are added at the time the VM is created. Logic for using the disk must go into your tests.
+
+Simply add the `disks` key and a list containing the sizes(in GB) of the disks you want to create and attach to that host.
+For example, to create 2 disks sized 8GB and 16GB to example-box:
+
+```yaml
+ example-box:
+    disks:
+      - 8
+      - 16
+    roles:
+      - satellite
+    platform: el-7-x86_64
+    hypervisor: vmpooler
+    template: redhat-7-x86_64
+```
 
 Users with Puppet credentials can follow our instructions for getting & using
 vmpooler tokens in our
-[internal documentation](https://confluence.puppetlabs.com/pages/viewpage.action?spaceKey=SRE&title=Generating+and+using+vmpooler+tokens).
+[internal documentation](https://confluence.puppetlabs.com/pages/viewpage.action?spaceKey=SRE&title=Generating+and+using+vmpooler+tokens).

data/docs/how_to/hypervisors/vsphere.md

@@ -10,6 +10,8 @@ To do this create a `~/.fog` file with your vSphere credentials:
 
 These follow the conventions used by Cloud Provisioner and Fog.
 
+>Note: Your fog credential file location may be specified in the 'CONFIG' section using the 'dot_fog' setting
+
 There are two possible `hypervisor` hypervisor-types to use for vSphere testing, `vsphere` and `vcloud`.
 
 ### `hypervisor: vsphere`
@@ -18,7 +20,7 @@ This option locates an existing static VM, optionally reverts it to a pre-existi
 ### `hypervisor: vcloud`
 This option clones a new VM from a pre-existing template, runs tests on the newly-provisioned clone, then deletes the clone once testing completes.
 
-The `vcloud` option requires a slightly-modified test configuration file, specifying both the target template as well as three additional parameters in the 'CONFIG' section ('datastore', 'resourcepool', and 'folder').
+The `vcloud` option requires a slightly-modified test configuration file, specifying both the target template as well as three additional parameters in the 'CONFIG' section ('datastore', 'datacenter', and 'folder').  Optionally, a resourcepool may be specified via the 'resourcepool' setting in the 'CONFIG' section.  Template can be expressed in the 'HOSTS' section, or you can set the template to be used via the `BEAKER_vcloud_template` environment variable.
 
 #### example vcloud hosts file ###
     HOSTS:
@@ -38,6 +40,7 @@ The `vcloud` option requires a slightly-modified test configuration file, specif
         hypervisor: vcloud
     CONFIG:
       consoleport: 443
+      datacenter: testdc
       datastore: instance0
       resourcepool: Delivery/Quality Assurance/FOSS/Dynamic
       folder: delivery/Quality Assurance/FOSS/Dynamic

data/lib/beaker/command.rb

@@ -73,12 +73,13 @@ module Beaker
       env_string = host.environment_string( env )
       prepend_commands = host.prepend_commands( cmd, pc, :cmd_exe => @cmdexe )
       if host[:platform] =~ /cisco/ && host[:user] != 'root'
-          append_command = '"'
+        append_command = '"'
         cmd = cmd.gsub('"') { '\\"' }
       end
 
       # This will cause things like `puppet -t -v agent` which is maybe bad.
-      cmd_line_array = [env_string, prepend_commands, cmd, options_string, args_string, append_command]
+      cmd_line_array = [env_string, prepend_commands, cmd, options_string, args_string]
+      cmd_line_array << append_command unless (cmd =~ /ntpdate/ && host[:platform] =~ /cisco_nexus/)
       cmd_line_array.compact.reject( &:empty? ).join( ' ' )
     end
 

data/lib/beaker/host/cisco.rb

@@ -70,8 +70,12 @@ module Cisco
     # @return [String] Command string as needed for this host
     def prepend_commands(command = '', user_pc = '', opts = {})
       return user_pc unless command.index('vsh').nil?
+      if self[:platform] =~ /cisco_nexus/
+        return user_pc unless command.index('ntpdate').nil?
+      end
 
-      prepend_cmds = ''
+      prepend_cmds = 'source /etc/profile;'
+      prepend_cmds << " sudo sh -c \"" if self[:user] != 'root'
       if self[:vrf]
         prepend_cmds << "ip netns exec #{self[:vrf]} "
       end
@@ -93,8 +97,7 @@ module Cisco
     #                  will ensure the environment is correctly set for the
     #                  given host.
     def environment_string env
-      prestring = 'source /etc/profile;'
-      prestring << " sudo sh -c \"" if self[:user] != 'root'
+      prestring = ''
       return prestring if env.empty?
       env_array = self.environment_variable_string_pair_array( env )
       environment_string = env_array.join(' ')

data/lib/beaker/host_prebuilt_steps.rb

@@ -53,6 +53,9 @@ module Beaker
           case
             when host['platform'] =~ /sles-/
               ntp_command = "sntp #{ntp_server}"
+            when host['platform'] =~ /cisco_nexus/
+              ntp_server = host.exec(Command.new("getent hosts #{NTPSERVER} | head -n1 |cut -d \" \" -f1"), :acceptable_exit_codes => [0]).stdout
+              ntp_command = "sudo -E sh -c 'export DCOS_CONTEXT=2;/isan/bin/ntpdate -u -t 20 #{ntp_server}'"
             else
               ntp_command = "ntpdate -u -t 20 #{ntp_server}"
           end
@@ -252,9 +255,11 @@ module Beaker
         when el_based?(host) && ['5','6','7'].include?(host['platform'].version)
           result = host.exec(Command.new('rpm -qa | grep epel-release'), :acceptable_exit_codes => [0,1])
           if result.exit_code == 1
-            host.exec(Command.new("rpm -i#{debug_opt} #{opts[:epel_url]}/epel-release-latest-#{host['platform'].version}.noarch.rpm"))
+            url_base = opts[:epel_url]
+            url_base = opts[:epel_url_archive] if host['platform'].version == '5'
+            host.exec(Command.new("rpm -i#{debug_opt} #{url_base}/epel-release-latest-#{host['platform'].version}.noarch.rpm"))
             #update /etc/yum.repos.d/epel.repo for new baseurl
-            host.exec(Command.new("sed -i -e 's;#baseurl.*$;baseurl=#{Regexp.escape("#{opts[:epel_url]}/#{host['platform'].version}")}/\$basearch;' /etc/yum.repos.d/epel.repo"))
+            host.exec(Command.new("sed -i -e 's;#baseurl.*$;baseurl=#{Regexp.escape("#{url_base}/#{host['platform'].version}")}/\$basearch;' /etc/yum.repos.d/epel.repo"))
             #remove mirrorlist
             host.exec(Command.new("sed -i -e '/mirrorlist/d' /etc/yum.repos.d/epel.repo"))
             host.exec(Command.new('yum clean all && yum makecache'))

data/lib/beaker/hypervisor/openstack.rb

@@ -35,29 +35,29 @@ module Beaker
       raise 'You must specify an Openstack tenant (:openstack_tenant) for OpenStack instances!' unless @options[:openstack_tenant]
       raise 'You must specify an Openstack network (:openstack_network) for OpenStack instances!' unless @options[:openstack_network]
 
-      optionhash = {}
-      optionhash[:provider]           = :openstack
-      optionhash[:openstack_api_key]  = @options[:openstack_api_key]
-      optionhash[:openstack_username] = @options[:openstack_username]
-      optionhash[:openstack_auth_url] = @options[:openstack_auth_url]
-      optionhash[:openstack_tenant]   = @options[:openstack_tenant]
-      optionhash[:openstack_region]   = @options[:openstack_region] if @options[:openstack_region]
+      # Common keystone authentication credentials
+      @credentials = {
+        :provider           => :openstack,
+        :openstack_auth_url => @options[:openstack_auth_url],
+        :openstack_api_key  => @options[:openstack_api_key],
+        :openstack_username => @options[:openstack_username],
+        :openstack_tenant   => @options[:openstack_tenant],
+        :openstack_region   => @options[:openstack_region],
+      }
+
+      # Keystone version 3 requires users and projects to be scoped
+      if @credentials[:openstack_auth_url].include?('/v3/')
+        @credentials[:openstack_user_domain]    = @options[:openstack_user_domain] || 'Default'
+        @credentials[:openstack_project_domain] = @options[:openstack_project_domain] || 'Default'
+      end
 
-      @compute_client ||= Fog::Compute.new(optionhash)
+      @compute_client ||= Fog::Compute.new(@credentials)
 
       if not @compute_client
         raise "Unable to create OpenStack Compute instance (api key: #{@options[:openstack_api_key]}, username: #{@options[:openstack_username]}, auth_url: #{@options[:openstack_auth_url]}, tenant: #{@options[:openstack_tenant]})"
       end
 
-      networkoptionhash = {}
-      networkoptionhash[:provider]           = :openstack
-      networkoptionhash[:openstack_api_key]  = @options[:openstack_api_key]
-      networkoptionhash[:openstack_username] = @options[:openstack_username]
-      networkoptionhash[:openstack_auth_url] = @options[:openstack_auth_url]
-      networkoptionhash[:openstack_tenant]   = @options[:openstack_tenant]
-      networkoptionhash[:openstack_region]   = @options[:openstack_region] if @options[:openstack_region]
-
-      @network_client ||= Fog::Network.new(networkoptionhash)
+      @network_client ||= Fog::Network.new(@credentials)
 
       if not @network_client
         raise "Unable to create OpenStack Network instance (api_key: #{@options[:openstack_api_key]}, username: #{@options[:openstack_username]}, auth_url: #{@options[:openstack_auth_url]}, tenant: #{@options[:openstack_tenant]})"
@@ -104,15 +104,7 @@ module Beaker
     # Create a volume client on request
     # @return [Fog::OpenStack::Volume] OpenStack volume client
     def volume_client_create
-      options = {
-        :provider           => :openstack,
-        :openstack_api_key  => @options[:openstack_api_key],
-        :openstack_username => @options[:openstack_username],
-        :openstack_auth_url => @options[:openstack_auth_url],
-        :openstack_tenant   => @options[:openstack_tenant],
-        :openstack_region   => @options[:openstack_region],
-      }
-      @volume_client ||= Fog::Volume.new(options)
+      @volume_client ||= Fog::Volume.new(@credentials)
       unless @volume_client
         raise "Unable to create OpenStack Volume instance"\
           " (api_key: #{@options[:openstack_api_key]},"\
@@ -220,8 +212,9 @@ module Beaker
 
       @hosts.each do |host|
         ip = get_ip
-        host[:vmhostname] = ip.ip.gsub('.','-') + '.rfc1918.puppetlabs.net'
-        host[:keyname] = key_name(host)
+        hostname = ip.ip.gsub('.','-')
+        host[:vmhostname] = hostname + '.rfc1918.puppetlabs.net'
+        create_or_associate_keypair(host, hostname)
         @logger.debug "Provisioning #{host.name} (#{host[:vmhostname]})"
         options = {
           :flavor_ref => flavor(host[:flavor]).id,
@@ -327,12 +320,11 @@ module Beaker
     #OpenStack keypairs
     #
     #@param [Host] host The OpenStack host to provision
-    #@return [String] key_name
     #@api private
-    def key_name(host)
+    def create_or_associate_keypair(host, keyname)
       if @options[:openstack_keyname]
         @logger.debug "Adding optional key_name #{@options[:openstack_keyname]} to #{host.name} (#{host[:vmhostname]})"
-        @options[:openstack_keyname]
+        keyname = @options[:openstack_keyname]
       else
         @logger.debug "Generate a new rsa key"
 
@@ -355,11 +347,12 @@ module Beaker
 
         type = key.ssh_type
         data = [ key.to_blob ].pack('m0')
-        @logger.debug "Creating Openstack keypair for public key '#{type} #{data}'"
-        @compute_client.create_key_pair host[:vmhostname], "#{type} #{data}"
+        @logger.debug "Creating Openstack keypair '#{keyname}' for public key '#{type} #{data}'"
+        @compute_client.create_key_pair keyname, "#{type} #{data}"
         host['ssh'][:key_data] = [ key.to_pem ]
-        host[:vmhostname]
       end
+
+      host[:keyname] = keyname
     end
   end
 end

data/lib/beaker/hypervisor/vcloud.rb

@@ -10,6 +10,7 @@ module Beaker
 
       raise 'You must specify a datastore for vCloud instances!' unless @options['datastore']
       raise 'You must specify a folder for vCloud instances!' unless @options['folder']
+      raise 'You must specify a datacenter for vCloud instances!' unless @options['datacenter']
       @vsphere_credentials = VsphereHelper.load_config(@options[:dot_fog])
     end
 
@@ -50,6 +51,16 @@ module Beaker
       end
     end
 
+    # Directly borrowed from openstack hypervisor
+    def enable_root(host)
+      if host['user'] != 'root'
+        copy_ssh_to_root(host, @options)
+        enable_root_login(host, @options)
+        host['user'] = 'root'
+        host.close
+      end
+    end
+
     def create_clone_spec host
       # Add VM annotation
       configSpec = RbVmomi::VIM.VirtualMachineConfigSpec(
@@ -76,8 +87,8 @@ module Beaker
 
       # Put the VM in the specified folder and resource pool
       relocateSpec = RbVmomi::VIM.VirtualMachineRelocateSpec(
-        :datastore    => @vsphere_helper.find_datastore(@options['datastore']),
-        :pool         => @options['resourcepool'] ? @vsphere_helper.find_pool(@options['resourcepool']) : nil,
+        :datastore    => @vsphere_helper.find_datastore(@options['datacenter'],@options['datastore']),
+        :pool         => @options['resourcepool'] ? @vsphere_helper.find_pool(@options['datacenter'],@options['resourcepool']) : nil,
         :diskMoveType => :moveChildMostDiskBacking
       )
 
@@ -95,7 +106,6 @@ module Beaker
     def provision
       connect_to_vsphere
       begin
-        vsphere_vms = {}
 
         try = 1
         attempts = @options[:timeout].to_i / 5
@@ -109,6 +119,12 @@ module Beaker
             h['vmhostname'] = generate_host_name
           end
 
+          if h['template'].nil? and defined?(ENV['BEAKER_vcloud_template'])
+            h['template'] = ENV['BEAKER_vcloud_template']
+          end
+
+          raise "Missing template configuration for #{h}.  Set template in nodeset or set ENV[BEAKER_vcloud_template]" unless h['template']
+
           if h['template'] =~ /\//
             templatefolders = h['template'].split('/')
             h['template'] = templatefolders.pop
@@ -119,7 +135,7 @@ module Beaker
           vm = {}
 
           if templatefolders
-            vm[h['template']] = @vsphere_helper.find_folder(templatefolders.join('/')).find(h['template'])
+            vm[h['template']] = @vsphere_helper.find_folder(@options['datacenter'],templatefolders.join('/')).find(h['template'])
           else
             vm = @vsphere_helper.find_vms(h['template'])
           end
@@ -131,8 +147,9 @@ module Beaker
           spec = create_clone_spec(h)
 
           # Deploy from specified template
-          tasks << vm[h['template']].CloneVM_Task( :folder => @vsphere_helper.find_folder(@options['folder']), :name => h['vmhostname'], :spec => spec )
+          tasks << vm[h['template']].CloneVM_Task( :folder => @vsphere_helper.find_folder(@options['datacenter'],@options['folder']), :name => h['vmhostname'], :spec => spec )
         end
+
         try = (Time.now - start) / 5
         @vsphere_helper.wait_for_tasks(tasks, try, attempts)
         @logger.notify 'Spent %.2f seconds deploying VMs' % (Time.now - start)
@@ -147,15 +164,22 @@ module Beaker
 
         try = (Time.now - start) / 5
         duration = run_and_report_duration do
-          @hosts.each_with_index do |h, i|
-            wait_for_dns_resolution(h, try, attempts)
+          @hosts.each do |host|
+            repeat_fibonacci_style_for 8 do
+              @vsphere_helper.find_vms(host['vmhostname'])[host['vmhostname']].summary.guest.ipAddress != nil
+            end
+            host[:ip] = @vsphere_helper.find_vms(host['vmhostname'])[host['vmhostname']].summary.guest.ipAddress
+            enable_root(host)
           end
         end
+
         @logger.notify "Spent %.2f seconds waiting for DNS resolution" % duration
+
       rescue => e
         @vsphere_helper.close
         report_and_raise(@logger, e, "Vcloud.provision")
       end
+
     end
 
     def cleanup

data/lib/beaker/hypervisor/vmpooler.rb

@@ -215,6 +215,33 @@ module Beaker
       end
 
       @logger.notify 'Spent %.2f seconds tagging VMs' % (Time.now - start)
+
+      # add additional disks to vm
+      @logger.debug 'Looking for disks to add...'
+
+      @hosts.each do |h|
+        hostname = h['vmhostname'].split(".")[0]
+
+        if h['disks']
+          @logger.debug "Found disks for #{hostname}!"
+          disks = h['disks']
+
+          disks.each_with_index do |disk_size, index|
+            start = Time.now
+
+            add_disk(hostname, disk_size)
+
+            done = wait_for_disk(hostname, disk_size, index)
+            if done
+              @logger.notify "Spent %.2f seconds adding disk #{index}. " % (Time.now - start)
+            else
+              raise "Could not verify disk was added after %.2f seconds" % (Time.now - start)
+            end
+          end
+        else
+          @logger.debug "No disks to add for #{hostname}"
+        end
+      end
     end
 
     def cleanup
@@ -246,5 +273,82 @@ module Beaker
       @logger.notify "Spent %.2f seconds cleaning up" % (Time.now - start)
     end
 
+    def add_disk(hostname, disk_size)
+      @logger.notify "Requesting an additional disk of size #{disk_size}GB for #{hostname}"
+
+      if !disk_size.to_s.match /[0123456789]/ || size <= '0'
+        raise NameError.new "Disk size must be an integer greater than zero!"
+      end
+
+      begin
+        uri = URI.parse(@options[:pooling_api] + '/api/v1/vm/' + hostname + '/disk/' + disk_size.to_s)
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        request = Net::HTTP::Post.new(uri.request_uri)
+        request['X-AUTH-TOKEN'] = @credentials[:vmpooler_token]
+
+        response = http.request(request)
+
+        parsed = parse_response(response)
+
+        raise "Response from #{hostname} indicates disk was not added" if !parsed['ok']
+
+      rescue NameError, RuntimeError, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, *SSH_EXCEPTIONS => e
+        report_and_raise(@logger, e, 'Vmpooler.add_disk')
+      end
+    end
+
+    def parse_response(response)
+      parsed_response = JSON.parse(response.body)
+    end
+
+    def disk_added?(host, disk_size, index)
+      if host['disk'].nil?
+        false
+      else
+        host['disk'][index] == "+#{disk_size}gb"
+      end
+    end
+
+    def get_vm(hostname)
+      begin
+        uri = URI.parse(@options[:pooling_api] + '/vm/' + hostname)
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        request = Net::HTTP::Get.new(uri.request_uri)
+
+        response = http.request(request)
+      rescue RuntimeError, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, *SSH_EXCEPTIONS => e
+        @logger.notify "Failed to connect to vmpooler while getting VM information!"
+      end
+    end
+
+    def wait_for_disk(hostname, disk_size, index)
+      response = get_vm(hostname)
+      parsed = parse_response(response)
+
+      @logger.notify "Waiting for disk"
+
+      attempts = 0
+
+      while (!disk_added?(parsed[hostname], disk_size, index) && attempts < 20)
+        sleep 10
+        begin
+          response = get_vm(hostname)
+          parsed = parse_response(response)
+        rescue RuntimeError, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+               Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, *SSH_EXCEPTIONS => e
+          report_and_raise(@logger, e, "Vmpooler.wait_for_disk")
+        end
+        print "."
+        attempts += 1
+      end
+
+      puts " "
+
+      disk_added?(parsed[hostname], disk_size, index)
+    end
   end
 end

data/lib/beaker/hypervisor/vsphere_helper.rb

@@ -118,29 +118,23 @@ class VsphereHelper
     vms
   end
 
-  def find_datastore datastorename
-    datacenter = @connection.serviceInstance.find_datacenter
+  def find_datastore(dc,datastorename)
+    datacenter = @connection.serviceInstance.find_datacenter(dc)
     datacenter.find_datastore(datastorename)
   end
 
-  def find_folder foldername
-    datacenter = @connection.serviceInstance.find_datacenter
-    base = datacenter.vmFolder
-    folders = foldername.split('/')
-    folders.each do |folder|
-      case base
-        when RbVmomi::VIM::Folder
-          base = base.childEntity.find { |f| f.name == folder }
-        else
-          abort "Unexpected object type encountered (#{base.class}) while finding folder"
-      end
+  def find_folder(dc,foldername)
+    datacenter = @connection.serviceInstance.find_datacenter(dc)
+    base = datacenter.vmFolder.traverse(foldername)
+    if base != nil
+      base
+    else
+      abort "Failed to find folder #{foldername}"
     end
-
-    base
   end
 
-  def find_pool poolname
-    datacenter = @connection.serviceInstance.find_datacenter
+  def find_pool(dc,poolname)
+    datacenter = @connection.serviceInstance.find_datacenter(dc)
     base = datacenter.hostFolder
     pools = poolname.split('/')
     pools.each do |pool|

data/lib/beaker/options/presets.rb

@@ -172,6 +172,7 @@ module Beaker
           :package_proxy          => false,
           :add_el_extras          => false,
           :epel_url               => "http://dl.fedoraproject.org/pub/epel",
+          :epel_url_archive       => 'http://archive.fedoraproject.org/pub/archive/epel',
           :consoleport            => 443,
           :pe_dir                 => '/opt/enterprise/dists',
           :pe_version_file        => 'LATEST',

data/lib/beaker/subcommands/subcommand_util.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'rake'
 require 'stringio'
 require 'yaml/store'
 require 'fileutils'

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.14.0'
+    STRING = '3.15.0'
   end
 end

data/spec/beaker/host/cisco_spec.rb

@@ -20,6 +20,19 @@ module Cisco
           @platform = 'cisco_nexus-7-x86_64'
         end
 
+        it 'starts with sourcing the /etc/profile script' do
+          answer_correct = 'source /etc/profile;'
+          answer_test = host.prepend_commands( 'fake_command' )
+          expect( answer_test ).to be === answer_correct
+        end
+
+        it 'uses `sudo` if not root' do
+          @options = { :user => 'notroot' }
+          answer_correct = "source /etc/profile; sudo sh -c \""
+          answer_test = host.prepend_commands( 'fake_command' )
+          expect( answer_test ).to be === answer_correct
+        end
+
         it 'ends with the :vrf host parameter' do
           vrf_answer = 'vrf_answer_135246'
           @options = {
@@ -29,19 +42,27 @@ module Cisco
           expect( answer_test ).to match( /ip netns exec #{vrf_answer}$/ )
         end
 
-        it 'guards against "vsh" usage (only scenario we dont want prefixing)' do
-          answer_prepend_commands = 'pc_param_unchanged_13584'
-          answer_test = host.prepend_commands( 'fake/vsh/command', answer_prepend_commands )
-          expect( answer_test ).to be === answer_prepend_commands
+        it 'guards against "vsh" usage (scenario we never want prefixing)' do
+          answer_user_pc = 'pc_param_unchanged_13584'
+          answer_test = host.prepend_commands( 'fake/vsh/command', answer_user_pc )
+          expect( answer_test ).to be === answer_user_pc
+        end
+
+        it 'guards against "ntpdate" usage (we dont want prefixing on nexus)' do
+          answer_user_pc = 'user_pc_param_54321'
+          answer_test = host.prepend_commands( 'fake/ntpdate/command', answer_user_pc )
+          expect( answer_test ).to be === answer_user_pc
         end
 
+
         it 'retains user-specified prepend commands when adding vrf' do
           @options = {
             :vrf  => 'fakevrf',
           }
           answer_prepend_commands = 'prepend'
+          answer_correct = 'source /etc/profile;ip netns exec fakevrf prepend'
           answer_test = host.prepend_commands( 'fake_command', answer_prepend_commands )
-          expect( answer_test ).to match( /^ip netns exec fakevrf #{answer_prepend_commands}/ )
+          expect( answer_test ).to be === answer_correct
         end
       end
 
@@ -51,52 +72,49 @@ module Cisco
           @platform = 'cisco_ios_xr-6-x86_64'
         end
 
+        it 'starts with sourcing the /etc/profile script' do
+          answer_correct = 'source /etc/profile;'
+          answer_test = host.prepend_commands( 'fake_command' )
+          expect( answer_test ).to be === answer_correct
+        end
+
         it 'does use the :vrf host parameter if provided' do
           @options = { :vrf => 'tpnns' }
           answer_test = host.prepend_commands( 'fake_command' )
           expect( answer_test ).to match( /ip netns exec tpnns/ )
         end
 
+        it 'does not guard "ntpdate" usage' do
+          answer_user_pc = 'user_pc_param_54321'
+          answer_correct = 'source /etc/profile;user_pc_param_54321'
+          answer_test = host.prepend_commands( 'fake/ntpdate/command', answer_user_pc )
+          expect( answer_test ).to be === answer_correct
+        end
+
         it 'retains user-specified prepend commands when adding vrf' do
           @options = { :vrf  => 'fakevrf', }
           answer_prepend_commands = 'prepend'
+          answer_correct = 'source /etc/profile;ip netns exec fakevrf prepend'
           answer_test = host.prepend_commands( 'fake_command', answer_prepend_commands )
-          expect( answer_test ).to match( /^ip netns exec fakevrf #{answer_prepend_commands}/ )
+          expect( answer_test ).to be === answer_correct
         end
       end
     end
 
     describe '#environment_string' do
 
-      it 'starts with sourcing the /etc/profile script' do
-        answer_test = host.environment_string( {} )
-        expect( answer_test ).to match( %r{^source /etc/profile;} )
-      end
-
-      it 'uses `sudo` if not root' do
-        @options = { :user => 'notroot' }
-        answer_test = host.environment_string( {} )
-        expect( answer_test ).to match( /sudo/ )
-      end
-
       context 'for cisco_nexus-7' do
 
         before :each do
           @platform = 'cisco_nexus-7-x86_64'
         end
 
-        it 'uses `sudo` if not root' do
-          @options = { :user => 'notroot' }
-          env_map = { 'PATH' => '/opt/pants/2' }
-          answer_test = host.environment_string( env_map )
-          expect( answer_test ).to match( %r{^source /etc/profile; sudo } )
-        end
-
         it 'uses `export` if root' do
           @options = { :user => 'root' }
           env_map = { 'PATH' => '/opt/pants/2' }
+          answer_correct = ' export PATH="/opt/pants/2";'
           answer_test = host.environment_string( env_map )
-          expect( answer_test ).to match( %r{^source /etc/profile; export } )
+          expect( answer_test ).to be === answer_correct
         end
 
         it 'ends with a semi-colon' do
@@ -108,7 +126,7 @@ module Cisco
         it 'turns env maps into paired strings correctly' do
           @options = { :user => 'root' }
           env_map = { 'var1' => 'ans1', 'VAR2' => 'ans2' }
-          answer_correct = 'source /etc/profile; export var1="ans1" VAR1="ans1" VAR2="ans2";'
+          answer_correct = ' export var1="ans1" VAR1="ans1" VAR2="ans2";'
           answer_test = host.environment_string( env_map )
           expect( answer_test ).to be === answer_correct
         end
@@ -122,15 +140,17 @@ module Cisco
         it 'uses `sudo` if not root' do
           @options = { :user => 'notroot' }
           env_map = { 'PATH' => '/opt/pants/2' }
+          answer_correct = ' env PATH="/opt/pants/2"'
           answer_test = host.environment_string( env_map )
-          expect( answer_test ).to match( %r{^source /etc/profile; sudo } )
+          expect( answer_test ).to be === answer_correct
         end
 
         it 'uses `env` if root' do
           @options = { :user => 'root' }
           env_map = { 'PATH' => '/opt/pants/1' }
+          answer_correct = ' env PATH="/opt/pants/1"'
           answer_test = host.environment_string( env_map )
-          expect( answer_test ).to match( %r{^source /etc/profile; env } )
+          expect( answer_test ).to be === answer_correct
         end
 
         it 'does not end with a semi-colon' do
@@ -142,7 +162,7 @@ module Cisco
         it 'turns env maps into paired strings correctly' do
           @options = { :user => 'root' }
           env_map = { 'VAR1' => 'ans1', 'var2' => 'ans2' }
-          answer_correct = 'source /etc/profile; env VAR1="ans1" var2="ans2" VAR2="ans2"'
+          answer_correct = ' env VAR1="ans1" var2="ans2" VAR2="ans2"'
           answer_test = host.environment_string( env_map )
           expect( answer_test ).to be === answer_correct
         end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -304,22 +304,53 @@ describe Beaker do
   context "add_el_extras" do
     subject { dummy_class.new }
 
-    it "add extras for el-5/6 hosts" do
+    it 'adds archived extras for el-5 hosts' do
+
+      hosts = make_hosts( { :platform => Beaker::Platform.new('el-5-arch'), :exit_code => 1 }, 2 )
+      hosts[1][:platform] = Beaker::Platform.new('oracle-5-arch')
+
+      expect( Beaker::Command ).to receive( :new ).with(
+        "rpm -qa | grep epel-release"
+      ).exactly( 2 ).times
+      expect( Beaker::Command ).to receive( :new ).with(
+        "rpm -i http://archive.fedoraproject.org/pub/archive/epel/epel-release-latest-5.noarch.rpm"
+      ).exactly( 2 ).times
+      expect( Beaker::Command ).to receive( :new ).with(
+        "sed -i -e 's;#baseurl.*$;baseurl=http://archive\\.fedoraproject\\.org/pub/archive/epel/5/$basearch;' /etc/yum.repos.d/epel.repo"
+      ).exactly( 2 ).times
+      expect( Beaker::Command ).to receive( :new ).with(
+        "sed -i -e '/mirrorlist/d' /etc/yum.repos.d/epel.repo"
+      ).exactly( 2 ).times
+      expect( Beaker::Command ).to receive( :new ).with(
+        "yum clean all && yum makecache"
+      ).exactly( 2 ).times
 
-      hosts = make_hosts( { :platform => Beaker::Platform.new('el-5-arch'), :exit_code => 1 }, 6 )
-      hosts[0][:platform] = Beaker::Platform.new('el-6-arch')
+      subject.add_el_extras( hosts, options )
+
+    end
+
+    it 'adds extras for el-6 hosts' do
+
+      hosts = make_hosts( { :platform => Beaker::Platform.new('el-6-arch'), :exit_code => 1 }, 4 )
       hosts[1][:platform] = Beaker::Platform.new('centos-6-arch')
       hosts[2][:platform] = Beaker::Platform.new('scientific-6-arch')
       hosts[3][:platform] = Beaker::Platform.new('redhat-6-arch')
-      hosts[4][:platform] = Beaker::Platform.new('oracle-5-arch')
-
-      expect( Beaker::Command ).to receive( :new ).with("rpm -qa | grep epel-release").exactly( 6 ).times
-      expect( Beaker::Command ).to receive( :new ).with("rpm -i http://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm").exactly( 4 ).times
-      expect( Beaker::Command ).to receive( :new ).with("rpm -i http://dl.fedoraproject.org/pub/epel/epel-release-latest-5.noarch.rpm").exactly( 2 ).times
-      expect( Beaker::Command ).to receive( :new ).with("sed -i -e 's;#baseurl.*$;baseurl=http://dl\\.fedoraproject\\.org/pub/epel/6/$basearch;' /etc/yum.repos.d/epel.repo").exactly( 4 ).times
-      expect( Beaker::Command ).to receive( :new ).with("sed -i -e 's;#baseurl.*$;baseurl=http://dl\\.fedoraproject\\.org/pub/epel/5/$basearch;' /etc/yum.repos.d/epel.repo").exactly( 2 ).times
-      expect( Beaker::Command ).to receive( :new ).with("sed -i -e '/mirrorlist/d' /etc/yum.repos.d/epel.repo").exactly( 6 ).times
-      expect( Beaker::Command ).to receive( :new ).with("yum clean all && yum makecache").exactly( 6 ).times
+
+      expect( Beaker::Command ).to receive( :new ).with(
+        "rpm -qa | grep epel-release"
+      ).exactly( 4 ).times
+      expect( Beaker::Command ).to receive( :new ).with(
+        "rpm -i http://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
+      ).exactly( 4 ).times
+      expect( Beaker::Command ).to receive( :new ).with(
+        "sed -i -e 's;#baseurl.*$;baseurl=http://dl\\.fedoraproject\\.org/pub/epel/6/$basearch;' /etc/yum.repos.d/epel.repo"
+      ).exactly( 4 ).times
+      expect( Beaker::Command ).to receive( :new ).with(
+        "sed -i -e '/mirrorlist/d' /etc/yum.repos.d/epel.repo"
+      ).exactly( 4 ).times
+      expect( Beaker::Command ).to receive( :new ).with(
+        "yum clean all && yum makecache"
+      ).exactly( 4 ).times
 
       subject.add_el_extras( hosts, options )
 

data/spec/beaker/hypervisor/openstack_spec.rb

@@ -84,7 +84,7 @@ module Beaker
       openstack.provision
 
       @hosts.each do |host|
-        expect(host[:keyname]).to match(/[_\-0-9a-zA-Z]+/)
+        expect(host[:keyname]).to match(/^[_\-0-9a-zA-Z]+$/)
       end
     end
 
@@ -156,5 +156,31 @@ module Beaker
       openstack.provision_storage mock_host, mock_vm
     end
 
+    it 'supports keystone v2' do
+      credentials = openstack.instance_eval('@credentials')
+      expect(credentials[:openstack_user_domain]).to be_nil
+      expect(credentials[:openstack_project_domain]).to be_nil
+    end
+
+    it 'supports keystone v3 with implicit arguments' do
+      v3_options = options
+      v3_options[:openstack_auth_url] = 'https://example.com/identity/v3/auth'
+
+      credentials = OpenStack.new(@hosts, v3_options).instance_eval('@credentials')
+      expect(credentials[:openstack_user_domain]).to eq('Default')
+      expect(credentials[:openstack_project_domain]).to eq('Default')
+    end
+
+    it 'supports keystone v3 with explicit arguments' do
+      v3_options = options
+      v3_options[:openstack_auth_url] = 'https://example.com/identity/v3/auth'
+      v3_options[:openstack_user_domain] = 'acme.com'
+      v3_options[:openstack_project_domain] = 'R&D'
+
+      credentials = OpenStack.new(@hosts, v3_options).instance_eval('@credentials')
+      expect(credentials[:openstack_user_domain]).to eq('acme.com')
+      expect(credentials[:openstack_project_domain]).to eq('R&D')
+    end
+
   end
 end

data/spec/beaker/hypervisor/vcloud_spec.rb

@@ -9,7 +9,7 @@ module Beaker
      stub_const( "VsphereHelper", MockVsphereHelper )
      stub_const( "Net", MockNet )
       json = double( 'json' )
-      allow( json ).to receive( :parse ) do |arg| 
+      allow( json ).to receive( :parse ) do |arg|
         arg
       end
      stub_const( "JSON", json )
@@ -23,6 +23,7 @@ module Beaker
 
         opts = make_opts
         opts[:pooling_api] = nil
+        opts[:datacenter] = 'testdc'
 
         vcloud = Beaker::Vcloud.new( make_hosts, opts )
         allow( vcloud ).to receive( :require ).and_return( true )
@@ -47,6 +48,7 @@ module Beaker
 
         opts = make_opts
         opts[:pooling_api] = nil
+        opts[:datacenter] = 'testdc'
 
         vcloud = Beaker::Vcloud.new( make_hosts, opts )
         allow( vcloud ).to receive( :require ).and_return( true )

data/spec/beaker/hypervisor/vmpooler_spec.rb

@@ -60,6 +60,42 @@ module Beaker
       end
     end
 
+    describe '#disk_added?' do
+      let(:vmpooler) { Beaker::Vmpooler.new(make_hosts, make_opts) }
+      let(:response_hash_no_disk) {
+        {
+          "ok" => "true",
+          "hostname" => {
+            "template"=>"redhat-7-x86_64",
+            "domain"=>"delivery.puppetlabs.net"
+          }
+        }
+      }
+      let(:response_hash_disk) {
+        {
+          "ok" => "true",
+          "hostname" => {
+            "disk" => [
+              '+16gb',
+              '+8gb'
+            ],
+            "template"=>"redhat-7-x86_64",
+            "domain"=>"delivery.puppetlabs.net"
+          }
+        }
+      }
+      it 'returns false when there is no disk' do
+        host = response_hash_no_disk['hostname']
+        expect(vmpooler.disk_added?(host, "8", 0)).to be(false)
+      end
+
+      it 'returns true when there is a disk' do
+        host = response_hash_disk["hostname"]
+        expect(vmpooler.disk_added?(host, "16", 0)).to be(true)
+        expect(vmpooler.disk_added?(host, "8", 1)).to be(true)
+      end
+    end
+
     describe "#provision" do
 
       it 'provisions hosts from the pool' do

data/spec/beaker/hypervisor/vsphere_helper_spec.rb

@@ -5,23 +5,21 @@ module Beaker
     let( :logger )         { double('logger').as_null_object }
     let( :vInfo )          { { :server => "vsphere.labs.net", :user => "vsphere@labs.com", :pass => "supersekritpassword" } }
     let( :vsphere_helper ) { VsphereHelper.new ( vInfo.merge( { :logger => logger } ) ) }
-    let( :snaplist )       { { 'snap1' => { 'snap1sub1' => nil , 
-                                            'snap1sub2' => nil }, 
+    let( :snaplist )       { { 'snap1' => { 'snap1sub1' => nil ,
+                                            'snap1sub2' => nil },
                                'snap2' => nil,
-                               'snap3' => { 'snap3sub1' => nil , 
+                               'snap3' => { 'snap3sub1' => nil ,
                                             'snap3sub2' => nil ,
                                             'snap3sub3' => nil } } }
-    let( :vms )            {  [ MockRbVmomiVM.new( 'mockvm1', snaplist ), 
-                                MockRbVmomiVM.new( 'mockvm2', snaplist ), 
+    let( :vms )            {  [ MockRbVmomiVM.new( 'mockvm1', snaplist ),
+                                MockRbVmomiVM.new( 'mockvm2', snaplist ),
                                 MockRbVmomiVM.new( 'mockvm3', snaplist ) ] }
 
-                                                
-
     before :each do
      stub_const( "RbVmomi", MockRbVmomi )
     end
 
-    describe "#load_config" do 
+    describe "#load_config" do
 
       it 'can load a .fog file' do
         allow( File ).to receive( :exists? ).and_return( true )
@@ -78,7 +76,9 @@ module Beaker
 
    describe "#find_datastore" do
      it 'finds the datastore from the connection object' do
-       expect(vsphere_helper.find_datastore( 'datastorename' ) ).to be === true
+       connection = vsphere_helper.instance_variable_get( :@connection )
+       dc = connection.serviceInstance.find_datacenter('testdc')
+       expect(vsphere_helper.find_datastore( dc,'datastorename' ) ).to be === true
      end
 
    end
@@ -86,8 +86,7 @@ module Beaker
    describe "#find_folder" do
      it 'can find a folder in the datacenter' do
        connection = vsphere_helper.instance_variable_get( :@connection )
-
-       expect(vsphere_helper.find_folder( 'root' ) ).to be === connection.serviceInstance.find_datacenter.vmFolder
+       expect(vsphere_helper.find_folder( 'testdc','root' ) ).to be === connection.serviceInstance.find_datacenter('testdc').vmFolder
      end
 
    end
@@ -95,26 +94,28 @@ module Beaker
    describe "#find_pool" do
      it 'can find a pool in a folder in the datacenter' do
        connection = vsphere_helper.instance_variable_get( :@connection )
-       connection.serviceInstance.find_datacenter.hostFolder = MockRbVmomi::VIM::Folder.new
-       connection.serviceInstance.find_datacenter.hostFolder.name = "/root"
+       dc = connection.serviceInstance.find_datacenter('testdc')
+       dc.hostFolder = MockRbVmomi::VIM::Folder.new
+       dc.hostFolder.name = "/root"
 
-       expect(vsphere_helper.find_pool( 'root' ) ).to be === connection.serviceInstance.find_datacenter.hostFolder
+       expect(vsphere_helper.find_pool( 'testdc','root' ) ).to be === connection.serviceInstance.find_datacenter('testdc').hostFolder
 
      end
      it 'can find a pool in a clustercomputeresource in the datacenter' do
        connection = vsphere_helper.instance_variable_get( :@connection )
-       connection.serviceInstance.find_datacenter.hostFolder = MockRbVmomi::VIM::ClusterComputeResource.new
-       connection.serviceInstance.find_datacenter.hostFolder.name = "/root"
-
-       expect(vsphere_helper.find_pool( 'root' ) ).to be === connection.serviceInstance.find_datacenter.hostFolder
+       dc = connection.serviceInstance.find_datacenter('testdc')
+       dc.hostFolder = MockRbVmomi::VIM::ClusterComputeResource.new
+       dc.hostFolder.name = "/root"
 
+       expect(vsphere_helper.find_pool( 'testdc','root' ) ).to be === connection.serviceInstance.find_datacenter('testdc').hostFolder
      end
      it 'can find a pool in a resourcepool in the datacenter' do
        connection = vsphere_helper.instance_variable_get( :@connection )
-       connection.serviceInstance.find_datacenter.hostFolder = MockRbVmomi::VIM::ResourcePool.new
-       connection.serviceInstance.find_datacenter.hostFolder.name = "/root"
+       dc = connection.serviceInstance.find_datacenter('testdc')
+       dc.hostFolder = MockRbVmomi::VIM::ResourcePool.new
+       dc.hostFolder.name = "/root"
 
-       expect(vsphere_helper.find_pool( 'root' ) ).to be === connection.serviceInstance.find_datacenter.hostFolder
+       expect(vsphere_helper.find_pool( 'testdc','root' ) ).to be === connection.serviceInstance.find_datacenter('testdc').hostFolder
      end
 
    end

data/spec/mock_vsphere.rb

@@ -183,7 +183,7 @@ class MockRbVmomiConnection
       @datacenter = Datacenter.new
     end
 
-    def find_datacenter
+    def find_datacenter dc
       @datacenter
     end
 
@@ -258,6 +258,7 @@ class MockRbVmomi
         self
       end
 
+
       def childEntity
         self
       end
@@ -266,6 +267,9 @@ class MockRbVmomi
         self
       end
 
+      def traverse path, type=Object, create=false
+        self
+      end
     end
 
     class ResourcePool

data/spec/mock_vsphere_helper.rb

@@ -160,15 +160,15 @@ class MockVsphereHelper
     nil
   end
 
-  def find_datastore datastore
+  def find_datastore dc,datastore
     datastore
   end
 
-  def find_pool pool
+  def find_pool dc,pool
     pool
   end
 
-  def find_folder folder
+  def find_folder dc,folder
     folder
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.15.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec