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

Improve test a bit

This commit is contained in:
Simas Cepaitis 2014-09-12 15:20:41 +01:00
parent d3d11ae68a
commit cee99f3c3e

View file

@ -53,11 +53,7 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
:Name => "Test static route #1", :Name => "Test static route #1",
:Network => "192.168.192.0/24", :Network => "192.168.192.0/24",
:NextHopIp => "192.168.0.1", :NextHopIp => "192.168.0.1",
:GatewayServiceInterface => { :GatewayInterface => {}
:name => '',
:type => '',
:href => ''
}
} }
] ]
} }
@ -89,7 +85,7 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
} }
] ]
} }
}.merge!(@vpn_configuration).merge!(@dhcp_configuration).merge!(@routing_service_configuration) }.merge!(@vpn_configuration).merge!(@dhcp_configuration)
@service = Fog::Compute::VcloudDirector.new @service = Fog::Compute::VcloudDirector.new
@org = VcloudDirector::Compute::Helper.current_org(@service) @org = VcloudDirector::Compute::Helper.current_org(@service)
@ -160,8 +156,16 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
end end
test('#check Static Routing service configuration').returns(true) do test('#check Static Routing service configuration').returns(true) do
edge_gateway = @service.get_edge_gateway(@edge_gateway_id).body
gateway_interface = edge_gateway[:Configuration][:GatewayInterface].first
@routing_service_configuration[:StaticRoutingService][:StaticRoute].first[:GatewayInterface] = {
:type => gateway_interface[:type],
:name => gateway_interface[:name],
:href => gateway_interface[:href]
}
response = @service.post_configure_edge_gateway_services(@edge_gateway_id, response = @service.post_configure_edge_gateway_services(@edge_gateway_id,
@original_gateway_conf[:Configuration][:EdgeGatewayServiceConfiguration]) @routing_service_configuration)
@service.process_task(response.body) @service.process_task(response.body)
edge_gateway = @service.get_edge_gateway(@edge_gateway_id).body edge_gateway = @service.get_edge_gateway(@edge_gateway_id).body
edge_gateway[:Configuration][:EdgeGatewayServiceConfiguration][:StaticRoutingService][:IsEnabled] == "true" edge_gateway[:Configuration][:EdgeGatewayServiceConfiguration][:StaticRoutingService][:IsEnabled] == "true"