vagrant-skytap 0.2.2 → 0.2.3

data/_patches-20160112/eng-11616-actual

@@ -1,184 +0,0 @@
-# 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-20160112/eng-11625a

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

data/_patches-20160112/eng-11711

@@ -1,85 +0,0 @@
-# HG changeset patch
-# Parent 1ead463a91644fcbe466a90a609e9ca004c03ccb
-ENG-11711 Clean up redundant REST calls -- this currently does not work -- the env hash probably gets cleared for each vm
-
-diff -r 1ead463a9164 lib/vagrant-skytap/action.rb
---- a/lib/vagrant-skytap/action.rb	Fri Nov 06 19:26:22 2015 -0800
-+++ b/lib/vagrant-skytap/action.rb	Fri Nov 06 19:39:47 2015 -0800
-@@ -115,10 +115,14 @@
-       # 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 ReadSSHInfo
-+          b.use Call, HasSSHInfo do |env1, b1|
-+            unless env1[:result]
-+              b1.use ConfigValidate
-+              b1.use InitializeAPIClient
-+              b1.use FetchEnvironment
-+              b1.use ReadSSHInfo
-+            end
-+          end
-         end
-       end
- 
-@@ -251,6 +255,7 @@
-       autoload :ExistenceCheck, action_root.join("existence_check")
-       autoload :FetchEnvironment, action_root.join("fetch_environment")
-       autoload :InitializeAPIClient, action_root.join("initialize_api_client")
-+      autoload :HasSSHInfo, action_root.join("has_ssh_info")
-       autoload :IsRunning, action_root.join("is_running")
-       autoload :IsStopped, action_root.join("is_stopped")
-       autoload :IsSuspended, action_root.join("is_suspended")
-diff -r 1ead463a9164 lib/vagrant-skytap/action/has_ssh_info.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/action/has_ssh_info.rb	Fri Nov 06 19:39:47 2015 -0800
-@@ -0,0 +1,19 @@
-+module VagrantPlugins
-+  module Skytap
-+    module Action
-+      # This can be used with "Call" built-in to check if the ssh info
-+      # has been read.
-+      class HasSSHInfo
-+        def initialize(app, env)
-+          @app = app
-+          @logger = Log4r::Logger.new("vagrant_skytap::action::has_ssh_info")
-+        end
-+
-+        def call(env)
-+          env[:result] = env[:machine_ssh_info].present?
-+          @app.call(env)
-+        end
-+      end
-+    end
-+  end
-+end
-diff -r 1ead463a9164 lib/vagrant-skytap/action/initialize_api_client.rb
---- a/lib/vagrant-skytap/action/initialize_api_client.rb	Fri Nov 06 19:26:22 2015 -0800
-+++ b/lib/vagrant-skytap/action/initialize_api_client.rb	Fri Nov 06 19:39:47 2015 -0800
-@@ -7,17 +7,20 @@
-       # This action initializes the API client, verifies the provided
-       # credentials, and stores the API client object in env[:api_client].
-       class InitializeAPIClient
--        def initialize(app, env)
-+        def initialize(app, env, reinitialize=false)
-           @app = app
-           @logger = Log4r::Logger.new("vagrant_skytap::action::initialize_api_client")
-+          @reinitialize = reinitialize
-         end
- 
-         def call(env)
-           @logger.info("Connecting to Skytap...")
- 
--          client = API::Client.new(env[:machine].provider_config)
--          if client.get('/configurations').code == '200'
--            env[:api_client] = client
-+          unless env[:api_client] && !@reinitialize
-+            client = API::Client.new(env[:machine].provider_config)
-+            if client.get('/configurations').code == '200'
-+              env[:api_client] = client
-+            end
-           end
- 
-           @app.call(env)

data/_patches-20160112/eng-12232-command-spec

@@ -1,236 +0,0 @@
-# HG changeset patch
-# Parent 54e776bb035d336526426643b3a371f7d04b7b0d
-ENG-12232 command publish-set show spec
-
-diff -r 54e776bb035d spec/unit/base.rb
---- a/spec/unit/base.rb	Tue Dec 15 15:11:38 2015 -0800
-+++ b/spec/unit/base.rb	Tue Dec 15 15:30:51 2015 -0800
-@@ -46,7 +46,7 @@
- ENV["VAGRANT_CWD"] = Dir.mktmpdir("vagrant")
- 
- # Set the dummy provider to the default for tests
--ENV["VAGRANT_DEFAULT_PROVIDER"] = "dummy"
-+ENV["VAGRANT_DEFAULT_PROVIDER"] = "skytap"
- 
- # Unset all host plugins so that we aren't executing subprocess things
- # to detect a host for every test.
-diff -r 54e776bb035d spec/unit/commands/publish_url/command/create_spec.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spec/unit/commands/publish_url/command/create_spec.rb	Tue Dec 15 15:30:51 2015 -0800
-@@ -0,0 +1,113 @@
-+BASE_PATH = File.expand_path('../../../..', __FILE__)
-+
-+require File.expand_path("#{BASE_PATH}/base")
-+require 'vagrant-skytap/api/publish_set'
-+require 'vagrant-skytap/api/environment'
-+require 'vagrant-skytap/command/publish_url/create'
-+require 'vagrant-skytap/command/helpers'
-+require 'vagrant-skytap/provider'
-+require 'ap'
-+
-+describe VagrantPlugins::Skytap::CommandPublishUrl::Create do
-+  include_context "unit"
-+  include_context "command plugin helpers"
-+
-+  let(:empty_environment_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'empty_environment.json')))}
-+  let(:vm1_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'vm1.json'))) }
-+  let(:vm2_attrs) { vm1_attrs.merge("id" => "6981851", "name" => "VM2") }
-+  let(:empty_publish_set_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'empty_publish_set.json')))}
-+
-+  let(:publish_set_attrs) do
-+    empty_publish_set_attrs.dup.tap do |ret|
-+      ret['vms'] = [
-+        {"vm_ref" => "http://example.com/vms/#{vm1_attrs['id']}"},
-+        {"vm_ref" => "http://example.com/vms/#{vm2_attrs['id']}"}
-+      ]
-+    end
-+  end
-+
-+  let(:attrs) do
-+    empty_environment_attrs.dup.tap do |ret|
-+      ret['vms'] = [vm1_attrs, vm2_attrs]
-+      ret['publish_sets'] = publish_set_attrs
-+    end
-+  end
-+
-+  let(:argv)     { [] }
-+  let(:iso_env) do
-+    # We have to create a Vagrantfile so there is a root path
-+    env = isolated_environment
-+    #debugger
-+    #env.vagrantfile("")
-+
-+    env.vagrantfile(<<-VF)
-+      Vagrant.configure("2") do |config|
-+        config.vm.box = "skytap/empty"
-+
-+        config.vm.provider :skytap do |skytap, override|
-+          skytap.base_url = "https://example.com/"
-+          skytap.username = "foo"
-+          skytap.api_token = "bar"
-+        end
-+
-+        config.vm.define "vm1" do |ubuntu|
-+          ubuntu.vm.provider :skytap do |box|
-+            box.vm_url = "vms/999"
-+          end
-+        end
-+
-+        config.vm.define "vm2" do |ubuntu|
-+          ubuntu.vm.provider :skytap do |box|
-+            box.vm_url = "vms/999"
-+          end
-+        end
-+      end
-+    VF
-+    env.create_vagrant_env
-+  end
-+
-+  subject { described_class.new(argv, iso_env) }
-+
-+  before do
-+    # don't really need, since we're reading an environment
-+    VagrantPlugins::Skytap::Provider.any_instance.stub(:state).and_return(Vagrant::MachineState.new(:running, "", ""))
-+
-+    stub_request(:get, %r{/configurations$}).to_return(status: 200, body: "")
-+    stub_request(:get, %r{/configurations/\d+}).to_return(status: 200, body: JSON.dump(attrs))
-+    stub_request(:post, %r{/configurations/\d+/publish_sets}).to_return(status: 200, body: JSON.dump(publish_set_attrs))
-+
-+    allow(VagrantPlugins::Skytap::API::Environment).to receive(:properties).and_return({'url' => '/configurations/5570024'})
-+
-+    WebMock.after_request do |request_signature, response|
-+      puts "Request #{request_signature} was made and #{response} was returned"
-+    end
-+  end
-+
-+
-+
-+  context "with --no-password" do
-+    let(:argv) { ["--no-password", "vm1", "vm2"] }
-+
-+    it "posts" do
-+      #debugger
-+      #expect { subject.execute }.to output("foo").to_stdout_from_any_process
-+      nil
-+      subject.execute
-+      expect(a_request(:post, "https://foo:bar@example.com/configurations/5570024/publish_sets").
-+        with do |req|
-+          debugger
-+          req.body == JSON.dump(
-+            name: "Vagrant publish set",
-+            publish_set_type: "single_url",
-+            vms: [
-+              {vm_ref: '/vms/6981850', access: "run_and_use"},
-+              {vm_ref: '/vms/6981851', access: "run_and_use"},
-+            ],
-+            password: ""
-+          )
-+        end).
-+        to have_been_made.once
-+
-+    end
-+  end
-+end
-diff -r 54e776bb035d spec/unit/commands/publish_url/command/show_spec.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spec/unit/commands/publish_url/command/show_spec.rb	Tue Dec 15 15:30:51 2015 -0800
-@@ -0,0 +1,88 @@
-+BASE_PATH = File.expand_path('../../../..', __FILE__)
-+
-+require File.expand_path("#{BASE_PATH}/base")
-+require 'vagrant-skytap/api/publish_set'
-+require 'vagrant-skytap/api/environment'
-+require 'vagrant-skytap/command/publish_url/show'
-+require 'vagrant-skytap/command/helpers'
-+require 'vagrant-skytap/provider'
-+require 'ap'
-+
-+describe VagrantPlugins::Skytap::CommandPublishUrl::Show do
-+  include_context "unit"
-+  include_context "command plugin helpers"
-+
-+  let(:empty_environment_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'empty_environment.json')))}
-+  let(:vm1_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'vm1.json'))) }
-+  let(:empty_publish_set_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'empty_publish_set.json')))}
-+
-+  let(:attrs) do
-+    vm2_attrs = vm1_attrs.merge("id" => "6981851", "name" => "VM2")
-+    empty_environment_attrs.dup.tap do |ret|
-+      ret['vms'] = [vm1_attrs, vm2_attrs]
-+      ret['publish_sets'] = [empty_publish_set_attrs.dup]
-+      ret['publish_sets'].first['vms'] = [
-+        {"vm_ref" => "http://example.com/vms/#{vm1_attrs['id']}"},
-+        {"vm_ref" => "http://example.com/vms/#{vm2_attrs['id']}"}
-+      ]
-+    end
-+  end
-+
-+  let(:argv)     { [] }
-+  let(:iso_env) do
-+    # We have to create a Vagrantfile so there is a root path
-+    env = isolated_environment
-+    #debugger
-+    #env.vagrantfile("")
-+
-+    env.vagrantfile(<<-VF)
-+      Vagrant.configure("2") do |config|
-+        config.vm.box = "skytap/empty"
-+
-+        config.vm.provider :skytap do |skytap, override|
-+          skytap.base_url = "https://test.skytap.com/"
-+          skytap.username = "etrue"
-+          skytap.api_token = "d41e7b2f98b63844512c0d62d0e5496949d35f57"
-+          skytap.vpn_url = "https://test.skytap.com/vpns/vpn-286952"
-+        end
-+
-+        config.vm.define "vm1" do |ubuntu|
-+          ubuntu.vm.provider :skytap do |box|
-+            box.vm_url = "https://test.skytap.com/vms/6984688"
-+          end
-+          ubuntu.ssh.username = "autoadmin"
-+          ubuntu.ssh.password = "autoadmin"
-+        end
-+      end
-+    VF
-+    env.create_vagrant_env
-+  end
-+
-+  subject { described_class.new(argv, iso_env) }
-+
-+  before do
-+    # don't really need, since we're reading an environment
-+    VagrantPlugins::Skytap::Provider.any_instance.stub(:state).and_return(Vagrant::MachineState.new(:running, "", ""))
-+
-+    stub_request(:get, %r{/configurations$}).to_return(status: 200, body: "")
-+    stub_request(:get, %r{/configurations/\d+}).to_return(status: 200, body: JSON.dump(attrs))
-+    allow(VagrantPlugins::Skytap::API::Environment).to receive(:properties).and_return({'url' => '/configurations/1'})
-+
-+    WebMock.after_request do |request_signature, response|
-+      puts "Request #{request_signature} was made and #{response} was returned"
-+    end
-+  end
-+
-+
-+
-+  context "with no arguments" do
-+    #let(:argv) { [] }
-+
-+    it "shows the output" do
-+      #debugger
-+      #expect { subject.execute }.to output("foo").to_stdout_from_any_process
-+      nil
-+
-+    end
-+  end
-+end
-diff -r 54e776bb035d spec/unit/skeletons/empty_environment.json
---- a/spec/unit/skeletons/empty_environment.json	Tue Dec 15 15:11:38 2015 -0800
-+++ b/spec/unit/skeletons/empty_environment.json	Tue Dec 15 15:30:51 2015 -0800
-@@ -1,6 +1,6 @@
- {
-   "id": "5570024",
--  "url": "https://example.com/templates/5570024",
-+  "url": "https://example.com/configurations/5570024",
-   "name": "Environment 1",
-   "error": "",
-   "runstate": "running",

data/_patches-20160112/eng-12235

@@ -1,83 +0,0 @@
-# HG changeset patch
-# Parent ffe81b8c1fbc30808778011dfb11428c24e94647
-# Parent  7bf28b483ba4495c173d9316aee2d8482d9705ab
-ENG-12235 override default "vagrant share" command for Skytap provider.
-
-diff -r ffe81b8c1fbc lib/vagrant-skytap/command/share.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/command/share.rb	Tue Dec 15 13:01:38 2015 -0800
-@@ -0,0 +1,59 @@
-+# Different behavior than the standard -- this creates a publish set
-+# and outputs the URL.
-+require_relative 'overridden_command'
-+
-+module VagrantPlugins
-+  module Skytap
-+    module Command
-+      class Share < OverriddenCommand
-+        def default_command_plugin
-+          VagrantPlugins::Share::Plugin
-+        end
-+
-+        def skytap_implementation
-+
-+          # read args to see if we've got the --fallback flag
-+          # is this destructive?
-+          debugger
-+#             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
-+
-+
-+
-+          command_class(VagrantPlugins::Skytap::Plugin, "publish-url").new(@argv, @env).execute
-+        end
-+      end
-+    end
-+  end
-+end
-+
-diff -r ffe81b8c1fbc lib/vagrant-skytap/plugin.rb
---- a/lib/vagrant-skytap/plugin.rb	Tue Dec 15 13:01:26 2015 -0800
-+++ b/lib/vagrant-skytap/plugin.rb	Tue Dec 15 13:01:38 2015 -0800
-@@ -44,6 +44,11 @@
-         Command::PublishUrlRoot
-       end
- 
-+      command("share", primary: true) do
-+        require_relative "command/share"
-+        Command::Share
-+      end
-+
-       provider_capability(:skytap, :public_address) do
-         require_relative "cap/public_address"
-         Cap::PublicAddress