From 1d2b8976f436375bc0023903e2a35d3591c43074 Mon Sep 17 00:00:00 2001 From: Benjamin Pillet Date: Mon, 19 Jan 2015 17:56:27 -0800 Subject: [PATCH 1/2] Add PlacementTenancy to launch configuration parser and test case --- .../auto_scaling/describe_launch_configurations.rb | 2 +- tests/requests/auto_scaling/auto_scaling_tests.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb b/lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb index ab14f7c6a0..19a5046219 100644 --- a/lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb +++ b/lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb @@ -66,7 +66,7 @@ def end_element(name) @launch_configuration[name] = value when 'KernelId', 'RamdiskId', 'UserData' @launch_configuration[name] = value - when 'IamInstanceProfile' + when 'IamInstanceProfile', 'PlacementTenancy' @launch_configuration[name] = value when 'SpotPrice' @launch_configuration[name] = value.to_f diff --git a/tests/requests/auto_scaling/auto_scaling_tests.rb b/tests/requests/auto_scaling/auto_scaling_tests.rb index cdc586ce38..a5264fdc58 100644 --- a/tests/requests/auto_scaling/auto_scaling_tests.rb +++ b/tests/requests/auto_scaling/auto_scaling_tests.rb @@ -7,14 +7,18 @@ image_id = 'ami-8c1fece5' instance_type = 't1.micro' #listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'http'}] - Fog::AWS[:auto_scaling].create_launch_configuration(image_id, instance_type, @lc_name).body + options = { + 'PlacementTenancy' => 'dedicated', + } + Fog::AWS[:auto_scaling].create_launch_configuration(image_id, instance_type, @lc_name, options).body end tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do Fog::AWS[:auto_scaling].describe_launch_configurations().body end tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do - Fog::AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => @lc_name).body + body = Fog::AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => @lc_name).body + returns(body['PlacementTenancy']) { 'dedicated' } end tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do Fog::AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => [@lc_name]).body From 2006086f6dd944cd966a217282e90d9dcc45231b Mon Sep 17 00:00:00 2001 From: Benjamin Pillet Date: Mon, 19 Jan 2015 18:33:08 -0800 Subject: [PATCH 2/2] Remove PlacementTenancy test --- tests/requests/auto_scaling/auto_scaling_tests.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/requests/auto_scaling/auto_scaling_tests.rb b/tests/requests/auto_scaling/auto_scaling_tests.rb index a5264fdc58..cdc586ce38 100644 --- a/tests/requests/auto_scaling/auto_scaling_tests.rb +++ b/tests/requests/auto_scaling/auto_scaling_tests.rb @@ -7,18 +7,14 @@ image_id = 'ami-8c1fece5' instance_type = 't1.micro' #listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'http'}] - options = { - 'PlacementTenancy' => 'dedicated', - } - Fog::AWS[:auto_scaling].create_launch_configuration(image_id, instance_type, @lc_name, options).body + Fog::AWS[:auto_scaling].create_launch_configuration(image_id, instance_type, @lc_name).body end tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do Fog::AWS[:auto_scaling].describe_launch_configurations().body end tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do - body = Fog::AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => @lc_name).body - returns(body['PlacementTenancy']) { 'dedicated' } + Fog::AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => @lc_name).body end tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do Fog::AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => [@lc_name]).body