diff --git a/api/types.go b/api/types.go index 1b99641..6d6b942 100644 --- a/api/types.go +++ b/api/types.go @@ -42,7 +42,7 @@ func (m *TypeMeta) GetKind() string { } type Status struct { - Code int32 `json:"code"` + Code uint32 `json:"code"` Message string `json:"message"` } diff --git a/client/client.go b/client/client.go index 1a557c8..881efb2 100644 --- a/client/client.go +++ b/client/client.go @@ -26,55 +26,55 @@ import ( ) type Client interface { - GetLoadBalancer(ctx context.Context, id string, ignoredErrors ...[]int32) (*api.LoadBalancer, error) - CreateLoadBalancer(ctx context.Context, lb *api.LoadBalancer, ignoredErrors ...[]int32) (*api.LoadBalancer, error) - DeleteLoadBalancer(ctx context.Context, id string, ignoredErrors ...[]int32) (*api.LoadBalancer, error) - - ListLoadBalancerPrefixes(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.PrefixList, error) - CreateLoadBalancerPrefix(ctx context.Context, prefix *api.LoadBalancerPrefix, ignoredErrors ...[]int32) (*api.LoadBalancerPrefix, error) - DeleteLoadBalancerPrefix(ctx context.Context, interfaceID string, prefix *netip.Prefix, ignoredErrors ...[]int32) (*api.LoadBalancerPrefix, error) - - ListLoadBalancerTargets(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.LoadBalancerTargetList, error) - CreateLoadBalancerTarget(ctx context.Context, lbtarget *api.LoadBalancerTarget, ignoredErrors ...[]int32) (*api.LoadBalancerTarget, error) - DeleteLoadBalancerTarget(ctx context.Context, id string, targetIP *netip.Addr, ignoredErrors ...[]int32) (*api.LoadBalancerTarget, error) - - GetInterface(ctx context.Context, id string, ignoredErrors ...[]int32) (*api.Interface, error) - ListInterfaces(ctx context.Context, ignoredErrors ...[]int32) (*api.InterfaceList, error) - CreateInterface(ctx context.Context, iface *api.Interface, ignoredErrors ...[]int32) (*api.Interface, error) - DeleteInterface(ctx context.Context, id string, ignoredErrors ...[]int32) (*api.Interface, error) - - GetVirtualIP(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.VirtualIP, error) - CreateVirtualIP(ctx context.Context, virtualIP *api.VirtualIP, ignoredErrors ...[]int32) (*api.VirtualIP, error) - DeleteVirtualIP(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.VirtualIP, error) - - ListPrefixes(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.PrefixList, error) - CreatePrefix(ctx context.Context, prefix *api.Prefix, ignoredErrors ...[]int32) (*api.Prefix, error) - DeletePrefix(ctx context.Context, interfaceID string, prefix *netip.Prefix, ignoredErrors ...[]int32) (*api.Prefix, error) - - ListRoutes(ctx context.Context, vni uint32, ignoredErrors ...[]int32) (*api.RouteList, error) - CreateRoute(ctx context.Context, route *api.Route, ignoredErrors ...[]int32) (*api.Route, error) - DeleteRoute(ctx context.Context, vni uint32, prefix *netip.Prefix, ignoredErrors ...[]int32) (*api.Route, error) - - GetNat(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.Nat, error) - CreateNat(ctx context.Context, nat *api.Nat, ignoredErrors ...[]int32) (*api.Nat, error) - DeleteNat(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.Nat, error) - ListLocalNats(ctx context.Context, natIP *netip.Addr, ignoredErrors ...[]int32) (*api.NatList, error) - - CreateNeighborNat(ctx context.Context, nat *api.NeighborNat, ignoredErrors ...[]int32) (*api.NeighborNat, error) - ListNats(ctx context.Context, natIP *netip.Addr, natType string, ignoredErrors ...[]int32) (*api.NatList, error) - DeleteNeighborNat(ctx context.Context, neigbhorNat *api.NeighborNat, ignoredErrors ...[]int32) (*api.NeighborNat, error) - ListNeighborNats(ctx context.Context, natIP *netip.Addr, ignoredErrors ...[]int32) (*api.NatList, error) - - ListFirewallRules(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.FirewallRuleList, error) - CreateFirewallRule(ctx context.Context, fwRule *api.FirewallRule, ignoredErrors ...[]int32) (*api.FirewallRule, error) - GetFirewallRule(ctx context.Context, interfaceID string, ruleID string, ignoredErrors ...[]int32) (*api.FirewallRule, error) - DeleteFirewallRule(ctx context.Context, interfaceID string, ruleID string, ignoredErrors ...[]int32) (*api.FirewallRule, error) - - CheckInitialized(ctx context.Context, ignoredErrors ...[]int32) (*api.Initialized, error) - Initialize(ctx context.Context, ignoredErrors ...[]int32) (*api.Initialized, error) - GetVni(ctx context.Context, vni uint32, vniType uint8, ignoredErrors ...[]int32) (*api.Vni, error) - ResetVni(ctx context.Context, vni uint32, vniType uint8, ignoredErrors ...[]int32) (*api.Vni, error) - GetVersion(ctx context.Context, version *api.Version, ignoredErrors ...[]int32) (*api.Version, error) + GetLoadBalancer(ctx context.Context, id string, ignoredErrors ...[]uint32) (*api.LoadBalancer, error) + CreateLoadBalancer(ctx context.Context, lb *api.LoadBalancer, ignoredErrors ...[]uint32) (*api.LoadBalancer, error) + DeleteLoadBalancer(ctx context.Context, id string, ignoredErrors ...[]uint32) (*api.LoadBalancer, error) + + ListLoadBalancerPrefixes(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.PrefixList, error) + CreateLoadBalancerPrefix(ctx context.Context, prefix *api.LoadBalancerPrefix, ignoredErrors ...[]uint32) (*api.LoadBalancerPrefix, error) + DeleteLoadBalancerPrefix(ctx context.Context, interfaceID string, prefix *netip.Prefix, ignoredErrors ...[]uint32) (*api.LoadBalancerPrefix, error) + + ListLoadBalancerTargets(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.LoadBalancerTargetList, error) + CreateLoadBalancerTarget(ctx context.Context, lbtarget *api.LoadBalancerTarget, ignoredErrors ...[]uint32) (*api.LoadBalancerTarget, error) + DeleteLoadBalancerTarget(ctx context.Context, id string, targetIP *netip.Addr, ignoredErrors ...[]uint32) (*api.LoadBalancerTarget, error) + + GetInterface(ctx context.Context, id string, ignoredErrors ...[]uint32) (*api.Interface, error) + ListInterfaces(ctx context.Context, ignoredErrors ...[]uint32) (*api.InterfaceList, error) + CreateInterface(ctx context.Context, iface *api.Interface, ignoredErrors ...[]uint32) (*api.Interface, error) + DeleteInterface(ctx context.Context, id string, ignoredErrors ...[]uint32) (*api.Interface, error) + + GetVirtualIP(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.VirtualIP, error) + CreateVirtualIP(ctx context.Context, virtualIP *api.VirtualIP, ignoredErrors ...[]uint32) (*api.VirtualIP, error) + DeleteVirtualIP(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.VirtualIP, error) + + ListPrefixes(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.PrefixList, error) + CreatePrefix(ctx context.Context, prefix *api.Prefix, ignoredErrors ...[]uint32) (*api.Prefix, error) + DeletePrefix(ctx context.Context, interfaceID string, prefix *netip.Prefix, ignoredErrors ...[]uint32) (*api.Prefix, error) + + ListRoutes(ctx context.Context, vni uint32, ignoredErrors ...[]uint32) (*api.RouteList, error) + CreateRoute(ctx context.Context, route *api.Route, ignoredErrors ...[]uint32) (*api.Route, error) + DeleteRoute(ctx context.Context, vni uint32, prefix *netip.Prefix, ignoredErrors ...[]uint32) (*api.Route, error) + + GetNat(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.Nat, error) + CreateNat(ctx context.Context, nat *api.Nat, ignoredErrors ...[]uint32) (*api.Nat, error) + DeleteNat(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.Nat, error) + ListLocalNats(ctx context.Context, natIP *netip.Addr, ignoredErrors ...[]uint32) (*api.NatList, error) + + CreateNeighborNat(ctx context.Context, nat *api.NeighborNat, ignoredErrors ...[]uint32) (*api.NeighborNat, error) + ListNats(ctx context.Context, natIP *netip.Addr, natType string, ignoredErrors ...[]uint32) (*api.NatList, error) + DeleteNeighborNat(ctx context.Context, neigbhorNat *api.NeighborNat, ignoredErrors ...[]uint32) (*api.NeighborNat, error) + ListNeighborNats(ctx context.Context, natIP *netip.Addr, ignoredErrors ...[]uint32) (*api.NatList, error) + + ListFirewallRules(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.FirewallRuleList, error) + CreateFirewallRule(ctx context.Context, fwRule *api.FirewallRule, ignoredErrors ...[]uint32) (*api.FirewallRule, error) + GetFirewallRule(ctx context.Context, interfaceID string, ruleID string, ignoredErrors ...[]uint32) (*api.FirewallRule, error) + DeleteFirewallRule(ctx context.Context, interfaceID string, ruleID string, ignoredErrors ...[]uint32) (*api.FirewallRule, error) + + CheckInitialized(ctx context.Context, ignoredErrors ...[]uint32) (*api.Initialized, error) + Initialize(ctx context.Context, ignoredErrors ...[]uint32) (*api.Initialized, error) + GetVni(ctx context.Context, vni uint32, vniType uint8, ignoredErrors ...[]uint32) (*api.Vni, error) + ResetVni(ctx context.Context, vni uint32, vniType uint8, ignoredErrors ...[]uint32) (*api.Vni, error) + GetVersion(ctx context.Context, version *api.Version, ignoredErrors ...[]uint32) (*api.Version, error) } type client struct { @@ -85,7 +85,7 @@ func NewClient(protoClient dpdkproto.DPDKonmetalClient) Client { return &client{protoClient} } -func (c *client) GetLoadBalancer(ctx context.Context, id string, ignoredErrors ...[]int32) (*api.LoadBalancer, error) { +func (c *client) GetLoadBalancer(ctx context.Context, id string, ignoredErrors ...[]uint32) (*api.LoadBalancer, error) { res, err := c.DPDKonmetalClient.GetLoadBalancer(ctx, &dpdkproto.GetLoadBalancerRequest{ LoadbalancerId: []byte(id), }) @@ -103,7 +103,7 @@ func (c *client) GetLoadBalancer(ctx context.Context, id string, ignoredErrors . return api.ProtoLoadBalancerToLoadBalancer(res, id) } -func (c *client) CreateLoadBalancer(ctx context.Context, lb *api.LoadBalancer, ignoredErrors ...[]int32) (*api.LoadBalancer, error) { +func (c *client) CreateLoadBalancer(ctx context.Context, lb *api.LoadBalancer, ignoredErrors ...[]uint32) (*api.LoadBalancer, error) { var lbPorts = make([]*dpdkproto.LbPort, 0, len(lb.Spec.Lbports)) for _, p := range lb.Spec.Lbports { lbPort := &dpdkproto.LbPort{Port: p.Port, Protocol: dpdkproto.Protocol(p.Protocol)} @@ -137,7 +137,7 @@ func (c *client) CreateLoadBalancer(ctx context.Context, lb *api.LoadBalancer, i return retLoadBalancer, nil } -func (c *client) DeleteLoadBalancer(ctx context.Context, id string, ignoredErrors ...[]int32) (*api.LoadBalancer, error) { +func (c *client) DeleteLoadBalancer(ctx context.Context, id string, ignoredErrors ...[]uint32) (*api.LoadBalancer, error) { res, err := c.DPDKonmetalClient.DeleteLoadBalancer(ctx, &dpdkproto.DeleteLoadBalancerRequest{ LoadbalancerId: []byte(id), }) @@ -155,7 +155,7 @@ func (c *client) DeleteLoadBalancer(ctx context.Context, id string, ignoredError return retLoadBalancer, nil } -func (c *client) ListLoadBalancerPrefixes(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.PrefixList, error) { +func (c *client) ListLoadBalancerPrefixes(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.PrefixList, error) { res, err := c.DPDKonmetalClient.ListLoadBalancerPrefixes(ctx, &dpdkproto.ListLoadBalancerPrefixesRequest{ InterfaceId: []byte(interfaceID), }) @@ -182,7 +182,7 @@ func (c *client) ListLoadBalancerPrefixes(ctx context.Context, interfaceID strin }, nil } -func (c *client) CreateLoadBalancerPrefix(ctx context.Context, lbprefix *api.LoadBalancerPrefix, ignoredErrors ...[]int32) (*api.LoadBalancerPrefix, error) { +func (c *client) CreateLoadBalancerPrefix(ctx context.Context, lbprefix *api.LoadBalancerPrefix, ignoredErrors ...[]uint32) (*api.LoadBalancerPrefix, error) { res, err := c.DPDKonmetalClient.CreateLoadBalancerPrefix(ctx, &dpdkproto.CreateLoadBalancerPrefixRequest{ InterfaceId: []byte(lbprefix.InterfaceID), Prefix: &dpdkproto.Prefix{ @@ -212,7 +212,7 @@ func (c *client) CreateLoadBalancerPrefix(ctx context.Context, lbprefix *api.Loa return retLBPrefix, nil } -func (c *client) DeleteLoadBalancerPrefix(ctx context.Context, interfaceID string, prefix *netip.Prefix, ignoredErrors ...[]int32) (*api.LoadBalancerPrefix, error) { +func (c *client) DeleteLoadBalancerPrefix(ctx context.Context, interfaceID string, prefix *netip.Prefix, ignoredErrors ...[]uint32) (*api.LoadBalancerPrefix, error) { res, err := c.DPDKonmetalClient.DeleteLoadBalancerPrefix(ctx, &dpdkproto.DeleteLoadBalancerPrefixRequest{ InterfaceId: []byte(interfaceID), Prefix: &dpdkproto.Prefix{ @@ -235,7 +235,7 @@ func (c *client) DeleteLoadBalancerPrefix(ctx context.Context, interfaceID strin return retLBPrefix, nil } -func (c *client) ListLoadBalancerTargets(ctx context.Context, loadBalancerID string, ignoredErrors ...[]int32) (*api.LoadBalancerTargetList, error) { +func (c *client) ListLoadBalancerTargets(ctx context.Context, loadBalancerID string, ignoredErrors ...[]uint32) (*api.LoadBalancerTargetList, error) { res, err := c.DPDKonmetalClient.ListLoadBalancerTargets(ctx, &dpdkproto.ListLoadBalancerTargetsRequest{ LoadbalancerId: []byte(loadBalancerID), }) @@ -269,7 +269,7 @@ func (c *client) ListLoadBalancerTargets(ctx context.Context, loadBalancerID str }, nil } -func (c *client) CreateLoadBalancerTarget(ctx context.Context, lbtarget *api.LoadBalancerTarget, ignoredErrors ...[]int32) (*api.LoadBalancerTarget, error) { +func (c *client) CreateLoadBalancerTarget(ctx context.Context, lbtarget *api.LoadBalancerTarget, ignoredErrors ...[]uint32) (*api.LoadBalancerTarget, error) { res, err := c.DPDKonmetalClient.CreateLoadBalancerTarget(ctx, &dpdkproto.CreateLoadBalancerTargetRequest{ LoadbalancerId: []byte(lbtarget.LoadBalancerTargetMeta.LoadbalancerID), TargetIp: api.NetIPAddrToProtoIpAddress(*lbtarget.Spec.TargetIP), @@ -289,7 +289,7 @@ func (c *client) CreateLoadBalancerTarget(ctx context.Context, lbtarget *api.Loa return retLBTarget, nil } -func (c *client) DeleteLoadBalancerTarget(ctx context.Context, lbid string, targetIP *netip.Addr, ignoredErrors ...[]int32) (*api.LoadBalancerTarget, error) { +func (c *client) DeleteLoadBalancerTarget(ctx context.Context, lbid string, targetIP *netip.Addr, ignoredErrors ...[]uint32) (*api.LoadBalancerTarget, error) { res, err := c.DPDKonmetalClient.DeleteLoadBalancerTarget(ctx, &dpdkproto.DeleteLoadBalancerTargetRequest{ LoadbalancerId: []byte(lbid), TargetIp: api.NetIPAddrToProtoIpAddress(*targetIP), @@ -308,7 +308,7 @@ func (c *client) DeleteLoadBalancerTarget(ctx context.Context, lbid string, targ return retLBTarget, nil } -func (c *client) GetInterface(ctx context.Context, id string, ignoredErrors ...[]int32) (*api.Interface, error) { +func (c *client) GetInterface(ctx context.Context, id string, ignoredErrors ...[]uint32) (*api.Interface, error) { res, err := c.DPDKonmetalClient.GetInterface(ctx, &dpdkproto.GetInterfaceRequest{ InterfaceId: []byte(id), }) @@ -324,7 +324,7 @@ func (c *client) GetInterface(ctx context.Context, id string, ignoredErrors ...[ return api.ProtoInterfaceToInterface(res.GetInterface()) } -func (c *client) ListInterfaces(ctx context.Context, ignoredErrors ...[]int32) (*api.InterfaceList, error) { +func (c *client) ListInterfaces(ctx context.Context, ignoredErrors ...[]uint32) (*api.InterfaceList, error) { res, err := c.DPDKonmetalClient.ListInterfaces(ctx, &dpdkproto.ListInterfacesRequest{}) if err != nil { return nil, err @@ -347,7 +347,7 @@ func (c *client) ListInterfaces(ctx context.Context, ignoredErrors ...[]int32) ( }, nil } -func (c *client) CreateInterface(ctx context.Context, iface *api.Interface, ignoredErrors ...[]int32) (*api.Interface, error) { +func (c *client) CreateInterface(ctx context.Context, iface *api.Interface, ignoredErrors ...[]uint32) (*api.Interface, error) { req := dpdkproto.CreateInterfaceRequest{ InterfaceType: dpdkproto.InterfaceType_VIRTUAL, InterfaceId: []byte(iface.ID), @@ -392,7 +392,7 @@ func (c *client) CreateInterface(ctx context.Context, iface *api.Interface, igno return retInterface, nil } -func (c *client) DeleteInterface(ctx context.Context, id string, ignoredErrors ...[]int32) (*api.Interface, error) { +func (c *client) DeleteInterface(ctx context.Context, id string, ignoredErrors ...[]uint32) (*api.Interface, error) { res, err := c.DPDKonmetalClient.DeleteInterface(ctx, &dpdkproto.DeleteInterfaceRequest{ InterfaceId: []byte(id), }) @@ -410,7 +410,7 @@ func (c *client) DeleteInterface(ctx context.Context, id string, ignoredErrors . return retInterface, nil } -func (c *client) GetVirtualIP(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.VirtualIP, error) { +func (c *client) GetVirtualIP(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.VirtualIP, error) { res, err := c.DPDKonmetalClient.GetVip(ctx, &dpdkproto.GetVipRequest{ InterfaceId: []byte(interfaceID), }) @@ -426,7 +426,7 @@ func (c *client) GetVirtualIP(ctx context.Context, interfaceID string, ignoredEr return api.ProtoVirtualIPToVirtualIP(interfaceID, res) } -func (c *client) CreateVirtualIP(ctx context.Context, virtualIP *api.VirtualIP, ignoredErrors ...[]int32) (*api.VirtualIP, error) { +func (c *client) CreateVirtualIP(ctx context.Context, virtualIP *api.VirtualIP, ignoredErrors ...[]uint32) (*api.VirtualIP, error) { res, err := c.DPDKonmetalClient.CreateVip(ctx, &dpdkproto.CreateVipRequest{ InterfaceId: []byte(virtualIP.InterfaceID), VipIp: api.NetIPAddrToProtoIpAddress(*virtualIP.Spec.IP), @@ -453,7 +453,7 @@ func (c *client) CreateVirtualIP(ctx context.Context, virtualIP *api.VirtualIP, return retVirtualIP, nil } -func (c *client) DeleteVirtualIP(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.VirtualIP, error) { +func (c *client) DeleteVirtualIP(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.VirtualIP, error) { res, err := c.DPDKonmetalClient.DeleteVip(ctx, &dpdkproto.DeleteVipRequest{ InterfaceId: []byte(interfaceID), }) @@ -471,7 +471,7 @@ func (c *client) DeleteVirtualIP(ctx context.Context, interfaceID string, ignore return retVirtualIP, nil } -func (c *client) ListPrefixes(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.PrefixList, error) { +func (c *client) ListPrefixes(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.PrefixList, error) { res, err := c.DPDKonmetalClient.ListPrefixes(ctx, &dpdkproto.ListPrefixesRequest{ InterfaceId: []byte(interfaceID), }) @@ -497,7 +497,7 @@ func (c *client) ListPrefixes(ctx context.Context, interfaceID string, ignoredEr }, nil } -func (c *client) CreatePrefix(ctx context.Context, prefix *api.Prefix, ignoredErrors ...[]int32) (*api.Prefix, error) { +func (c *client) CreatePrefix(ctx context.Context, prefix *api.Prefix, ignoredErrors ...[]uint32) (*api.Prefix, error) { res, err := c.DPDKonmetalClient.CreatePrefix(ctx, &dpdkproto.CreatePrefixRequest{ InterfaceId: []byte(prefix.InterfaceID), Prefix: &dpdkproto.Prefix{ @@ -526,7 +526,7 @@ func (c *client) CreatePrefix(ctx context.Context, prefix *api.Prefix, ignoredEr return retPrefix, nil } -func (c *client) DeletePrefix(ctx context.Context, interfaceID string, prefix *netip.Prefix, ignoredErrors ...[]int32) (*api.Prefix, error) { +func (c *client) DeletePrefix(ctx context.Context, interfaceID string, prefix *netip.Prefix, ignoredErrors ...[]uint32) (*api.Prefix, error) { res, err := c.DPDKonmetalClient.DeletePrefix(ctx, &dpdkproto.DeletePrefixRequest{ InterfaceId: []byte(interfaceID), Prefix: &dpdkproto.Prefix{ @@ -549,7 +549,7 @@ func (c *client) DeletePrefix(ctx context.Context, interfaceID string, prefix *n return retPrefix, nil } -func (c *client) CreateRoute(ctx context.Context, route *api.Route, ignoredErrors ...[]int32) (*api.Route, error) { +func (c *client) CreateRoute(ctx context.Context, route *api.Route, ignoredErrors ...[]uint32) (*api.Route, error) { res, err := c.DPDKonmetalClient.CreateRoute(ctx, &dpdkproto.CreateRouteRequest{ Vni: route.VNI, Route: &dpdkproto.Route{ @@ -580,7 +580,7 @@ func (c *client) CreateRoute(ctx context.Context, route *api.Route, ignoredError return retRoute, nil } -func (c *client) DeleteRoute(ctx context.Context, vni uint32, prefix *netip.Prefix, ignoredErrors ...[]int32) (*api.Route, error) { +func (c *client) DeleteRoute(ctx context.Context, vni uint32, prefix *netip.Prefix, ignoredErrors ...[]uint32) (*api.Route, error) { res, err := c.DPDKonmetalClient.DeleteRoute(ctx, &dpdkproto.DeleteRouteRequest{ Vni: vni, Route: &dpdkproto.Route{ @@ -609,7 +609,7 @@ func (c *client) DeleteRoute(ctx context.Context, vni uint32, prefix *netip.Pref return retRoute, nil } -func (c *client) ListRoutes(ctx context.Context, vni uint32, ignoredErrors ...[]int32) (*api.RouteList, error) { +func (c *client) ListRoutes(ctx context.Context, vni uint32, ignoredErrors ...[]uint32) (*api.RouteList, error) { res, err := c.DPDKonmetalClient.ListRoutes(ctx, &dpdkproto.ListRoutesRequest{ Vni: vni, }) @@ -635,7 +635,7 @@ func (c *client) ListRoutes(ctx context.Context, vni uint32, ignoredErrors ...[] }, nil } -func (c *client) GetNat(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.Nat, error) { +func (c *client) GetNat(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.Nat, error) { res, err := c.DPDKonmetalClient.GetNat(ctx, &dpdkproto.GetNatRequest{InterfaceId: []byte(interfaceID)}) if err != nil { return &api.Nat{}, err @@ -649,7 +649,7 @@ func (c *client) GetNat(ctx context.Context, interfaceID string, ignoredErrors . return api.ProtoNatToNat(res, interfaceID) } -func (c *client) CreateNat(ctx context.Context, nat *api.Nat, ignoredErrors ...[]int32) (*api.Nat, error) { +func (c *client) CreateNat(ctx context.Context, nat *api.Nat, ignoredErrors ...[]uint32) (*api.Nat, error) { res, err := c.DPDKonmetalClient.CreateNat(ctx, &dpdkproto.CreateNatRequest{ InterfaceId: []byte(nat.NatMeta.InterfaceID), NatIp: api.NetIPAddrToProtoIpAddress(*nat.Spec.NatIP), @@ -678,7 +678,7 @@ func (c *client) CreateNat(ctx context.Context, nat *api.Nat, ignoredErrors ...[ return retNat, nil } -func (c *client) DeleteNat(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.Nat, error) { +func (c *client) DeleteNat(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.Nat, error) { res, err := c.DPDKonmetalClient.DeleteNat(ctx, &dpdkproto.DeleteNatRequest{ InterfaceId: []byte(interfaceID), }) @@ -696,11 +696,11 @@ func (c *client) DeleteNat(ctx context.Context, interfaceID string, ignoredError return retNat, nil } -func (c *client) ListLocalNats(ctx context.Context, natIP *netip.Addr, ignoredErrors ...[]int32) (*api.NatList, error) { +func (c *client) ListLocalNats(ctx context.Context, natIP *netip.Addr, ignoredErrors ...[]uint32) (*api.NatList, error) { return c.ListNats(ctx, natIP, "local", ignoredErrors...) } -func (c *client) CreateNeighborNat(ctx context.Context, nNat *api.NeighborNat, ignoredErrors ...[]int32) (*api.NeighborNat, error) { +func (c *client) CreateNeighborNat(ctx context.Context, nNat *api.NeighborNat, ignoredErrors ...[]uint32) (*api.NeighborNat, error) { res, err := c.DPDKonmetalClient.CreateNeighborNat(ctx, &dpdkproto.CreateNeighborNatRequest{ NatIp: api.NetIPAddrToProtoIpAddress(*nNat.NatIP), @@ -724,7 +724,7 @@ func (c *client) CreateNeighborNat(ctx context.Context, nNat *api.NeighborNat, i return retnNat, nil } -func (c *client) ListNats(ctx context.Context, natIP *netip.Addr, natType string, ignoredErrors ...[]int32) (*api.NatList, error) { +func (c *client) ListNats(ctx context.Context, natIP *netip.Addr, natType string, ignoredErrors ...[]uint32) (*api.NatList, error) { var nType int32 switch strings.ToLower(natType) { case "local", "1": @@ -803,7 +803,7 @@ func (c *client) ListNats(ctx context.Context, natIP *netip.Addr, natType string }, nil } -func (c *client) DeleteNeighborNat(ctx context.Context, neigbhorNat *api.NeighborNat, ignoredErrors ...[]int32) (*api.NeighborNat, error) { +func (c *client) DeleteNeighborNat(ctx context.Context, neigbhorNat *api.NeighborNat, ignoredErrors ...[]uint32) (*api.NeighborNat, error) { res, err := c.DPDKonmetalClient.DeleteNeighborNat(ctx, &dpdkproto.DeleteNeighborNatRequest{ NatIp: api.NetIPAddrToProtoIpAddress(*neigbhorNat.NatIP), Vni: neigbhorNat.Spec.Vni, @@ -824,11 +824,11 @@ func (c *client) DeleteNeighborNat(ctx context.Context, neigbhorNat *api.Neighbo return nnat, nil } -func (c *client) ListNeighborNats(ctx context.Context, natIP *netip.Addr, ignoredErrors ...[]int32) (*api.NatList, error) { +func (c *client) ListNeighborNats(ctx context.Context, natIP *netip.Addr, ignoredErrors ...[]uint32) (*api.NatList, error) { return c.ListNats(ctx, natIP, "neigh", ignoredErrors...) } -func (c *client) ListFirewallRules(ctx context.Context, interfaceID string, ignoredErrors ...[]int32) (*api.FirewallRuleList, error) { +func (c *client) ListFirewallRules(ctx context.Context, interfaceID string, ignoredErrors ...[]uint32) (*api.FirewallRuleList, error) { res, err := c.DPDKonmetalClient.ListFirewallRules(ctx, &dpdkproto.ListFirewallRulesRequest{ InterfaceId: []byte(interfaceID), }) @@ -853,7 +853,7 @@ func (c *client) ListFirewallRules(ctx context.Context, interfaceID string, igno }, nil } -func (c *client) CreateFirewallRule(ctx context.Context, fwRule *api.FirewallRule, ignoredErrors ...[]int32) (*api.FirewallRule, error) { +func (c *client) CreateFirewallRule(ctx context.Context, fwRule *api.FirewallRule, ignoredErrors ...[]uint32) (*api.FirewallRule, error) { var action, direction uint8 switch strings.ToLower(fwRule.Spec.FirewallAction) { @@ -913,7 +913,7 @@ func (c *client) CreateFirewallRule(ctx context.Context, fwRule *api.FirewallRul return retFwrule, nil } -func (c *client) GetFirewallRule(ctx context.Context, interfaceID string, ruleID string, ignoredErrors ...[]int32) (*api.FirewallRule, error) { +func (c *client) GetFirewallRule(ctx context.Context, interfaceID string, ruleID string, ignoredErrors ...[]uint32) (*api.FirewallRule, error) { res, err := c.DPDKonmetalClient.GetFirewallRule(ctx, &dpdkproto.GetFirewallRuleRequest{ InterfaceId: []byte(interfaceID), RuleId: []byte(ruleID), @@ -933,7 +933,7 @@ func (c *client) GetFirewallRule(ctx context.Context, interfaceID string, ruleID return api.ProtoFwRuleToFwRule(res.Rule, interfaceID) } -func (c *client) DeleteFirewallRule(ctx context.Context, interfaceID string, ruleID string, ignoredErrors ...[]int32) (*api.FirewallRule, error) { +func (c *client) DeleteFirewallRule(ctx context.Context, interfaceID string, ruleID string, ignoredErrors ...[]uint32) (*api.FirewallRule, error) { res, err := c.DPDKonmetalClient.DeleteFirewallRule(ctx, &dpdkproto.DeleteFirewallRuleRequest{ InterfaceId: []byte(interfaceID), RuleId: []byte(ruleID), @@ -953,7 +953,7 @@ func (c *client) DeleteFirewallRule(ctx context.Context, interfaceID string, rul return retFwrule, nil } -func (c *client) CheckInitialized(ctx context.Context, ignoredErrors ...[]int32) (*api.Initialized, error) { +func (c *client) CheckInitialized(ctx context.Context, ignoredErrors ...[]uint32) (*api.Initialized, error) { res, err := c.DPDKonmetalClient.CheckInitialized(ctx, &dpdkproto.CheckInitializedRequest{}) if err != nil { return &api.Initialized{}, err @@ -969,7 +969,7 @@ func (c *client) CheckInitialized(ctx context.Context, ignoredErrors ...[]int32) return retInitialized, nil } -func (c *client) Initialize(ctx context.Context, ignoredErrors ...[]int32) (*api.Initialized, error) { +func (c *client) Initialize(ctx context.Context, ignoredErrors ...[]uint32) (*api.Initialized, error) { res, err := c.DPDKonmetalClient.Initialize(ctx, &dpdkproto.InitializeRequest{}) if err != nil { return &api.Initialized{}, err @@ -985,7 +985,7 @@ func (c *client) Initialize(ctx context.Context, ignoredErrors ...[]int32) (*api return retInit, nil } -func (c *client) GetVni(ctx context.Context, vni uint32, vniType uint8, ignoredErrors ...[]int32) (*api.Vni, error) { +func (c *client) GetVni(ctx context.Context, vni uint32, vniType uint8, ignoredErrors ...[]uint32) (*api.Vni, error) { res, err := c.DPDKonmetalClient.CheckVniInUse(ctx, &dpdkproto.CheckVniInUseRequest{ Vni: vni, Type: dpdkproto.VniType(vniType), @@ -1005,7 +1005,7 @@ func (c *client) GetVni(ctx context.Context, vni uint32, vniType uint8, ignoredE return retVni, nil } -func (c *client) ResetVni(ctx context.Context, vni uint32, vniType uint8, ignoredErrors ...[]int32) (*api.Vni, error) { +func (c *client) ResetVni(ctx context.Context, vni uint32, vniType uint8, ignoredErrors ...[]uint32) (*api.Vni, error) { res, err := c.DPDKonmetalClient.ResetVni(ctx, &dpdkproto.ResetVniRequest{ Vni: vni, Type: dpdkproto.VniType(vniType), @@ -1024,7 +1024,7 @@ func (c *client) ResetVni(ctx context.Context, vni uint32, vniType uint8, ignore return retVni, nil } -func (c *client) GetVersion(ctx context.Context, version *api.Version, ignoredErrors ...[]int32) (*api.Version, error) { +func (c *client) GetVersion(ctx context.Context, version *api.Version, ignoredErrors ...[]uint32) (*api.Version, error) { version.ClientProtocol = strings.TrimSpace(dpdkproto.GeneratedFrom) res, err := c.DPDKonmetalClient.GetVersion(ctx, &dpdkproto.GetVersionRequest{ ClientProtocol: version.ClientProtocol, diff --git a/errors/errors.go b/errors/errors.go index 0d7fb6a..54b2dcd 100644 --- a/errors/errors.go +++ b/errors/errors.go @@ -67,7 +67,7 @@ const ( ) type StatusError struct { - errorCode int32 + errorCode uint32 message string } @@ -75,7 +75,7 @@ func (s *StatusError) Message() string { return s.message } -func (s *StatusError) ErrorCode() int32 { +func (s *StatusError) ErrorCode() uint32 { return s.errorCode } @@ -86,7 +86,7 @@ func (s *StatusError) Error() string { return fmt.Sprintf("error code %d", s.errorCode) } -func NewStatusError(errorCode int32, message string) *StatusError { +func NewStatusError(errorCode uint32, message string) *StatusError { return &StatusError{ errorCode: errorCode, message: message, @@ -94,7 +94,7 @@ func NewStatusError(errorCode int32, message string) *StatusError { } // Ignore requested status errors -func GetError(status *dpdkproto.Status, ignoredErrors [][]int32) error { +func GetError(status *dpdkproto.Status, ignoredErrors [][]uint32) error { if status.Code == 0 { return nil } @@ -108,7 +108,7 @@ func GetError(status *dpdkproto.Status, ignoredErrors [][]int32) error { return NewStatusError(status.Code, status.Message) } -func IsStatusErrorCode(err error, errorCodes ...int32) bool { +func IsStatusErrorCode(err error, errorCodes ...uint32) bool { statusError := &StatusError{} if !errors.As(err, &statusError) { return false @@ -122,7 +122,7 @@ func IsStatusErrorCode(err error, errorCodes ...int32) bool { return false } -func IgnoreStatusErrorCode(err error, errorCodes ...int32) error { +func IgnoreStatusErrorCode(err error, errorCodes ...uint32) error { if IsStatusErrorCode(err, errorCodes...) { return nil } @@ -130,8 +130,8 @@ func IgnoreStatusErrorCode(err error, errorCodes ...int32) error { } // Create array of status error codes to be ignored -func Ignore(errorCodes ...int32) []int32 { - arr := make([]int32, 0, len(errorCodes)) +func Ignore(errorCodes ...uint32) []uint32 { + arr := make([]uint32, 0, len(errorCodes)) arr = append(arr, errorCodes...) return arr diff --git a/proto/dpdk.pb.go b/proto/dpdk.pb.go index 92b3ac4..4ec0721 100644 --- a/proto/dpdk.pb.go +++ b/proto/dpdk.pb.go @@ -371,7 +371,7 @@ type Status struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` } @@ -407,7 +407,7 @@ func (*Status) Descriptor() ([]byte, []int) { return file_proto_dpdk_proto_rawDescGZIP(), []int{1} } -func (x *Status) GetCode() int32 { +func (x *Status) GetCode() uint32 { if x != nil { return x.Code } @@ -733,7 +733,8 @@ type VirtualFunction struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Linux VF NIC device name + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Linux VF NIC device name + // TODO: Not available anymore, remove in next breaking change Domain uint32 `protobuf:"varint,2,opt,name=domain,proto3" json:"domain,omitempty"` // PCIe Domain Bus uint32 `protobuf:"varint,3,opt,name=bus,proto3" json:"bus,omitempty"` // PCIe Bus Slot uint32 `protobuf:"varint,4,opt,name=slot,proto3" json:"slot,omitempty"` // PCIe Slot @@ -5508,7 +5509,7 @@ var file_proto_dpdk_proto_rawDesc = []byte{ 0x74, 0x6f, 0x12, 0x0e, 0x64, 0x70, 0x64, 0x6b, 0x6f, 0x6e, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x2e, 0x76, 0x31, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x36, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, + 0x01, 0x28, 0x0d, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x56, 0x0a, 0x09, 0x49, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2f, 0x0a, 0x05, 0x69, 0x70, 0x76, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, diff --git a/proto/generated_from.txt b/proto/generated_from.txt index fd8518c..4d8de33 100644 --- a/proto/generated_from.txt +++ b/proto/generated_from.txt @@ -1 +1 @@ -v0.2.13 +v0.2.15-30-g33574d4