From e2409db0ec2ca04e34b472fe45590a84efb39d17 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Thu, 2 Apr 2015 17:55:58 -0400 Subject: [PATCH] Add new Amazon D2 instance types and deprecate the HS1 instance type. Fixes #2477 https://bugzilla.redhat.com/show_bug.cgi?id=1208698 --- lib/Amazon/MiqEc2InstanceTypes.rb | 124 +++++++++++++++--- .../ec2_refresher_other_region_spec.rb | 4 +- .../refreshers/ec2_refresher_spec.rb | 4 +- 3 files changed, 112 insertions(+), 20 deletions(-) diff --git a/lib/Amazon/MiqEc2InstanceTypes.rb b/lib/Amazon/MiqEc2InstanceTypes.rb index a356658d39e..fe861f4caee 100644 --- a/lib/Amazon/MiqEc2InstanceTypes.rb +++ b/lib/Amazon/MiqEc2InstanceTypes.rb @@ -574,7 +574,7 @@ module MiqEc2InstanceTypes :memory => 61.gigabytes, :vcpu => 8, :ebs_only => false, - :instance_store_size => 1600.gigabytes, + :instance_store_size => 1_600.gigabytes, :instance_store_volumes => 2, # SSD :architecture => [:x86_64], :virtualization_type => [:hvm], @@ -597,7 +597,7 @@ module MiqEc2InstanceTypes :memory => 122.gigabytes, :vcpu => 16, :ebs_only => false, - :instance_store_size => 3200.gigabytes, + :instance_store_size => 3_200.gigabytes, :instance_store_volumes => 4, # SSD :architecture => [:x86_64], :virtualization_type => [:hvm], @@ -620,7 +620,7 @@ module MiqEc2InstanceTypes :memory => 244.gigabytes, :vcpu => 32, :ebs_only => false, - :instance_store_size => 6400.gigabytes, + :instance_store_size => 6_400.gigabytes, :instance_store_volumes => 8, # SSD :architecture => [:x86_64], :virtualization_type => [:hvm], @@ -636,26 +636,95 @@ module MiqEc2InstanceTypes :cluster_networking => true, }, - "hs1.8xlarge" => { - :name => "hs1.8xlarge", + "d2.xlarge" => { + :name => "d2.xlarge", :family => "Storage Optimized", - :description => "High Storage Eight Extra Large", - :memory => 117.gigabytes, + :description => "D2 Extra Large", + :memory => 30.5.gigabytes, + :vcpu => 4, + :ebs_only => false, + :instance_store_size => 6_000.gigabytes, + :instance_store_volumes => 3, + :architecture => [:x86_64], + :virtualization_type => [:hvm], + :network_performance => :moderate, + :physical_processor => "Intel Xeon E5-2676v3", + :processor_clock_speed => 2.4, # GHz + :intel_aes_ni => true, + :intel_avx => true, + :intel_avx2 => true, + :intel_turbo => true, + :ebs_optimized_available => true, + :enhanced_networking => true, + :cluster_networking => true, + }, + + "d2.2xlarge" => { + :name => "d2.2xlarge", + :family => "Storage Optimized", + :description => "D2 Double Extra Large", + :memory => 61.gigabytes, + :vcpu => 8, + :ebs_only => false, + :instance_store_size => 12_000.gigabytes, + :instance_store_volumes => 6, + :architecture => [:x86_64], + :virtualization_type => [:hvm], + :network_performance => :high, + :physical_processor => "Intel Xeon E5-2676v3", + :processor_clock_speed => 2.4, # GHz + :intel_aes_ni => true, + :intel_avx => true, + :intel_avx2 => true, + :intel_turbo => true, + :ebs_optimized_available => true, + :enhanced_networking => true, + :cluster_networking => true, + }, + + "d2.4xlarge" => { + :name => "d2.4xlarge", + :family => "Storage Optimized", + :description => "D2 Quadruple Extra Large", + :memory => 122.gigabytes, :vcpu => 16, :ebs_only => false, - :instance_store_size => 48.terabytes, + :instance_store_size => 24_000.gigabytes, + :instance_store_volumes => 12, + :architecture => [:x86_64], + :virtualization_type => [:hvm], + :network_performance => :high, + :physical_processor => "Intel Xeon E5-2676v3", + :processor_clock_speed => 2.4, # GHz + :intel_aes_ni => true, + :intel_avx => true, + :intel_avx2 => true, + :intel_turbo => true, + :ebs_optimized_available => true, + :enhanced_networking => true, + :cluster_networking => true, + }, + + "d2.8xlarge" => { + :name => "d2.8xlarge", + :family => "Storage Optimized", + :description => "D2 Eight Extra Large", + :memory => 244.gigabytes, + :vcpu => 36, + :ebs_only => false, + :instance_store_size => 48_000.gigabytes, :instance_store_volumes => 24, :architecture => [:x86_64], - :virtualization_type => [:paravirtual, :hvm], + :virtualization_type => [:hvm], :network_performance => :very_high, - :physical_processor => "Intel Xeon E5-2650", - :processor_clock_speed => 2.0, # GHz + :physical_processor => "Intel Xeon E5-2676v3", + :processor_clock_speed => 2.4, # GHz :intel_aes_ni => true, - :intel_avx => nil, - :intel_avx2 => nil, - :intel_turbo => nil, - :ebs_optimized_available => nil, - :enhanced_networking => nil, + :intel_avx => true, + :intel_avx2 => true, + :intel_turbo => true, + :ebs_optimized_available => true, + :enhanced_networking => true, :cluster_networking => true, }, } @@ -983,6 +1052,29 @@ module MiqEc2InstanceTypes :enhanced_networking => nil, :cluster_networking => nil, }, + + "hs1.8xlarge" => { + :name => "hs1.8xlarge", + :family => "Storage Optimized", + :description => "High Storage Eight Extra Large", + :memory => 117.gigabytes, + :vcpu => 16, + :ebs_only => false, + :instance_store_size => 48.terabytes, + :instance_store_volumes => 24, + :architecture => [:x86_64], + :virtualization_type => [:paravirtual, :hvm], + :network_performance => :very_high, + :physical_processor => "Intel Xeon E5-2650", + :processor_clock_speed => 2.0, # GHz + :intel_aes_ni => true, + :intel_avx => nil, + :intel_avx2 => nil, + :intel_turbo => nil, + :ebs_optimized_available => nil, + :enhanced_networking => nil, + :cluster_networking => true, + }, } # Types that are no longer advertised diff --git a/vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_other_region_spec.rb b/vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_other_region_spec.rb index 72ff6f6328d..ceaafaa07d1 100644 --- a/vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_other_region_spec.rb +++ b/vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_other_region_spec.rb @@ -32,7 +32,7 @@ def assert_table_counts ExtManagementSystem.count.should == 1 - Flavor.count.should == 43 + Flavor.count.should == 47 AvailabilityZone.count.should == 3 FloatingIp.count.should == 1 AuthPrivateKey.count.should == 2 @@ -61,7 +61,7 @@ def assert_ems :uid_ems => nil ) - @ems.flavors.size.should == 43 + @ems.flavors.size.should == 47 @ems.availability_zones.size.should == 3 @ems.floating_ips.size.should == 1 @ems.key_pairs.size.should == 2 diff --git a/vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_spec.rb b/vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_spec.rb index 8c6d88f35fe..8ec950e8ce4 100644 --- a/vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_spec.rb +++ b/vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_spec.rb @@ -40,7 +40,7 @@ def assert_table_counts ExtManagementSystem.count.should == 1 - Flavor.count.should == 43 + Flavor.count.should == 47 AvailabilityZone.count.should == 5 FloatingIp.count.should == 5 AuthPrivateKey.count.should == 7 @@ -76,7 +76,7 @@ def assert_ems :uid_ems => nil ) - @ems.flavors.size.should == 43 + @ems.flavors.size.should == 47 @ems.availability_zones.size.should == 5 @ems.floating_ips.size.should == 5 @ems.key_pairs.size.should == 7