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

[google|compute] remove hard-coded references to /projects/google/

Browse source
This commit is contained in:
Eric Johnson 2014-06-09 16:31:53 +00:00
parent 912cd6fae1
commit 8512ddc751
2 changed files with 3 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
lib/fog/google/compute.rb
View file

@ -213,61 +213,6 @@ module Fog
def self.data(api_version) def self.data(api_version)
@data ||= Hash.new do |hash, key| @data ||= Hash.new do |hash, key|
case key case key
when 'google'
hash[key] = {
:images => {
"centos-6-2-v20120621" => {
"kind" => "compute#image",
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-2-v20120621",
"id" => "12920641029336858796",
"creationTimestamp" => "2012-06-21T22:59:56.392-07:00",
"name" => "centos-6-2-v20120621",
"description" => "CentOS 6.2; Created Thu, 21 Jun 2012 14:22:21 +0000",
"sourceType" => "RAW",
"rawDisk" => {
"containerType" => "TAR",
"source" => ""
},
"deprecated" => {
"state" => "DELETED",
"replacement" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20130104"
},
"status" => "READY"
},
"centos-6-v20120912" => {
"kind" => "compute#image",
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20120912",
"id" => "12994279803511049620",
"creationTimestamp" => "2012-09-18T08:52:47.584-07:00",
"name" => "centos-6-v20120912",
"description" => "CentOS 6; Created Wed, 12 Sep 2012 00:00:00 +0000",
"sourceType" => "RAW",
"rawDisk" => {
"containerType" => "TAR",
"source" => ""
},
"deprecated" => {
"state" => "DEPRECATED",
"replacement" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20130104"
},
"status" => "READY"
},
"centos-6-v20121106" => {
"kind" => "compute#image",
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20121106",
"id" => "13037720516378381209",
"creationTimestamp" => "2012-11-09T11:40:41.079-08:00",
"name" => "centos-6-v20121106",
"description" => "SCSI-enabled CentOS 6; Created Tue, 06 Nov 2012 00:00:00 +0000",
"sourceType" => "RAW",
"rawDisk" => {
"containerType" => "TAR",
"source" => ""
},
"status" => "READY"
}
}
}
when 'debian-cloud' when 'debian-cloud'
hash[key] = { hash[key] = {
:images => { :images => {

6
lib/fog/google/requests/compute/get_machine_type.rb
View file

@ -11,11 +11,11 @@ module Fog
{ {
"domain" => "global", "domain" => "global",
"reason" => "notFound", "reason" => "notFound",
"message" => "The resource 'projects/google/zones/#{zone_name}/machineTypes/#{machine_type_name}' was not found" "message" => "The resource 'projects/#{@project}/zones/#{zone_name}/machineTypes/#{machine_type_name}' was not found"
} }
], ],
"code" => 404, "code" => 404,
"message" => "The resource 'projects/google/zones/#{zone_name}/machineTypes/#{machine_type_name}' was not found" "message" => "The resource 'projects/#{@project}/zones/#{zone_name}/machineTypes/#{machine_type_name}' was not found"
} }
} }
build_response(:body => machine_type) build_response(:body => machine_type)
@ -31,7 +31,7 @@ module Fog
api_method = @compute.machine_types.get api_method = @compute.machine_types.get
parameters = { parameters = {
'zone' => zone_name, 'zone' => zone_name,
'project' => 'google', 'project' => @project,
'machineType' => machine_type_name 'machineType' => machine_type_name
} }