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

a few workarounds allowing aws plugin to work with Eucalyptus cloud

Browse source
This commit is contained in:
Tomasz Bak 2012-11-29 15:50:35 -08:00 • committed by geemus
parent 4935fc8703
commit 262fd7986b
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/fog/aws/parsers/compute/describe_instances.rb
View file

@ -9,7 +9,7 @@ module Fog
@block_device_mapping = {} @block_device_mapping = {}
@network_interface = {} @network_interface = {}
@context = [] @context = []
@contexts = ['blockDeviceMapping', 'groupSet', 'iamInstanceProfile', 'instancesSet', 'instanceState', 'networkInterfaceSet', 'placement', 'productCodes', 'stateReason', 'tagSet'] @contexts = ['blockDevices', 'blockDeviceMapping', 'groupSet', 'iamInstanceProfile', 'instancesSet', 'instanceState', 'networkInterfaceSet', 'placement', 'productCodes', 'stateReason', 'tagSet']
@instance = { 'blockDeviceMapping' => [], 'networkInterfaces' => [], 'iamInstanceProfile' => {}, 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} } @instance = { 'blockDeviceMapping' => [], 'networkInterfaces' => [], 'iamInstanceProfile' => {}, 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }
@reservation = { 'groupIds' => [], 'groupSet' => [], 'instancesSet' => [] } @reservation = { 'groupIds' => [], 'groupSet' => [], 'instancesSet' => [] }
@response = { 'reservationSet' => [] } @response = { 'reservationSet' => [] }
@ -81,6 +81,8 @@ module Fog
when 'tagSet' when 'tagSet'
@instance['tagSet'][@tag['key']] = @tag['value'] @instance['tagSet'][@tag['key']] = @tag['value']
@tag = {} @tag = {}
when 'blockDevices'
# Ignore this one (Eucalyptus specific)
when nil when nil
@response['reservationSet'] << @reservation @response['reservationSet'] << @reservation
@reservation = { 'groupIds' => [], 'groupSet' => [], 'instancesSet' => [] } @reservation = { 'groupIds' => [], 'groupSet' => [], 'instancesSet' => [] }
@ -101,6 +103,11 @@ module Fog
@instance['monitoring'][name] = (value == 'enabled') @instance['monitoring'][name] = (value == 'enabled')
when 'ebsOptimized' when 'ebsOptimized'
@instance['ebsOptimized'] = (value == 'true') @instance['ebsOptimized'] = (value == 'true')
# Eucalyptus passes status in schema non conforming way
when 'stateCode'
@instance['instanceState']['code'] = value
when 'stateName'
@instance['instanceState']['name'] = value
end end
end end