Merge pull request #26676 from elfosardo/provisoning-tools

Test baremetal deployment without provisioning network

Author: openshift-merge-robot

test/extended/baremetal/common.go

@@ -58,9 +58,22 @@ func skipIfUnsupportedPlatformOrConfig(oc *exutil.CLI, dc dynamic.Interface) {
 	}
 }
 
+func skipIfProvisioningNetworkSet(dc dynamic.Interface) {
+	g.By("checking Provisioning Network CIDR")
+
+	provisioningClient := provisioningClient(dc)
+	provisioningConfig, err := provisioningClient.Get(context.Background(), "provisioning-configuration", metav1.GetOptions{})
+	o.Expect(err).NotTo(o.HaveOccurred())
+
+	_, provisioningNetworkCIDRfound, err := unstructured.NestedString(provisioningConfig.Object, "spec", "provisioningNetworkCIDR")
+	o.Expect(err).NotTo(o.HaveOccurred())
+	if provisioningNetworkCIDRfound {
+		e2eskipper.Skipf("Provisioning Network set")
+	}
+}
+
 func getProvisioningNetwork(dc dynamic.Interface) string {
-	provisioningGVR := schema.GroupVersionResource{Group: "metal3.io", Resource: "provisionings", Version: "v1alpha1"}
-	provisioningClient := dc.Resource(provisioningGVR)
+	provisioningClient := provisioningClient(dc)
 	provisioningConfig, err := provisioningClient.Get(context.Background(), "provisioning-configuration", metav1.GetOptions{})
 	if err != nil {
 		return ""
@@ -91,6 +104,11 @@ func preprovisioningImagesClient(dc dynamic.Interface) dynamic.ResourceInterface
 	return ppiClient.Namespace("openshift-machine-api")
 }
 
+func provisioningClient(dc dynamic.Interface) dynamic.ResourceInterface {
+	pClient := dc.Resource(schema.GroupVersionResource{Group: "metal3.io", Resource: "provisionings", Version: "v1alpha1"})
+	return pClient
+}
+
 type FieldGetterFunc func(obj map[string]interface{}, fields ...string) (interface{}, bool, error)
 
 func expectField(object unstructured.Unstructured, resource string, nestedField string, fieldGetter FieldGetterFunc) o.Assertion {

test/extended/baremetal/hosts.go

@@ -187,3 +187,81 @@ var _ = g.Describe("[sig-installer][Feature:baremetal][Serial] Baremetal platfor
 		o.Expect(found).To(o.BeFalse())
 	})
 })
+
+var _ = g.Describe("[sig-installer][Feature:baremetal][Serial] A baremetal deployment without a provisioning network should", func() {
+	defer g.GinkgoRecover()
+
+	var (
+		oc = exutil.NewCLI("baremetal")
+	)
+
+	g.It("show the Provisioning Network as 'Disabled'", func() {
+		skipIfNotBaremetal(oc)
+
+		dc := oc.AdminDynamicClient()
+
+		skipIfProvisioningNetworkSet(dc)
+
+		o.Expect(getProvisioningNetwork(dc)).To((o.BeEquivalentTo("Disabled")))
+
+		g.By("Not allow setting the ProvisioningNetwork to 'Managed' with invalid values")
+		invalidProvisioningNetworkCIDR := "172.22.0.0/33"
+		provisioningClient := provisioningClient(dc)
+
+		provisionings, err := provisioningClient.List(context.Background(), metav1.ListOptions{})
+		o.Expect(err).NotTo(o.HaveOccurred())
+		o.Expect(provisionings.Items).ToNot(o.BeEmpty())
+
+		provisioning := provisionings.Items[0]
+
+		err = unstructured.SetNestedField(provisioning.Object, invalidProvisioningNetworkCIDR, "spec", "provisioningNetworkCIDR")
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		_, err = provisioningClient.Update(context.Background(), &provisioning, metav1.UpdateOptions{})
+		o.Expect(err).To(o.HaveOccurred())
+		o.Expect(err.Error()).To(o.ContainSubstring("could not parse provisioningNetworkCIDR"))
+
+		o.Expect(getProvisioningNetwork(dc)).To((o.BeEquivalentTo("Disabled")))
+	})
+
+	g.It("allow setting the ProvisioningNetwork to 'Managed' with valid settings", func() {
+		skipIfNotBaremetal(oc)
+
+		dc := oc.AdminDynamicClient()
+
+		skipIfProvisioningNetworkSet(dc)
+
+		validProvisioningNetworkCIDR := "172.22.0.0/24"
+		validProvisioningIP := "172.22.0.3"
+
+		provisioningClient := provisioningClient(dc)
+
+		provisionings, err := provisioningClient.List(context.Background(), metav1.ListOptions{})
+		o.Expect(err).NotTo(o.HaveOccurred())
+		o.Expect(provisionings.Items).ToNot(o.BeEmpty())
+
+		provisioning := provisionings.Items[0]
+
+		err = unstructured.SetNestedField(provisioning.Object, validProvisioningNetworkCIDR, "spec", "provisioningNetworkCIDR")
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		err = unstructured.SetNestedField(provisioning.Object, validProvisioningIP, "spec", "provisioningIP")
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		err = unstructured.SetNestedField(provisioning.Object, "Managed", "spec", "provisioningNetwork")
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		_, err = provisioningClient.Update(context.Background(), &provisioning, metav1.UpdateOptions{})
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		g.By("Move the ProvisioningNetwork back to 'Disabled'")
+		err = unstructured.SetNestedField(provisioning.Object, "Disabled", "spec", "provisioningNetwork")
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		_, err = provisioningClient.Update(context.Background(), &provisioning, metav1.UpdateOptions{})
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		o.Expect(getProvisioningNetwork(dc)).To((o.BeEquivalentTo("Disabled")))
+	})
+
+})