beaker-vmpooler 0.2.0 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTM4OWFjZjExMGE1ZTAzMmRlNjEzZjRjNGE1MjFmOTc2NDc2MWM5Yw==
+    M2U4YmFhNjE0OTE4MzZkN2RhNWEzYWZlNGUxYjVmNjhhMGE3NDBjMQ==
   data.tar.gz: !binary |-
-    MWE1ZjU5NDRhMmNhMmUyOTdkZjg1NjhiMDRiMGUxMWVlNDMxN2ExZA==
+    OTU2MjlmNjRmNzg5Zjk4YmYzZmZlZGMyZWZjMjk5YmYyMmVjYzhkNQ==
 SHA512:
   metadata.gz: !binary |-
-    MjE4ZDgxZjA1ZTc1ZTg2ZjllMjgxZWEwNjliNDc4MjM4MDRmMzBkYTIxM2E2
-    MzVmNzQwZjM5MGViNDBjNzdhYzZkZjVjNDZjMzQ1MzlhZTQ1Yjg3M2FkMmJi
-    MGQ2MWVmMzlmNWU0ZTVkZGNiNmUxZDM2YTJhYTUzOTlkM2MxMGI=
+    NmVjYWYxODI2NDIyYzc2YzE4ZWUzZGNlZmMyNmQyMTliYzZhZTU0MzFmYTkx
+    ZDNiMTVkMjFiZTQzZGQ5YjgyMGFjNDUwNjIzMzc0MWM0YWViYmExNTgwY2Mz
+    NWYzNTQ1NzQwMzU1Y2IxMDI0MWFiMTFlMzc1OTllYjFhMmRmNTU=
   data.tar.gz: !binary |-
-    Nzg5YmNiOWFkOTRlODYxZGYyNzUxMTY1NmUwNGZlNDg0NGQwYmExN2E3ZTY4
-    MDc1ZGRkNjY4MTRlNmZjYTllYzIwYjliMmFhZGI3NGMxMGQ3MTRhNWYwYWZm
-    NzZiMDJkZTQxNDJmMWI2NGM2YWZjZjNiZWVjNTdmMGYxZDFkYWM=
+    OGM2ODE3YmM5OGQ2ZWRlMWI3YmIwODM2ZTEyODllNWRiODZhYzQ4NDIyYzZm
+    MzYwZTk0YWM4ZTJlY2VhOGI2NzI1MTZlZDczMWZhYjRlMTE4YzgzNjJkNTYz
+    ZjEwNGM5YjRkZTA4NDM1ODhkY2M3N2YzOTVhZjIzZDQ2MThjYmE=

data/beaker-vmpooler.gemspec

@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
 
   # Run time dependencies
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
-  s.add_runtime_dependency 'rbvmomi', '~> 1.9'
 
 end
 

data/lib/beaker-vmpooler/version.rb

@@ -1,3 +1,3 @@
 module BeakerVmpooler
-  VERSION = '0.2.0'
+  VERSION = '1.0.0'
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'simplecov'
 require 'rspec/its'
 require 'beaker'
 require 'beaker/hypervisor/vmpooler'
-require 'beaker/hypervisor/vcloud'
 
 # setup & require beaker's spec_helper.rb
 beaker_gem_spec = Gem::Specification.find_by_name('beaker')
@@ -14,4 +13,4 @@ require File.join(beaker_spec_path, 'spec_helper.rb')
 RSpec.configure do |config|
   config.include TestFileHelpers
   config.include HostHelpers
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -150,20 +150,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.0
-- !ruby/object:Gem::Dependency
-  name: rbvmomi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.9'
 description: For use for the Beaker acceptance testing tool
 email:
 - rishi.javia@puppet.com, kevin.imber@puppet.com, tony.vu@puppet.com
@@ -182,9 +168,7 @@ files:
 - beaker-vmpooler.gemspec
 - bin/beaker-vmpooler
 - lib/beaker-vmpooler/version.rb
-- lib/beaker/hypervisor/vcloud.rb
 - lib/beaker/hypervisor/vmpooler.rb
-- spec/beaker/hypervisor/vcloud_spec.rb
 - spec/beaker/hypervisor/vmpooler_spec.rb
 - spec/spec_helper.rb
 - vmpooler.md

data/lib/beaker/hypervisor/vcloud.rb

@@ -1,238 +0,0 @@
-require 'yaml' unless defined?(YAML)
-require 'beaker/hypervisor/vmpooler'
-
-module Beaker
-  class Vcloud < Beaker::Hypervisor
-
-    def self.new(vcloud_hosts, options)
-      if options['pooling_api']
-        Beaker::Vmpooler.new(vcloud_hosts, options)
-      else
-        super
-      end
-    end
-
-    def initialize(vcloud_hosts, options)
-      @options = options
-      @logger = options[:logger]
-      @hosts = vcloud_hosts
-
-      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
-
-    def connect_to_vsphere
-      @logger.notify "Connecting to vSphere at #{@vsphere_credentials[:server]}" +
-        " with credentials for #{@vsphere_credentials[:user]}"
-
-      @vsphere_helper = VsphereHelper.new( @vsphere_credentials )
-    end
-
-    def wait_for_dns_resolution host, try, attempts
-      @logger.notify "Waiting for #{host['vmhostname']} DNS resolution"
-      begin
-        Socket.getaddrinfo(host['vmhostname'], nil)
-      rescue
-        if try <= attempts
-          sleep 5
-          try += 1
-
-          retry
-        else
-          raise "DNS resolution failed after #{@options[:timeout].to_i} seconds"
-        end
-      end
-    end
-
-    def booting_host host, try, attempts
-      @logger.notify "Booting #{host['vmhostname']} (#{host.name}) and waiting for it to register with vSphere"
-      until
-        @vsphere_helper.find_vms(host['vmhostname'])[host['vmhostname']].summary.guest.toolsRunningStatus == 'guestToolsRunning' and
-        @vsphere_helper.find_vms(host['vmhostname'])[host['vmhostname']].summary.guest.ipAddress != nil
-        if try <= attempts
-          sleep 5
-          try += 1
-        else
-          raise "vSphere registration failed after #{@options[:timeout].to_i} seconds"
-        end
-      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(
-        :annotation =>
-          'Base template:  ' + host['template'] + "\n" +
-          'Creation time:  ' + Time.now.strftime("%Y-%m-%d %H:%M") + "\n\n" +
-          'CI build link:  ' + ( ENV['BUILD_URL'] || 'Deployed independently of CI' ) +
-          'department:     ' + @options[:department] +
-          'project:        ' + @options[:project],
-        :extraConfig => [
-          { :key   => 'guestinfo.hostname',
-            :value => host['vmhostname']
-          }
-        ]
-      )
-
-      # Are we using a customization spec?
-      customizationSpec = @vsphere_helper.find_customization( host['template'] )
-
-      if customizationSpec
-        # Print a logger message if using a customization spec
-        @logger.notify "Found customization spec for '#{host['template']}', will apply after boot"
-      end
-
-      # Put the VM in the specified folder and resource pool
-      relocateSpec = RbVmomi::VIM.VirtualMachineRelocateSpec(
-        :datastore    => @vsphere_helper.find_datastore(@options['datacenter'],@options['datastore']),
-        :pool         => @options['resourcepool'] ? @vsphere_helper.find_pool(@options['datacenter'],@options['resourcepool']) : nil,
-        :diskMoveType => :moveChildMostDiskBacking
-      )
-
-      # Create a clone spec
-      spec = RbVmomi::VIM.VirtualMachineCloneSpec(
-        :config        => configSpec,
-        :location      => relocateSpec,
-        :customization => customizationSpec,
-        :powerOn       => true,
-        :template      => false
-      )
-      spec
-    end
-
-    def provision
-      connect_to_vsphere
-      begin
-
-        try = 1
-        attempts = @options[:timeout].to_i / 5
-
-        start = Time.now
-        tasks = []
-        @hosts.each_with_index do |h, i|
-          if h['name']
-            h['vmhostname'] = h['name']
-          else
-            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
-          end
-
-          @logger.notify "Deploying #{h['vmhostname']} (#{h.name}) to #{@options['folder']} from template '#{h['template']}'"
-
-          vm = {}
-
-          if templatefolders
-            vm[h['template']] = @vsphere_helper.find_folder(@options['datacenter'],templatefolders.join('/')).find(h['template'])
-          else
-            vm = @vsphere_helper.find_vms(h['template'])
-          end
-
-          if vm.length == 0
-            raise "Unable to find template '#{h['template']}'!"
-          end
-
-          spec = create_clone_spec(h)
-
-          # Deploy from specified template
-          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)
-
-        try = (Time.now - start) / 5
-        duration = run_and_report_duration do
-          @hosts.each_with_index do |h, i|
-            booting_host(h, try, attempts)
-          end
-        end
-        @logger.notify "Spent %.2f seconds booting and waiting for vSphere registration" % duration
-
-        try = (Time.now - start) / 5
-        duration = run_and_report_duration do
-          @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
-      @logger.notify "Destroying vCloud boxes"
-      connect_to_vsphere
-
-      vm_names = @hosts.map {|h| h['vmhostname'] }.compact
-      if @hosts.length != vm_names.length
-        @logger.warn "Some hosts did not have vmhostname set correctly! This likely means VM provisioning was not successful"
-      end
-      vms = @vsphere_helper.find_vms vm_names
-      begin
-        vm_names.each do |name|
-          unless vm = vms[name]
-            @logger.warn "Unable to cleanup #{name}, couldn't find VM #{name} in vSphere!"
-            next
-          end
-
-          if vm.runtime.powerState == 'poweredOn'
-            @logger.notify "Shutting down #{vm.name}"
-            duration = run_and_report_duration do
-              vm.PowerOffVM_Task.wait_for_completion
-            end
-            @logger.notify "Spent %.2f seconds halting #{vm.name}" % duration
-          end
-
-          duration = run_and_report_duration do
-            vm.Destroy_Task
-          end
-          @logger.notify "Spent %.2f seconds destroying #{vm.name}" % duration
-
-        end
-      rescue RbVmomi::Fault => ex
-        if ex.fault.is_a?(RbVmomi::VIM::ManagedObjectNotFound)
-          #it's already gone, don't bother trying to delete it
-          name = vms.key(ex.fault.obj)
-          vms.delete(name)
-          vm_names.delete(name)
-          @logger.warn "Unable to destroy #{name}, it was not found in vSphere"
-          retry
-        end
-      end
-      @vsphere_helper.close
-    end
-
-  end
-end

data/spec/beaker/hypervisor/vcloud_spec.rb

@@ -1,79 +0,0 @@
-require 'spec_helper'
-
-module Beaker
-  describe Vcloud do
-
-    before :each do
-      MockVsphereHelper.set_config( fog_file_contents )
-      MockVsphereHelper.set_vms( make_hosts() )
-     stub_const( "VsphereHelper", MockVsphereHelper )
-     stub_const( "Net", MockNet )
-      json = double( 'json' )
-      allow( json ).to receive( :parse ) do |arg|
-        arg
-      end
-     stub_const( "JSON", json )
-      allow( Socket ).to receive( :getaddrinfo ).and_return( true )
-    end
-
-    describe "#provision" do
-
-      it 'instantiates vmpooler if pooling api is provided' do
-        opts = make_opts
-        opts[:pooling_api] = 'testpool'
-        hypervisor = Beaker::Vcloud.new( make_hosts, opts)
-        expect( hypervisor.class ).to be Beaker::Vmpooler
-      end
-
-      it 'provisions hosts and add them to the pool' do
-        MockVsphereHelper.powerOff
-
-        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 )
-        allow( vcloud ).to receive( :sleep ).and_return( true )
-        vcloud.provision
-
-        hosts = vcloud.instance_variable_get( :@hosts )
-        hosts.each do | host |
-          name = host['vmhostname']
-          vm = MockVsphereHelper.find_vm( name )
-          expect( vm.toolsRunningStatus ).to be === "guestToolsRunning"
-        end
-
-      end
-
-    end
-
-    describe "#cleanup" do
-
-      it "cleans up hosts not in the pool" do
-        MockVsphereHelper.powerOn
-
-        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 )
-        allow( vcloud ).to receive( :sleep ).and_return( true )
-        vcloud.provision
-        vcloud.cleanup
-
-        hosts = vcloud.instance_variable_get( :@hosts )
-        vm_names = hosts.map {|h| h['vmhostname'] }.compact
-        vm_names.each do | name |
-          vm = MockVsphereHelper.find_vm( name )
-          expect( vm.runtime.powerState ).to be === "poweredOff"
-        end
-
-      end
-
-    end
-
-  end
-
-end