Skip to content

OCPBUGS-17667: Validate vCenter datacenters in failure domain topology #10086

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-17667: Validate vCenter datacenters in failure domain topology #10086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions pkg/types/vsphere/validation/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ func validateFailureDomains(p *vsphere.Platform, platformFldPath *field.Path, fl

if len(failureDomain.Topology.Datacenter) == 0 {
allErrs = append(allErrs, field.Required(topologyFld.Child("datacenter"), "must specify a datacenter"))
} else if associatedVCenter != nil && len(associatedVCenter.Datacenters) > 0 && !slices.Contains(associatedVCenter.Datacenters, failureDomain.Topology.Datacenter) {
allErrs = append(allErrs, field.Invalid(topologyFld.Child("datacenter"), failureDomain.Topology.Datacenter, fmt.Sprintf("datacenter must be defined in vCenter %s datacenters list", failureDomain.Server)))
}
if len(failureDomain.Topology.Datastore) == 0 {
allErrs = append(allErrs, field.Required(topologyFld.Child("datastore"), "must specify a datastore"))
Expand Down
13 changes: 13 additions & 0 deletions pkg/types/vsphere/validation/platform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,19 @@ func TestValidatePlatform(t *testing.T) {
}(),
expectedError: `^test-path\.failureDomains\.server: Invalid value: "bad-vcenter": server does not exist in vcenters`,
},
{
name: "Multi-zone platform datacenter not in vCenter datacenters list",
platform: func() *vsphere.Platform {
p := validPlatform()
p.FailureDomains[0].Topology.Datacenter = "non-existent-datacenter"
p.FailureDomains[0].Topology.Datastore = "/non-existent-datacenter/datastore/test-datastore"
p.FailureDomains[0].Topology.ComputeCluster = "/non-existent-datacenter/host/test-cluster"
p.FailureDomains[0].Topology.ResourcePool = "/non-existent-datacenter/host/test-cluster/Resources/test-resourcepool"
p.FailureDomains[0].Topology.Folder = "/non-existent-datacenter/vm/test-folder"
return p
}(),
expectedError: `^test-path\.failureDomains\.topology\.datacenter: Invalid value: "non-existent-datacenter": datacenter must be defined in vCenter test-vcenter datacenters list$`,
},
{
name: "Multi-zone platform failure domain topology cluster relative path",
platform: func() *vsphere.Platform {
Expand Down