diff --git a/plugins/ipam/plugin_test.go b/plugins/ipam/plugin_test.go index 474e5a1..f10e4f9 100644 --- a/plugins/ipam/plugin_test.go +++ b/plugins/ipam/plugin_test.go @@ -88,7 +88,7 @@ var _ = Describe("IPAM Plugin", func() { Expect(handler).NotTo(BeNil()) }) - It("should not return an error for empty ipam config", func() { + It("should not return an error for empty IPAM config", func() { invalidConfig := &api.IPAMConfig{} invalidConfigData, err := yaml.Marshal(invalidConfig) Expect(err).NotTo(HaveOccurred()) @@ -152,7 +152,7 @@ var _ = Describe("IPAM Plugin", func() { Expect(checkIP).To(BeFalse()) }) - It("return formrted string, if valid ipv6", func() { + It("return formatted string, if valid ipv6", func() { longIP := getLongIPv6(net.ParseIP("fe80::")) Expect(longIP).To(Equal("fe80-0000-0000-0000-0000-0000-0000-0000")) }) @@ -163,7 +163,7 @@ var _ = Describe("IPAM Plugin", func() { }).To(Panic()) }) - It("return pretty fromated string for ipamv1alpha1.IPSpec", func() { + It("return pretty formatted string for ipamv1alpha1.IPSpec", func() { ipv6Addr, err := ipamv1alpha1.IPAddrFromString(linkLocalIPV6Addr.String()) Expect(err).NotTo(HaveOccurred()) ipv6 := &ipamv1alpha1.IP{ diff --git a/plugins/ipam/suite_test.go b/plugins/ipam/suite_test.go index 626bc61..99809c4 100644 --- a/plugins/ipam/suite_test.go +++ b/plugins/ipam/suite_test.go @@ -34,13 +34,9 @@ const ( pollingInterval = 50 * time.Millisecond eventuallyTimeout = 3 * time.Second consistentlyDuration = 1 * time.Second - unknownMachineMACAddress = "11:11:11:11:11:11" linkLocalIPV6Prefix = "fe80::" - subnetLabel = "subnet=dhcp" machineWithIPAddressMACAddress = "11:22:33:44:55:66" - machineWithWrongMACAddress = "11:22:33:44" machineWithMacAddress = "11:22:33:44:55:77" - privateIPV4Address = "192.168.47.11" ipamConfigFile = "config.yaml" ) @@ -75,7 +71,7 @@ var _ = BeforeSuite(func() { // Note that you must have the required binaries setup under the bin directory to perform // the tests directly. When we run make test it will be setup and used automatically. BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s", - fmt.Sprintf("1.30.0-%s-%s", runtime.GOOS, runtime.GOARCH)), + fmt.Sprintf("1.32.0-%s-%s", runtime.GOOS, runtime.GOARCH)), } var err error @@ -134,6 +130,7 @@ func SetupTest() *corev1.Namespace { Expect(err).NotTo(HaveOccurred()) Expect(config.Namespace).To(Equal(ns.Name)) Expect(config.Subnets[0]).To(Equal("ipam-subnet1")) + Expect(config.Subnets[1]).To(Equal("ipam-subnet2")) }) return ns diff --git a/plugins/metal/plugin_test.go b/plugins/metal/plugin_test.go index 8bca061..ac01130 100644 --- a/plugins/metal/plugin_test.go +++ b/plugins/metal/plugin_test.go @@ -453,7 +453,7 @@ var _ = Describe("Endpoint", func() { Eventually(Get(endpoint)).Should(Satisfy(apierrors.IsNotFound)) }) - It("Should not create an endpoint for IPv6 DHCP request from a unknown machine", func(ctx SpecContext) { + FIt("Should not create an endpoint for IPv6 DHCP request from a unknown machine", func(ctx SpecContext) { mac, _ := net.ParseMAC(unknownMachineMACAddress) req, _ := dhcpv4.NewDiscovery(mac)