Skip to content

baremetal: Add validation for provisioning network IPs #2320

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
openshift-merge-robot merged 2 commits into from
Oct 1, 2019
Merged

baremetal: Add validation for provisioning network IPs #2320

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
b50172b
baremetal: add test for platform validation
Sep 5, 2019
47974e6
baremetal: Add validation for provisioning network IPs
Sep 5, 2019
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
13 changes: 13 additions & 0 deletions pkg/types/baremetal/validation/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ func validateIPinMachineCIDR(vip string, n *types.Networking) error {
return nil
}

func validateIPNotinMachineCIDR(ip string, n *types.Networking) error {
if n.MachineCIDR.Contains(net.ParseIP(ip)) {
return fmt.Errorf("the IP must not be in %s subnet", n.MachineCIDR.String())
}
return nil
}

// ValidatePlatform checks that the specified platform is valid.
func ValidatePlatform(p *baremetal.Platform, n *types.Networking, fldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{}
Expand Down Expand Up @@ -71,6 +78,12 @@ func ValidatePlatform(p *baremetal.Platform, n *types.Networking, fldPath *field
if err := validateIPinMachineCIDR(p.DNSVIP, n); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("dnsVIP"), p.DNSVIP, err.Error()))
}
if err := validateIPNotinMachineCIDR(p.ClusterProvisioningIP, n); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("provisioningHostIP"), p.ClusterProvisioningIP, err.Error()))
}
if err := validateIPNotinMachineCIDR(p.BootstrapProvisioningIP, n); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("bootstrapHostIP"), p.BootstrapProvisioningIP, err.Error()))
}

return allErrs
}
194 changes: 194 additions & 0 deletions pkg/types/baremetal/validation/platform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
package validation

import (
"net"
"testing"

"github.com/openshift/installer/pkg/ipnet"
"github.com/openshift/installer/pkg/types"
"github.com/openshift/installer/pkg/types/baremetal"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/util/validation/field"
)

func TestValidatePlatform(t *testing.T) {
iface, _ := net.Interfaces()
network := &types.Networking{MachineCIDR: ipnet.MustParseCIDR("192.168.111.0/24")}
cases := []struct {
name string
platform *baremetal.Platform
network *types.Networking
expected string
}{
{
name: "valid",
platform: &baremetal.Platform{
APIVIP: "192.168.111.2",
DNSVIP: "192.168.111.3",
IngressVIP: "192.168.111.4",
Hosts: []*baremetal.Host{},
LibvirtURI: "qemu://system",
ClusterProvisioningIP: "172.22.0.3",
BootstrapProvisioningIP: "172.22.0.2",
ExternalBridge: iface[0].Name,
ProvisioningBridge: iface[0].Name,
},
network: network,
},
{
name: "invalid_apivip",
platform: &baremetal.Platform{
APIVIP: "192.168.222.2",
DNSVIP: "192.168.111.3",
IngressVIP: "192.168.111.4",
Hosts: []*baremetal.Host{},
LibvirtURI: "qemu://system",
ClusterProvisioningIP: "172.22.0.3",
BootstrapProvisioningIP: "172.22.0.2",
ExternalBridge: iface[0].Name,
ProvisioningBridge: iface[0].Name,
},
network: network,
expected: "Invalid value: \"192.168.222.2\": the virtual IP is expected to be in 192.168.111.0/24 subnet",
},
{
name: "invalid_dnsvip",
platform: &baremetal.Platform{
APIVIP: "192.168.111.2",
DNSVIP: "192.168.222.3",
IngressVIP: "192.168.111.4",
Hosts: []*baremetal.Host{},
LibvirtURI: "qemu://system",
ClusterProvisioningIP: "172.22.0.3",
BootstrapProvisioningIP: "172.22.0.2",
ExternalBridge: iface[0].Name,
ProvisioningBridge: iface[0].Name,
},
network: network,
expected: "Invalid value: \"192.168.222.3\": the virtual IP is expected to be in 192.168.111.0/24 subnet",
},
{
name: "invalid_ingressvip",
platform: &baremetal.Platform{
APIVIP: "192.168.111.2",
DNSVIP: "192.168.111.3",
IngressVIP: "192.168.222.4",
Hosts: []*baremetal.Host{},
LibvirtURI: "qemu://system",
ClusterProvisioningIP: "172.22.0.3",
BootstrapProvisioningIP: "172.22.0.2",
ExternalBridge: iface[0].Name,
ProvisioningBridge: iface[0].Name,
},
network: network,
expected: "Invalid value: \"192.168.222.4\": the virtual IP is expected to be in 192.168.111.0/24 subnet",
},
{
name: "invalid_hosts",
platform: &baremetal.Platform{
APIVIP: "192.168.111.2",
DNSVIP: "192.168.111.3",
IngressVIP: "192.168.111.4",
Hosts: nil,
LibvirtURI: "qemu://system",
ClusterProvisioningIP: "172.22.0.3",
BootstrapProvisioningIP: "172.22.0.2",
ExternalBridge: iface[0].Name,
ProvisioningBridge: iface[0].Name,
},
network: network,
expected: "bare metal hosts are missing",
},
{
name: "invalid_libvirturi",
platform: &baremetal.Platform{
APIVIP: "192.168.111.2",
DNSVIP: "192.168.111.3",
IngressVIP: "192.168.111.4",
Hosts: []*baremetal.Host{},
LibvirtURI: "",
ClusterProvisioningIP: "172.22.0.3",
BootstrapProvisioningIP: "172.22.0.2",
ExternalBridge: iface[0].Name,
ProvisioningBridge: iface[0].Name,
},
network: network,
expected: "invalid URI \"\"",
},
{
name: "invalid_extbridge",
platform: &baremetal.Platform{
APIVIP: "192.168.111.2",
DNSVIP: "192.168.111.3",
IngressVIP: "192.168.111.4",
Hosts: []*baremetal.Host{},
LibvirtURI: "qemu://system",
ClusterProvisioningIP: "172.22.0.3",
BootstrapProvisioningIP: "172.22.0.2",
ExternalBridge: "noexist",
ProvisioningBridge: iface[0].Name,
},
network: network,
expected: "Invalid value: \"noexist\": noexist is not a valid network interface",
},
{
name: "invalid_provbridge",
platform: &baremetal.Platform{
APIVIP: "192.168.111.2",
DNSVIP: "192.168.111.3",
IngressVIP: "192.168.111.4",
Hosts: []*baremetal.Host{},
LibvirtURI: "qemu://system",
ClusterProvisioningIP: "172.22.0.3",
BootstrapProvisioningIP: "172.22.0.2",
ExternalBridge: iface[0].Name,
ProvisioningBridge: "noexist",
},
network: network,
expected: "Invalid value: \"noexist\": noexist is not a valid network interface",
},
{
name: "invalid_clusterprovip",
platform: &baremetal.Platform{
APIVIP: "192.168.111.2",
DNSVIP: "192.168.111.3",
IngressVIP: "192.168.111.4",
Hosts: []*baremetal.Host{},
LibvirtURI: "qemu://system",
ClusterProvisioningIP: "192.168.111.5",
BootstrapProvisioningIP: "172.22.0.2",
ExternalBridge: iface[0].Name,
ProvisioningBridge: iface[0].Name,
},
network: network,
expected: "Invalid value: \"192.168.111.5\": the IP must not be in 192.168.111.0/24 subnet",
},
{
name: "invalid_bootstrapprovip",
platform: &baremetal.Platform{
APIVIP: "192.168.111.2",
DNSVIP: "192.168.111.3",
IngressVIP: "192.168.111.4",
Hosts: []*baremetal.Host{},
LibvirtURI: "qemu://system",
ClusterProvisioningIP: "172.22.0.3",
BootstrapProvisioningIP: "192.168.111.5",
ExternalBridge: iface[0].Name,
ProvisioningBridge: iface[0].Name,
},
network: network,
expected: "Invalid value: \"192.168.111.5\": the IP must not be in 192.168.111.0/24 subnet",
},
}

for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
err := ValidatePlatform(tc.platform, tc.network, field.NewPath("test-path")).ToAggregate()
if tc.expected == "" {
assert.NoError(t, err)
} else {
assert.Regexp(t, tc.expected, err)
}
})
}
}