vagrant-openstack-provider 0.3.4.pre → 0.4.0

data/spec/vagrant-openstack-provider/action/read_ssh_info_spec.rb

@@ -14,9 +14,11 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
       config.stub(:tenant_name) { 'testTenant' }
       config.stub(:username) { 'username' }
       config.stub(:password) { 'password' }
-      config.stub(:ssh_username) { 'sshuser' }
+      config.stub(:ssh_username) { 'test_username' }
       config.stub(:floating_ip) { nil }
       config.stub(:floating_ip_pool) { nil }
+      config.stub(:keypair_name) { nil }
+      config.stub(:public_key_path) { nil }
     end
   end
 
@@ -36,12 +38,26 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
     end
   end
 
+  let(:ssh_config) do
+    double('ssh_config').tap do |config|
+      config.stub(:username) { 'sshuser' }
+      config.stub(:port) { nil }
+    end
+  end
+
+  let(:machine_config) do
+    double('machine_config').tap do |config|
+      config.stub(:ssh) { ssh_config }
+    end
+  end
+
   let(:env) do
     Hash.new.tap do |env|
       env[:ui] = double('ui')
       env[:ui].stub(:info).with(anything)
       env[:machine] = double('machine')
       env[:machine].stub(:provider_config) { config }
+      env[:machine].stub(:config) { machine_config }
       env[:machine].stub(:id) { '1234' }
       env[:machine].stub(:data_dir) { '/data/dir' }
       env[:openstack_client] = double('openstack_client')
@@ -56,6 +72,36 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
   end
 
   describe 'read_ssh_info' do
+    context 'with deprecated ssh_username specified' do
+      context 'with ssh.username specified' do
+        it 'returns ssh.username' do
+          ssh_config.stub(:username) { 'sshuser' }
+          config.stub(:ssh_username) { 'test_username' }
+          config.stub(:floating_ip) { '80.80.80.80' }
+          config.stub(:keypair_name) { 'my_keypair' }
+          @action.read_ssh_info(env).should eq(host: '80.80.80.80', port: 22, username: 'sshuser')
+        end
+      end
+      context 'without ssh.username specified' do
+        it 'returns ssh.username' do
+          ssh_config.stub(:username) { nil }
+          config.stub(:ssh_username) { 'test_username' }
+          config.stub(:floating_ip) { '80.80.80.80' }
+          config.stub(:keypair_name) { 'my_keypair' }
+          @action.read_ssh_info(env).should eq(host: '80.80.80.80', port: 22, username: 'test_username')
+        end
+      end
+    end
+
+    context 'with ssh.port overriden' do
+      it 'returns ssh.port' do
+        ssh_config.stub(:port) { 33 }
+        config.stub(:floating_ip) { '80.80.80.80' }
+        config.stub(:keypair_name) { 'my_keypair' }
+        @action.read_ssh_info(env).should eq(host: '80.80.80.80', port: 33, username: 'sshuser')
+      end
+    end
+
     context 'with config.floating_ip specified' do
       context 'with keypair_name specified' do
         it 'returns the specified floating ip' do
@@ -84,9 +130,7 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
         end
       end
     end
-  end
 
-  describe 'read_ssh_info' do
     context 'without config.floating_ip specified' do
       it 'return the a floating_ip found by querying server details' do
         nova.stub(:get_server_details).with(env, '1234') do
@@ -106,4 +150,5 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
       end
     end
   end
+
 end

data/spec/vagrant-openstack-provider/client/cinder_spec.rb

@@ -0,0 +1,114 @@
+require 'vagrant-openstack-provider/spec_helper'
+
+describe VagrantPlugins::Openstack::CinderClient do
+
+  let(:env) do
+    Hash.new
+  end
+
+  let(:session) do
+    VagrantPlugins::Openstack.session
+  end
+
+  before :each do
+    session.token = '123456'
+    session.project_id = 'a1b2c3'
+    session.endpoints = { volume: 'http://cinder' }
+    @cinder_client = VagrantPlugins::Openstack::CinderClient.instance
+  end
+
+  describe 'get_all_volumes' do
+    context 'on api v1' do
+      it 'returns volumes with details' do
+
+        stub_request(:get, 'http://cinder/volumes/detail')
+        .with(
+            headers:
+                {
+                  'Accept' => 'application/json',
+                  'X-Auth-Token' => '123456'
+                })
+        .to_return(
+            status: 200,
+            body: '
+                {
+                  "volumes": [
+                    {
+                      "id": "987",
+                      "display_name": "vol-01",
+                      "size": "2",
+                      "status": "available",
+                      "bootable": "true",
+                      "attachments": []
+                    },
+                    {
+                      "id": "654",
+                      "display_name": "vol-02",
+                      "size": "4",
+                      "status": "in-use",
+                      "bootable": "false",
+                      "attachments": [
+                        {
+                          "server_id": "inst-01",
+                          "device": "/dev/vdc"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ')
+
+        volumes = @cinder_client.get_all_volumes(env)
+
+        expect(volumes).to eq [Volume.new('987', 'vol-01', '2', 'available', 'true', nil, nil),
+                               Volume.new('654', 'vol-02', '4', 'in-use', 'false', 'inst-01', '/dev/vdc')]
+      end
+    end
+
+    context 'on api v2' do
+      it 'returns volumes with details' do
+
+        stub_request(:get, 'http://cinder/volumes/detail')
+        .with(
+            headers:
+                {
+                  'Accept' => 'application/json',
+                  'X-Auth-Token' => '123456'
+                })
+        .to_return(
+            status: 200,
+            body: '
+                {
+                  "volumes": [
+                    {
+                      "id": "987",
+                      "name": "vol-01",
+                      "size": "2",
+                      "status": "available",
+                      "bootable": "true",
+                      "attachments": []
+                    },
+                    {
+                      "id": "654",
+                      "name": "vol-02",
+                      "size": "4",
+                      "status": "in-use",
+                      "bootable": "false",
+                      "attachments": [
+                        {
+                          "server_id": "inst-01",
+                          "device": "/dev/vdc"
+                        }
+                      ]
+                    }
+                  ]
+                }')
+
+        volumes = @cinder_client.get_all_volumes(env)
+
+        expect(volumes).to eq [Volume.new('987', 'vol-01', '2', 'available', 'true', nil, nil),
+                               Volume.new('654', 'vol-02', '4', 'in-use', 'false', 'inst-01', '/dev/vdc')]
+      end
+    end
+  end
+end

data/spec/vagrant-openstack-provider/client/nova_spec.rb

@@ -114,6 +114,37 @@ describe VagrantPlugins::Openstack::NovaClient do
         expect(instance_id).to eq('o1o2o3')
       end
 
+      context 'with all options specified' do
+        it 'returns new instance id' do
+          stub_request(:post, 'http://nova/a1b2c3/servers')
+              .with(
+                body: '{"server":{"name":"inst","imageRef":"img","flavorRef":"flav","key_name":"key",'\
+                '"security_groups":["default"],"user_data":"user_data_test","metadata":"metadata_test"},'\
+                '"scheduler_hints":"sched_hints_test"}',
+                headers:
+                {
+                  'Accept' => 'application/json',
+                  'Content-Type' => 'application/json',
+                  'X-Auth-Token' => '123456'
+                })
+              .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
+
+          instance_id = @nova_client.create_server(
+            env,
+            name: 'inst',
+            image_ref: 'img',
+            flavor_ref: 'flav',
+            networks: nil,
+            keypair: 'key',
+            security_groups: ['default'],
+            user_data: 'user_data_test',
+            metadata: 'metadata_test',
+            scheduler_hints: 'sched_hints_test')
+
+          expect(instance_id).to eq('o1o2o3')
+        end
+      end
+
       context 'with one two networks' do
         it 'returns new instance id' do
 
@@ -154,6 +185,25 @@ describe VagrantPlugins::Openstack::NovaClient do
         end
       end
 
+      context 'with volume_boot' do
+        it 'returns new instance id' do
+
+          stub_request(:post, 'http://nova/a1b2c3/servers')
+          .with(
+              body: '{"server":{"name":"inst","block_device_mapping":[{"volume_id":"vol","device_name":"vda"}],"flavorRef":"flav","key_name":"key"}}',
+              headers:
+                  {
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json',
+                    'X-Auth-Token' => '123456'
+                  })
+          .to_return(status: 202, body: '{ "server": { "id": "o1o2o3" } }')
+
+          instance_id = @nova_client.create_server(env, name: 'inst', volume_boot: { id: 'vol', device: 'vda' }, flavor_ref: 'flav', keypair: 'key')
+
+          expect(instance_id).to eq('o1o2o3')
+        end
+      end
     end
   end
 

data/spec/vagrant-openstack-provider/command/floatingip_list_spec.rb

@@ -3,17 +3,6 @@ require 'vagrant-openstack-provider/spec_helper'
 describe VagrantPlugins::Openstack::Command::FloatingIpList do
   describe 'cmd' do
 
-    let(:config) do
-      double('config').tap do |config|
-        config.stub(:openstack_auth_url) { 'http://keystoneAuthV2' }
-        config.stub(:openstack_compute_url) { nil }
-        config.stub(:openstack_network_url) { nil }
-        config.stub(:tenant_name) { 'testTenant' }
-        config.stub(:username) { 'username' }
-        config.stub(:password) { 'password' }
-      end
-    end
-
     let(:nova) do
       double('nova').tap do |nova|
         nova.stub(:get_floating_ip_pools) do
@@ -61,6 +50,8 @@ describe VagrantPlugins::Openstack::Command::FloatingIpList do
     end
 
     it 'should get floating ip and floating ip pool from server' do
+      nova.should_receive(:get_floating_ip_pools).with(env)
+      nova.should_receive(:get_floating_ips).with(env)
       @floating_ip_list_cmd.cmd('floatingip-list', ['--'], env)
     end
   end

data/spec/vagrant-openstack-provider/command/volume_list_spec.rb

@@ -0,0 +1,33 @@
+require 'vagrant-openstack-provider/spec_helper'
+
+describe VagrantPlugins::Openstack::Command::FloatingIpList do
+  describe 'cmd' do
+
+    let(:cinder) do
+      double('cinder').tap do |cinder|
+        cinder.stub(:get_all_volumes) do
+          [Volume.new('987', 'vol-01', '2', 'available', 'true', nil, nil),
+           Volume.new('654', 'vol-02', '4', 'in-use', 'false', 'inst-01', '/dev/vdc')]
+        end
+      end
+    end
+
+    let(:env) do
+      Hash.new.tap do |env|
+        env[:ui] = double('ui')
+        env[:ui].stub(:info).with(anything)
+        env[:openstack_client] = double
+        env[:openstack_client].stub(:cinder) { cinder }
+      end
+    end
+
+    before :each do
+      @volume_list_cmd = VagrantPlugins::Openstack::Command::VolumeList.new(nil, env)
+    end
+
+    it 'should get volumes list from server' do
+      cinder.should_receive(:get_all_volumes).with(env)
+      @volume_list_cmd.cmd('volume-list', [], env)
+    end
+  end
+end

data/spec/vagrant-openstack-provider/config_spec.rb

@@ -22,6 +22,11 @@ describe VagrantPlugins::Openstack::Config do
     its(:public_key_path) { should be_nil }
     its(:availability_zone) { should be_nil }
     its(:ssh_username) { should be_nil }
+    its(:floating_ip_pool_always_allocate) { should be_false }
+    its(:scheduler_hints) { should be_nil }
+    its(:security_groups) { should be_nil }
+    its(:user_data) { should be_nil }
+    its(:metadata) { should be_nil }
   end
 
   describe 'overriding defaults' do
@@ -35,6 +40,11 @@ describe VagrantPlugins::Openstack::Config do
       :username,
       :keypair_name,
       :ssh_username,
+      :floating_ip_pool_always_allocate,
+      :scheduler_hints,
+      :security_groups,
+      :user_data,
+      :metadata,
       :availability_zone,
       :public_key_path].each do |attribute|
       it "should not default #{attribute} if overridden" do
@@ -64,6 +74,7 @@ describe VagrantPlugins::Openstack::Config do
       error_message.stub(:yellow) { 'Yellowed Error message ' }
       machine.stub_chain(:env, :root_path).and_return '/'
       ssh.stub(:private_key_path) { 'private key path' }
+      ssh.stub(:username) { 'ssh username' }
       config.stub(:ssh) { ssh }
       machine.stub(:config) { config }
       subject.username = 'foo'
@@ -86,6 +97,15 @@ describe VagrantPlugins::Openstack::Config do
       end
     end
 
+    context 'with no ssh username provider' do
+      it 'should raise an error' do
+        ssh.stub(:username) { nil }
+        subject.ssh_username = nil
+        I18n.should_receive(:t).with('vagrant_openstack.config.ssh_username_required').and_return error_message
+        validation_errors.first.should == error_message
+      end
+    end
+
     context 'with good values' do
       it 'should validate' do
         validation_errors.should be_empty

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-provider
 version: !ruby/object:Gem::Version
-  version: 0.3.4.pre
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Guillaume Giamarchi
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkey
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -84,20 +95,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -105,6 +119,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,15 +127,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Enables Vagrant to manage machines in Openstack Cloud.
@@ -165,6 +182,7 @@ files:
 - lib/vagrant-openstack-provider/action/sync_folders.rb
 - lib/vagrant-openstack-provider/action/wait_active.rb
 - lib/vagrant-openstack-provider/action/wait_stop.rb
+- lib/vagrant-openstack-provider/client/cinder.rb
 - lib/vagrant-openstack-provider/client/domain.rb
 - lib/vagrant-openstack-provider/client/http_utils.rb
 - lib/vagrant-openstack-provider/client/keystone.rb
@@ -179,6 +197,7 @@ files:
 - lib/vagrant-openstack-provider/command/main.rb
 - lib/vagrant-openstack-provider/command/network_list.rb
 - lib/vagrant-openstack-provider/command/utils.rb
+- lib/vagrant-openstack-provider/command/volume_list.rb
 - lib/vagrant-openstack-provider/config.rb
 - lib/vagrant-openstack-provider/errors.rb
 - lib/vagrant-openstack-provider/plugin.rb
@@ -188,11 +207,13 @@ files:
 - spec/vagrant-openstack-provider/action/connect_openstack_spec.rb
 - spec/vagrant-openstack-provider/action/create_server_spec.rb
 - spec/vagrant-openstack-provider/action/read_ssh_info_spec.rb
+- spec/vagrant-openstack-provider/client/cinder_spec.rb
 - spec/vagrant-openstack-provider/client/keystone_spec.rb
 - spec/vagrant-openstack-provider/client/neutron_spec.rb
 - spec/vagrant-openstack-provider/client/nova_spec.rb
 - spec/vagrant-openstack-provider/client/utils_spec.rb
 - spec/vagrant-openstack-provider/command/floatingip_list_spec.rb
+- spec/vagrant-openstack-provider/command/volume_list_spec.rb
 - spec/vagrant-openstack-provider/config_spec.rb
 - spec/vagrant-openstack-provider/provider_spec.rb
 - spec/vagrant-openstack-provider/spec_helper.rb
@@ -200,36 +221,45 @@ files:
 - vagrant-openstack-provider.gemspec
 homepage: https://github.com/ggiamarchi/vagrant-openstack-provider
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4437050053646903495
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -4437050053646903495
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Enables Vagrant to manage machines in Openstack Cloud.
 test_files:
 - spec/vagrant-openstack-provider/action/connect_openstack_spec.rb
 - spec/vagrant-openstack-provider/action/create_server_spec.rb
 - spec/vagrant-openstack-provider/action/read_ssh_info_spec.rb
+- spec/vagrant-openstack-provider/client/cinder_spec.rb
 - spec/vagrant-openstack-provider/client/keystone_spec.rb
 - spec/vagrant-openstack-provider/client/neutron_spec.rb
 - spec/vagrant-openstack-provider/client/nova_spec.rb
 - spec/vagrant-openstack-provider/client/utils_spec.rb
 - spec/vagrant-openstack-provider/command/floatingip_list_spec.rb
+- spec/vagrant-openstack-provider/command/volume_list_spec.rb
 - spec/vagrant-openstack-provider/config_spec.rb
 - spec/vagrant-openstack-provider/provider_spec.rb
 - spec/vagrant-openstack-provider/spec_helper.rb