mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
more accurate server requests
This commit is contained in:
parent
a00ec777ef
commit
a388b9f51e
2 changed files with 16 additions and 4 deletions
|
@ -23,9 +23,9 @@ module Fog
|
|||
}
|
||||
body_object = {
|
||||
'name' => server_name,
|
||||
'image' => @api_url + "google/images/#{image_name}",
|
||||
'image' => @api_url + @project + "/global/images/#{image_name}",
|
||||
'zone' => @api_url + @project + "/zones/#{zone_name}",
|
||||
'machineType' => @api_url + @project + "/machineTypes/#{machine_name}",
|
||||
'machineType' => @api_url + @project + "/global/machineTypes/#{machine_name}",
|
||||
'networkInterfaces' => [{
|
||||
'network' => @api_url + @project + "/global/networks/#{network_name}"
|
||||
}]
|
||||
|
|
|
@ -49,13 +49,12 @@ Shindo.tests('Fog::Compute[:google] | server requests', ['google']) do
|
|||
'kind' => String,
|
||||
'id' => String,
|
||||
'selfLink' => String,
|
||||
'items' => []
|
||||
}
|
||||
|
||||
tests('success') do
|
||||
|
||||
server_name = 'new-server-test'
|
||||
image_name = "gcel-12-04-v20130225"
|
||||
image_name = "gcel-12-04-v20130325"
|
||||
machine_type = "n1-standard-1"
|
||||
zone_name = "us-central1-a"
|
||||
|
||||
|
@ -69,6 +68,13 @@ Shindo.tests('Fog::Compute[:google] | server requests', ['google']) do
|
|||
end
|
||||
|
||||
tests("#get_server").formats(@get_server_format) do
|
||||
@google.insert_server(
|
||||
server_name,
|
||||
image_name,
|
||||
zone_name,
|
||||
machine_type
|
||||
)
|
||||
|
||||
@google.get_server(server_name, zone_name).body
|
||||
end
|
||||
|
||||
|
@ -77,6 +83,12 @@ Shindo.tests('Fog::Compute[:google] | server requests', ['google']) do
|
|||
end
|
||||
|
||||
tests("#delete_server").formats(@delete_server_format) do
|
||||
@google.insert_server(
|
||||
server_name,
|
||||
image_name,
|
||||
zone_name,
|
||||
machine_type
|
||||
)
|
||||
@google.delete_server(server_name, zone_name).body
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue