vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160113/eng-10269-test-stuff

@@ -0,0 +1,87 @@
+# HG changeset patch
+# Parent 6547dde950c57c1f4694245d8a41ab5a5a8b7d28
+improvements to tests for ENG-10269.  sighhhhhhh.  This will not be ready when the main patch is ready, just live with it.
+
+diff -r 6547dde950c5 lib/vagrant-skytap/action/read_state.rb
+--- a/lib/vagrant-skytap/action/read_state.rb	Wed Nov 25 18:56:41 2015 -0800
++++ b/lib/vagrant-skytap/action/read_state.rb	Mon Nov 30 11:51:41 2015 -0800
+@@ -17,6 +17,7 @@
+         end
+ 
+         def call(env)
++          debugger
+           env[:machine_state_id] = read_state(env[:machine])
+ 
+           @app.call(env)
+diff -r 6547dde950c5 spec/acceptance/provider/up_spec.rb
+--- a/spec/acceptance/provider/up_spec.rb	Wed Nov 25 18:56:41 2015 -0800
++++ b/spec/acceptance/provider/up_spec.rb	Mon Nov 30 11:51:41 2015 -0800
+@@ -19,6 +19,15 @@
+   it 'should bring up the machine and halt it' do
+     status("Test: machine can be brought up, parallel by default")
+     up_result = execute("vagrant", "up")
++
++    # up_result.stderr =~ /REST API call: PUT .*multiselect.*\[(.*)\]/
++    #    (byebug) $1
++    #    "\"7677382\""
++    # assert exactly one match with two separate ids
++    # could we make rest calls from this test? or get by without?
++    #multiselect should occur once
++    # vagrant status output?
++
+     expect(up_result).to exit_with(0)
+ 
+     status("Test: machine is running after up")
+@@ -30,6 +39,10 @@
+   it 'should bring up the machine and halt it' do
+     status("Test: machine can be brought up no parallel")
+     up_result = execute("vagrant", "up", "--no-parallel")
++
++#    up_result.stderr =~ /REST API call: PUT .*multiselect.*\[(.*)\]/
++    # assert no match
++
+     expect(up_result).to exit_with(0)
+ 
+     status("Test: machine is running after up")
+@@ -37,4 +50,10 @@
+     expect(echo_result).to exit_with(0)
+     expect(echo_result.stdout).to match(/foo\n$/)
+   end
++
++  # what else to test?
++  # 2 new vms. Provisioners should run on both.
++  # Only one runstate API call should be made by default.
++  # 2 vms, one new, one already running.
++  # Parallelness should be discernible in the output.
+ end
+diff -r 6547dde950c5 spec/acceptance/skeletons/generic/Vagrantfile
+--- a/spec/acceptance/skeletons/generic/Vagrantfile	Wed Nov 25 18:56:41 2015 -0800
++++ b/spec/acceptance/skeletons/generic/Vagrantfile	Mon Nov 30 11:51:41 2015 -0800
+@@ -2,14 +2,20 @@
+   config.vm.box = "skytap/empty"
+ 
+   config.vm.provider :skytap do |skytap, override|
+-    skytap.username = "user"
+-    skytap.api_token = "9999999999999999999999"
+-    skytap.base_url = "https://example.com/"
++    skytap.vm_url  = "/vms/7285844"
++    skytap.vpn_url = "/vpns/vpn-711360"
++#    skytap.vpn_url = "/vpns/vpn-3195669"
+   end
+ 
+-  config.vm.define "vm1" do |ubuntu|
+-    ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = "https://example.com/vms/1"
+-    end
++  config.vm.define "vm1" do |vm1|
++    vm1.ssh.username = "skytap"
++    vm1.ssh.password = "ChangeMe!"
++    vm1.vm.provision "shell", inline: "echo '****** HALLO EVERYONE this is vm1 ******'"
++  end
++
++  config.vm.define "vm2" do |vm2|
++    vm2.ssh.username = "skytap"
++    vm2.ssh.password = "ChangeMe!"
++    vm2.vm.provision "shell", inline: "echo '****** HALLO EVERYONE this is vm2 ******'"
+   end
+ end

data/_patches-20160113/eng-10269-wtf

@@ -0,0 +1,119 @@
+# HG changeset patch
+# Parent b774dc85ccd962a862c877e9a4c3fe3684c344e5
+ENG-10269 parallel halt operation
+
+diff -r b774dc85ccd9 lib/vagrant-skytap/action/fetch_environment.rb
+--- a/lib/vagrant-skytap/action/fetch_environment.rb	Mon Nov 16 15:45:01 2015 -0800
++++ b/lib/vagrant-skytap/action/fetch_environment.rb	Mon Nov 16 15:45:23 2015 -0800
+@@ -21,6 +21,7 @@
+               rescue Errors::DoesNotExist => ex
+                 @logger.info("Ignoring missing environment '#{props['url']}'.")
+               end
++              # env[:environment_fetched] = true # this might be useful, come back to it
+             end
+           end
+ 
+diff -r b774dc85ccd9 lib/vagrant-skytap/action/stop_vm.rb
+--- a/lib/vagrant-skytap/action/stop_vm.rb	Mon Nov 16 15:45:01 2015 -0800
++++ b/lib/vagrant-skytap/action/stop_vm.rb	Mon Nov 16 15:45:23 2015 -0800
+@@ -24,17 +24,36 @@
+         end
+ 
+         def call(env)
+-          vm = env[:environment].current_vm
+-          if env[:force_halt]
+-            vm.poweroff!
++          # Is this stale, I wonder?
++          case state = env[:machine_state_id]
++          when :not_created
++            env[:ui].info(I18n.t("vagrant_skytap.not_created"))
++          when :stopped
++            env[:ui].info(I18n.t("vagrant_skytap.already_status", :status => "stopped"))
++          when :suspended
++            if env[:force_halt]
++              stop = true
++            else
++              env[:ui].info(I18n.t("vagrant_skytap.cannot_halt_if_suspended"))
++            end
+           else
+-            begin
+-              vm.stop!
+-            rescue Errors::InstanceReadyTimeout
+-              @logger.info(I18n.t("vagrant_skytap.graceful_halt_vm_failed"))
++            stop = true
++          end
++
++          if stop
++            vm = env[:environment].current_vm
++            if env[:force_halt]
+               vm.poweroff!
++            else
++              begin
++                vm.stop!
++              rescue Errors::InstanceReadyTimeout
++                @logger.info(I18n.t("vagrant_skytap.graceful_halt_vm_failed"))
++                vm.poweroff!
++              end
+             end
+           end
++
+           @app.call(env)
+         end
+       end
+diff -r b774dc85ccd9 lib/vagrant-skytap/command/halt.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/command/halt.rb	Mon Nov 16 15:45:23 2015 -0800
+@@ -0,0 +1,41 @@
++require 'optparse'
++
++module VagrantPlugins
++  module Skytap
++    module Command
++      class Halt < Vagrant.plugin("2", :command)
++        def self.synopsis
++          "stops the vagrant machine (hi mom)"
++        end
++
++        def execute
++          options = {}
++          options[:force] = false
++
++          opts = OptionParser.new do |o|
++            o.banner = "Usage: vagrant halt [options] [name]"
++            o.separator ""
++            o.separator "Options:"
++            o.separator ""
++
++            o.on("-f", "--force", "Force shut down (equivalent of pulling power)") do |f|
++              options[:force] = f
++            end
++          end
++
++          # Parse the options
++          argv = parse_options(opts)
++          return if !argv
++
++          @logger.debug("Halt command: #{argv.inspect} #{options.inspect}")
++          with_target_vms(argv, reverse: true) do |vm|
++            vm.action(:halt, force_halt: options[:force])
++          end
++
++          # Success, exit status 0
++          0
++        end
++      end
++    end
++  end
++end
+diff -r b774dc85ccd9 locales/en.yml
+--- a/locales/en.yml	Mon Nov 16 15:45:01 2015 -0800
++++ b/locales/en.yml	Mon Nov 16 15:45:23 2015 -0800
+@@ -42,6 +42,8 @@
+       The environment could not be halted gracefully. Forcing halt.
+     graceful_halt_vm_failed: |-
+       The VM could not be halted gracefully. Forcing halt.
++    cannot_halt_if_suspended: |-
++      A suspended VM cannot be halted without the --force flag.
+ 
+     config:
+       username_required:

data/_patches-20160113/eng-10369

@@ -0,0 +1,143 @@
+# HG changeset patch
+# Parent d55067c6de25d1b7ff712f9a8a934dc122e82e14
+# Parent  d55067c6de25d1b7ff712f9a8a934dc122e82e14
+ENG-10369 Detect errors in 200 response.
+
+diff -r d55067c6de25 Vagrantfile
+--- a/Vagrantfile	Mon Nov 09 18:52:55 2015 -0800
++++ b/Vagrantfile	Tue Nov 10 15:32:33 2015 -0800
+@@ -3,20 +3,20 @@
+   config.vm.synced_folder ".", "/vagrant", disabled: true
+ 
+   config.vm.provider :skytap do |skytap, override|
+-    skytap.username = "etrue"
+-    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
+-    skytap.base_url = "https://cloud.skytap.com/"
+-    #skytap.username = "vagrant_provider_admin"
+-    #skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
+-    #skytap.base_url = "https://test.skytap.com/"
++#    skytap.username = "etrue"
++#    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
++#    skytap.base_url = "https://cloud.skytap.com/"
++    skytap.username = "vagrant_provider_admin"
++    skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
++    skytap.base_url = "https://test.skytap.com/"
+     #skytap.username = "jsmith"
+     #skytap.api_token = "754be5220955f35840498340606b4dfa89f7eb61"
+     #skytap.base_url = "https://cloud.skytap.dev/"
+   end
+ 
+-  GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
++#  GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
+   # for test user
+-  #GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/4840008'
++  GENERIC_UBUNTU = 'https://test.skytap.com/vms/4840008'
+   # local user
+   #GENERIC_UBUNTU = 'https://cloud.skytap.dev/vms/374'
+ 
+@@ -33,6 +33,8 @@
+   UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A = "https://cloud.skytap.com/vms/7457184"
+   UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B = "https://cloud.skytap.com/vms/7468766"
+ 
++  VAGRANT_CUSTOMER_VPN = "https://cloud.skytap.com/vpns/vpn-3195669"
++
+   # separate template
+   # another ubuntu  = 'https://cloud.skytap.com/vms/7242466'
+   WINDOWS_WINRM_CONFIGURED = 'https://cloud.skytap.com/vms/7242468'
+@@ -40,12 +42,13 @@
+   config.vm.define "vm1" do |ubuntu|
+     ubuntu.vm.hostname = "vm1"
+     ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = UBUNTU1#GENERIC_UBUNTU
++      box.vm_url = GENERIC_UBUNTU
+       #box.cpus = 1
+       #box.cpuspersocket = 1
+       #box.ram = 1024
+       #box.guestos = "ubuntu"
+       #box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
++      box.vpn_url = VAGRANT_CUSTOMER_VPN
+     end
+     ubuntu.vm.synced_folder "vm1", "/synced", type: :nfs
+     ubuntu.vm.communicator = :ssh
+diff -r d55067c6de25 lib/vagrant-skytap/api/busyable.rb
+--- a/lib/vagrant-skytap/api/busyable.rb	Mon Nov 09 18:52:55 2015 -0800
++++ b/lib/vagrant-skytap/api/busyable.rb	Tue Nov 10 15:32:33 2015 -0800
+@@ -10,6 +10,7 @@
+         def update_with_retry(attrs, path=nil)
+           retry_while_resource_busy do
+             resp = api_client.put(path || url, JSON.dump(attrs))
++            raise Errors::OperationFailed, err: err if err = api_client.error_string_from_body(resp)
+             refresh(JSON.load(resp.body))
+             break
+           end
+diff -r d55067c6de25 lib/vagrant-skytap/api/client.rb
+--- a/lib/vagrant-skytap/api/client.rb	Mon Nov 09 18:52:55 2015 -0800
++++ b/lib/vagrant-skytap/api/client.rb	Tue Nov 10 15:32:33 2015 -0800
+@@ -96,7 +96,7 @@
+         def error_string_from_body(resp)
+           resp = resp.body if resp.respond_to?(:body)
+           begin
+-            resp = JSON.load(resp)
++            resp = JSON.load(resp) unless resp.is_a?(Hash)
+             errors = resp['error'] || resp['errors']
+             errors = errors.join('; ') if errors.respond_to? :join
+           rescue
+diff -r d55067c6de25 lib/vagrant-skytap/api/runstate_operations.rb
+--- a/lib/vagrant-skytap/api/runstate_operations.rb	Mon Nov 09 18:52:55 2015 -0800
++++ b/lib/vagrant-skytap/api/runstate_operations.rb	Tue Nov 10 15:32:33 2015 -0800
+@@ -36,12 +36,18 @@
+         def wait_for_runstate(expected_runstate)
+           expected_runstate = expected_runstate.to_s
+           retry_while_resource_busy do
+-            unless reload.busy?
++            unless reload_with_error_handling.busy?
+               break if runstate == expected_runstate || expected_runstate == 'ready'
+             end
+           end
+         end
+ 
++        def reload_with_error_handling
++          reload.tap do |ret|
++            raise Errors::OperationFailed, err: err if err = api_client.error_string_from_body(attrs)
++          end
++        end
++
+         def runstate
+           get_api_attribute('runstate')
+         end
+diff -r d55067c6de25 lib/vagrant-skytap/api/vm.rb
+--- a/lib/vagrant-skytap/api/vm.rb	Mon Nov 09 18:52:55 2015 -0800
++++ b/lib/vagrant-skytap/api/vm.rb	Tue Nov 10 15:32:33 2015 -0800
+@@ -20,12 +20,6 @@
+             resp = env[:api_client].get(url)
+             new(JSON.load(resp.body), env[:environment], env)
+           end
+-
+-          def current_vm(env)
+-            if (environment = env[:environment]) && (machine = env[:machine]) && machine.id
+-              environment.get_vm_by_id(machine.id)
+-            end
+-          end
+         end
+ 
+         def initialize(attrs, environment, env)
+@@ -40,6 +34,19 @@
+           super
+         end
+ 
++        def refresh_from_environment
++          refresh(environment.get_vm_by_id(id).attrs)
++        end
++
++        def reload_with_error_handling
++          environment.reload_with_error_handling
++          refresh_from_environment.tap do |ret|
++            if err = api_client.error_string_from_body(attrs)
++              raise Errors::OperationFailed, err: err
++            end
++          end
++        end
++
+         def interfaces
+           @interfaces ||= (get_api_attribute('interfaces') || []).collect do |iface_attrs|
+             Interface.new(iface_attrs, self, env)

data/_patches-20160113/eng-10369-tmp

@@ -0,0 +1,60 @@
+# HG changeset patch
+# Parent d5f0a5fe77ec4a2935c018a0687deddad1a951c7
+diff -r d5f0a5fe77ec -r c9b0b1d64a0a lib/vagrant-skytap/api/client.rb
+--- a/lib/vagrant-skytap/api/client.rb	Mon Nov 09 19:28:06 2015 -0800
++++ b/lib/vagrant-skytap/api/client.rb	Mon Nov 09 19:46:14 2015 -0800
+@@ -67,11 +67,7 @@
+             tries += 1
+             http.send_request(method, URI.encode(path), body, headers).tap do |ret|
+               @logger.debug("REST API response: #{ret.body}")
+-              if ret.code =~ /^2\d\d/
+-                if options[:raise_on_error_field] && err = error_string_from_body(ret)
+-                  raise Errors::OperationSucceededWithErrors, err: err
+-                end
+-              else
++              unless ret.code =~ /^2\d\d/
+                 raise Errors::DoesNotExist, object_name: "Object '#{path}'" if ret.code == '404'
+                 error_class = case ret.code
+                 when '403'
+diff -r d5f0a5fe77ec -r c9b0b1d64a0a lib/vagrant-skytap/api/resource.rb
+--- a/lib/vagrant-skytap/api/resource.rb	Mon Nov 09 19:28:06 2015 -0800
++++ b/lib/vagrant-skytap/api/resource.rb	Mon Nov 09 19:46:14 2015 -0800
+@@ -23,8 +23,8 @@
+           "/#{self.class.resource_name.downcase}s/#{id}"
+         end
+ 
+-        def reload(options={})
+-          resp = api_client.get(url, options)
++        def reload
++          resp = api_client.get(url)
+           refresh(JSON.load(resp.body))
+         end
+ 
+@@ -33,6 +33,14 @@
+           self
+         end
+ 
++        def error?
++          error.present?
++        end
++
++        def error
++          api_client.error_string_from_body(attrs)
++        end
++
+         private
+ 
+         def api_client
+diff -r d5f0a5fe77ec -r c9b0b1d64a0a lib/vagrant-skytap/api/runstate_operations.rb
+--- a/lib/vagrant-skytap/api/runstate_operations.rb	Mon Nov 09 19:28:06 2015 -0800
++++ b/lib/vagrant-skytap/api/runstate_operations.rb	Mon Nov 09 19:46:14 2015 -0800
+@@ -43,7 +43,8 @@
+         end
+ 
+         def reload_with_error_handling
+-          reload(raise_on_error_field: true)
++          reload
++          raise Errors::OperationSucceededWithErrors, err: error if error
+         end
+ 
+         def runstate

data/_patches-20160113/eng-10919

@@ -0,0 +1,56 @@
+# HG changeset patch
+# Parent 5e38cb4ec26e32e78ff52c68649daacdcafb0b3d
+ENG-10919 handle SIGINT in api_client
+
+diff -r 5e38cb4ec26e lib/vagrant-skytap/action/initialize_api_client.rb
+--- a/lib/vagrant-skytap/action/initialize_api_client.rb	Tue Oct 20 12:34:52 2015 -0700
++++ b/lib/vagrant-skytap/action/initialize_api_client.rb	Tue Oct 20 12:35:29 2015 -0700
+@@ -17,7 +17,7 @@
+         def call(env)
+           @logger.info("Connecting to Skytap...")
+ 
+-          client = API::Client.new(env[:machine].provider_config)
++          client = API::Client.new(env[:machine].provider_config, env)
+           if client.get('/configurations').code == '200'
+             env[:api_client] = client
+           end
+diff -r 5e38cb4ec26e lib/vagrant-skytap/api/busyable.rb
+--- a/lib/vagrant-skytap/api/busyable.rb	Tue Oct 20 12:34:52 2015 -0700
++++ b/lib/vagrant-skytap/api/busyable.rb	Tue Oct 20 12:35:29 2015 -0700
+@@ -19,7 +19,7 @@
+           begin
+             Timeout.timeout(timeout) do
+               loop do
+-                break if env[:interrupted] # is this right?
++                break if env[:interrupted]
+                 begin
+                   yield
+                 rescue Errors::ResourceBusy
+diff -r 5e38cb4ec26e lib/vagrant-skytap/api/client.rb
+--- a/lib/vagrant-skytap/api/client.rb	Tue Oct 20 12:34:52 2015 -0700
++++ b/lib/vagrant-skytap/api/client.rb	Tue Oct 20 12:35:29 2015 -0700
+@@ -4,13 +4,14 @@
+   module Skytap
+     module API
+       class Client
+-        attr_reader :config, :http
++        attr_reader :config, :http, :env
+ 
+         MAX_RATE_LIMIT_RETRIES = 3
+         DEFAULT_RETRY_AFTER_SECONDS = 10
+ 
+-        def initialize(config)
++        def initialize(config, env)
+           @logger = Log4r::Logger.new("vagrant_skytap::api_client")
++          @env = env
+ 
+           @config = config
+           uri = URI.parse(config.base_url)
+@@ -65,6 +66,7 @@
+           retry_after = DEFAULT_RETRY_AFTER_SECONDS
+           begin
+             tries += 1
++            break if env[:interrupted]
+             http.send_request(method, URI.encode(path), body, headers).tap do |ret|
+               unless ret.code =~ /^2\d\d/
+                 raise Errors::DoesNotExist, object_name: "Object '#{path}'" if ret.code == '404'

data/_patches-20160113/eng-11177-fix-actions-requires

@@ -0,0 +1,44 @@
+# HG changeset patch
+# Parent 31f40af2f5bd2a0dd1fbb21d3f00e34333866824
+ENG-11177 fix 'require's
+
+diff -r 31f40af2f5bd lib/vagrant-skytap/action/add_vm_to_environment.rb
+--- a/lib/vagrant-skytap/action/add_vm_to_environment.rb	Tue Oct 20 13:54:33 2015 -0700
++++ b/lib/vagrant-skytap/action/add_vm_to_environment.rb	Tue Oct 20 13:56:31 2015 -0700
+@@ -1,7 +1,4 @@
+ require 'log4r'
+-require 'json'
+-require 'vagrant-skytap/setup_helper'
+-
+ 
+ module VagrantPlugins
+   module Skytap
+diff -r 31f40af2f5bd lib/vagrant-skytap/action/create_environment.rb
+--- a/lib/vagrant-skytap/action/create_environment.rb	Tue Oct 20 13:54:33 2015 -0700
++++ b/lib/vagrant-skytap/action/create_environment.rb	Tue Oct 20 13:56:31 2015 -0700
+@@ -1,16 +1,7 @@
+ require 'log4r'
+-require 'json'
+-
+-require 'vagrant-skytap/setup_helper'
+ require 'vagrant-skytap/util/timer'
+ require 'vagrant-skytap/api/environment'
+ 
+-require 'net/https'
+-require 'uri'
+-require 'base64'
+-require 'json'
+-require 'timeout'
+-
+ module VagrantPlugins
+   module Skytap
+     module Action
+diff -r 31f40af2f5bd lib/vagrant-skytap/action/delete_environment.rb
+--- a/lib/vagrant-skytap/action/delete_environment.rb	Tue Oct 20 13:54:33 2015 -0700
++++ b/lib/vagrant-skytap/action/delete_environment.rb	Tue Oct 20 13:56:31 2015 -0700
+@@ -1,3 +1,5 @@
++require 'log4r'
++
+ module VagrantPlugins
+   module Skytap
+     module Action

data/_patches-20160113/eng-11442

@@ -0,0 +1,4 @@
+# HG changeset patch
+# Parent ba71fe2c4ceae94483de98f66c12c847759ec956
+ENG-11442 Vagrant provider: speed up the environment creation by adding multiple VMs before starting them
+