vagrant-skytap 0.1.7 → 0.1.8

data/eng-10269.diff.1

@@ -1,455 +0,0 @@
-# HG changeset patch
-# Parent 586410d23ff4907e87ce5ee2c7eee574f0749ab0
-ENG-10269 add parallelization support for `vagrant up`. This appears to work for the no-parallel case.
-
-diff -r 586410d23ff4 lib/vagrant-skytap/action.rb
---- a/lib/vagrant-skytap/action.rb	Thu Nov 19 21:24:21 2015 -0800
-+++ b/lib/vagrant-skytap/action.rb	Thu Nov 19 21:24:32 2015 -0800
-@@ -187,6 +187,30 @@
-       # This action is called to bring the box up from nothing.
-       def self.action_up
-         Vagrant::Action::Builder.new.tap do |b|
-+          b.use action_create
-+
-+          b.use Call, IsStopped do |env, b1|
-+            if env[:result]
-+              # this has some kind of hook that executes
-+              # when #action returns
-+              b1.use action_prepare_boot
-+            end
-+          end
-+
-+          b.use Call, IsRunning do |env, b1|
-+            if env[:result]
-+              b1.use MessageAlreadyRunning
-+              next
-+            end
-+            b1.use RunVm
-+            b1.use WaitForCommunicator
-+          end
-+        end
-+      end
-+
-+      # Pulled out of action_up to allow
-+      def self.action_create
-+        Vagrant::Action::Builder.new.tap do |b|
-           b.use HandleBox
-           b.use ConfigValidate
-           b.use InitializeAPIClient
-@@ -204,26 +228,23 @@
-             b1.use StoreExtraData
-             b1.use SetUpVm
-           end
--          b.use Call, IsRunning do |env, b1|
-+          b.use Call, IsStopped do |env, b1|
-             if env[:result]
--              b1.use MessageAlreadyRunning
--              next
--            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
-+              b1.use UpdateHardware
-+              b1.use SetHostname
-             end
-           end
-         end
-       end
- 
-+      def self.action_run_environment
-+        Vagrant::Action::Builder.new.tap do |b|
-+          b.use InitializeAPIClient
-+          b.use FetchEnvironment
-+          b.use RunEnvironment
-+        end
-+      end
-+
-       def self.action_reload
-         Vagrant::Action::Builder.new.tap do |b|
-           b.use ConfigValidate
-diff -r 586410d23ff4 lib/vagrant-skytap/action/initialize_api_client.rb
---- a/lib/vagrant-skytap/action/initialize_api_client.rb	Thu Nov 19 21:24:21 2015 -0800
-+++ b/lib/vagrant-skytap/action/initialize_api_client.rb	Thu Nov 19 21:24:32 2015 -0800
-@@ -15,7 +15,14 @@
-         def call(env)
-           @logger.info("Connecting to Skytap...")
- 
--          client = API::Client.new(env[:machine].provider_config)
-+          # This can be called outside the context of a machine
-+          config = env[:machine].try(:provider_config) || {
-+            base_url:  env[:base_url],
-+            username:  env[:username],
-+            api_token: env[:api_token],
-+          }
-+
-+          client = API::Client.new(config)
-           if client.get('/configurations').code == '200'
-             env[:api_client] = client
-           end
-diff -r 586410d23ff4 lib/vagrant-skytap/action/run_environment.rb
---- a/lib/vagrant-skytap/action/run_environment.rb	Thu Nov 19 21:24:21 2015 -0800
-+++ b/lib/vagrant-skytap/action/run_environment.rb	Thu Nov 19 21:24:32 2015 -0800
-@@ -16,8 +16,10 @@
-         end
- 
-         def call(env)
--          env[:ui].info(I18n.t("vagrant_skytap.launching_instance"))
--          environment.run!
-+          env[:ui].info(I18n.t("vagrant_skytap.running_environment"))
-+          vm_ids = env[:machines].try(:collect, &:id)
-+          @logger.info("Running VMs: #{vm_ids}")
-+          env[:environment].run!(vm_ids)
- 
-           @app.call(env)
-         end
-diff -r 586410d23ff4 lib/vagrant-skytap/api/environment.rb
---- a/lib/vagrant-skytap/api/environment.rb	Thu Nov 19 21:24:21 2015 -0800
-+++ b/lib/vagrant-skytap/api/environment.rb	Thu Nov 19 21:24:32 2015 -0800
-@@ -28,7 +28,9 @@
-           end
- 
-           def properties(env)
--            EnvironmentProperties.read(env[:machine].env.local_data_path)
-+            # This can be called outside the context of a particular machine
-+            path = env[:local_data_path] || env[:machine].env.local_data_path
-+            EnvironmentProperties.read(path)
-           end
- 
-           def check_vm_before_adding(env, vm)
-@@ -78,6 +80,10 @@
-           super
-         end
- 
-+        def run!(vm_ids = nil)
-+          set_runstate :running, vm_ids: vm_ids
-+        end
-+
-         def delete
-           retry_while_resource_busy do
-             api_client.delete(url)
-diff -r 586410d23ff4 lib/vagrant-skytap/api/runstate_operations.rb
---- a/lib/vagrant-skytap/api/runstate_operations.rb	Thu Nov 19 21:24:21 2015 -0800
-+++ b/lib/vagrant-skytap/api/runstate_operations.rb	Thu Nov 19 21:24:32 2015 -0800
-@@ -20,12 +20,17 @@
-         end
- 
-         def poweroff!
--          set_runstate :halted, :stopped
-+          set_runstate :halted, completed_runstate: :stopped
-         end
- 
--        def set_runstate(new_runstate, completed_runstate = nil)
--          completed_runstate ||= new_runstate
--          update_with_retry(runstate: new_runstate)
-+        def set_runstate(new_runstate, opts = {})
-+          completed_runstate = opts.delete(:completed_runstate) || new_runstate
-+
-+          params = {runstate: new_runstate}.tap do |ret|
-+            ret[:multiselect] = opts[:vm_ids] if opts[:vm_ids]
-+          end
-+          update_with_retry(params)
-+
-           wait_for_runstate(completed_runstate) unless runstate == completed_runstate
-         end
- 
-diff -r 586410d23ff4 lib/vagrant-skytap/command/start_mixins.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/command/start_mixins.rb	Thu Nov 19 21:24:32 2015 -0800
-@@ -0,0 +1,47 @@
-+module VagrantPlugins
-+  module Skytap
-+    module Command
-+      module StartMixins
-+
-+        # Would be nice to just extend this, then alias #build_start_options
-+        # and add default options flag.
-+        #include VagrantPlugins::CommandUp::StartMixins
-+
-+        # This adds the standard `start` command line flags to the given
-+        # OptionParser, storing the result in the `options` dictionary.
-+        #
-+        # @param [OptionParser] parser
-+        # @param [Hash] options
-+        def build_start_options(parser, options)
-+          # Setup the defaults
-+          options[:provision_types] = nil
-+
-+          # Add the options
-+          parser.on("--[no-]provision", "Enable or disable provisioning") do |p|
-+            options[:provision_enabled] = p
-+            options[:provision_ignore_sentinel] = true
-+          end
-+
-+          parser.on("--provision-with x,y,z", Array,
-+                  "Enable only certain provisioners, by type.") do |list|
-+            options[:provision_types] = list.map { |type| type.to_sym }
-+            options[:provision_enabled] = true
-+            options[:provision_ignore_sentinel] = true
-+          end
-+        end
-+
-+        # This validates the provisioner flags and raises an exception
-+        # if there are invalid ones.
-+        def validate_provisioner_flags!(options)
-+          (options[:provision_types] || []).each do |type|
-+              klass = Vagrant.plugin("2").manager.provisioners[type]
-+              if !klass
-+                raise Vagrant::Errors::ProvisionerFlagInvalid,
-+                  name: type.to_s
-+              end
-+          end
-+        end
-+      end
-+    end
-+  end
-+end
-diff -r 586410d23ff4 lib/vagrant-skytap/command/up.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/command/up.rb	Thu Nov 19 21:24:32 2015 -0800
-@@ -0,0 +1,139 @@
-+require 'optparse'
-+
-+require "vagrant"
-+require 'byebug'
-+
-+require_relative 'start_mixins'
-+
-+# This is a copy of Vagrant's built-in "up" command which handles
-+# parallel runstate changes by invoking the run_environment action
-+# once for all machines: runstate operations lock the environment,
-+# and are therefore not thread-safe.
-+
-+module VagrantPlugins
-+  module Skytap
-+    module Command
-+      #class Up < VagrantPlugins::CommandUp::Command
-+      class Up < Vagrant.plugin("2", :command)
-+        include StartMixins
-+
-+        def self.synopsis
-+          "starts and provisions the vagrant environment (with parallel runstate support)"
-+        end
-+
-+        def execute
-+          options = {}
-+          options[:destroy_on_error] = true
-+          options[:parallel] = true
-+          options[:provision_ignore_sentinel] = false
-+
-+          opts = OptionParser.new do |o|
-+            o.banner = "Usage: vagrant up [options] [name]"
-+            o.separator ""
-+            o.separator "Options:"
-+            o.separator ""
-+
-+            build_start_options(o, options)
-+
-+            o.on("--[no-]destroy-on-error",
-+                 "Destroy machine if any fatal error happens (default to true)") do |destroy|
-+              options[:destroy_on_error] = destroy
-+            end
-+
-+            o.on("--[no-]parallel",
-+                 "Enable or disable parallelism if provider supports it") do |parallel|
-+              options[:parallel] = parallel
-+            end
-+
-+            o.on("--provider PROVIDER", String,
-+                 "Back the machine with a specific provider") do |provider|
-+              options[:provider] = provider
-+            end
-+          end
-+
-+          # Parse the options
-+          argv = parse_options(opts)
-+          return if !argv
-+
-+          # Validate the provisioners
-+          validate_provisioner_flags!(options)
-+
-+          # Go over each VM and bring it up
-+          @logger.debug("'Up' each target VM...")
-+
-+
-+          # Begin modified section
-+
-+          machines = []
-+          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
-+
-+          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
-+
-+            if options[:parallel]
-+              machine.action(:create, options)
-+            else
-+              machine.action(:up, options)
-+            end
-+          end
-+
-+          if options[:parallel]
-+            @env.action_runner.run(VagrantPlugins::Skytap::Action.action_run_environment,
-+              local_data_path: @env.local_data_path,
-+              machines:        machines,
-+              machine:         machines.first,
-+              base_url:        nil,
-+              username:        nil,
-+              api_token:       nil,
-+              ui:              @env.ui
-+            )
-+          end
-+
-+          # End modified section
-+
-+
-+          if machines.empty?
-+            @env.ui.info(I18n.t("vagrant.up_no_machines"))
-+            return 0
-+          else
-+
-+          end
-+
-+          # Output the post-up messages that we have, if any
-+          machines.each do |m|
-+            next if !m.config.vm.post_up_message
-+            next if m.config.vm.post_up_message == ""
-+
-+            # Add a newline to separate things.
-+            @env.ui.info("", prefix: false)
-+
-+            m.ui.success(I18n.t(
-+              "vagrant.post_up_message",
-+              name: m.name.to_s,
-+              message: m.config.vm.post_up_message))
-+          end
-+
-+          # Success, exit status 0
-+          0
-+        end
-+      end
-+    end
-+  end
-+end
-diff -r 586410d23ff4 lib/vagrant-skytap/plugin.rb
---- a/lib/vagrant-skytap/plugin.rb	Thu Nov 19 21:24:21 2015 -0800
-+++ b/lib/vagrant-skytap/plugin.rb	Thu Nov 19 21:24:32 2015 -0800
-@@ -24,7 +24,7 @@
-         Config
-       end
- 
--      provider(:skytap, parallel: false) do
-+      provider(:skytap, parallel: true) do
-         # Setup logging and i18n
-         setup_logging
-         setup_i18n
-@@ -34,6 +34,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 586410d23ff4 locales/en.yml
---- a/locales/en.yml	Thu Nov 19 21:24:21 2015 -0800
-+++ b/locales/en.yml	Thu Nov 19 21:24:32 2015 -0800
-@@ -3,8 +3,8 @@
-     already_status: |-
-       The machine is already %{status}.
- 
--    launching_instance: |-
--      Launching an instance with the following settings...
-+    running_environment: |-
-+      Starting VMs ...
-     launching_vm: |-
-       Launching a VM with the following settings...
-     not_created: |-
-diff -r 586410d23ff4 spec/acceptance/provider/up_spec.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spec/acceptance/provider/up_spec.rb	Thu Nov 19 21:24:32 2015 -0800
-@@ -0,0 +1,33 @@
-+# This tests that an instance can be halted correctly
-+shared_examples 'provider/up' do |provider, options|
-+  if !options[:box]
-+    raise ArgumentError,
-+          "box option must be specified for provider: #{provider}"
-+  end
-+
-+  include_context 'acceptance'
-+
-+  before do
-+    environment.skeleton('generic')
-+    #assert_execute('vagrant', 'box', 'add', 'basic', options[:box])
-+  end
-+
-+  after do
-+    assert_execute('vagrant', 'destroy', '--force')
-+  end
-+
-+  it 'should bring up the machine and halt it' do
-+    status("Test: machine can be brought up")
-+    up_result = execute("vagrant", "up")
-+    expect(up_result).to exit_with(0)
-+
-+    status("Test: machine is running after up")
-+    echo_result = execute("vagrant", "ssh", "-c", "echo foo")
-+    expect(echo_result).to exit_with(0)
-+    expect(echo_result.stdout).to match(/foo\n$/)
-+
-+    status("Test: machine can be halted")
-+    halt_result = execute("vagrant", "halt")
-+    expect(halt_result).to exit_with(0)
-+  end
-+end
-diff -r 586410d23ff4 spec/acceptance/skeletons/generic/Vagrantfile
---- a/spec/acceptance/skeletons/generic/Vagrantfile	Thu Nov 19 21:24:21 2015 -0800
-+++ b/spec/acceptance/skeletons/generic/Vagrantfile	Thu Nov 19 21:24:32 2015 -0800
-@@ -1,15 +1,14 @@
- Vagrant.configure("2") do |config|
--  config.vm.box = "skytap-dummy"
-+  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
-+    ubuntu.ssh.username = "skytap"
-+    ubuntu.ssh.password = "ChangeMe!"
-   end
- end