Skip to content

fix removal of gpus from base-instance-type agg filter #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 8, 2020
Merged

fix removal of gpus from base-instance-type agg filter #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfb10cd
fix removal of gpus from base-instance-type agg filter
bwagner5 Jul 8, 2020
d4dabc7
add base-instance-type gpu unit test
bwagner5 Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/selector/aggregates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,11 @@ func (itf Selector) TransformBaseInstanceType(filters Filters) (Filters, error)
filters.Fpga = &isFpgaSupported
}
if filters.GpusRange == nil {
gpuCount := 0
if instanceTypeInfo.GpuInfo != nil {
gpuCount := int(*getTotalGpusCount(instanceTypeInfo.GpuInfo))
filters.GpusRange = &IntRangeFilter{LowerBound: gpuCount, UpperBound: gpuCount}
gpuCount = int(*getTotalGpusCount(instanceTypeInfo.GpuInfo))
}
filters.GpusRange = &IntRangeFilter{LowerBound: gpuCount, UpperBound: gpuCount}
}
if filters.MemoryRange == nil {
lowerBound := int(float64(*instanceTypeInfo.MemoryInfo.SizeInMiB) * AggregateLowPercentile)
Expand Down
22 changes: 22 additions & 0 deletions pkg/selector/aggregates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,28 @@ func TestTransformBaseInstanceType(t *testing.T) {
h.Assert(t, *filters.BareMetal == false, " should filter out bare metal instances")
h.Assert(t, *filters.Fpga == false, "should filter out FPGA instances")
h.Assert(t, *filters.CPUArchitecture == "x86_64", "should only return x86_64 instance types")
h.Assert(t, filters.GpusRange.LowerBound == 0 && filters.GpusRange.UpperBound == 0, "should only return non-gpu instance types")
}

func TestTransformBaseInstanceTypeWithGPU(t *testing.T) {
ec2Mock := mockedEC2{
DescribeInstanceTypesResp: setupMock(t, describeInstanceTypes, "g2_2xlarge.json").DescribeInstanceTypesResp,
DescribeInstanceTypesPagesResp: setupMock(t, describeInstanceTypesPages, "g2_2xlarge_group.json").DescribeInstanceTypesPagesResp,
DescribeInstanceTypeOfferingsResp: setupMock(t, describeInstanceTypeOfferings, "us-east-2a.json").DescribeInstanceTypeOfferingsResp,
}
itf := selector.Selector{
EC2: ec2Mock,
}
instanceTypeBase := "g2.2xlarge"
filters := selector.Filters{
InstanceTypeBase: &instanceTypeBase,
}
filters, err := itf.TransformBaseInstanceType(filters)
h.Ok(t, err)
h.Assert(t, *filters.BareMetal == false, " should filter out bare metal instances")
h.Assert(t, *filters.Fpga == false, "should filter out FPGA instances")
h.Assert(t, *filters.CPUArchitecture == "x86_64", "should only return x86_64 instance types")
h.Assert(t, filters.GpusRange.LowerBound == 1 && filters.GpusRange.UpperBound == 1, "should only return gpu instance types")
}

func TestTransformFamilyFlexibile(t *testing.T) {
Expand Down
82 changes: 82 additions & 0 deletions test/static/DescribeInstanceTypes/c4_2xlarge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"InstanceTypes": [
{
"AutoRecoverySupported": true,
"BareMetal": false,
"BurstablePerformanceSupported": false,
"CurrentGeneration": true,
"DedicatedHostsSupported": true,
"EbsInfo": {
"EbsOptimizedInfo": {
"BaselineBandwidthInMbps": 1000,
"BaselineIops": 8000,
"BaselineThroughputInMBps": 125,
"MaximumBandwidthInMbps": 1000,
"MaximumIops": 8000,
"MaximumThroughputInMBps": 125
},
"EbsOptimizedSupport": "default",
"EncryptionSupport": "supported"
},
"FpgaInfo": null,
"FreeTierEligible": false,
"GpuInfo": null,
"HibernationSupported": true,
"Hypervisor": "xen",
"InferenceAcceleratorInfo": null,
"InstanceStorageInfo": null,
"InstanceStorageSupported": false,
"InstanceType": "c4.2xlarge",
"MemoryInfo": {
"SizeInMiB": 15360
},
"NetworkInfo": {
"EfaSupported": false,
"EnaSupport": "unsupported",
"Ipv4AddressesPerInterface": 15,
"Ipv6AddressesPerInterface": 15,
"Ipv6Supported": true,
"MaximumNetworkInterfaces": 4,
"NetworkPerformance": "High"
},
"PlacementGroupInfo": {
"SupportedStrategies": [
"cluster",
"partition",
"spread"
]
},
"ProcessorInfo": {
"SupportedArchitectures": [
"x86_64"
],
"SustainedClockSpeedInGhz": 2.9
},
"SupportedRootDeviceTypes": [
"ebs"
],
"SupportedUsageClasses": [
"on-demand",
"spot"
],
"SupportedVirtualizationTypes": [
"hvm"
],
"VCpuInfo": {
"DefaultCores": 4,
"DefaultThreadsPerCore": 2,
"DefaultVCpus": 8,
"ValidCores": [
1,
2,
3,
4
],
"ValidThreadsPerCore": [
1,
2
]
}
}
]
}
Loading