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

[openstack|network] fixing broken tests

Browse source
This commit is contained in:
Kyle Rames 2014-04-01 16:26:41 -05:00
parent 2f5d0efc65
commit b83441333c
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/hp/models/network/router.rb
View file

@ -10,7 +10,7 @@ module Fog
attribute :name attribute :name
attribute :tenant_id attribute :tenant_id
attribute :external_gateway_info attribute :external_gateway_info
attribute :admin_state_up attribute :admin_state_up, :type => :boolean
attribute :status attribute :status
def destroy def destroy

9
lib/fog/openstack/models/network/router.rb
View file

@ -32,15 +32,16 @@ module Fog
def create def create
requires :name requires :name
merge_attributes(service.create_router(self.name, response = service.create_router(self.name, self.attributes)
self.attributes).body['router']) merge_attributes(response.body['router'])
self self
end end
def update def update
requires :id requires :id
merge_attributes(service.update_router(self.id, response = service.update_router(self.id, self.attributes)
self.attributes).body['router']) merge_attributes(response.body['router'])
self self
end end

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

@ -68,8 +68,9 @@ module Fog
end end
end end
options.keys.each do |k| options.keys.each do |k|
router[k.to_s] = options[k] router[k] = options[k]
end end
response.body = { 'router' => router } response.body = { 'router' => router }
response.status = 200 response.status = 200
response response

4
tests/openstack/requests/network/router_tests.rb
View file

@ -33,7 +33,7 @@ Shindo.tests('Fog::Network[:openstack] | router requests', ['openstack']) do
:name => 'net_name', :name => 'net_name',
:external_gateway_info => { :network_id => 'net_id' }, :external_gateway_info => { :network_id => 'net_id' },
:status => 'ACTIVE', :status => 'ACTIVE',
:admin_state_up => 'true' :admin_state_up => true
} }
Fog::Network[:openstack].update_router(router_id, attributes).body Fog::Network[:openstack].update_router(router_id, attributes).body
end end
@ -45,7 +45,7 @@ Shindo.tests('Fog::Network[:openstack] | router requests', ['openstack']) do
:name => 'net_name', :name => 'net_name',
:external_gateway_info => net, :external_gateway_info => net,
:status => 'ACTIVE', :status => 'ACTIVE',
:admin_state_up => 'true' :admin_state_up => true
} }
Fog::Network[:openstack].update_router(router_id, attributes).body Fog::Network[:openstack].update_router(router_id, attributes).body
end end