vagrant-skytap 0.1.5 → 0.1.6

data/spec/unit/environment_spec.rb

@@ -1,5 +1,7 @@
 require_relative 'base'
 require "vagrant-skytap/api/environment"
+require "vagrant-skytap/api/vm"
+require "vagrant-skytap/errors"
 
 describe VagrantPlugins::Skytap::API::Environment do
   include_context "unit"
@@ -7,13 +9,17 @@ describe VagrantPlugins::Skytap::API::Environment do
 
   let(:vm1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vm1.json'))) }
   let(:vm2_attrs) { vm1_attrs.merge("id" => "6981851", "name" => "VM2") }
+  let(:config_vm_attrs) { vm1_attrs.merge("configuration_url" => "https://example.com/configurations/5570024", "template_url" => nil) }
   let(:network1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'network1.json'))) }
+  let(:vpn_attachment1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vpn_attachment1.json'))) }
   let(:empty_environment_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'empty_environment.json')))}
 
   let(:attrs_one_vm) do
     empty_environment_attrs.dup.tap do |ret|
       ret['vms'] = [vm1_attrs]
-      ret['networks'] = [network1_attrs]
+      ret['networks'] = [network1_attrs.dup.tap do |ret|
+        ret['vpn_attachments'] = [vpn_attachment1_attrs]
+      end]
     end
   end
 
@@ -46,7 +52,11 @@ describe VagrantPlugins::Skytap::API::Environment do
     ENV.stub(:[] => nil)
   end
 
-  describe "check_vm_before_adding" do
+  describe "check_vm_before_adding class method" do
+    after(:each) do
+      allow(subject).to receive(:runstate).and_call_original
+    end
+
     subject do
       instance.vms.first
     end
@@ -54,20 +64,49 @@ describe VagrantPlugins::Skytap::API::Environment do
     it "raises SourceVmNotStopped if the vm is running" do
       allow(subject).to receive(:runstate).and_return('running')
       expect {described_class.check_vm_before_adding(env, subject)}.to raise_error(Errors::SourceVmNotStopped)
-      allow(subject).to receive(:runstate).and_call_original
     end
 
     it "raises SourceVmNotStopped if the vm is suspended" do
       allow(subject).to receive(:runstate).and_return('suspended')
       expect {described_class.check_vm_before_adding(env, subject)}.to raise_error(Errors::SourceVmNotStopped)
-      allow(subject).to receive(:runstate).and_call_original
     end
 
     it "raises nothing if the vm is stopped" do
       allow(subject).to receive(:runstate).and_return('stopped')
       expect {described_class.check_vm_before_adding(env, subject)}.to_not raise_error
+    end
+
+    it "raises NotTemplateVm if the vm is not a template vm" do
+      vm = VagrantPlugins::Skytap::API::Vm.new(config_vm_attrs, nil, env)
+      expect {described_class.check_vm_before_adding(env, vm)}.to raise_error(Errors::NotTemplateVm)
+    end
+  end
+
+  describe "check_vm_before_adding instance method" do
+    after(:each) do
+      allow(subject).to receive(:region).and_call_original
       allow(subject).to receive(:runstate).and_call_original
     end
+
+    subject do
+      instance.vms.first
+    end
+
+    it "raises RegionMismatch if the vm is in a different region" do
+      allow(subject).to receive(:region).and_return('EMEA')
+      expect {subject.environment.check_vm_before_adding(env, subject)}.to raise_error(Errors::RegionMismatch)
+    end
+
+    it "raises SourceVmNotStopped if the vm is in the same region but running" do
+      allow(subject).to receive(:region).and_return('US-West')
+      allow(subject).to receive(:runstate).and_return('running')
+      expect {subject.environment.check_vm_before_adding(env, subject)}.to raise_error(Errors::SourceVmNotStopped)
+    end
+
+    it "raises nothing if the vm is in the same region" do
+      allow(subject).to receive(:region).and_return('US-West')
+      expect {subject.environment.check_vm_before_adding(env, subject)}.to_not raise_error
+    end
   end
 
   describe "vms" do

data/spec/unit/setup_helper_spec.rb

@@ -0,0 +1,128 @@
+require_relative 'base'
+require "vagrant-skytap/setup_helper"
+require "vagrant-skytap/api/environment"
+require "vagrant-skytap/api/vpn"
+require "vagrant-skytap/api/vpn_attachment"
+
+describe VagrantPlugins::Skytap::SetupHelper do
+  include_context "unit"
+
+  let(:instance) { described_class.new }
+
+  let(:vm1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vm1.json'))) }
+  let(:network1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'network1.json'))) }
+  let(:vpn1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vpn1.json'))) }
+  let(:vpn_attachment1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vpn_attachment1.json'))) }
+  let(:empty_environment_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'empty_environment.json')))}
+
+
+  let(:network_attrs) do
+    network1_attrs.dup.tap do |ret|
+      ret['vpn_attachments'] = [vpn_attachment1_attrs]
+    end
+  end
+
+  let(:vm_attrs) do
+    vm1_attrs.dup.tap do |ret|
+      ret['interfaces'].first['nat_addresses']['vpn_nat_addresses'] = {}
+    end
+  end
+
+  let(:environment_attrs) do
+    empty_environment_attrs.dup.tap do |ret|
+      ret['vms'] = [vm_attrs]
+      ret['networks'] = [network1_attrs]
+    end
+  end
+
+  let(:environment) { VagrantPlugins::Skytap::API::Environment.new(environment_attrs, env) }
+
+  let(:vpn_attrs) do
+    vpn1_attrs.dup.tap do |ret|
+      ret['network_attachments'] = [vpn_attachment1_attrs]
+    end
+  end
+
+  let(:vpn) {VagrantPlugins::Skytap::API::Vpn.new(vpn_attrs, env)}
+
+  let(:iso_env) do
+    # We have to create a Vagrantfile so there is a root path
+    env = isolated_environment
+    env.vagrantfile("")
+    env.create_vagrant_env
+  end
+
+  let(:machine)  { iso_env.machine(iso_env.machine_names[0], :dummy) }
+  let(:env)      {{ machine: machine, api_client: double(post: Net::HTTPOK) }}
+  let(:instance) { described_class.new(attrs, env) }
+
+  let(:api_client) do
+    # By default, all GET requests will return an environment with VM1, VM2, and 1 network
+    double('api_client',
+      get: double('resp', body: JSON.dump(attrs))
+    )
+  end
+
+  before :each do
+    # Ensure tests are not affected by Skytap credential environment variables
+    ENV.stub(:[] => nil)
+
+    machine.id = environment.vms.first.id
+  end
+
+  after(:each) do
+    allow(machine).to receive(:provider_config).and_call_original
+  end
+
+  describe "ask_routing" do
+    after(:each) do
+      allow_any_instance_of(VpnChoice).to receive(:choose).and_call_original
+    end
+
+    subject do
+      myenv = env.merge(
+        ui:         double(ask: '')
+      )
+      described_class.new(myenv, environment).tap do |ret|
+        allow(ret).to receive(:vpns).and_return([vpn])
+      end
+    end
+
+    it "has connection_choices" do
+      interface = subject.current_vm.interfaces.first
+      choices = subject.send(:connection_choices, interface)
+      expect(choices.count).to eq 1
+      expect(choices.first.vpn).to_not be_nil
+    end
+
+    it "does not show choices if vpn_url specified" do
+      allow_any_instance_of(VpnChoice).to receive(:choose).and_return(['1.2.3.4', 22])
+
+      cfg = VagrantPlugins::Skytap::Config.new
+      cfg.vpn_url = vpn.url
+      cfg.finalize!
+      allow(machine).to receive(:provider_config).and_return cfg
+
+      expect(subject).not_to receive(:ask_from_list)
+      subject.send(:ask_routing)
+    end
+
+    it "raises DoesNotExist if non-existent vpn_url specified" do
+      cfg = VagrantPlugins::Skytap::Config.new
+      cfg.vpn_url = 'bogus'
+      cfg.finalize!
+      allow(machine).to receive(:provider_config).and_return cfg
+
+      expect{subject.send(:ask_routing)}.to raise_error(Errors::DoesNotExist)
+    end
+
+    it "shows choices if vpn_url unspecified" do
+      cfg = VagrantPlugins::Skytap::Config.new
+      cfg.finalize!
+      allow(machine).to receive(:provider_config).and_return cfg
+
+      expect(subject).to receive(:ask_from_list)
+      subject.send(:ask_routing)
+    end
+  end
+end

data/spec/unit/skeletons/network1.json

@@ -11,26 +11,7 @@
   "secondary_nameserver": null,
   "region": "US-West",
   "domain": "skytap.example",
-  "vpn_attachments": [
-    {
-      "id": "3288116-vpn-711360",
-      "connected": true,
-      "network": {
-        "id": "3288116",
-        "subnet": "10.0.0.0/24",
-        "network_name": "Default Network",
-        "configuration_id": "5570024"
-      },
-      "vpn": {
-        "id": "vpn-711360",
-        "name": "Skytap sea9 NAT VPN",
-        "enabled": true,
-        "nat_enabled": true,
-        "remote_subnets": "10.1.0.0/24, 10.1.1.0/24, 10.1.2.0/24, 10.1.4.0/24, 10.1.6.0/24, 10.1.8.0/24, 10.1.16.0/24, 172.16.89.0/24, 192.168.0.0/16",
-        "remote_peer_ip": "66.193.98.66"
-      }
-    }
-  ],
+  "vpn_attachments": [],
   "tunnelable": false,
   "tunnels": []
 }

data/spec/unit/skeletons/vm1.json

@@ -50,10 +50,10 @@
         "network_nat_addresses": [],
         "vpn_nat_addresses": [
           {
-            "ip_address": "10.1.130.104",
-            "vpn_id": "vpn-711360",
-            "vpn_name": "Skytap sea9 NAT VPN",
-            "vpn_url": "https://example.com/vpns/vpn-711360"
+            "ip_address": "3.4.5.6",
+            "vpn_id": "vpn-123",
+            "vpn_name": "my VPN",
+            "vpn_url": "https://example.com/vpns/vpn-123"
           }
         ]
       },
@@ -72,7 +72,7 @@
   "credentials": [
     {
       "id": "5695620",
-      "text": "skytap / ChangeMe!"
+      "text": "xxx / yyy"
     }
   ],
   "desktop_resizable": true,

data/spec/unit/skeletons/vpn1.json

@@ -0,0 +1,26 @@
+{
+  "id": "vpn-123",
+  "url": "https://example.com/vpns/123",
+  "name": "my VPN",
+  "status": "active",
+  "enabled": true,
+  "remote_subnets": [
+    {
+      "id": "10.1.0.0/24",
+      "cidr_block": "10.1.0.0/24",
+      "excluded": false
+    }
+  ],
+  "local_subnet": "10.1.128.0/19",
+  "nat_local_subnet": true,
+  "route_based": false,
+  "error": null,
+  "local_peer_ip": "2.3.4.5",
+  "remote_peer_ip": "1.2.3.4",
+  "attached_network_count": 264,
+  "connected_network_count": 1,
+  "network_attachments": [],
+  "test_results": {},
+  "region": "US-West",
+  "region_backend": "skytap"
+}

data/spec/unit/skeletons/vpn_attachment1.json

@@ -0,0 +1,18 @@
+{
+  "id": "1-vpn-1",
+  "connected": true,
+  "network": {
+    "id": "3288116",
+    "subnet": "10.0.0.0/24",
+    "network_name": "Default Network",
+    "configuration_id": "5570024"
+  },
+  "vpn": {
+    "id": "vpn-123",
+    "name": "my VPN",
+    "enabled": true,
+    "nat_enabled": true,
+    "remote_subnets": "10.1.0.0/24",
+    "remote_peer_ip": "1.2.3.4"
+  }
+}

data/spec/unit/vm_spec.rb

@@ -115,4 +115,16 @@ describe VagrantPlugins::Skytap::API::Vm do
       allow(subject).to receive(:runstate).and_call_original
     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)
+    end
+    its("region") { should == 'EMEA' }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Nick Astete
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -118,16 +118,15 @@ files:
 - ".hgignore"
 - ".project"
 - ".rspec"
-- 1-2.diff
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- dummy.box
-- example_box/README.md
-- example_box/metadata.json
-- f.diff
+- boxes/README.md
+- boxes/empty.box
+- boxes/metadata.json
+- eng-10369.diff
 - lib/vagrant-skytap.rb
 - lib/vagrant-skytap/action.rb
 - lib/vagrant-skytap/action/add_vm_to_environment.rb
@@ -161,6 +160,7 @@ files:
 - lib/vagrant-skytap/action/suspend_vm.rb
 - lib/vagrant-skytap/action/timed_provision.rb
 - lib/vagrant-skytap/action/update_hardware.rb
+- lib/vagrant-skytap/action/wait_for_communicator.rb
 - lib/vagrant-skytap/api/busyable.rb
 - lib/vagrant-skytap/api/client.rb
 - lib/vagrant-skytap/api/credentials.rb
@@ -191,7 +191,6 @@ files:
 - lib/vagrant-skytap/version.rb
 - lib/vagrant-skytap/vm_properties.rb
 - locales/en.yml
-- skytap-dummy.box
 - spec/acceptance/base.rb
 - spec/acceptance/provider/halt_spec.rb
 - spec/acceptance/shared/context_skytap.rb
@@ -200,9 +199,12 @@ files:
 - spec/unit/base.rb
 - spec/unit/config_spec.rb
 - spec/unit/environment_spec.rb
+- spec/unit/setup_helper_spec.rb
 - spec/unit/skeletons/empty_environment.json
 - spec/unit/skeletons/network1.json
 - spec/unit/skeletons/vm1.json
+- spec/unit/skeletons/vpn1.json
+- spec/unit/skeletons/vpn_attachment1.json
 - spec/unit/support/dummy_communicator.rb
 - spec/unit/support/dummy_provider.rb
 - spec/unit/support/isolated_environment.rb