Skip to content
Merged
Changes from all commits
Commits
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
31 changes: 21 additions & 10 deletions pkg/provider/azure/data/compute-request.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ import (
const (
// standard D,E and F series are the VM families
// supporting nested virtualization
dSeriesPattern = `standardD.*v[3-6]Family$`
eSeriesPattern = `standardE.*v[3-6]Family$`
fSeriesPattern = `standardF.*v\dFamily$`
excludedFamilies = "Av4Family,ASv4Family,CSv3Family"
dSeriesPattern = `^[Ss]tandardD.*v[3-6]Family$`
eSeriesPattern = `^[Ss]tandardE.*v[3-6]Family$`
fSeriesPattern = `^[Ss]tandardF.*v\dFamily$`
//
lowerCpuPattern = `Standard.*-.*_v\d$`
lowerCpuPattern = `^[Ss]tandard.*-.*_v\d$`
)

type ComputeSelector struct{}
Expand Down Expand Up @@ -120,15 +121,25 @@ type virtualMachine struct {

func (vm *virtualMachine) nestedVirtSupported() bool {
dSeries := regexp.MustCompile(dSeriesPattern)
if dSeries.Match([]byte(vm.Family)) {
return true
}
eSeries := regexp.MustCompile(eSeriesPattern)
if eSeries.Match([]byte(vm.Family)) {
fSeries := regexp.MustCompile(fSeriesPattern)

if (dSeries.Match([]byte(vm.Family)) ||
eSeries.Match([]byte(vm.Family)) ||
fSeries.Match([]byte(vm.Family))) && !isExcludedFamily(vm.Family) {
return true
}
fSeries := regexp.MustCompile(fSeriesPattern)
return fSeries.Match([]byte(vm.Family))
return false
}

func isExcludedFamily(family string) bool {
excluded := strings.Split(excludedFamilies, ",")
for _, ex := range excluded {
if strings.HasSuffix(family, strings.TrimSpace(ex)) {
return true
}
}
return false
}

func (vm *virtualMachine) hypervGen2Supported() bool {
Expand Down