vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160113/eng-11616

@@ -0,0 +1,403 @@
+# HG changeset patch
+# Parent c24fb4f0f929782eb6188401fe2bc1066e4dc9b6
+# Parent  c24fb4f0f929782eb6188401fe2bc1066e4dc9b6
+ENG-11616 refactoring "up"
+
+diff -r c24fb4f0f929 lib/vagrant-skytap/action.rb
+--- a/lib/vagrant-skytap/action.rb	Mon Nov 16 15:28:30 2015 -0800
++++ b/lib/vagrant-skytap/action.rb	Tue Nov 17 12:09:41 2015 -0800
+@@ -9,9 +9,7 @@
+       # This action is called to halt the remote machine.
+       def self.action_halt
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use ConfigValidate
+-          b.use InitializeAPIClient
+-          b.use FetchEnvironment
++          b.use action_initialize
+           b.use Call, ExistenceCheck do |env1, b1|
+             case result = env1[:result]
+             when :missing_environment, :missing_vm, :no_vms
+@@ -26,9 +24,7 @@
+       # This action is called to suspend the remote machine.
+       def self.action_suspend
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use ConfigValidate
+-          b.use InitializeAPIClient
+-          b.use FetchEnvironment
++          b.use action_initialize
+           b.use Call, ExistenceCheck do |env1, b1|
+             case result = env1[:result]
+             when :missing_environment, :missing_vm, :no_vms
+@@ -43,9 +39,7 @@
+       # This action is called to terminate the remote machine.
+       def self.action_destroy
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use ConfigValidate
+-          b.use InitializeAPIClient
+-          b.use FetchEnvironment
++          b.use action_initialize
+           b.use Call, ExistenceCheck do |env, b1|
+             case existence_state = env[:result]
+             when :missing_environment, :no_vms
+@@ -79,9 +73,7 @@
+       # This action is called when `vagrant provision` is called.
+       def self.action_provision
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use ConfigValidate
+-          b.use InitializeAPIClient
+-          b.use FetchEnvironment
++          b.use action_initialize
+           b.use Call, ExistenceCheck do |env, b1|
+             case result = env[:result]
+             when :missing_environment, :missing_vm, :no_vms
+@@ -115,9 +107,7 @@
+       # key.
+       def self.action_read_ssh_info
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use ConfigValidate
+-          b.use InitializeAPIClient
+-          b.use FetchEnvironment
++          b.use action_initialize
+           b.use ReadSSHInfo
+         end
+       end
+@@ -127,9 +117,7 @@
+       # key.
+       def self.action_read_state
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use ConfigValidate
+-          b.use InitializeAPIClient
+-          b.use FetchEnvironment
++          b.use action_initialize
+           #TODO:NLA Can this whole action be removed?
+           b.use ReadState
+         end
+@@ -138,9 +126,7 @@
+       # This action is called to SSH into the machine.
+       def self.action_ssh
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use ConfigValidate
+-          b.use InitializeAPIClient
+-          b.use FetchEnvironment
++          b.use action_initialize
+           b.use Call, ExistenceCheck do |env1, b1|
+             case result = env1[:result]
+             when :missing_environment, :missing_vm, :no_vms
+@@ -154,9 +140,7 @@
+ 
+       def self.action_ssh_run
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use ConfigValidate
+-          b.use InitializeAPIClient
+-          b.use FetchEnvironment
++          b.use action_initialize
+           b.use Call, ExistenceCheck do |env1, b1|
+             case result = env1[:result]
+             when :missing_environment, :missing_vm, :no_vms
+@@ -184,26 +168,37 @@
+         end
+       end
+ 
+-      # This action is called to bring the box up from nothing.
+-      def self.action_up
++      def self.action_create_vm
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use HandleBox
+-          b.use ConfigValidate
+-          b.use InitializeAPIClient
+-          b.use FetchEnvironment
+           b.use Call, ExistenceCheck do |env, b1|
+             case result = env[:result]
+             when :missing_environment
+               b1.use CreateEnvironment
+-              b1.use MessageEnvironmentUrl
+             when :no_vms, :missing_vm
+               b1.use AddVmToEnvironment
+             else
+               next
+             end
++
++            # FetchSourceVm
++            # FetchTargetEnvironment
++            # CheckSuitability
++              # if environment exists, checks region mismatch
++
+             b1.use StoreExtraData
+-            b1.use SetUpVm
++            b1.use SetRouting
++            b1.use SetCredentials
+           end
++        end
++      end
++
++      # This action is called to bring the box up from nothing.
++      def self.action_up
++        Vagrant::Action::Builder.new.tap do |b|
++          b.use HandleBox
++          b.use action_initialize
++          b.use action_create_vm
++
+           b.use Call, IsRunning do |env, b1|
+             if env[:result]
+               b1.use MessageAlreadyRunning
+@@ -226,9 +221,7 @@
+ 
+       def self.action_reload
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use ConfigValidate
+-          b.use InitializeAPIClient
+-          b.use FetchEnvironment
++          b.use action_initialize
+           b.use Call, ExistenceCheck do |env, b2|
+             case env[:result]
+             when :missing_environment, :missing_vm, :no_vms
+@@ -241,6 +234,17 @@
+         end
+       end
+ 
++      def self.action_initialize
++        Vagrant::Action::Builder.new.tap do |b|
++          b.use ConfigValidate
++          b.use InitializeAPIClient
++          b.use FetchEnvironment
++          b.use ReadState
++          # Can we make this Callable and do ExistenceCheck on the
++          # block? It's a logical unit almost everywhere.
++        end
++      end
++
+       # The autoload farm
+       action_root = Pathname.new(File.expand_path("../action", __FILE__))
+       autoload :StoreExtraData, action_root.join("store_extra_data")
+@@ -265,8 +269,9 @@
+       autoload :ReadState, action_root.join("read_state")
+       autoload :RunEnvironment, action_root.join("run_environment")
+       autoload :RunVm, action_root.join("run_vm")
++      autoload :SetCredentials, action_root.join("set_credentials")
+       autoload :SetHostname, action_root.join("set_hostname")
+-      autoload :SetUpVm, action_root.join("set_up_vm")
++      autoload :SetRouting, action_root.join("set_routing")
+       autoload :StopVm, action_root.join("stop_vm")
+       autoload :SuspendVm, action_root.join("suspend_vm")
+       autoload :TimedProvision, action_root.join("timed_provision") # some plugins now expect this action to exist
+diff -r c24fb4f0f929 lib/vagrant-skytap/action/create_environment.rb
+--- a/lib/vagrant-skytap/action/create_environment.rb	Mon Nov 16 15:28:30 2015 -0800
++++ b/lib/vagrant-skytap/action/create_environment.rb	Tue Nov 17 12:09:41 2015 -0800
+@@ -30,6 +30,7 @@
+           env[:environment] = environment
+           environment.properties.write('url' => environment.url)
+           env[:machine].id = environment.vms.first.id
++          env[:ui].info(I18n.t("vagrant_skytap.environment_url", url: environment.url))
+           environment.wait_until_ready
+ 
+           @app.call(env)
+diff -r c24fb4f0f929 lib/vagrant-skytap/action/message_environment_url.rb
+--- a/lib/vagrant-skytap/action/message_environment_url.rb	Mon Nov 16 15:28:30 2015 -0800
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,16 +0,0 @@
+-module VagrantPlugins
+-  module Skytap
+-    module Action
+-      class MessageEnvironmentUrl
+-        def initialize(app, env)
+-          @app = app
+-        end
+-
+-        def call(env)
+-          env[:ui].info(I18n.t("vagrant_skytap.environment_url", url: env[:environment].url))
+-          @app.call(env)
+-        end
+-      end
+-    end
+-  end
+-end
+diff -r c24fb4f0f929 lib/vagrant-skytap/action/read_state.rb
+--- a/lib/vagrant-skytap/action/read_state.rb	Mon Nov 16 15:28:30 2015 -0800
++++ b/lib/vagrant-skytap/action/read_state.rb	Tue Nov 17 12:09:41 2015 -0800
+@@ -22,14 +22,10 @@
+           @app.call(env)
+         end
+ 
++        # Assumes FetchEnvironment was called to populate env[:environment].
+         def read_state(machine)
+-          if VmProperties.read(machine.data_dir)
+-            if environment = env[:environment]
+-              environment.reload
+-            elsif props = API::Environment.properties(env)
+-              @logger.info("env[:environment] was not set!")
+-            end
+-
++          if environment = env[:environment]
++            environment.reload
+             if vm = environment.try(:current_vm)
+               return vm.runstate.to_sym
+             end
+diff -r c24fb4f0f929 lib/vagrant-skytap/action/set_credentials.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/action/set_credentials.rb	Tue Nov 17 12:09:41 2015 -0800
+@@ -0,0 +1,20 @@
++require 'log4r'
++require 'vagrant-skytap/setup_helper'
++
++module VagrantPlugins
++  module Skytap
++    module Action
++      class SetCredentials
++        def initialize(app, env)
++          @app = app
++          @logger = Log4r::Logger.new("vagrant_skytap::action::set_credentials")
++        end
++
++        def call(env)
++          SetupHelper.new(env).set_credentials
++          @app.call(env)
++        end
++      end
++    end
++  end
++end
+diff -r c24fb4f0f929 lib/vagrant-skytap/action/set_routing.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/action/set_routing.rb	Tue Nov 17 12:09:41 2015 -0800
+@@ -0,0 +1,20 @@
++require 'log4r'
++require 'vagrant-skytap/setup_helper'
++
++module VagrantPlugins
++  module Skytap
++    module Action
++      class SetRouting
++        def initialize(app, env)
++          @app = app
++          @logger = Log4r::Logger.new("vagrant_skytap::action::set_routing")
++        end
++
++        def call(env)
++          SetupHelper.new(env).set_routing
++          @app.call(env)
++        end
++      end
++    end
++  end
++end
+diff -r c24fb4f0f929 lib/vagrant-skytap/action/set_up_vm.rb
+--- a/lib/vagrant-skytap/action/set_up_vm.rb	Mon Nov 16 15:28:30 2015 -0800
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,21 +0,0 @@
+-require 'log4r'
+-require 'json'
+-require 'vagrant-skytap/setup_helper'
+-
+-module VagrantPlugins
+-  module Skytap
+-    module Action
+-      class SetUpVm
+-        def initialize(app, env)
+-          @app = app
+-          @logger = Log4r::Logger.new("vagrant_skytap::action::set_up_vm")
+-        end
+-
+-        def call(env)
+-          SetupHelper.run!(env, env[:environment])
+-          @app.call(env)
+-        end
+-      end
+-    end
+-  end
+-end
+diff -r c24fb4f0f929 lib/vagrant-skytap/config.rb
+--- a/lib/vagrant-skytap/config.rb	Mon Nov 16 15:28:30 2015 -0800
++++ b/lib/vagrant-skytap/config.rb	Tue Nov 17 12:09:41 2015 -0800
+@@ -80,7 +80,9 @@
+         @api_token = ENV['VAGRANT_SKYTAP_API_TOKEN'] if @api_token == UNSET_VALUE
+ 
+         # Base URL for API calls.
+-        @base_url = "https://cloud.skytap.com/" if @base_url == UNSET_VALUE
++        if @base_url == UNSET_VALUE
++          @base_url = ENV['VAGRANT_SKYTAP_BASE_URL'].presence || "https://cloud.skytap.com/"
++        end
+ 
+         # Source VM url must be set.
+         @vm_url = nil if @vm_url == UNSET_VALUE
+diff -r c24fb4f0f929 lib/vagrant-skytap/plugin.rb
+--- a/lib/vagrant-skytap/plugin.rb	Mon Nov 16 15:28:30 2015 -0800
++++ b/lib/vagrant-skytap/plugin.rb	Tue Nov 17 12:09:41 2015 -0800
+@@ -24,6 +24,7 @@
+         Config
+       end
+ 
++      #provider(:skytap, parallel: true) do
+       provider(:skytap, parallel: false) do
+         # Setup logging and i18n
+         setup_logging
+@@ -34,6 +35,11 @@
+         Provider
+       end
+ 
++      command("up", primary: true) do
++        require_relative "command/up"
++        Command::Up
++      end
++
+       # This initializes the internationalization strings.
+       def self.setup_i18n
+         I18n.load_path << File.expand_path("locales/en.yml", Skytap.source_root)
+diff -r c24fb4f0f929 lib/vagrant-skytap/setup_helper.rb
+--- a/lib/vagrant-skytap/setup_helper.rb	Mon Nov 16 15:28:30 2015 -0800
++++ b/lib/vagrant-skytap/setup_helper.rb	Tue Nov 17 12:09:41 2015 -0800
+@@ -10,14 +10,10 @@
+       attr_reader :env, :environment, :machine, :provider_config
+       attr_reader :username, :password, :host, :port
+ 
+-      def self.run!(env, environment)
+-        new(env, environment).run!
+-      end
+-
+-      def initialize(env, environment)
++      def initialize(env)
+         @env = env
+         @logger = Log4r::Logger.new("vagrant_skytap::setup_helper")
+-        @environment = environment
++        @environment = env[:environment]
+         @machine = env[:machine]
+         @provider_config = env[:machine].provider_config
+         @username = @machine.config.ssh.username
+@@ -30,12 +26,20 @@
+         environment.current_vm
+       end
+ 
+-      def run!
++      def set_routing
+         ask_routing
+-        ask_credentials
+-        write_properties
++        VmProperties.write(env[:machine].data_dir,
++                              'host' => host,
++                              'port' => port)
++
+       end
+ 
++      def set_credentials
++        ask_credentials
++        VmProperties.write(env[:machine].data_dir,
++                              'username' => username,
++                              'password' => password)
++      end
+ 
+       private
+ 
+@@ -189,14 +193,6 @@
+ 
+         env[:ui].ask(prompt, {prefix: false}.merge(options))
+       end
+-
+-      def write_properties
+-        VmProperties.write(env[:machine].data_dir,
+-                              'username' => username,
+-                              'password' => password,
+-                              'host' => host,
+-                              'port' => port)
+-      end
+     end
+   end
+ end

data/_patches-20160113/eng-11616-2

@@ -0,0 +1,67 @@
+# HG changeset patch
+# Parent 1e2e97f6f44b0e6b126aca3ed3b0d5110ee694e9
+[mq]: eng-11616-2
+
+diff -r 1e2e97f6f44b lib/vagrant-skytap/command/up.rb
+--- a/lib/vagrant-skytap/command/up.rb	Mon Nov 16 18:02:44 2015 -0800
++++ b/lib/vagrant-skytap/command/up.rb	Tue Nov 17 12:08:41 2015 -0800
+@@ -53,31 +53,43 @@
+ 
+           # Build up the batch job of what we'll do
+           machines = []
+-          @env.batch(options[:parallel]) do |batch|
+-            names = argv
+-            if names.empty?
+-              autostart = false
+-              @env.vagrantfile.machine_names_and_options.each do |n, o|
+-                autostart = true if o.key?(:autostart)
+-                o[:autostart] = true if !o.key?(:autostart)
+-                names << n.to_s if o[:autostart]
++          names = argv
++          if names.empty?
++            autostart = false
++            @env.vagrantfile.machine_names_and_options.each do |n, o|
++              autostart = true if o.key?(:autostart)
++              o[:autostart] = true if !o.key?(:autostart)
++              names << n.to_s if o[:autostart]
++            end
++
++            # If we have an autostart key but no names, it means that
++            # all machines are autostart: false and we don't start anything.
++            names = nil if autostart && names.empty?
++          end
++
++          if names
++            if options[:parallel]
++              @env.batch do |batch|
++                with_target_vms(names, provider: options[:provider]) do |machine|
++                  # batch.action(machine, :pre_up, options)
++                end
+               end
+ 
+-              # If we have an autostart key but no names, it means that
+-              # all machines are autostart: false and we don't start anything.
+-              names = nil if autostart && names.empty?
+-            end
++              # up
+ 
+-            if names
++              @env.batch do |batch|
++                with_target_vms(names, provider: options[:provider]) do |machine|
++                  # batch.action(machine, :post_up, options)
++                end
++              end
++            else
+               with_target_vms(names, provider: options[:provider]) do |machine|
+                 @env.ui.info(I18n.t(
+                   "vagrant.commands.up.upping",
+                   name: machine.name,
+                   provider: machine.provider_name))
+-
+                 machines << machine
+-
+-                batch.action(machine, :up, options)
++                machine.action(:up)
+               end
+             end
+           end

data/_patches-20160113/eng-11616-actual

@@ -0,0 +1,184 @@
+# HG changeset patch
+# Parent bc32846888f966e4da20f51175d02f6aea678dd4
+ENG-11616 actually refactoring up
+
+diff -r bc32846888f9 lib/vagrant-skytap/action.rb
+--- a/lib/vagrant-skytap/action.rb	Mon Nov 16 15:47:02 2015 -0800
++++ b/lib/vagrant-skytap/action.rb	Mon Nov 16 18:02:32 2015 -0800
+@@ -192,33 +192,56 @@
+         end
+       end
+ 
+-      # This action is called to bring the box up from nothing.
++      # This action is called to actually bring the box up.
+       def self.action_up
+         Vagrant::Action::Builder.new.tap do |b|
+-          b.use HandleBox
+-          b.use action_initialize
+-          b.use action_create_vm
+-
++          b.use action_pre_up
+           b.use Call, IsRunning do |env, b1|
+             if env[:result]
+               b1.use MessageAlreadyRunning
+               next
+             end
++            b1.use action_actual_up
++            b1.use action_post_up
++          end
++        end
++      end
+ 
+-            b1.use Call, IsStopped do |env2, b2|
+-              if env2[:result]
+-                b2.use UpdateHardware
+-                b2.use SetHostname
+-                b2.use action_prepare_boot
+-              end
+-
+-              b2.use RunVm
+-              b2.use WaitForCommunicator
++      # This action is called to prepare to bring the box up from nothing.
++      def self.action_pre_up
++        Vagrant::Action::Builder.new.tap do |b|
++          b.use HandleBox
++          b.use action_initialize
++          b.use action_create_vm
++          b.use Call, IsStopped do |env2, b2|
++            if env2[:result]
++              b2.use UpdateHardware
++              b2.use SetHostname
++              b2.use action_prepare_boot
+             end
+           end
+         end
+       end
+ 
++      # This action is called to actually bring the box up.
++      def self.action_actual_up
++        Vagrant::Action::Builder.new.tap do |b|
++          b.use Call, IsRunning do |env, b1|
++            if env[:result]
++              b1.use MessageAlreadyRunning
++              next
++            end
++            b2.use RunVm
++          end
++        end
++      end
++
++      def self.action_post_up
++        Vagrant::Action::Builder.new.tap do |b|
++          b.use WaitForCommunicator
++        end
++      end
++
+       def self.action_reload
+         Vagrant::Action::Builder.new.tap do |b|
+           b.use action_initialize
+diff -r bc32846888f9 lib/vagrant-skytap/action/run_environment.rb
+--- a/lib/vagrant-skytap/action/run_environment.rb	Mon Nov 16 15:47:02 2015 -0800
++++ b/lib/vagrant-skytap/action/run_environment.rb	Mon Nov 16 18:02:32 2015 -0800
+@@ -17,7 +17,7 @@
+ 
+         def call(env)
+           env[:ui].info(I18n.t("vagrant_skytap.launching_instance"))
+-          environment.run!
++          environment.run_multiple!
+ 
+           @app.call(env)
+         end
+diff -r bc32846888f9 lib/vagrant-skytap/api/environment.rb
+--- a/lib/vagrant-skytap/api/environment.rb	Mon Nov 16 15:47:02 2015 -0800
++++ b/lib/vagrant-skytap/api/environment.rb	Mon Nov 16 18:02:32 2015 -0800
+@@ -48,6 +48,10 @@
+           @provider_config = env[:machine].provider_config
+         end
+ 
++        def run_multiple!(vm_ids = [])
++          run!
++        end
++
+         def vms
+           @vms ||= (get_api_attribute('vms') || []).collect do |vm_attrs|
+             Vm.new(vm_attrs, self, env)
+diff -r bc32846888f9 lib/vagrant-skytap/command/up.rb
+--- a/lib/vagrant-skytap/command/up.rb	Mon Nov 16 15:47:02 2015 -0800
++++ b/lib/vagrant-skytap/command/up.rb	Mon Nov 16 18:02:32 2015 -0800
+@@ -1,5 +1,6 @@
+ require 'optparse'
+ require_relative 'start_mixins'
++require 'byebug'
+ 
+ module VagrantPlugins
+   module Skytap
+@@ -53,22 +54,24 @@
+ 
+           # Build up the batch job of what we'll do
+           machines = []
+-          @env.batch(options[:parallel]) do |batch|
+-            names = argv
+-            if names.empty?
+-              autostart = false
+-              @env.vagrantfile.machine_names_and_options.each do |n, o|
+-                autostart = true if o.key?(:autostart)
+-                o[:autostart] = true if !o.key?(:autostart)
+-                names << n.to_s if o[:autostart]
+-              end
+-
+-              # If we have an autostart key but no names, it means that
+-              # all machines are autostart: false and we don't start anything.
+-              names = nil if autostart && names.empty?
++          names = argv
++          if names.empty?
++            autostart = false
++            @env.vagrantfile.machine_names_and_options.each do |n, o|
++              autostart = true if o.key?(:autostart)
++              o[:autostart] = true if !o.key?(:autostart)
++              names << n.to_s if o[:autostart]
+             end
+ 
+-            if names
++            # If we have an autostart key but no names, it means that
++            # all machines are autostart: false and we don't start anything.
++            names = nil if autostart && names.empty?
++          end
++
++
++
++          if names
++            @env.batch(options[:parallel]) do |batch|
+               with_target_vms(names, provider: options[:provider]) do |machine|
+                 @env.ui.info(I18n.t(
+                   "vagrant.commands.up.upping",
+@@ -77,11 +80,29 @@
+ 
+                 machines << machine
+ 
+-                batch.action(machine, :up, options)
++                batch.action(machine, :pre_up, options)
++                if !options[:parallel]
++                  batch.action(machine, :up, options)
++                  #batch.action(machine, :post_up, options) # note: this gives success message even if the machine was already running
++                end
+               end
+             end
+           end
+ 
++          # Don't use normal Vagrant parallelization to run VMs
++          if options[:parallel] && machines
++            # do thing, then
++
++            # WaitForCommunicator
++            @env.batch do |batch|
++              with_target_vms(names, provider: options[:provider]) do |machine|
++                batch.action(machine, :post_up, options)
++              end
++            end
++          end
++
++
++
+           if machines.empty?
+             @env.ui.info(I18n.t("vagrant.up_no_machines"))
+             return 0

data/_patches-20160113/eng-11625a

@@ -0,0 +1,4 @@
+# HG changeset patch
+# Parent 0f7b255ffa6a13cd9435bebbfe2bee9f618f46a6
+ENG-11625 find clean way to just invoke the builtin action directly
+