fixup! feat: Add Cisco IOS-XR Provider and implement interface stubs

Author: sven-rosenzweig

internal/provider/cisco/iosxr/intf.go

@@ -91,7 +91,7 @@ type MTUs struct {
 }
 
 type MTU struct {
-	MTU   uint16 `json:"mtu,omitzero"`
+	MTU   int32  `json:"mtu,omitzero"`
 	Owner string `json:"owner,omitempty"`
 }
 
@@ -167,17 +167,7 @@ type PhysIfState struct {
 	Name  string `json:"-,omitempty"`
 }
 
-// func (phys *PhysIfState) DeepCopy() *gnmiext.Configurable {
-// 	if phys == nil {
-// 		return nil
-// 	}
-// 	newPhys := new(PhysIfState)
-// 	newPhys.State = phys.State
-// 	var configurable gnmiext.Configurable = newPhys
-// 	return &configurable
-// }
-
 func (phys *PhysIfState) XPath() string {
-	//(fixme): hardcoded route processor for the moment
+	// (fixme): hardcoded route processor for the moment
 	return fmt.Sprintf("Cisco-IOS-XR-ifmgr-oper:interface-properties/data-nodes/data-node[data-node-name=0/RP0/CPU0]/system-view/interfaces/interface[interface-name=%s]", phys.Name)
 }

internal/provider/cisco/iosxr/provider.go

@@ -2,7 +2,9 @@ package iosxr
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"strconv"
 
 	"github.com/ironcore-dev/network-operator/internal/deviceutil"
 	"github.com/ironcore-dev/network-operator/internal/provider"
@@ -43,21 +45,22 @@ func (p *Provider) Disconnect(ctx context.Context, conn *deviceutil.Connection)
 
 func (p *Provider) EnsureInterface(ctx context.Context, req *provider.InterfaceRequest) error {
 	if p.client == nil {
-		return fmt.Errorf("client is not connected")
+		return errors.New("client is not connected")
 	}
-	var name string = req.Interface.Spec.Name
+	var name = req.Interface.Spec.Name
 
-	var physif *PhisIf = NewIface(name)
+	var physif = NewIface(name)
 
 	physif.Name = req.Interface.Spec.Name
 	physif.Description = req.Interface.Spec.Description
 
 	physif.Statistics.LoadInterval = 30
 	owner, err := ExractMTUOwnerFromIfaceName(name)
 	if err != nil {
-		return fmt.Errorf("failed to extract MTU owner from interface name %s: %w", name, err)
+		message := "failed to extract MTU owner from interface name" + name
+		return errors.New(message)
 	}
-	physif.MTUs = MTUs{MTU: []MTU{{MTU: uint16(req.Interface.Spec.MTU), Owner: string(owner)}}}
+	physif.MTUs = MTUs{MTU: []MTU{{MTU: req.Interface.Spec.MTU, Owner: string(owner)}}}
 
 	// (fixme): for the moment it is enought to keep this static
 	// option1: extend existing interface spec
@@ -66,31 +69,30 @@ func (p *Provider) EnsureInterface(ctx context.Context, req *provider.InterfaceR
 	physif.Statistics.LoadInterval = uint8(30)
 
 	if len(req.Interface.Spec.IPv4.Addresses) == 0 {
-		return fmt.Errorf("no IPv4 address configured for interface %s", name)
+		message := "no IPv4 address configured for interface " + name
+		return errors.New(message)
 	}
 
 	if len(req.Interface.Spec.IPv4.Addresses) > 1 {
-		return fmt.Errorf("only a single primary IPv4 address is supported for interface %s", name)
+		message := "multiple IPv4 addresses configured for interface " + name
+		return errors.New(message)
 	}
 
 	// (fixme): support IPv6 addresses, IPv6 neighbor config
-	ip := req.Interface.Spec.IPv4.Addresses[0].Prefix.Addr().String()
-	ipNet := req.Interface.Spec.IPv4.Addresses[0].Prefix.Bits()
-	if err != nil {
-		return fmt.Errorf("failed to parse IPv4 address %s: %w", req.Interface.Spec.IPv4.Addresses[0], err)
-	}
+	ip := req.Interface.Spec.IPv4.Addresses[0].Addr().String()
+	ipNet := req.Interface.Spec.IPv4.Addresses[0].Bits()
 
 	physif.IPv4Network = IPv4Network{
 		Addresses: AddressesIPv4{
 			Primary: Primary{
 				Address: ip,
-				Netmask: fmt.Sprintf("%d", ipNet),
+				Netmask: strconv.Itoa(ipNet),
 			},
 		},
 	}
 
 	// Check if interface exists otherwise patch will fail
-	var tmpiFace *PhisIf = NewIface(name)
+	var tmpiFace = NewIface(name)
 	err = p.client.GetConfig(ctx, tmpiFace)
 	if err != nil {
 		// Interface does not exist, create it
@@ -114,7 +116,7 @@ func (p *Provider) DeleteInterface(ctx context.Context, req *provider.InterfaceR
 	var iFace = NewIface(req.Interface.Spec.Name)
 
 	if p.client == nil {
-		return fmt.Errorf("client is not connected")
+		return errors.New("client is not connected")
 	}
 
 	err := p.client.Delete(ctx, iFace)
@@ -129,7 +131,7 @@ func (p *Provider) GetInterfaceStatus(ctx context.Context, req *provider.Interfa
 	state.Name = req.Interface.Spec.Name
 
 	if p.client == nil {
-		return provider.InterfaceStatus{}, fmt.Errorf("client is not connected")
+		return provider.InterfaceStatus{}, errors.New("client is not connected")
 	}
 
 	err := p.client.GetState(ctx, state)

internal/provider/cisco/iosxr/provider_test.go

@@ -135,9 +135,15 @@ func Test_EnsureInterface(t *testing.T) {
 
 	ctx := context.Background()
 
-	var name string = "TwentyFiveGigE0/0/0/14"
+	var name = "TwentyFiveGigE0/0/0/14"
 	var prefix netip.Prefix
-	prefix, _ = netip.ParsePrefix("192.168.1.0/24")
+
+	prefix, err := netip.ParsePrefix("192.168.1.0/24")
+
+	if err != nil {
+		t.Fatalf("Failed to parse prefix: %v", err)
+	}
+
 	ipv4 := v1alpha1.InterfaceIPv4{
 		Addresses: []v1alpha1.IPPrefix{
 			{
@@ -159,7 +165,7 @@ func Test_EnsureInterface(t *testing.T) {
 		},
 	}
 
-	err := p.EnsureInterface(ctx, req)
+	err = p.EnsureInterface(ctx, req)
 	if err != nil {
 		t.Fatalf("EnsureInterface() error = %v", err)
 	}
@@ -180,7 +186,7 @@ func Test_GetState(t *testing.T) {
 
 	ctx := context.Background()
 
-	var name string = "TwentyFiveGigE0/0/0/14"
+	var name = "TwentyFiveGigE0/0/0/14"
 
 	req := &provider.InterfaceRequest{
 		Interface: &v1alpha1.Interface{