kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

deleted update_floatingip and changed variable name from floating_network_id to floatingip_id.

Browse source
This commit is contained in:
kanetann 2012-12-19 14:58:26 +09:00
parent 920672fbb0
commit 54b85c26e3
6 changed files with 19103 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/fog/openstack/models/network/floatingip.rb
View file

@ -37,9 +37,6 @@ module Fog
end
def update
requires :id, :floating_network_id
merge_attributes(connection.update_floatingip(self.floating_network_id,
self.attributes).body['floatingip'])
self
end
@ -49,19 +46,6 @@ module Fog
true
end
def assosiate
requires :floating_network_id
merge_attributes(connection.assosiate_floatingip(self.floating_network_id,
self.port_id,
self.attributes).body['floatingip'])
self
end
def disassosiate
requires :floating_network_id
connection.disassosiate_floatingip(self.floating_network_id)
self
end
end
end
end

1
lib/fog/openstack/network.rb
View file

@ -52,7 +52,6 @@ module Fog
request :create_floatingip
request :delete_floatingip
request :get_floatingip
request :update_floatingip
request :associate_floatingip
request :disassociate_floatingip

3
lib/fog/openstack/requests/network/associate_floatingip.rb
View file

@ -6,7 +6,6 @@ module Fog
def associate_floatingip(floatingip_id, port_id, options = {})
data = {
'floatingip' => {
# 'floatingip_id' => floatingip_id,
'port_id' => port_id,
}
}
@ -32,7 +31,7 @@ module Fog
data = {
'id' => '00000000-0000-0000-0000-000000000000',
}
self.data[:floatingips][data['id']] = data
self.data[:floatingips][data['floatingip_id']] = data
response.body = { 'floatingip' => data }
response
end

41
lib/fog/openstack/requests/network/update_floatingip.rb
View file

@ -1,41 +0,0 @@
module Fog
module Network
class OpenStack
class Real
def update_floatingip(floating_network_id, options = {})
data = { 'floatingip' => {} }
vanilla_options = [:port_id, :tenant_id, :fixed_ip_address ]
vanilla_options.select{ |o| options.has_key?(o) }.each do |key|
data['floatingip'][key] = options[key]
end
request(
:body => Fog::JSON.encode(data),
:expects => 200,
:method => 'PUT',
:path => "floatingips/#{floating_network_id}"
)
end
end
class Mock
def update_floatingip(floating_network_id, options = {})
response = Excon::Response.new
if floatingip = list_floatingips.body['floatingips'].detect { |_| _['id'] == floating_network_id }
floatingip['port_id'] = options[:port_id]
floatingip['tenant_id'] = options[:tenant_id]
floatingip['fixed_ip_address'] = options[:fixed_ip_address]
response.body = { 'floatingip' => floatingip }
response.status = 200
response
else
raise Fog::Network::OpenStack::NotFound
end
end
end
end
end
end

19094
tags Normal file
View file

File diff suppressed because it is too large Load diff

28
tests/openstack/requests/network/floatingip_tests.rb
View file

@ -26,32 +26,24 @@ Shindo.tests('Fog::Network[:openstack] | floatingip requests', ['openstack']) do
end
tests('#get_floatingip').formats({'floatingip' => @floatingip_format}) do
floating_network_id = Fog::Network[:openstack].floatingips.all.first.id
Fog::Network[:openstack].get_floatingip(floating_network_id).body
end
tests('#update_floatingip').formats({'floatingip' => @floatingip_format}) do
floating_network_id = Fog::Network[:openstack].floatingips.all.first.id
attributes = {:port_id => 'p0000000-0000-0000-0000-000000000000',
:tenant_id => 't0000000-0000-0000-0000-000000000000',
:fixed_ip_address => '192.168.0.1' }
Fog::Network[:openstack].update_floatingip(floating_network_id, attributes).body
floatingip_id = Fog::Network[:openstack].floatingips.all.first.id
Fog::Network[:openstack].get_floatingip(floatingip_id).body
end
tests('#associate_floatingip').succeeds do
floating_network_id = Fog::Network[:openstack].floatingips.all.first.id
floatingip_id = Fog::Network[:openstack].floatingips.all.first.id
port_id = 'p00000000-0000-0000-0000-000000000000'
Fog::Network[:openstack].associate_floatingip(floating_network_id, port_id).body
Fog::Network[:openstack].associate_floatingip(floatingip_id, port_id).body
end
tests('#disassociate_floatingip').succeeds do
floating_network_id = Fog::Network[:openstack].floatingips.all.first.id
Fog::Network[:openstack].disassociate_floatingip(floating_network_id).body
floatingip_id = Fog::Network[:openstack].floatingips.all.first.id
Fog::Network[:openstack].disassociate_floatingip(floatingip_id).body
end
tests('#delete_floatingip').succeeds do
floating_network_id = Fog::Network[:openstack].floatingips.all.first.id
Fog::Network[:openstack].delete_floatingip(floating_network_id).body
floatingip_id = Fog::Network[:openstack].floatingips.all.first.id
Fog::Network[:openstack].delete_floatingip(floatingip_id).body
end
end
@ -61,10 +53,6 @@ Shindo.tests('Fog::Network[:openstack] | floatingip requests', ['openstack']) do
Fog::Network[:openstack].get_floatingip(0)
end
tests('#update_floatingip').raises(Fog::Network::OpenStack::NotFound) do
Fog::Network[:openstack].update_floatingip(0, {})
end
tests('#delete_floatingip').raises(Fog::Network::OpenStack::NotFound) do
Fog::Network[:openstack].delete_floatingip(0)
end