fog 0.7.2 → 0.8.0

data/lib/fog/compute/parsers/aws/detach_volume.rb

@@ -8,9 +8,9 @@ module Fog
           def end_element(name)
             case name
             when 'attachTime'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             when 'device', 'instanceId', 'requestId', 'status', 'volumeId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/compute/parsers/aws/get_console_output.rb

@@ -12,15 +12,11 @@ module Fog
           def end_element(name)
             case name
             when 'instanceId', 'requestId'
-              @response[name] = @value
+              @response[name] = value
             when 'output'
-              @response[name] = if @value
-                Base64.decode64(@value)
-              else
-                nil
-              end
+              @response[name] = value && Base64.decode64(value)
             when 'timestamp'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             end
           end
 

data/lib/fog/compute/parsers/aws/import_key_pair.rb

@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'keyFingerprint', 'keyName', 'requestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/compute/parsers/aws/monitor_unmonitor_instances.rb

@@ -14,14 +14,14 @@ module Fog
           def end_element(name)
             case name
             when 'requestId'
-              @response['requestId'] = @value
+              @response['requestId'] = value
             when 'instanceId'
-              @current_instance_set['instanceId'] = @value
+              @current_instance_set['instanceId'] = value
             when 'item'
               @instance_set << @current_instance_set
               @current_instance_set = {}
             when 'state'
-              @current_instance_set['monitoring'] = @value
+              @current_instance_set['monitoring'] = value
             when 'instancesSet'
               @response['instancesSet'] = @instance_set
             end

data/lib/fog/compute/parsers/aws/register_image.rb

@@ -8,7 +8,7 @@ module Fog
           def end_element(name)
             case name
             when 'requestId', 'imageId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/compute/parsers/aws/run_instances.rb

@@ -26,30 +26,26 @@ module Fog
           def end_element(name)
             case name
             when 'amiLaunchIndex'
-              @instance[name] = @value.to_i
+              @instance[name] = value.to_i
             when 'architecture', 'clientToken', 'dnsName', 'imageId',
                   'instanceId', 'instanceType', 'ipAddress', 'kernelId',
                   'keyName', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
                   'reason', 'rootDeviceType'
-              @instance[name] = @value
+              @instance[name] = value
             when 'availabilityZone'
-              @instance['placement'][name] = @value
+              @instance['placement'][name] = value
             when 'attachTime'
-              @block_device_mapping[name] = Time.parse(@value)
+              @block_device_mapping[name] = Time.parse(value)
             when 'blockDeviceMapping'
               @in_block_device_mapping = false
             when 'code'
-              @instance['instanceState'][name] = @value.to_i
+              @instance['instanceState'][name] = value.to_i
             when 'deleteOnTermination'
-              if @value == 'true'
-                @block_device_mapping[name] = true
-              else
-                @block_device_mapping[name] = false
-              end
+              @block_device_mapping[name] = (value == 'true')
             when 'deviceName', 'status', 'volumeId'
-              @block_device_mapping[name] = @value
+              @block_device_mapping[name] = value
             when 'groupId'
-              @response['groupSet'] << @value
+              @response['groupSet'] << value
             when 'groupSet'
               @in_group_set = false
             when 'item'
@@ -61,23 +57,19 @@ module Fog
                 @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [] }
               end
             when 'launchTime'
-              @instance[name] = Time.parse(@value)
+              @instance[name] = Time.parse(value)
             when 'name'
-              @instance['instanceState'][name] = @value
+              @instance['instanceState'][name] = value
             when 'ownerId', 'requestId', 'reservationId'
-              @response[name] = @value
+              @response[name] = value
             when 'product_code'
-              @instance['productCodes'] << @value
+              @instance['productCodes'] << value
             when 'productCodes'
               @in_product_codes = false
             when 'state'
-              if @value == 'true'
-                @instance['monitoring'][name] = true
-              else
-                @instance['monitoring'][name] = false
-              end
+              @instance['monitoring'][name] = (value == 'true')
             when 'subnetId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/compute/parsers/aws/start_stop_instances.rb

@@ -22,14 +22,14 @@ module Fog
           def end_element(name)
             case name
             when 'code'
-              @instance[@state][name] = @value.to_s
+              @instance[@state][name] = value.to_s
             when 'instanceId'
-              @instance[name] = @value
+              @instance[name] = value
             when 'item'
               @response['instancesSet'] << @instance
               @instance = { 'currentState' => {}, 'previousState' => {} }
             when 'name'
-              @instance[@state][name] = @value
+              @instance[@state][name] = value
             end
           end
 

data/lib/fog/compute/parsers/aws/terminate_instances.rb

@@ -22,26 +22,26 @@ module Fog
           def end_element(name)
             case name
             when 'instanceId'
-              @instance[name] = @value
+              @instance[name] = value
             when 'item'
               @response['instancesSet'] << @instance
               @instance = { 'previousState' => {}, 'currentState' => {} }
             when 'code'
               if @in_previous_state
-                @instance['previousState'][name] = @value.to_i
+                @instance['previousState'][name] = value.to_i
               elsif @in_current_state
-                @instance['currentState'][name] = @value.to_i
+                @instance['currentState'][name] = value.to_i
               end
             when 'name'
               if @in_previous_state
-                @instance['previousState'][name] = @value
+                @instance['previousState'][name] = value
               elsif @in_current_state
-                @instance['currentState'][name] = @value
+                @instance['currentState'][name] = value
               end
             when 'previousState'
               @in_previous_state = false
             when 'requestId'
-              @response[name] = @value
+              @response[name] = value
             when 'currentState'
               @in_current_state = false
             end

data/lib/fog/compute/parsers/slicehost/create_slice.rb

@@ -13,13 +13,13 @@ module Fog
             case name
             when 'address'
               @response['addresses'] ||= []
-              @response['addresses'] << @value
+              @response['addresses'] << value
             when 'backup-id', 'flavor-id', 'id', 'image-id', 'progress'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'bw-in', 'bw-out'
-              @response[name] = @value.to_f
+              @response[name] = value.to_f
             when 'name', 'root-password', 'status'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/compute/parsers/slicehost/get_backups.rb

@@ -16,11 +16,11 @@ module Fog
               @response['backups'] << @backup
               @backup = {}
             when 'date'
-              @backup[name] = Time.parse(@value)
+              @backup[name] = Time.parse(value)
             when 'id', 'slice-id'
-              @backup[name] = @value.to_i
+              @backup[name] = value.to_i
             when 'name'
-              @backup[name] = @value
+              @backup[name] = value
             end
           end
 

data/lib/fog/compute/parsers/slicehost/get_flavor.rb

@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'id', 'price', 'ram'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'name'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/compute/parsers/slicehost/get_flavors.rb

@@ -16,9 +16,9 @@ module Fog
               @response['flavors'] << @flavor
               @flavor = {}
             when 'id', 'price', 'ram'
-              @flavor[name] = @value.to_i
+              @flavor[name] = value.to_i
             when 'name'
-              @flavor[name] = @value
+              @flavor[name] = value
             end
           end
 

data/lib/fog/compute/parsers/slicehost/get_image.rb

@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'id'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'name'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/compute/parsers/slicehost/get_images.rb

@@ -13,12 +13,12 @@ module Fog
           def end_element(name)
             case name
             when 'id'
-              @image[name] = @value.to_i
+              @image[name] = value.to_i
             when 'image'
               @response['images'] << @image
               @image = {}
             when 'name'
-              @image[name] = @value
+              @image[name] = value
             end
           end
 

data/lib/fog/compute/parsers/slicehost/get_slice.rb

@@ -13,13 +13,13 @@ module Fog
             case name
             when 'address'
               @response['addresses'] ||= []
-              @response['addresses'] << @value
+              @response['addresses'] << value
             when 'backup-id', 'flavor-id', 'id', 'image-id', 'progress'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'bw-in', 'bw-out'
-              @response[name] = @value.to_f
+              @response[name] = value.to_f
             when 'name', 'status'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/compute/parsers/slicehost/get_slices.rb

@@ -14,13 +14,13 @@ module Fog
             case name
             when 'address'
               @slice['addresses'] ||= []
-              @slice['addresses'] << @value
+              @slice['addresses'] << value
             when 'backup-id', 'flavor-id', 'id', 'image-id', 'progress'
-              @slice[name] = @value.to_i
+              @slice[name] = value.to_i
             when 'bw-in', 'bw-out'
-              @slice[name] = @value.to_f
+              @slice[name] = value.to_f
             when 'name', 'status'
-              @slice[name] = @value
+              @slice[name] = value
             when 'slice'
               @response['slices'] << @slice
               @slice = {}

data/lib/fog/compute/parsers/voxel/devices_list.rb

@@ -71,13 +71,13 @@ module Fog
             when 'access_method'
               @device['access_methods'] << @access_method
             when 'architecture'
-              @device['operating_system'][name] = @value.to_i
+              @device['operating_system'][name] = value.to_i
             when 'cage', 'facility', 'rack', 'row', 'zone'
-              @device['location'][name]['value'] = @value
+              @device['location'][name]['value'] = value
             when 'cores'
-              @device['processor'][name] = @value.to_i
+              @device['processor'][name] = value.to_i
             when 'description'
-              @device[name] = @value
+              @device[name] = value
             when 'device'
               @response['devices'] << @device
               @device = {}
@@ -85,21 +85,21 @@ module Fog
               @device['drives'] << @drive
               @drive = {}
             when 'cores'
-              @device['processing_cores'] = @value.to_i
+              @device['processing_cores'] = value.to_i
             when 'ipassignment'
-              @device['ipassignments'].last['value'] = @value
+              @device['ipassignments'].last['value'] = value
             when 'model', 'type'
-              @device[name]['value'] = @value
+              @device[name]['value'] = value
             when 'name'
-              @device['operating_system'][name] = @value
+              @device['operating_system'][name] = value
             when 'position'
-              @device['location'][name] = @value
+              @device['location'][name] = value
             when 'power_consumption'
-              @device[name] = [@value, @device[name]].join(' ')
+              @device[name] = [value, @device[name]].join(' ')
             when 'size'
-              @drive[name] = @value.to_i
+              @drive[name] = value.to_i
             when 'host', 'password', 'protocol', 'username'
-              @access_method[name] = @value
+              @access_method[name] = value
             end
           end
 

data/lib/fog/compute/parsers/voxel/images_list.rb

@@ -36,18 +36,18 @@ module Fog
           def end_element(name)
             case name
             when 'architecture'
-              @image['operating_system'][name] = @value.to_i
+              @image['operating_system'][name] = value.to_i
             when 'admin_username', 'family', 'product_family', 'product_version', 'version'
-              @image['operating_system'][name] = @value
+              @image['operating_system'][name] = value
             when 'description'
-              @image[name] = @value
+              @image[name] = value
             when 'image'
               @response['images'] << @image
               @image = {}
             when 'size'
-              @image['filesystem'][name] = @value.to_i
+              @image['filesystem'][name] = value.to_i
             when 'type'
-              @image['filesystem'][name] = @value
+              @image['filesystem'][name] = value
             end
           end
 

data/lib/fog/compute/parsers/voxel/voxcloud_create.rb

@@ -26,9 +26,9 @@ module Fog
           def end_element(name)
             case name
             when 'id'
-              @response['device'][name] = @value
+              @response['device'][name] = value
             when 'last_update'
-              @response['device'][name] = Time.at(@value.to_i)
+              @response['device'][name] = Time.at(value.to_i)
             end
           end
 

data/lib/fog/compute/parsers/voxel/voxcloud_status.rb

@@ -30,9 +30,9 @@ module Fog
               @response['devices'] << @device
               @device = {}
             when 'id', 'status'
-              @device[name] = @value
+              @device[name] = value
             when 'last_update'
-              @device[name] = Time.at(@value.to_i)
+              @device[name] = Time.at(value.to_i)
             end
           end
         end

data/lib/fog/compute/requests/aws/describe_availability_zones.rb

@@ -43,13 +43,29 @@ module Fog
 
           response = Excon::Response.new
 
-          availability_zone_info = [
+          all_zones = [
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1c", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1d", "zoneState" => "available"},
+
+            {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1b", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1c", "zoneState" => "available"},
+
+            {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1b", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1c", "zoneState" => "available"},
+
+            {"messageSet" => [], "regionName" => "ap-northeast-1", "zoneName" => "ap-northeast-1a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "ap-northeast-1", "zoneName" => "ap-northeast-1b", "zoneState" => "available"},
+
+            {"messageSet" => [], "regionName" => "ap-southeast-1", "zoneName" => "ap-southeast-1a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "ap-southeast-1", "zoneName" => "ap-southeast-1b", "zoneState" => "available"},
           ]
 
+          availability_zone_info = all_zones.select { |zoneinfo| zoneinfo["regionName"] == @region }
+
           aliases = {'region-name' => 'regionName', 'zone-name' => 'zoneName', 'state' => 'zoneState'}
           for filter_key, filter_value in filters
             aliased_key = aliases[filter_key]