vagrant-skytap 0.2.10 → 0.3.0

data/spec/unit/setup_helper_spec.rb

@@ -58,10 +58,15 @@ describe VagrantPlugins::Skytap::SetupHelper do
     end
   end
 
-  let(:vpn)        {API::Vpn.new(vpn_attrs, env)}
-  let(:vpns)       {[vpn]}
-  let(:vpn_choice) {double(:vpn_choice, vpn: vpn, choose: ["1.2.3.4", 22], :valid? => true)}
-  let(:user_input) { "" }
+  let(:vpn)                  {API::Vpn.new(vpn_attrs, env)}
+  let(:vpns)                 {[vpn]}
+  let(:vpn_choice)           {double(:vpn_choice, vpn: vpn, choose: ["1.2.3.4", 22], :valid? => true)}
+  let(:vpn_choice2)          {double(:vpn_choice2, vpn: nil, choose: ["5.6.7.8", 22], :valid? => true)}
+  let(:icnr_choice)          {double(:icnr_choice, choose: ["10.0.0.1", 22], :valid? => icnr_valid, validation_error_message: icnr_err_msg)}
+  let(:icnr_valid)           { true }
+  let(:icnr_err_msg)         { nil }
+  let(:user_input)           { "" }
+  let(:running_in_skytap_vm) {false}
 
   let(:ssh_config) do
     double(:ssh_config, username: nil, password: nil, host: nil, port: nil)
@@ -83,6 +88,7 @@ describe VagrantPlugins::Skytap::SetupHelper do
     ENV.stub(:[] => nil)
     allow(ui).to receive(:ask).and_return(user_input)
     allow(instance).to receive(:vpns).and_return(vpns)
+    allow(instance).to receive(:running_in_skytap_vm?).and_return(running_in_skytap_vm)
     allow(vpn).to receive(:choice_for_setup).and_return(vpn_choice)
     stub_request(:get, /.*/).to_return(body: "{}", status: 200)
   end
@@ -110,29 +116,63 @@ describe VagrantPlugins::Skytap::SetupHelper do
       instance.send(:ask_routing)
     end
 
-    context "when valid vpn_url specified" do
-      it {should eq ["1.2.3.4", 22]}
+    let(:connection_choices) {[vpn_choice, vpn_choice2]}
+    let(:asks_user) {false}
+
+    before do
+      allow(instance).to receive(:connection_choices).and_return(connection_choices)
+      if asks_user
+        expect(ui).to receive(:ask)
+      else
+        expect(ui).to_not receive(:ask)
+      end
     end
 
-    context "when invalid vpn_url specified" do
-      let(:vpn_url) {"bogus"}
-      it "raises error" do
-        expect{subject}.to raise_error Errors::DoesNotExist
+    context "when no valid choices are available" do
+      let(:connection_choices) {[]}
+      it "should raise NoConnectionOptions" do
+        expect{subject}.to raise_error Errors::NoConnectionOptions
       end
     end
 
-    context "when vpn_url unspecified" do
-      let(:vpn_url)    {nil}
-      let(:user_input) {"1"}
-      it {should eq ["1.2.3.4", 22]}
+    context "when a single valid choice is available" do
+      let(:connection_choices) {[vpn_choice]}
+      it "should pick the only available choice automatically" do
+        expect(subject).to eq connection_choices.first.choose
+      end
     end
 
-    context "when no valid vpns exist" do
-      before do
-        allow(vpn_choice).to receive(:valid?).and_return(false)
+    context "when vpn_url specified" do
+      context "when vpn is an available choice" do
+        it "should use the specified vpn" do
+          expect(subject).to eq vpn_choice.choose
+        end
       end
-      it "raises error" do
-        expect{subject}.to raise_error Errors::NoConnectionOptions
+
+      context "when vpn is not an available choice" do
+        let(:vpn_url) {"/vpns/999"}
+        it "should raise DoesNotExist" do
+          expect{subject}.to raise_error Errors::DoesNotExist
+        end
+      end
+
+      context "when running in skytap vm" do
+        let(:running_in_skytap_vm) {true}
+        let(:connection_choices) {[icnr_choice]}
+        it "should ignore the vpn_url" do
+          expect(subject).to eq icnr_choice.choose
+        end
+      end
+    end
+
+    context "when vpn_url is not specified" do
+      let(:vpn_url) {nil}
+      context "when multiple valid choices are available" do
+        let(:user_input) {"2"}
+        let(:asks_user) {true}
+        it "should pick the one chosen by the user" do
+          expect(subject).to eq vpn_choice2.choose
+        end
       end
     end
   end

data/spec/unit/support/api_responses/tunnel1.json

@@ -0,0 +1,7 @@
+{
+  "id": "tunnel-xxx-yyy",
+  "status": "not_busy",
+  "error": null,
+  "source_network": {},
+  "target_network": {}
+}

data/spec/unit/support/api_responses/vm1.json

@@ -47,7 +47,18 @@
       "vm_name": "Ubuntu Server 14.04 - 64-bit",
       "status": "Running",
       "nat_addresses": {
-        "network_nat_addresses": [],
+        "network_nat_addresses": [
+          {
+            "ip_address": "10.0.4.1",
+            "network_id": "2",
+            "network_name": "network",
+            "network_url": "https://example.com/configurations/7345188/networks/2",
+            "configuration_id": 7345188,
+            "configuration_name": "cfg7345188",
+            "configuration_url": "https://example.com/configurations/7345188",
+            "viewable": true
+          }
+        ],
         "vpn_nat_addresses": [
           {
             "ip_address": "3.4.5.6",

data/spec/unit/support/shared/rest_api_context.rb

@@ -27,6 +27,7 @@ require "vagrant-skytap/api/network"
 require "vagrant-skytap/api/public_ip"
 require "vagrant-skytap/api/published_service"
 require "vagrant-skytap/api/resource"
+require "vagrant-skytap/api/tunnel"
 require "vagrant-skytap/api/vm"
 require "vagrant-skytap/api/vpn_attachment"
 require "vagrant-skytap/api/vpn"

data/spec/unit/tunnel_spec.rb

@@ -0,0 +1,62 @@
+# Copyright (c) 2014-2016 Skytap, Inc.
+#
+# The MIT License (MIT)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+require_relative 'base'
+
+describe VagrantPlugins::Skytap::API::Tunnel do
+  include_context "rest_api"
+
+  let(:json_path)      { File.join(File.expand_path('..', __FILE__), 'support', 'api_responses') }
+  let(:tunnel1_attrs)  { read_json(json_path, 'tunnel1.json') }
+  let(:network1_attrs) { read_json(json_path, 'network1.json').merge("id" => "1") }
+  let(:network2_attrs) { network1_attrs.merge("id" => "2", "tunnelable" => true) }
+
+  # TODO is this backward or not???
+  let(:tunnel_attrs)   { tunnel1_attrs.merge("source_network" => network2_attrs, "target_network" => network1_attrs)}
+
+  let(:source_network) { API::Network.new(network1_attrs, nil, env) }
+  let(:target_network) { API::Network.new(network2_attrs, nil, env) }
+
+  let(:nat_subnet)     { "11.0.0.0/24" }
+  let(:tunnelable)     { false }
+
+  let(:provider_config) do
+    double(:provider_config, vm_url: "/vms/1", username: "jsmith", api_token: "123123", base_url: base_url)
+  end
+  let(:api_client) { API::Client.new(provider_config) }
+
+  let(:environment) {nil}
+  let(:env) { { environment: environment, api_client: api_client, provider_config: provider_config } }
+
+  let(:attrs)       { tunnel_attrs }
+  let(:instance)    { described_class.new(attrs, environment, env) }
+
+  describe "create!" do
+    subject { API::Tunnel.create!(env, source_network, target_network) }
+
+    it "should have a source and target network" do
+      expect(subject.source_network).to be_a_kind_of(API::Network)
+      expect(subject.source_network).to be_a_kind_of(API::Network)
+      expect(a_request(:post, %r{/tunnels})).to have_been_made.once
+    end
+  end
+end

data/spec/unit/vm_spec.rb

@@ -38,7 +38,6 @@ describe VagrantPlugins::Skytap::API::Vm do
   let(:api_client) { API::Client.new(provider_config) }
   let(:machine)    { double(:machine, name: "vm1", id: nil, :id= => nil, provider_config: provider_config) }
   let(:env)        { { machine: machine, api_client: api_client } }
-  let(:instance)   { described_class.new(attrs, env) }
 
   let(:environment) do
     env_attrs = empty_environment_attrs
@@ -46,30 +45,19 @@ describe VagrantPlugins::Skytap::API::Vm do
   end
 
   let(:attrs)    { vm1_attrs }
+  let(:runstate) { nil }
   let(:instance) { described_class.new(attrs, environment, env) }
 
-  # Ensure tests are not affected by Skytap credential environment variables
+  let(:get_vm_attrs) { vm1_attrs }
   before :each do
-    ENV.stub(:[] => nil)
-    stub_request(:get, /.*/).to_return(body: '{}', status: 200)
-    stub_request(:get, %r{/vms/\d+}).to_return(body: JSON.dump(attrs), status: 200)
+    stub_get(%r{/vms/\d+}, get_vm_attrs)
+    allow(instance).to receive(:runstate).and_return(runstate)
   end
 
   describe "reload" do
-    subject do
-      new_attrs = attrs.merge('name' => 'VM1, renamed')
-      client = double('api_client',
-        get: double('resp', body: JSON.dump(new_attrs))
-      )
-      myenv = env.merge(api_client: client)
-      described_class.new(attrs, environment, myenv)
-    end
-
-    it "updates the attrs" do
-      expect(subject.get_api_attribute('name')).to eq 'VM1'
-      subject.reload
-      expect(subject.get_api_attribute('name')).to eq 'VM1, renamed'
-    end
+    subject { instance.reload }
+    let(:get_vm_attrs) {vm1_attrs.merge('name' => 'VM1, renamed')}
+    its("name") {should eq 'VM1, renamed'}
   end
 
   describe "url" do
@@ -80,68 +68,73 @@ describe VagrantPlugins::Skytap::API::Vm do
   end
 
   describe "busy?" do
-    subject do
-      instance
-    end
+    subject { instance.busy? }
 
-    it "returns false when stopped" do
-      allow(subject).to receive(:runstate).and_return('stopped')
-      expect(subject.busy?).to eq false
-      allow(subject).to receive(:runstate).and_call_original
+    context "when stopped" do
+      let(:runstate) {'stopped'}
+      it {should be false}
     end
 
-    it "returns false when running" do
-      allow(subject).to receive(:runstate).and_return('running')
-      expect(subject.busy?).to eq false
-      allow(subject).to receive(:runstate).and_call_original
+    context "when running" do
+      let(:runstate) {'running'}
+      it {should be false}
     end
 
-    it "returns true when runstate is busy" do
-      allow(subject).to receive(:runstate).and_return('busy')
-      expect(subject.busy?).to eq true
-      allow(subject).to receive(:runstate).and_call_original
+    context "when busy" do
+      let(:runstate) {'busy'}
+      it {should be true}
     end
   end
 
   describe "running?" do
-    subject do
-      instance
+    subject { instance.running? }
+
+    context "when stopped" do
+      let(:runstate) {'stopped'}
+      it {should be false}
+    end
+
+    context "when suspended" do
+      let(:runstate) {'suspended'}
+      it {should be false}
     end
 
-    it "returns false when stopped" do
-      allow(subject).to receive(:runstate).and_return('stopped')
-      expect(subject.running?).to eq false
-      allow(subject).to receive(:runstate).and_call_original
+    context "when busy" do
+      let(:runstate) {'busy'}
+      it {should be false}
     end
 
-    it "returns false when suspended" do
-      allow(subject).to receive(:runstate).and_return('suspended')
-      expect(subject.running?).to eq false
-      allow(subject).to receive(:runstate).and_call_original
+    context "when running" do
+      let(:runstate) {'running'}
+      it {should be true}
     end
+  end
+
+  describe "parent" do
+    subject {instance.region}
 
-    it "returns false when runstate is busy" do
-      allow(subject).to receive(:runstate).and_return('busy')
-      expect(subject.running?).to eq false
-      allow(subject).to receive(:runstate).and_call_original
+    context "when environment was passed in" do
+      before do
+        expect(a_request(:any, %r{.*})).not_to have_been_made
+      end
+      it { should eq 'US-West'}
     end
 
-    it "returns true when running" do
-      allow(subject).to receive(:runstate).and_return('running')
-      expect(subject.running?).to eq true
-      allow(subject).to receive(:runstate).and_call_original
+    context "when environment was not passed in" do
+      let(:environment) {nil}
+      before do
+        stub_get(%r{/templates/\d+}, {region: 'US-East'})
+      end
+      it { should eq 'US-East'}
     end
   end
 
   describe "region" do
-    subject do
-      fake_template_attrs = {'id' => '5570024', 'region' => 'EMEA'}
-      client = double('api_client',
-        get: double('resp', body: JSON.dump(fake_template_attrs))
-      )
-      myenv = env.merge(api_client: client)
-      described_class.new(attrs, environment, myenv)
+    subject {instance.region}
+
+    before do
+      allow(environment).to receive(:region).and_return('EMEA')
     end
-    its("region") { should == 'EMEA' }
+    it { should eq 'EMEA' }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.3.0
 platform: ruby
 authors:
 - Eric True
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -124,6 +124,8 @@ files:
 - Gemfile
 - lib/vagrant-skytap/action/action_helpers.rb
 - lib/vagrant-skytap/action/add_vm_to_environment.rb
+- lib/vagrant-skytap/action/check_created.rb
+- lib/vagrant-skytap/action/check_running.rb
 - lib/vagrant-skytap/action/clear_forwarded_ports.rb
 - lib/vagrant-skytap/action/compose_environment.rb
 - lib/vagrant-skytap/action/create_environment.rb
@@ -132,6 +134,7 @@ files:
 - lib/vagrant-skytap/action/existence_check.rb
 - lib/vagrant-skytap/action/fetch_environment.rb
 - lib/vagrant-skytap/action/forward_ports.rb
+- lib/vagrant-skytap/action/get_host_vm.rb
 - lib/vagrant-skytap/action/initial_state.rb
 - lib/vagrant-skytap/action/initialize_api_client.rb
 - lib/vagrant-skytap/action/is_parallelized.rb
@@ -165,6 +168,7 @@ files:
 - lib/vagrant-skytap/action.rb
 - lib/vagrant-skytap/api/busyable.rb
 - lib/vagrant-skytap/api/client.rb
+- lib/vagrant-skytap/api/connectable.rb
 - lib/vagrant-skytap/api/credentials.rb
 - lib/vagrant-skytap/api/environment.rb
 - lib/vagrant-skytap/api/interface.rb
@@ -175,9 +179,11 @@ files:
 - lib/vagrant-skytap/api/resource.rb
 - lib/vagrant-skytap/api/runstate_operations.rb
 - lib/vagrant-skytap/api/specified_attributes.rb
+- lib/vagrant-skytap/api/tunnel.rb
 - lib/vagrant-skytap/api/vm.rb
 - lib/vagrant-skytap/api/vpn.rb
 - lib/vagrant-skytap/api/vpn_attachment.rb
+- lib/vagrant-skytap/cap/host_metadata.rb
 - lib/vagrant-skytap/cap/public_address.rb
 - lib/vagrant-skytap/command/helpers.rb
 - lib/vagrant-skytap/command/publish_url/create.rb
@@ -186,6 +192,11 @@ files:
 - lib/vagrant-skytap/command/publish_url/show.rb
 - lib/vagrant-skytap/command/up.rb
 - lib/vagrant-skytap/config.rb
+- lib/vagrant-skytap/connection/public_ip_choice.rb
+- lib/vagrant-skytap/connection/published_service_choice.rb
+- lib/vagrant-skytap/connection/tunnel_choice.rb
+- lib/vagrant-skytap/connection/vpn_choice.rb
+- lib/vagrant-skytap/connection.rb
 - lib/vagrant-skytap/core_ext/object/blank.rb
 - lib/vagrant-skytap/core_ext/object/tap.rb
 - lib/vagrant-skytap/core_ext/try.rb
@@ -217,17 +228,25 @@ files:
 - spec/unit/actions/update_hardware_spec.rb
 - spec/unit/api_client_spec.rb
 - spec/unit/base.rb
+- spec/unit/cap/host_metadata_spec.rb
 - spec/unit/config_spec.rb
+- spec/unit/connections/public_ip_choice_spec.rb
+- spec/unit/connections/published_service_choice_spec.rb
+- spec/unit/connections/tunnel_choice_spec.rb
+- spec/unit/connections/vpn_choice_spec.rb
 - spec/unit/credentials_spec.rb
 - spec/unit/environment_spec.rb
 - spec/unit/forwarded_port_spec.rb
 - spec/unit/hosts/common/cap/ssh_tunnel_spec.rb
+- spec/unit/interface_spec.rb
+- spec/unit/network_spec.rb
 - spec/unit/prepare_collision_params_spec.rb
 - spec/unit/publish_set_spec.rb
 - spec/unit/setup_helper_spec.rb
 - spec/unit/support/api_responses/empty_environment.json
 - spec/unit/support/api_responses/empty_publish_set.json
 - spec/unit/support/api_responses/network1.json
+- spec/unit/support/api_responses/tunnel1.json
 - spec/unit/support/api_responses/vm1.json
 - spec/unit/support/api_responses/vpn1.json
 - spec/unit/support/api_responses/vpn_attachment1.json
@@ -243,6 +262,7 @@ files:
 - spec/unit/support/forwarded_ports/machines/vm4/skytap/tcp8888_tcp_8888_80.pid
 - spec/unit/support/shared/rest_api_context.rb
 - spec/unit/support/shared/skytap_context.rb
+- spec/unit/tunnel_spec.rb
 - spec/unit/vm_spec.rb
 - tasks/acceptance.rake
 - tasks/bundler.rake