Fix linting issues

ironcore-dev · Sep 25, 2024 · 801a827 · 801a827
1 parent ce75688
commit 801a827
Showing 1 changed file with 39 additions and 41 deletions.
diff --git a/plugins/httpboot/plugin_test.go b/plugins/httpboot/plugin_test.go
@@ -219,13 +219,19 @@ func TestHTTPBootNotRequested6(t *testing.T) {
 	req.MessageType = dhcpv6.MessageTypeRequest
 	req.AddOption(dhcpv6.OptRequestedOption(dhcpv6.OptionBootfileURL))
 
+	// known LinkAddr
+	relayedRequest, err := dhcpv6.EncapsulateRelay(req, dhcpv6.MessageTypeRelayForward, net.IPv6loopback, net.IPv6loopback)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	stub, err := dhcpv6.NewMessage()
 	if err != nil {
 		t.Fatal(err)
 	}
 	stub.MessageType = dhcpv6.MessageTypeReply
 
-	resp, stop := handler6(req, stub)
+	resp, stop := handler6(relayedRequest, stub)
 	if resp == nil {
 		t.Fatal("plugin did not return a message")
 	}
@@ -496,31 +502,14 @@ func TestCustomHTTPBootRequestedKnownIP(t *testing.T) {
 }
 
 func TestCustomHTTPBootRequestedKnownMAC(t *testing.T) {
-	Init6(fmt.Sprintf(bootServiceEndpoint, bootServicePort))
-	req, err := dhcpv6.NewMessage()
-	if err != nil {
-		t.Fatal(err)
-	}
-	req.MessageType = dhcpv6.MessageTypeRequest
-	req.AddOption(dhcpv6.OptRequestedOption(dhcpv6.OptionBootfileURL))
-	optVendorClass := dhcpv6.OptVendorClass{}
-	buf := []byte{
-		0, 0, 5, 57, // nice "random" enterprise number, can be ignored
-		0, 10, // length ot vendor class
-		'H', 'T', 'T', 'P', 'C', 'l', 'i', 'e', 'n', 't', // vendor class
-	}
-	_ = optVendorClass.FromBytes(buf)
-	req.UpdateOption(&optVendorClass)
+	// known LinkLayerAddress
+	macAddress, _ := net.ParseMAC("aa:bb:cc:dd:ee:ff")
 
-	// not known LinkAddr
-	relayedRequest, err := dhcpv6.EncapsulateRelay(req, dhcpv6.MessageTypeRelayForward,
-		net.IP{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}, net.IPv6loopback)
+	err, relayedRequest := createHTTPBootRequest(t)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	// known LinkLayerAddress
-	macAddress, _ := net.ParseMAC("aa:bb:cc:dd:ee:ff")
 	opt := dhcpv6.OptClientLinkLayerAddress(iana.HWTypeEthernet, macAddress)
 	relayedRequest.AddOption(opt)
 
@@ -565,31 +554,14 @@ func TestCustomHTTPBootRequestedKnownMAC(t *testing.T) {
 }
 
 func TestCustomHTTPBootRequestedUnknownClient(t *testing.T) {
-	Init6(fmt.Sprintf(bootServiceEndpoint, bootServicePort))
-	req, err := dhcpv6.NewMessage()
-	if err != nil {
-		t.Fatal(err)
-	}
-	req.MessageType = dhcpv6.MessageTypeRequest
-	req.AddOption(dhcpv6.OptRequestedOption(dhcpv6.OptionBootfileURL))
-	optVendorClass := dhcpv6.OptVendorClass{}
-	buf := []byte{
-		0, 0, 5, 57, // nice "random" enterprise number, can be ignored
-		0, 10, // length ot vendor class
-		'H', 'T', 'T', 'P', 'C', 'l', 'i', 'e', 'n', 't', // vendor class
-	}
-	_ = optVendorClass.FromBytes(buf)
-	req.UpdateOption(&optVendorClass)
+	// not known LinkLayerAddress
+	macAddress, _ := net.ParseMAC("11:22:33:44:55:66")
 
-	// not known LinkAddr
-	relayedRequest, err := dhcpv6.EncapsulateRelay(req, dhcpv6.MessageTypeRelayForward,
-		net.IP{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}, net.IPv6loopback)
+	err, relayedRequest := createHTTPBootRequest(t)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	// not known LinkLayerAddress
-	macAddress, _ := net.ParseMAC("11:22:33:44:55:66")
 	opt := dhcpv6.OptClientLinkLayerAddress(iana.HWTypeEthernet, macAddress)
 	relayedRequest.AddOption(opt)
 
@@ -633,6 +605,32 @@ func TestCustomHTTPBootRequestedUnknownClient(t *testing.T) {
 	}
 }
 
+func createHTTPBootRequest(t *testing.T) (error, *dhcpv6.RelayMessage) {
+	Init6(fmt.Sprintf(bootServiceEndpoint, bootServicePort))
+	req, err := dhcpv6.NewMessage()
+	if err != nil {
+		t.Fatal(err)
+	}
+	req.MessageType = dhcpv6.MessageTypeRequest
+	req.AddOption(dhcpv6.OptRequestedOption(dhcpv6.OptionBootfileURL))
+	optVendorClass := dhcpv6.OptVendorClass{}
+	buf := []byte{
+		0, 0, 5, 57, // nice "random" enterprise number, can be ignored
+		0, 10, // length ot vendor class
+		'H', 'T', 'T', 'P', 'C', 'l', 'i', 'e', 'n', 't', // vendor class
+	}
+	_ = optVendorClass.FromBytes(buf)
+	req.UpdateOption(&optVendorClass)
+
+	// not known LinkAddr
+	relayedRequest, err := dhcpv6.EncapsulateRelay(req, dhcpv6.MessageTypeRelayForward,
+		net.IP{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}, net.IPv6loopback)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return err, relayedRequest
+}
+
 func TestNoRelayCustomHTTPBootRequested(t *testing.T) {
 	Init6(fmt.Sprintf(bootServiceEndpoint, bootServicePort))