vagrant-openstack-provider 0.6.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +15 -0
  3. data/lib/vagrant-openstack-provider/action/connect_openstack.rb +0 -1
  4. data/lib/vagrant-openstack-provider/action/create_server.rb +3 -2
  5. data/lib/vagrant-openstack-provider/action/create_stack.rb +3 -2
  6. data/lib/vagrant-openstack-provider/action/delete_server.rb +3 -2
  7. data/lib/vagrant-openstack-provider/action/delete_stack.rb +3 -2
  8. data/lib/vagrant-openstack-provider/action/wait_active.rb +3 -3
  9. data/lib/vagrant-openstack-provider/action/wait_stop.rb +3 -3
  10. data/lib/vagrant-openstack-provider/catalog/openstack_catalog.rb +6 -5
  11. data/lib/vagrant-openstack-provider/client/cinder.rb +0 -1
  12. data/lib/vagrant-openstack-provider/client/domain.rb +0 -1
  13. data/lib/vagrant-openstack-provider/client/glance.rb +5 -3
  14. data/lib/vagrant-openstack-provider/client/heat.rb +0 -1
  15. data/lib/vagrant-openstack-provider/client/http_utils.rb +7 -6
  16. data/lib/vagrant-openstack-provider/client/keystone.rb +5 -4
  17. data/lib/vagrant-openstack-provider/client/neutron.rb +0 -1
  18. data/lib/vagrant-openstack-provider/client/nova.rb +0 -1
  19. data/lib/vagrant-openstack-provider/client/openstack.rb +0 -1
  20. data/lib/vagrant-openstack-provider/client/request_logger.rb +0 -1
  21. data/lib/vagrant-openstack-provider/client/rest_utils.rb +25 -0
  22. data/lib/vagrant-openstack-provider/command/abstract_command.rb +4 -1
  23. data/lib/vagrant-openstack-provider/command/flavor_list.rb +3 -5
  24. data/lib/vagrant-openstack-provider/command/floatingip_list.rb +3 -5
  25. data/lib/vagrant-openstack-provider/command/image_list.rb +3 -5
  26. data/lib/vagrant-openstack-provider/command/network_list.rb +3 -5
  27. data/lib/vagrant-openstack-provider/command/openstack_command.rb +16 -0
  28. data/lib/vagrant-openstack-provider/command/reset.rb +1 -2
  29. data/lib/vagrant-openstack-provider/command/subnet_list.rb +2 -5
  30. data/lib/vagrant-openstack-provider/command/volume_list.rb +3 -5
  31. data/lib/vagrant-openstack-provider/config.rb +59 -2
  32. data/lib/vagrant-openstack-provider/config/http.rb +39 -0
  33. data/lib/vagrant-openstack-provider/config_resolver.rb +13 -9
  34. data/lib/vagrant-openstack-provider/utils.rb +11 -6
  35. data/lib/vagrant-openstack-provider/version.rb +1 -1
  36. data/locales/en.yml +4 -0
  37. data/spec/vagrant-openstack-provider/action/connect_openstack_spec.rb +226 -4
  38. data/spec/vagrant-openstack-provider/action/create_server_spec.rb +6 -3
  39. data/spec/vagrant-openstack-provider/action/create_stack_spec.rb +7 -3
  40. data/spec/vagrant-openstack-provider/action/delete_server_spec.rb +13 -4
  41. data/spec/vagrant-openstack-provider/action/read_ssh_info_spec.rb +24 -3
  42. data/spec/vagrant-openstack-provider/action/wait_active_spec.rb +9 -2
  43. data/spec/vagrant-openstack-provider/action/wait_stop_spec.rb +9 -2
  44. data/spec/vagrant-openstack-provider/client/cinder_spec.rb +17 -1
  45. data/spec/vagrant-openstack-provider/client/glance_spec.rb +18 -2
  46. data/spec/vagrant-openstack-provider/client/heat_spec.rb +8 -0
  47. data/spec/vagrant-openstack-provider/client/keystone_spec.rb +8 -0
  48. data/spec/vagrant-openstack-provider/client/neutron_spec.rb +18 -2
  49. data/spec/vagrant-openstack-provider/client/nova_spec.rb +8 -0
  50. data/spec/vagrant-openstack-provider/config_resolver_spec.rb +10 -0
  51. data/spec/vagrant-openstack-provider/config_spec.rb +39 -4
  52. data/spec/vagrant-openstack-provider/utils_spec.rb +17 -17
  53. metadata +5 -2
@@ -41,7 +41,7 @@ describe VagrantPlugins::Openstack::Utils do
41
41
  nova.stub(:get_server_details).with(env, '1234id') do
42
42
  {
43
43
  'addresses' => {
44
- 'toto' => [{
44
+ 'net' => [{
45
45
  'addr' => '13.13.13.13'
46
46
  }, {
47
47
  'addr' => '12.12.12.12',
@@ -55,13 +55,13 @@ describe VagrantPlugins::Openstack::Utils do
55
55
  end
56
56
 
57
57
  context 'without floating ip in nova details' do
58
- context 'with on single ip in nova details' do
58
+ context 'with a single ip in nova details' do
59
59
  it 'returns the single ip' do
60
60
  config.stub(:floating_ip) { nil }
61
61
  nova.stub(:get_server_details).with(env, '1234id') do
62
62
  {
63
63
  'addresses' => {
64
- 'toto' => [{
64
+ 'net' => [{
65
65
  'addr' => '13.13.13.13',
66
66
  'OS-EXT-IPS:type' => 'fixed'
67
67
  }]
@@ -73,21 +73,28 @@ describe VagrantPlugins::Openstack::Utils do
73
73
  end
74
74
 
75
75
  context 'with multiple ips in nova details' do
76
- it 'fails' do
76
+ it 'return the one corresponding to the first network in the Vagrantfile' do
77
77
  config.stub(:floating_ip) { nil }
78
+ config.stub(:networks) { %w(net-2 net-1 net-3) }
78
79
  nova.stub(:get_server_details).with(env, '1234id') do
79
80
  {
80
81
  'addresses' => {
81
- 'toto' => [{
82
- 'addr' => '13.13.13.13'
83
- }, {
82
+ 'net-1' => [{
83
+ 'addr' => '11.11.11.11',
84
+ 'OS-EXT-IPS:type' => 'fixed'
85
+ }],
86
+ 'net-2' => [{
84
87
  'addr' => '12.12.12.12',
85
- 'OS-EXT-IPS:type' => 'private'
88
+ 'OS-EXT-IPS:type' => 'fixed'
89
+ }],
90
+ 'net-3' => [{
91
+ 'addr' => '13.13.13.13',
92
+ 'OS-EXT-IPS:type' => 'fixed'
86
93
  }]
87
94
  }
88
95
  }
89
96
  end
90
- expect(@action.get_ip_address(env)).to eq('13.13.13.13')
97
+ expect(@action.get_ip_address(env)).to eq('12.12.12.12')
91
98
  end
92
99
  end
93
100
 
@@ -97,7 +104,7 @@ describe VagrantPlugins::Openstack::Utils do
97
104
  nova.stub(:get_server_details).with(env, '1234id') do
98
105
  {
99
106
  'addresses' => {
100
- 'toto' => []
107
+ 'net' => []
101
108
  }
102
109
  }
103
110
  end
@@ -118,12 +125,5 @@ describe VagrantPlugins::Openstack::Utils do
118
125
  end
119
126
  end
120
127
  end
121
-
122
- context 'with config.floating_ip' do
123
- it 'returns floating_ip' do
124
- config.stub(:floating_ip) { '1.2.3.4' }
125
- @action.get_ip_address(env).should eq('1.2.3.4')
126
- end
127
- end
128
128
  end
129
129
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-openstack-provider
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Guillaume Giamarchi
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-11-28 00:00:00.000000000 Z
12
+ date: 2015-01-30 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: json
@@ -207,17 +207,20 @@ files:
207
207
  - lib/vagrant-openstack-provider/client/nova.rb
208
208
  - lib/vagrant-openstack-provider/client/openstack.rb
209
209
  - lib/vagrant-openstack-provider/client/request_logger.rb
210
+ - lib/vagrant-openstack-provider/client/rest_utils.rb
210
211
  - lib/vagrant-openstack-provider/command/abstract_command.rb
211
212
  - lib/vagrant-openstack-provider/command/flavor_list.rb
212
213
  - lib/vagrant-openstack-provider/command/floatingip_list.rb
213
214
  - lib/vagrant-openstack-provider/command/image_list.rb
214
215
  - lib/vagrant-openstack-provider/command/main.rb
215
216
  - lib/vagrant-openstack-provider/command/network_list.rb
217
+ - lib/vagrant-openstack-provider/command/openstack_command.rb
216
218
  - lib/vagrant-openstack-provider/command/reset.rb
217
219
  - lib/vagrant-openstack-provider/command/subnet_list.rb
218
220
  - lib/vagrant-openstack-provider/command/utils.rb
219
221
  - lib/vagrant-openstack-provider/command/volume_list.rb
220
222
  - lib/vagrant-openstack-provider/config.rb
223
+ - lib/vagrant-openstack-provider/config/http.rb
221
224
  - lib/vagrant-openstack-provider/config_resolver.rb
222
225
  - lib/vagrant-openstack-provider/errors.rb
223
226
  - lib/vagrant-openstack-provider/logging.rb