mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
[openstack|compute] Assert Timezone to UTC and fix format for OS on get_usage
Signed-off-by: Nelvin Driz <nelvindriz@live.com>
This commit is contained in:
parent
e82ad1631f
commit
6a2c9dafe7
1 changed files with 18 additions and 18 deletions
|
@ -5,8 +5,8 @@ module Fog
|
|||
|
||||
def get_usage(tenant_id, date_start, date_end)
|
||||
params = Hash.new
|
||||
params[:start] = date_start.iso8601.gsub(/\+.*/, '')
|
||||
params[:end] = date_end.iso8601.gsub(/\+.*/, '')
|
||||
params[:start] = date_start.utc.iso8601.chop!
|
||||
params[:end] = date_end.utc.iso8601.chop!
|
||||
request(
|
||||
:expects => [200, 203],
|
||||
:method => 'GET',
|
||||
|
@ -22,27 +22,27 @@ module Fog
|
|||
response = Excon::Response.new
|
||||
response.status = 200
|
||||
response.body = {"tenant_usage"=>
|
||||
{"total_memory_mb_usage" => 0.0,
|
||||
"total_vcpus_usage" => 0.0,
|
||||
{"total_memory_mb_usage" => 0.0,
|
||||
"total_vcpus_usage" => 0.0,
|
||||
"total_hours" => 0.0,
|
||||
"tenant_id" => tenant_id,
|
||||
"stop" => date_start,
|
||||
"start" => date_end,
|
||||
"tenant_id" => tenant_id,
|
||||
"stop" => date_start,
|
||||
"start" => date_end,
|
||||
"total_local_gb_usage" => 0.0,
|
||||
"server_usages" =>[{
|
||||
"hours" => 0.0,
|
||||
"uptime" => 69180,
|
||||
"local_gb" => 0,
|
||||
"ended_at" => nil,
|
||||
"name" => "test server",
|
||||
"tenant_id" => tenant_id,
|
||||
"vcpus" => 1,
|
||||
"memory_mb" => 512,
|
||||
"state" => "active",
|
||||
"flavor" => "m1.tiny",
|
||||
"hours" => 0.0,
|
||||
"uptime" => 69180,
|
||||
"local_gb" => 0,
|
||||
"ended_at" => nil,
|
||||
"name" => "test server",
|
||||
"tenant_id" => tenant_id,
|
||||
"vcpus" => 1,
|
||||
"memory_mb" => 512,
|
||||
"state" => "active",
|
||||
"flavor" => "m1.tiny",
|
||||
"started_at" => "2012-03-05 09:11:44"
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
response
|
||||
|
|
Loading…
Add table
Reference in a new issue